Changed from Environment.NewLine to dedicated NewLine module thoroughly, Fixing a bug on always asks for update, Slowly migrating from full Terminal-dependant to Console-based

22 files changed, 976 insertions, 612 deletions

diff --git a/ShiftOS-TheRevival/MainForms/Terminal.Designer.vb b/ShiftOS-TheRevival/MainForms/Console.Designer.vb
index e556749..505c77a 100644
--- a/ShiftOS-TheRevival/MainForms/Terminal.Designer.vb
+++ b/ShiftOS-TheRevival/MainForms/Console.Designer.vb
@@ -1,5 +1,5 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
-Partial Class Terminal
+Partial Class Console
     Inherits System.Windows.Forms.Form
 
     'Form overrides dispose to clean up the component list.
@@ -40,6 +40,7 @@ Partial Class Terminal
         Me.TextBox1.Location = New System.Drawing.Point(0, 36)
         Me.TextBox1.Multiline = True
         Me.TextBox1.Name = "TextBox1"
+        Me.TextBox1.ShortcutsEnabled = False
         Me.TextBox1.Size = New System.Drawing.Size(800, 396)
         Me.TextBox1.TabIndex = 0
         '
@@ -76,7 +77,7 @@ Partial Class Terminal
         Me.ToolBar.TabIndex = 1
         Me.ToolBar.Visible = False
         '
-        'Terminal
+        'Console
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@@ -86,7 +87,8 @@ Partial Class Terminal
         Me.Controls.Add(Me.InfoBar)
         Me.Controls.Add(Me.ToolBar)
         Me.ForeColor = System.Drawing.Color.White
-        Me.Name = "Terminal"
+        Me.Name = "Console"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "Terminal"
         Me.ResumeLayout(False)
         Me.PerformLayout()
diff --git a/ShiftOS-TheRevival/MainForms/Terminal.resx b/ShiftOS-TheRevival/MainForms/Console.resx
index 4224eae..4224eae 100644
--- a/ShiftOS-TheRevival/MainForms/Terminal.resx
+++ b/ShiftOS-TheRevival/MainForms/Console.resx
diff --git a/ShiftOS-TheRevival/MainForms/Terminal.vb b/ShiftOS-TheRevival/MainForms/Console.vb
index e74f317..e273917 100644
--- a/ShiftOS-TheRevival/MainForms/Terminal.vb
+++ b/ShiftOS-TheRevival/MainForms/Console.vb
@@ -1,11 +1,8 @@
 Imports System.IO
 
-Public Class Terminal
+Public Class Console
     Public TrackPos As Integer
-    Public RawCommand As String
-    Public command As String
     Public DefaultPrompt As String
-    Public AdvancedCommand As Boolean
     Public BadCommand As Boolean
     Public DisplayStory As Integer
     Public StoryToTell As String
@@ -18,7 +15,7 @@ Public Class Terminal
     Public ReleaseCursor As Boolean = False
     Public ShOSKey As String
 
-    Private Sub Terminal_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+    Private Sub Console_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         FormBorderStyle = FormBorderStyle.None
         WindowState = FormWindowState.Maximized
         Cursor.Hide()
@@ -34,14 +31,14 @@ Public Class Terminal
             Strings.ComputerInfo(0) = "shiftos"
             Strings.ComputerInfo(1) = "user"
             CheckFeature()
-            PrintPrompt()
-            AssignPrompt()
+            Terminal_PrintPrompt()
+            Terminal_AssignPrompt()
         Else
             If StayAtChapter = True Then
                 LoadGame()
                 CheckFeature()
-                PrintPrompt()
-                AssignPrompt()
+                Terminal_PrintPrompt()
+                Terminal_AssignPrompt()
             Else
                 If Strings.ComputerInfo(3) = "0" Then
                     TextBox1.ReadOnly = True
@@ -50,15 +47,14 @@ Public Class Terminal
                 Else
                     LoadGame()
                     CheckFeature()
-                    PrintPrompt()
-                    AssignPrompt()
+                    Terminal_PrintPrompt()
+                    Terminal_AssignPrompt()
                 End If
             End If
         End If
         CurrentDirectory = Strings.OnceInfo(1)
         Pseudodir = CurrentDirectory.Replace(Strings.OnceInfo(1), "!\")
-        TextBox1.Select(TextBox1.TextLength, 0)
-        TextBox1.ScrollToCaret()
+        TextRebind()
     End Sub
 
     Public Sub CheckFeature()
@@ -101,52 +97,8 @@ Public Class Terminal
         End If
     End Sub
 
-    Public Sub PrintPrompt()
-        If TextBox1.Text = Nothing Then
-            If ChangeInterpreter = True Then
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & DefaultPrompt
-            Else
-                If Strings.OnceInfo(0) = "Yes" Then
-                    TextBox1.Text = "root@" & Strings.ComputerInfo(0) & " #> "
-                Else
-                    TextBox1.Text = Strings.ComputerInfo(1) & "@" & Strings.ComputerInfo(0) & " $> "
-                End If
-            End If
-        Else
-            If ChangeInterpreter = True Then
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & DefaultPrompt
-            Else
-                If Strings.OnceInfo(0) = "Yes" Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "root@" & Strings.ComputerInfo(0) & " #> "
-                Else
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & Strings.ComputerInfo(1) & "@" & Strings.ComputerInfo(0) & " $> "
-                End If
-            End If
-        End If
-    End Sub
-
-    Public Sub AssignPrompt()
-        If ChangeInterpreter = False Then
-            If Strings.OnceInfo(0) = "Yes" Then
-                DefaultPrompt = "root@" & Strings.ComputerInfo(0) & " #> "
-            Else
-                DefaultPrompt = Strings.ComputerInfo(1) & "@" & Strings.ComputerInfo(0) & " $> "
-            End If
-        End If
-    End Sub
-
     Private Sub Undeveloped()
-        TextBox1.Text = TextBox1.Text & Environment.NewLine & "Oopsie! It's only for newer version"
-    End Sub
-
-    Private Sub ReadCommand()
-        command = TextBox1.Lines(TextBox1.Lines.Length - 1)
-        If DefaultPrompt = Nothing Then
-        Else
-            command = command.Replace(DefaultPrompt, "")
-        End If
-        RawCommand = command
-        command = command.ToLower()
+        NewLine("Oopsie! It's only for newer version")
     End Sub
 
     Private Sub DoCommand()
@@ -156,6 +108,11 @@ Public Class Terminal
             Case ""
                 AdvancedCommand = False
                 BadCommand = False
+            Case "05tray"
+                Dim TempCP As Integer = Convert.ToInt32(Strings.ComputerInfo(2))
+                TempCP = TempCP + 50
+                Strings.ComputerInfo(2) = Convert.ToString(TempCP)
+                NewLine("you cheater!")
             Case "bc"
                 If Strings.AvailableFeature(9) = "1" Then
                     ChangeInterpreter = True
@@ -170,7 +127,7 @@ Public Class Terminal
                     BadCommand = False
                 End If
             Case "codepoint"
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & Strings.ComputerInfo(2) & " Codepoint(s) available in your wallet"
+                NewLine(Strings.ComputerInfo(2) & " Codepoint(s) available in your wallet")
                 AdvancedCommand = False
                 BadCommand = False
             Case "colors"
@@ -189,9 +146,9 @@ Public Class Terminal
                 Else
                     AdvancedCommand = False
                     BadCommand = False
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "Exitting root mode..."
+                    NewLine("Exitting root mode...")
                     Strings.OnceInfo(0) = "No"
-                    AssignPrompt()
+                    Terminal_AssignPrompt()
                 End If
             Case "guess"
                 ChangeInterpreter = True
@@ -199,102 +156,99 @@ Public Class Terminal
                 AdvancedCommand = False
                 BadCommand = False
                 'Undeveloped()
-            Case "gimme"
-                Dim TempCP As Integer = Convert.ToInt32(Strings.ComputerInfo(2))
-                TempCP = TempCP + 50
-                Strings.ComputerInfo(2) = Convert.ToString(TempCP)
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "you cheater!"
             Case "help"
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "ShiftOS Help Manual" & Environment.NewLine & Environment.NewLine & "You can type 'help' to get all available commands and its corresponding action."
+                NewLine("ShiftOS Help Manual")
+                NewLine(Nothing)
+                NewLine("You can type 'help' to get all available commands and its corresponding action.")
                 If Strings.AvailableFeature(0) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "To get help on each command, you can type 'man [command]'" & Environment.NewLine
+                    NewLine("To get help on each command, you can type 'man [command]'")
+                    NewLine(Nothing)
                 Else
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine
+                    NewLine(Nothing)
                 End If
                 If Strings.AvailableFeature(9) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "BC          Basic Calculator for simple calculation"
+                    NewLine("BC          Basic Calculator for simple calculation")
                 End If
                 If Strings.AvailableFeature(16) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "CD          Changes directory to a selected one"
+                    NewLine("CD          Changes directory to a selected one")
                 End If
                 If Strings.AvailableFeature(1) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "CLEAR       Clear the terminal"
+                    NewLine("CLEAR       Clear the terminal")
                 End If
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "CODEPOINT   Display Codepoint(s) from your wallet"
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "COLOR       Changes Terminal Text and Background color to the corresponding choice"
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "COLORS      Shows available colors support for the terminal"
+                NewLine("CODEPOINT   Display Codepoint(s) from your wallet")
+                NewLine("COLOR       Changes Terminal Text And Background color To the corresponding choice")
+                NewLine("COLORS      Shows available colors support For the terminal")
                 If Strings.AvailableFeature(22) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "COWSAY      Spawn a cow and saying anything you want"
+                    NewLine("COWSAY      Spawn a cow And saying anything you want")
                 End If
                 If Strings.AvailableFeature(16) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "DEL         Delete a selected file from the directory"
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "DIR         Displays subdirectories and files in a directory"
+                    NewLine("DEL         Delete a selected file from the directory")
+                    NewLine("DIR         Displays subdirectories And files In a directory")
                 End If
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "GUESS       Runs 'Guess the Number' application"
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "HELP        Shows all commands available and its corresponding action"
+                NewLine("GUESS       Runs 'Guess the Number' application")
+                NewLine("HELP        Shows all commands available and its corresponding action")
                 If Strings.AvailableFeature(20) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "HOSTNAME    Sets the name of current hostname/computer name with a new one"
+                    NewLine("HOSTNAME    Sets the name of current hostname/computer name with a new one")
                 End If
                 If Strings.AvailableFeature(4) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "INFOBAR     Displays informations about current session such as current app, current user, current time, etc."
+                    NewLine("INFOBAR     Displays informations about current session such as current app, current user, current time, etc.")
                 End If
                 If Strings.AvailableFeature(0) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "MAN         Shows a command, its corresponding action, and its example usage"
+                    NewLine("MAN         Shows a command, its corresponding action, and its example usage")
                 End If
                 If Strings.AvailableFeature(16) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "MKDIR       Creating a directory"
+                    NewLine("MKDIR       Creating a directory")
                 End If
                 If Strings.AvailableFeature(16) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "PWD         Display current directory navigated on ShiftOS"
+                    NewLine("PWD         Display current directory navigated on ShiftOS")
                 End If
                 If Strings.AvailableFeature(2) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "PRINT       Prints a corresponding text entered in the command"
+                    NewLine("PRINT       Prints a corresponding text entered in the command")
                 End If
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "REBOOT      Terminate and re-run ShiftOS session"
+                NewLine("REBOOT      Terminate and re-run ShiftOS session")
                 If Strings.AvailableFeature(21) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "REV         Turn any sentences you want and making it reversed"
+                    NewLine("REV         Turn any sentences you want and making it reversed")
                 End If
                 If Strings.AvailableFeature(16) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "RMDIR       Deleting a directory"
+                    NewLine("RMDIR       Deleting a directory")
                 End If
                 If Strings.AvailableFeature(8) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "SHIFTFETCH  Shows informations about your computer"
+                    NewLine("SHIFTFETCH  Shows informations about your computer")
                 End If
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "SHIFTORIUM  A software center for upgrading features on ShiftOS"
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "SHUTDOWN    Terminate ShiftOS session"
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "SU          Runs terminal as super user"
+                NewLine("SHIFTORIUM  A software center for upgrading features on ShiftOS")
+                NewLine("SHUTDOWN    Terminate ShiftOS session")
+                NewLine("SU          Runs terminal as super user")
                 If Strings.AvailableFeature(17) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "TEXTPAD     Simple text-editor for ShiftOS"
+                    NewLine("TEXTPAD     Simple text-editor for ShiftOS")
                 End If
                 If Strings.AvailableFeature(5) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "TIME        Display the current time in the form of seconds since midnight"
+                    NewLine("TIME        Display the current time in the form of seconds since midnight")
                 ElseIf Strings.AvailableFeature(5) = 3 Then
                     If Strings.AvailableFeature(6) = 1 Then
-                        TextBox1.Text = TextBox1.Text & Environment.NewLine & "TIME        Display the current time in the form of minutes since midnight"
+                        NewLine("TIME        Display the current time in the form of minutes since midnight")
                     ElseIf Strings.AvailableFeature(6) = 3 Then
                         If Strings.AvailableFeature(7) = 1 Then
-                            TextBox1.Text = TextBox1.Text & Environment.NewLine & "TIME        Display the current time in the form of hours since midnight"
+                            NewLine("TIME        Display the current time in the form of hours since midnight")
                         ElseIf Strings.AvailableFeature(7) = 3 Then
                             If Strings.AvailableFeature(12) = 1 Then
-                                TextBox1.Text = TextBox1.Text & Environment.NewLine & "TIME        Display the current time in the form of PM and AM format"
+                                NewLine("TIME        Display the current time in the form of PM and AM format")
                             End If
                         End If
                     End If
                 End If
                 If Strings.AvailableFeature(20) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "USERNAME    Sets the name of current user with a new one"
+                    NewLine("USERNAME    Sets the name of current user with a new one")
                 End If
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "VER         Printing current version of ShiftOS TheRevival"
-                TextBox1.Text = TextBox1.Text & Environment.NewLine
+                NewLine("VER         Printing current version of ShiftOS TheRevival")
                 AdvancedCommand = False
                 BadCommand = False
             Case "infobar"
                 If Strings.AvailableFeature(4) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & My.Resources.man_infobar
+                    NewLine(My.Resources.man_infobar)
                 End If
             Case "pwd"
                 If Strings.AvailableFeature(16) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & CurrentDirectory.Replace(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\ShiftFS", "!")
+                    NewLine(CurrentDirectory.Replace(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\ShiftFS", "!"))
                     AdvancedCommand = False
                     BadCommand = False
                 End If
@@ -302,41 +256,42 @@ Public Class Terminal
                 TextBox1.Text = Nothing
                 AdvancedCommand = False
                 BadCommand = False
+                SaveGame()
                 InitializeTerminal()
             Case "shiftorium"
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & My.Resources.man_shiftorium
+                NewLine(My.Resources.man_shiftorium)
                 AdvancedCommand = False
                 BadCommand = False
             Case "shiftfetch"
                 If Strings.AvailableFeature(8) = "1" Then
                     If Strings.OnceInfo(0) = "Yes" Then
-                        TextBox1.Text = TextBox1.Text & Environment.NewLine & Environment.NewLine & "                 :^!7?JJJJJ?7!^:                  root@shiftos"
+                        NewLine("                 :^!7?JJJJJ?7!^:                  root@shiftos")
                     Else
-                        TextBox1.Text = TextBox1.Text & Environment.NewLine & Environment.NewLine & "                 :^!7?JJJJJ?7!^:                  user@shiftos"
+                        NewLine("                 :^!7?JJJJJ?7!^:                  " & Strings.ComputerInfo(1) & "@" & Strings.ComputerInfo(0))
                     End If
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "            .~?PB###BGP555PGB###BP?~.             ----------------------"
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "         .!P#&B57^..::^~~!!~^::~7YG&#5!.          OS: ShiftOS TheRevival"
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "       .?#@G7: .^               :^::!5&#?.        Host: " & Environment.MachineName
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "     .?#@5^  !                   .^!!..J&#?       Kernel: " & My.Resources.CurrentVersion
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "    ^B@G^ .J                        :7?..J@G:     Uptime: N/A"
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "   ~&@Y  7         ~PB&#Y:.           ~G7 ~&&^    Packages: " & Strings.ComputerInfo(4)
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "  ^&@Y  Y         5#5??YB@&B~          .GJ :&&:   Shell: sos-justshell"
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "  G@B  ?         5P      ^YB!           .#! ~@G   Window Manager: -"
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & " ^@@! :          @Y   .:::^~:.           7#  Y@^  Window Manager Theme: -"
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & " 7@@: !          B@&BBBBGPPB@#Y.         :&^ ^@?  Terminal: shiftos-terminal"
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & " ?@@: 7          :??7~:.    5@@5         :&^ .&?  Terminal Font: Consolas, 11pt"
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & " ~@@! !@    G#&B!.          Y@@B         7#.  Y~  CPU: " & My.Computer.Registry.GetValue("HKEY_LOCAL_MACHINE\HARDWARE\DESCRIPTION\System\CentralProcessor\0", "ProcessorNameString", Nothing)
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "  B@G  B@J   ...~&G.       7@@@?        .#?   7   GPU: N/A"
+                    NewLine("            .~?PB###BGP555PGB###BP?~.             ----------------------")
+                    NewLine("        .!P#&B57^..:: ^~~!!~^::~7YG&#5!.          OS: ShiftOS TheRevival")
+                    NewLine("       .?#@G7: .^               :^::!5&#?.        Host: " & Environment.MachineName)
+                    NewLine("     .?#@5^  !                   .^!!..J&#?       Kernel: " & My.Resources.CurrentVersion)
+                    NewLine("    B@G^ .J                        : 7?..J@G:     Uptime : N/ A")
+                    NewLine("   ~&@Y  7         ~PB&#Y:.           ~G7 ~&&^    Packages: " & Strings.ComputerInfo(4))
+                    NewLine("  ^&@Y  Y         5#5??YB@&B~          .GJ :&&:   Shell: sos-justshell")
+                    NewLine("  G@B  ?         5P      ^YB!           .#! ~@G   Window Manager: -")
+                    NewLine(" ^@@! :          @Y   .:::^~:.           7#  Y@^  Window Manager Theme: -")
+                    NewLine(" 7@@: !          B@&BBBBGPPB@#Y.         :&^ ^@?  Terminal: shiftos-terminal")
+                    NewLine(" ?@@: 7          :??7~:.    5@@5         :&^ .&?  Terminal Font: Consolas, 11pt")
+                    NewLine(" ~@@! !@    G#&B!.          Y@@B         7#.  Y~  CPU: " & My.Computer.Registry.GetValue("HKEY_LOCAL_MACHINE\HARDWARE\DESCRIPTION\System\CentralProcessor\0", "ProcessorNameString", Nothing))
+                    NewLine("  B@G  B@J   ...~&G.       7@@@?        .#?   7   GPU: N/A")
                     Dim TripleDigitRAM As String
                     TripleDigitRAM = (My.Computer.Info.TotalPhysicalMemory / 1024 / 1024 / 1024)
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "  ~&@? ^@Y       !G#57~~!YB@#Y^        .GP   ..   Memory: " & TripleDigitRAM.Substring(0, 4) & " GB"
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "   !@@7 ~#J        5#&&BG57^          ~BY         Codepoint: " & Strings.ComputerInfo(2)
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "    ~#@Y .5P~                       ^5G~          "
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "     .J&#! ^JY!:.                ^?P5!            "
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "       :J&B?..!JYY7!~::...::~!7Y5Y7:              "
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "         .7PBP?^::~!?JJJJJJJ?7~:                  "
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "            .~?55Y?!^:...                         "
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "                 .:~~^~^^::.                      "
+                    NewLine("  ~&@? ^@Y       !G#57~~!YB@#Y^        .GP   ..   Memory: " & TripleDigitRAM.Substring(0, 4) & " GB")
+                    NewLine("   !@@7 ~#J        5#&&BG57^          ~BY         Codepoint: " & Strings.ComputerInfo(2))
+                    NewLine("    ~#@Y .5P~                       ^5G~          ")
+                    NewLine("     .J&#! ^JY!:.                ^?P5!            ")
+                    NewLine("       :J&B?..!JYY7!~::...::~!7Y5Y7:              ")
+                    NewLine("         .7PBP?^::~!?JJJJJJJ?7~:                  ")
+                    NewLine("            .~?55Y?!^:...                         ")
+                    NewLine("                 .:~~^~^^::.                      ")
                     AdvancedCommand = False
                     BadCommand = False
                 End If
@@ -347,7 +302,7 @@ Public Class Terminal
                 BadCommand = False
                 Undeveloped()
             Case "shutdown", "shut down"
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "Saving game..."
+                NewLine("Saving game...")
                 If Strings.OnceInfo(6) = "story" Then
                     SaveGame()
                 End If
@@ -356,26 +311,28 @@ Public Class Terminal
                 Close()
             Case "textpad"
                 If Strings.AvailableFeature(17) = "1" Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "Type any filename after 'textpad'!, ex: textpad text.txt"
+                    NewLine("Type any filename after 'textpad'!, ex: textpad text.txt")
                     AdvancedCommand = False
                     BadCommand = False
                 End If
             Case "time"
                 If Strings.AvailableFeature(5) = "1" Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & Math.Floor(Date.Now.Subtract(Date.Today).TotalSeconds) & " seconds passed since midnight"
+                    NewLine(Math.Floor(Date.Now.Subtract(Date.Today).TotalSeconds) & " seconds passed since midnight")
                 ElseIf Strings.AvailableFeature(5) = "3" Then
                     If Strings.AvailableFeature(6) = "1" Then
-                        TextBox1.Text = TextBox1.Text & Environment.NewLine & Math.Floor(Date.Now.Subtract(Date.Today).TotalMinutes) & " minutes passed since midnight"
+                        NewLine(Math.Floor(Date.Now.Subtract(Date.Today).TotalMinutes) & " minutes passed since midnight")
                     ElseIf Strings.AvailableFeature(6) = "3" Then
                         If Strings.AvailableFeature(7) = "1" Then
-                            TextBox1.Text = TextBox1.Text & Environment.NewLine & Math.Floor(Date.Now.Subtract(Date.Today).TotalHours) & " hours passed since midnight"
+                            NewLine(Math.Floor(Date.Now.Subtract(Date.Today).TotalHours) & " hours passed since midnight")
                         ElseIf Strings.AvailableFeature(7) = "3" Then
                             If Strings.AvailableFeature(12) = "1" Then
                                 If Date.Now.Hour < 12 Then
-                                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "The time is " & TimeOfDay.Hour & " AM"
+                                    NewLine("The time is " & TimeOfDay.Hour & " AM")
                                 Else
-                                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "The time is " & TimeOfDay.Hour - 12 & " PM"
+                                    NewLine("The time is " & TimeOfDay.Hour - 12 & " PM")
                                 End If
+                            ElseIf Strings.AvailableFeature(23) = "1" Then
+                                NewLine("The time is " & TimeOfDay.Hour & ":" & TimeOfDay.Minute)
                             End If
                         End If
                     End If
@@ -384,15 +341,15 @@ Public Class Terminal
                 BadCommand = False
             Case "su"
                 If Strings.OnceInfo(0) = "Yes" Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "You already in root mode!"
+                    NewLine("You already in root mode!")
                 Else
                     Strings.OnceInfo(0) = "Yes"
-                    AssignPrompt()
+                    Terminal_AssignPrompt()
                 End If
                 AdvancedCommand = False
                 BadCommand = False
             Case "ver"
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "ShiftOS TheRevival version " & My.Resources.CurrentVersion
+                NewLine("ShiftOS TheRevival version " & My.Resources.CurrentVersion)
                 AdvancedCommand = False
                 BadCommand = False
         End Select
@@ -432,7 +389,7 @@ Public Class Terminal
             If command Like "hostname *" Then
                 If Strings.AvailableFeature(20) = 1 Then
                     Strings.ComputerInfo(0) = command.Substring(command.LastIndexOf(" ") + 1, command.Length - (command.LastIndexOf(" ") + 1))
-                    AssignPrompt()
+                    Terminal_AssignPrompt()
                     AdvancedCommand = False
                     BadCommand = False
                 End If
@@ -476,17 +433,17 @@ Public Class Terminal
             End If
             If command Like "print *" Then
                 If Strings.AvailableFeature(2) = "1" Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & RawCommand.Substring(6)
+                    NewLine(RawCommand.Substring(6))
                     'Dim printed As String = command.Replace("print ", "")
                     ''It has the same issue, only displays in lowercase
-                    'TextBox1.Text = TextBox1.Text & Environment.NewLine & printed
+                    'NewLine( printed
                     BadCommand = False
                     AdvancedCommand = False
                 End If
             End If
             If command Like "rev *" Then
                 If Strings.AvailableFeature(21) = 1 Then
-                    TextBox1.Text = TextBox1.Text & Environment.NewLine & StrReverse(RawCommand.Substring(4))
+                    NewLine(StrReverse(RawCommand.Substring(4)))
                     BadCommand = False
                     AdvancedCommand = False
                 End If
@@ -500,7 +457,7 @@ Public Class Terminal
             End If
             If command Like "shiftorium *" Then
                 Dim prompt As String = command.Replace("shiftorium ", "")
-                TextBox1.Text = TextBox1.Text & Environment.NewLine & "Shiftorium ShiftOS Center"
+                NewLine("Shiftorium ShiftOS Center")
                 If prompt Like "info *" Then
                     Shiftoriums.prompt = command.Replace("shiftorium info ", "")
                     Shiftorium_InformationFeatures()
@@ -526,10 +483,10 @@ Public Class Terminal
             If command Like "username *" Then
                 If Strings.AvailableFeature(19) = 1 Then
                     If command.Substring(9) = "root" Then
-                        TextBox1.Text = TextBox1.Text & Environment.NewLine & "This username is already taken!"
+                        NewLine("This username is already taken!")
                     Else
                         Strings.ComputerInfo(1) = command.Substring(command.LastIndexOf(" ") + 1, command.Length - (command.LastIndexOf(" ") + 1))
-                        AssignPrompt()
+                        Terminal_AssignPrompt()
                     End If
                     AdvancedCommand = False
                     BadCommand = False
@@ -538,114 +495,22 @@ Public Class Terminal
         End If
 
         If BadCommand = True Then
-            TextBox1.Text = TextBox1.Text & Environment.NewLine & "Bad command or wrong file name"
+            NewLine("Bad command or wrong file name")
         End If
     End Sub
 
-    Public Sub TextRebind()
-        TextBox1.Select(TextBox1.Text.Length, 0)
-        TextBox1.ScrollToCaret()
-    End Sub
-
     Private Sub txtterm_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles TextBox1.KeyDown
-        TerminalApps.KeyInput = e.KeyData
+        KeyInput = e.KeyData
         Select Case e.KeyData
             Case (Keys.Control + Keys.Q)
                 If CurrentInterpreter = "terminal" Then
                 Else
-                    TerminateApp(TerminalApps.KeyInput)
+                    TerminateApp(KeyInput)
                     TextRebind()
                 End If
             Case Else
-                CaptureKeyBinding(TerminalApps.KeyInput)
+                CaptureKeyBinding(KeyInput)
         End Select
-        'If ReleaseCursor = True Then
-
-        'Else
-        '    Select Case e.KeyCode
-        '        Case Keys.ShiftKey
-        '            TrackPos = TrackPos - 1
-        '        Case Keys.Alt
-        '            TrackPos = TrackPos - 1
-        '        Case Keys.CapsLock
-        '            TrackPos = TrackPos - 1
-        '        Case Keys.ControlKey
-        '            TrackPos = TrackPos - 1
-        '        Case Keys.LWin
-        '            TrackPos = TrackPos - 1
-        '        Case Keys.RWin
-        '            TrackPos = TrackPos - 1
-        '        Case Keys.Right
-        '            If TextBox1.SelectionStart = TextBox1.TextLength Then
-        '                TrackPos = TrackPos - 1
-        '            End If
-        '        Case Keys.Left
-        '            If TrackPos < 1 Then
-        '                e.SuppressKeyPress = True
-        '                TrackPos = TrackPos - 1
-        '            Else
-        '                TrackPos = TrackPos - 2
-        '            End If
-        '        Case Keys.Up
-        '            e.SuppressKeyPress = True
-        '            TrackPos = TrackPos - 1
-        '        Case Keys.Down
-        '            e.SuppressKeyPress = True
-        '            TrackPos = TrackPos - 1
-        '    End Select
-        'End If
-
-        'If e.KeyCode = Keys.Enter Then
-        '    e.SuppressKeyPress = True
-        '    If TextBox1.ReadOnly = True Then
-
-        '    Else
-        '        ReadCommand()
-        '        If ChangeInterpreter = True Then
-        '            DoChildCommand()
-        '            PrintPrompt()
-        '            TextBox1.Select(TextBox1.Text.Length, 0)
-        '        Else
-        '            DoCommand()
-        '            PrintPrompt()
-        '            TextBox1.Select(TextBox1.Text.Length, 0)
-        '        End If
-        '    End If
-
-        '    'If command = "clear" Then
-        '    '    PrintPrompt()
-        '    '    TextBox1.Select(TextBox1.Text.Length, 0)
-
-        '    'Else
-        '    '    PrintPrompt()
-        '    '    TextBox1.Select(TextBox1.Text.Length, 0)
-        '    'End If
-
-        '    TrackPos = 0
-        'Else
-        '    If ReleaseCursor = True Then
-
-        '    Else
-        '        If e.KeyCode = Keys.Back Then
-        '        Else
-        '            TrackPos = TrackPos + 1
-        '        End If
-        '    End If
-        'End If
-
-        'If e.KeyCode = Keys.Back Then
-        '    If TrackPos < 1 Then
-        '        e.SuppressKeyPress = True
-        '    Else
-        '        If TextBox1.SelectedText.Length < 1 Then
-        '            TrackPos = TrackPos - 1
-        '        Else
-        '            e.SuppressKeyPress = True
-        '        End If
-        '    End If
-        'End If
-        'TextBox1.Select(TextBox1.TextLength, 0)
-        'TextBox1.ScrollToCaret()
         If ReleaseCursor = True Then
 
         Else
@@ -655,17 +520,17 @@ Public Class Terminal
                     If TextBox1.ReadOnly = True Then
 
                     Else
-                        ReadCommand()
+                        Terminal_ReadCommand()
                         If Strings.AvailableFeature(18) = 1 Then
                             ShOSKey_InputCommand(command)
                         End If
                         If ChangeInterpreter = True Then
                             DoChildCommand()
-                            PrintPrompt()
+                            Terminal_PrintPrompt()
                             TextRebind()
                         Else
                             DoCommand()
-                            PrintPrompt()
+                            Terminal_PrintPrompt()
                             TextRebind()
                         End If
                     End If
@@ -762,8 +627,7 @@ Public Class Terminal
     End Sub
 
     Private Sub TextBox1_Click(sender As Object, e As EventArgs) Handles TextBox1.Click, TextBox1.MouseDoubleClick
-        TextBox1.Select(TextBox1.TextLength, 0)
-        TextBox1.ScrollToCaret()
+        TextRebind()
     End Sub
 
     Private Sub StoryOnlyTimer_Tick(sender As Object, e As EventArgs) Handles StoryOnlyTimer.Tick
@@ -771,27 +635,27 @@ Public Class Terminal
             Case "0"
                 Select Case DisplayStory
                     Case 5
-                        TextBox1.Text = "Connected to <null>"
+                        ResetLine("Connected to <null>")
                     Case 25
-                        TextBox1.Text = TextBox1.Text & Environment.NewLine & "<null>: Hey there, Unknown user!"
+                        NewLine("<null>: Hey there, Unknown user!")
                     Case 60
-                        TextBox1.Text = TextBox1.Text & Environment.NewLine & "<null>: Congratulaions! You have been involuntarily selected for a test on my experimental operating system, ShiftOS."
+                        NewLine("<null>: Congratulaions! You have been involuntarily selected for a test on my experimental operating system, ShiftOS.")
                     Case 125
-                        TextBox1.Text = TextBox1.Text & Environment.NewLine & "<null>: ShiftOS is an operating system that will evolve itself as you use it as I progressively add more features into ShiftOS."
+                        NewLine("<null>: ShiftOS is an operating system that will evolve itself as you use it as I progressively add more features into ShiftOS.")
                     Case 160
-                        TextBox1.Text = TextBox1.Text & Environment.NewLine & "<null>: Currently ShiftOS isn't much from a basic command-line operating system."
+                        NewLine("<null>: Currently ShiftOS isn't much from a basic command-line operating system.")
                     Case 210
-                        TextBox1.Text = TextBox1.Text & Environment.NewLine & "<null>: I don't wish to reveal my indentity at this point in time."
+                        NewLine("<null>: I don't wish to reveal my indentity at this point in time.")
                     Case 270
-                        TextBox1.Text = TextBox1.Text & Environment.NewLine & "<null>: I will install ShiftOS on your system once I leave while I work on... something else."
+                        NewLine("<null>: I will install ShiftOS on your system once I leave while I work on... something else.")
                     Case 335
-                        TextBox1.Text = TextBox1.Text & Environment.NewLine & "<null>: Once you have ShiftOS rich feature enough, I will come back to you. In the mean time, goodbye!"
+                        NewLine("<null>: Once you have ShiftOS rich feature enough, I will come back to you. In the mean time, goodbye!")
                     Case 400
-                        TextBox1.Text = TextBox1.Text & Environment.NewLine & "<null> Disconnected"
+                        NewLine("<null> Disconnected")
                     Case 430
-                        TextBox1.Text = "Installing ShiftOS..."
+                        ResetLine("Installing ShiftOS...")
                     Case 550
-                        TextBox1.Text = "ShiftOS Installed, The computer will restart in a few seconds"
+                        ResetLine("ShiftOS Installed, The computer will restart in a few seconds")
                     Case 600
                         StoryOnlyTimer.Stop()
                         TextBox1.Text = Nothing
@@ -799,8 +663,8 @@ Public Class Terminal
                         Strings.ComputerInfo(0) = "shiftos"
                         Strings.ComputerInfo(1) = "user"
                         CheckFeature()
-                        PrintPrompt()
-                        AssignPrompt()
+                        Terminal_PrintPrompt()
+                        Terminal_AssignPrompt()
                         TextBox1.Select(TextBox1.TextLength, 0)
                         TextBox1.ScrollToCaret()
                 End Select
@@ -825,6 +689,10 @@ Public Class Terminal
                         Else
                             InfoBar.Text = InfoBar.Text & Environment.NewLine & " " & TimeOfDay.Hour - 12 & " PM |"
                         End If
+                    ElseIf Strings.AvailableFeature(12) = "3" Then
+                        If Strings.AvailableFeature(23) = "1" Then
+                            InfoBar.Text = InfoBar.Text & Environment.NewLine & " " & TimeOfDay.Hour & ":" & TimeOfDay.Minute & " |"
+                        End If
                     End If
                 End If
             End If
diff --git a/ShiftOS-TheRevival/MainForms/ConsoleAPI.vb b/ShiftOS-TheRevival/MainForms/ConsoleAPI.vb
new file mode 100644
index 0000000..28b7efc
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/ConsoleAPI.vb
@@ -0,0 +1,18 @@
+Module ConsoleAPI
+    Public Sub NewLine(str As String)
+        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & str
+    End Sub
+
+    Public Sub AddLine(str As String)
+        Console.TextBox1.Text = Console.TextBox1.Text & str
+    End Sub
+
+    Public Sub ResetLine(str As String)
+        Console.TextBox1.Text = str
+    End Sub
+
+    Public Sub TextRebind()
+        Console.TextBox1.Select(Console.TextBox1.Text.Length, 0)
+        Console.TextBox1.ScrollToCaret()
+    End Sub
+End Module
diff --git a/ShiftOS-TheRevival/MainForms/ConsoleRTF.Designer.vb b/ShiftOS-TheRevival/MainForms/ConsoleRTF.Designer.vb
new file mode 100644
index 0000000..3fd31d0
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/ConsoleRTF.Designer.vb
@@ -0,0 +1,56 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class ConsoleRTF
+    Inherits System.Windows.Forms.Form
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.RichTextBox1 = New System.Windows.Forms.RichTextBox()
+        Me.SuspendLayout()
+        '
+        'RichTextBox1
+        '
+        Me.RichTextBox1.BackColor = System.Drawing.Color.Black
+        Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.RichTextBox1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.RichTextBox1.Font = New System.Drawing.Font("Consolas", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.RichTextBox1.ForeColor = System.Drawing.Color.White
+        Me.RichTextBox1.Location = New System.Drawing.Point(0, 0)
+        Me.RichTextBox1.Name = "RichTextBox1"
+        Me.RichTextBox1.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None
+        Me.RichTextBox1.ShortcutsEnabled = False
+        Me.RichTextBox1.Size = New System.Drawing.Size(800, 450)
+        Me.RichTextBox1.TabIndex = 0
+        Me.RichTextBox1.Text = ""
+        '
+        'ConsoleRTF
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Controls.Add(Me.RichTextBox1)
+        Me.Name = "ConsoleRTF"
+        Me.Text = "ConsoleRTF"
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents RichTextBox1 As RichTextBox
+End Class
diff --git a/ShiftOS-TheRevival/MainForms/ConsoleRTF.resx b/ShiftOS-TheRevival/MainForms/ConsoleRTF.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/ConsoleRTF.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/ShiftOS-TheRevival/MainForms/ConsoleRTF.vb b/ShiftOS-TheRevival/MainForms/ConsoleRTF.vb
new file mode 100644
index 0000000..18b9bea
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/ConsoleRTF.vb
@@ -0,0 +1,3 @@
+Public Class ConsoleRTF
+
+End Class
\ No newline at end of file
diff --git a/ShiftOS-TheRevival/MainForms/DebugWindow.Designer.vb b/ShiftOS-TheRevival/MainForms/DebugWindow.Designer.vb
new file mode 100644
index 0000000..c8a0429
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/DebugWindow.Designer.vb
@@ -0,0 +1,82 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class DebugWindow
+    Inherits System.Windows.Forms.Form
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.TextBox1 = New System.Windows.Forms.TextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.SuspendLayout()
+        '
+        'TextBox1
+        '
+        Me.TextBox1.Location = New System.Drawing.Point(12, 49)
+        Me.TextBox1.Multiline = True
+        Me.TextBox1.Name = "TextBox1"
+        Me.TextBox1.ReadOnly = True
+        Me.TextBox1.Size = New System.Drawing.Size(760, 500)
+        Me.TextBox1.TabIndex = 0
+        Me.TextBox1.Text = "=====SHIFTOS ANTIBUGSPAP====="
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 24.0!, System.Drawing.FontStyle.Bold)
+        Me.Label1.Location = New System.Drawing.Point(12, 9)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(551, 37)
+        Me.Label1.TabIndex = 1
+        Me.Label1.Text = "ShiftOS-TheRevival Debug Window"
+        '
+        'Button1
+        '
+        Me.Button1.Location = New System.Drawing.Point(697, 20)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.TabIndex = 2
+        Me.Button1.Text = "Copy All"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'DebugWindow
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(784, 561)
+        Me.Controls.Add(Me.Button1)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.TextBox1)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "DebugWindow"
+        Me.ShowIcon = False
+        Me.ShowInTaskbar = False
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "DebugWindow"
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents TextBox1 As TextBox
+    Friend WithEvents Label1 As Label
+    Friend WithEvents Button1 As Button
+End Class
diff --git a/ShiftOS-TheRevival/MainForms/DebugWindow.resx b/ShiftOS-TheRevival/MainForms/DebugWindow.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/DebugWindow.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/ShiftOS-TheRevival/MainForms/DebugWindow.vb b/ShiftOS-TheRevival/MainForms/DebugWindow.vb
new file mode 100644
index 0000000..e9f4f0b
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/DebugWindow.vb
@@ -0,0 +1,13 @@
+Public Class DebugWindow
+
+    Public ShouldDebug As Boolean
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        Clipboard.SetText(TextBox1.Text)
+    End Sub
+
+    Public Sub AddLine(subs As String, int As String, str As String, action As String)
+        If ShouldDebug = True Then
+            TextBox1.Text = TextBox1.Text & Environment.NewLine & subs & " Sub with " & str & " string and " & int & " integer did " & action
+        End If
+    End Sub
+End Class
\ No newline at end of file
diff --git a/ShiftOS-TheRevival/MainForms/DirectoryManagements.vb b/ShiftOS-TheRevival/MainForms/DirectoryManagements.vb
index 4179e6f..1ab684d 100644
--- a/ShiftOS-TheRevival/MainForms/DirectoryManagements.vb
+++ b/ShiftOS-TheRevival/MainForms/DirectoryManagements.vb
@@ -1,13 +1,13 @@
 Module DirectoryManagements
     Dim spaces As String
     Public Sub TerminalDirectories(TheDirectory As String)
-        Terminal.Pseudodir = TheDirectory.Replace(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\ShiftFS", "!")
-        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Contents of " & Terminal.Pseudodir & Environment.NewLine
-        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "[DIR]     0 KB ."
-        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "[DIR]     0 KB .."
+        Console.Pseudodir = TheDirectory.Replace(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\ShiftFS", "!")
+        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Contents of " & Console.Pseudodir & Environment.NewLine
+        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "[DIR]     0 KB ."
+        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "[DIR]     0 KB .."
         For Each Dir As String In IO.Directory.GetDirectories(TheDirectory)
             Dim dirinf As New IO.DirectoryInfo(Dir)
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "[DIR]     0 KB " & dirinf.Name
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "[DIR]     0 KB " & dirinf.Name
         Next
         For Each file As String In IO.Directory.GetFiles(TheDirectory)
             Dim filinf As New IO.FileInfo(file)
@@ -33,50 +33,50 @@
             End Select
             Select Case thesize
                 Case 1
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & spaces & filsize & " KB " & filinf.Name
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & spaces & filsize & " KB " & filinf.Name
                 Case 2
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & spaces & filsize & " MB " & filinf.Name
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & spaces & filsize & " MB " & filinf.Name
                 Case 3
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & spaces & filsize & " GB " & filinf.Name
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & spaces & filsize & " GB " & filinf.Name
             End Select
         Next
     End Sub
 
     Public Sub NavigateDir(TheDirectory As String)
         If TheDirectory = ".." Then
-            If Terminal.CurrentDirectory = Strings.OnceInfo(1) Then
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "!\"
+            If Console.CurrentDirectory = Strings.OnceInfo(1) Then
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "!\"
             Else
-                Terminal.CurrentDirectory = IO.Directory.GetParent(Terminal.CurrentDirectory).ToString
+                Console.CurrentDirectory = IO.Directory.GetParent(Console.CurrentDirectory).ToString
             End If
         Else
-            If IO.Directory.Exists(Terminal.CurrentDirectory + "\" + TheDirectory) Then
-                Terminal.CurrentDirectory = Terminal.CurrentDirectory & "\" & TheDirectory
+            If IO.Directory.Exists(Console.CurrentDirectory + "\" + TheDirectory) Then
+                Console.CurrentDirectory = Console.CurrentDirectory & "\" & TheDirectory
             ElseIf IO.Directory.Exists(TheDirectory) Then
-                Terminal.CurrentDirectory = TheDirectory
+                Console.CurrentDirectory = TheDirectory
             Else
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "The directory is not exist!"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "The directory is not exist!"
             End If
         End If
     End Sub
 
     Public Sub CreateDir(TheDirectory As String)
-        If IO.Directory.Exists(Terminal.CurrentDirectory + "\" + TheDirectory) Then
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Directory is already exists!"
+        If IO.Directory.Exists(Console.CurrentDirectory + "\" + TheDirectory) Then
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Directory is already exists!"
         Else
-            IO.Directory.CreateDirectory(Terminal.CurrentDirectory + "\" + TheDirectory)
+            IO.Directory.CreateDirectory(Console.CurrentDirectory + "\" + TheDirectory)
         End If
     End Sub
 
     Public Sub RemoveDir(TheDirectory As String)
-        If IO.Directory.Exists(Terminal.CurrentDirectory + "\" + TheDirectory) Then
+        If IO.Directory.Exists(Console.CurrentDirectory + "\" + TheDirectory) Then
             Try
-                IO.Directory.Delete(Terminal.CurrentDirectory + "\" + TheDirectory)
+                IO.Directory.Delete(Console.CurrentDirectory + "\" + TheDirectory)
             Catch ex As Exception
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ex.Message
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ex.Message
             End Try
         Else
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "The directory is not exists!"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "The directory is not exists!"
         End If
     End Sub
 End Module
diff --git a/ShiftOS-TheRevival/MainForms/FileManagement.vb b/ShiftOS-TheRevival/MainForms/FileManagement.vb
index 32d7822..76b0d59 100644
--- a/ShiftOS-TheRevival/MainForms/FileManagement.vb
+++ b/ShiftOS-TheRevival/MainForms/FileManagement.vb
@@ -2,15 +2,15 @@
 
 Module FileManagement
     Public Sub CatFile(filename As String)
-        If File.Exists(Terminal.CurrentDirectory & "\" & filename) = True Then
-            Dim ContentsFinal As String = File.ReadAllText(Terminal.CurrentDirectory & "\" & filename)
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ContentsFinal
+        If File.Exists(Console.CurrentDirectory & "\" & filename) = True Then
+            Dim ContentsFinal As String = File.ReadAllText(Console.CurrentDirectory & "\" & filename)
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ContentsFinal
         End If
     End Sub
 
     Public Sub DeleteFile(filename As String)
-        If File.Exists(Terminal.CurrentDirectory & "\" & filename) = True Then
-            File.Delete(Terminal.CurrentDirectory & "\" & filename)
+        If File.Exists(Console.CurrentDirectory & "\" & filename) = True Then
+            File.Delete(Console.CurrentDirectory & "\" & filename)
         End If
     End Sub
 
@@ -20,6 +20,6 @@ Module FileManagement
         'Else
         '    File.WriteAllText(Terminal.CurrentDirectory & "\" & filename, Terminal.TextBox1.Text)
         'End If
-        File.WriteAllText(Terminal.CurrentDirectory & "\" & filename, Terminal.TextBox1.Text)
+        File.WriteAllText(Console.CurrentDirectory & "\" & filename, Console.TextBox1.Text)
     End Sub
 End Module
diff --git a/ShiftOS-TheRevival/MainForms/IntroStory.vb b/ShiftOS-TheRevival/MainForms/IntroStory.vb
index 36df1e5..de048a4 100644
--- a/ShiftOS-TheRevival/MainForms/IntroStory.vb
+++ b/ShiftOS-TheRevival/MainForms/IntroStory.vb
@@ -31,7 +31,7 @@
                 If Opacity = 1 Then
                     Strings.ComputerInfo(3) = "0"
                     Strings.IsFree = False
-                    Terminal.Show()
+                    Console.Show()
                     Close()
                 Else
                     Opacity = Opacity + 0.05
diff --git a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb b/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb
index efafee8..7b14171 100644
--- a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb
+++ b/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb
@@ -35,6 +35,8 @@ Module SaveLoadSystem
         Strings.AvailableFeature(20) = "2"
         Strings.AvailableFeature(21) = "2"
         Strings.AvailableFeature(22) = "2"
+        '0.2.5 Features
+        Strings.AvailableFeature(23) = "2"
     End Sub
 
     Public Sub FreeRoamMode()
@@ -54,7 +56,7 @@ Module SaveLoadSystem
         Strings.AvailableFeature(9) = "1"
         Strings.AvailableFeature(10) = "1"
         Strings.AvailableFeature(11) = "1"
-        Strings.AvailableFeature(12) = "1"
+        Strings.AvailableFeature(12) = "3"
         Strings.AvailableFeature(13) = "1"
         Strings.AvailableFeature(14) = "1"
         Strings.AvailableFeature(15) = "1"
@@ -66,6 +68,8 @@ Module SaveLoadSystem
         Strings.AvailableFeature(20) = "1"
         Strings.AvailableFeature(21) = "1"
         Strings.AvailableFeature(22) = "1"
+        '0.2.5 Features
+        Strings.AvailableFeature(23) = "1"
     End Sub
 
     Public Sub GodMode()
@@ -96,6 +100,8 @@ Module SaveLoadSystem
         Strings.AvailableFeature(20) = "2"
         Strings.AvailableFeature(21) = "2"
         Strings.AvailableFeature(22) = "2"
+        '0.2.5 Features
+        Strings.AvailableFeature(23) = "2"
     End Sub
 
     Public Sub SaveGame()
diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb
index 02b5377..746e5da 100644
--- a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb
+++ b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb
@@ -9,23 +9,6 @@ Public Class ShiftOSMenu
     Public Shared ShouldUpdate As Boolean = False
 
     Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        'Try
-        '    If File.Exists("D:\ShiftOSBuildLab.txt") Then
-        '        BuildLab = File.ReadAllLines("D:\ShiftOSBuildLab.txt")
-        '        If BuildLab(0) = "No" Then
-        '            Dim BuildNum As Integer = BuildLab(1)
-        '            BuildNum = BuildLab(1) + 1
-        '            ActualBuildLab = "ShiftOS_TheRevival." & BuildLab(3) & "." & BuildNum & "." & Date.Today.Year & Date.Today.Month & Date.Today.Day
-        '            BuildLab(1) = BuildNum
-        '            File.WriteAllLines("D:\ShiftOSBuildLab.txt", BuildLab)
-        '        End If
-        '        lbl_BuildString.Text = ActualBuildLab
-        '    Else
-
-        '    End If
-        'Catch ex As Exception
-        '    MsgBox("Why? Because of " & ex.Message)
-        'End Try
         CheckInstall()
         BannerChange.Start()
     End Sub
@@ -44,7 +27,7 @@ Public Class ShiftOSMenu
                     Strings.IsFree = True
                     Strings.OnceInfo(6) = "free"
                     FreeRoamMode()
-                    Terminal.Show()
+                    Console.Show()
                     Close()
                 Catch ex As Exception
                     Dim NewBugSlap As New BugSlap
@@ -55,8 +38,8 @@ Public Class ShiftOSMenu
             Case "Continue"
                 Strings.IsFree = False
                 Strings.OnceInfo(6) = "story"
-                Terminal.StayAtChapter = True
-                Terminal.Show()
+                Console.StayAtChapter = True
+                Console.Show()
                 Close()
             Case "No"
                 Label3.Visible = False
@@ -94,6 +77,7 @@ Public Class ShiftOSMenu
                 btn_Back.Visible = True
             Case "Chapter 1" & Environment.NewLine & "Hijacked!"
                 Epilepsy.Show()
+                DebugWindow.ShouldDebug = True
         End Select
     End Sub
 
@@ -154,7 +138,7 @@ Public Class ShiftOSMenu
             If File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\version.txt") = True Then
                 TheUpdater.WhatVersion = File.ReadAllText(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\version.txt")
             Else
-                TheUpdater.WhatVersion = "0.2.3"
+                TheUpdater.WhatVersion = "0.2.4"
             End If
             If TheUpdater.WhatVersion = My.Resources.CurrentVersion Then
                 File.WriteAllText(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\version.txt", My.Resources.CurrentVersion)
@@ -186,6 +170,7 @@ Public Class ShiftOSMenu
                 Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS")
                 Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\ShiftFS")
                 Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved")
+                File.WriteAllText(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\version.txt", My.Resources.CurrentVersion)
             End If
         End If
     End Sub
@@ -198,7 +183,7 @@ Public Class ShiftOSMenu
         If Label2.Text = "Debug it your way" Then
             Strings.IsFree = True
             GodMode()
-            Terminal.Show()
+            Console.Show()
             Close()
         End If
     End Sub
diff --git a/ShiftOS-TheRevival/MainForms/Shiftoriums.vb b/ShiftOS-TheRevival/MainForms/Shiftoriums.vb
index 3d31f9f..0c85b46 100644
--- a/ShiftOS-TheRevival/MainForms/Shiftoriums.vb
+++ b/ShiftOS-TheRevival/MainForms/Shiftoriums.vb
@@ -2,52 +2,52 @@
     Public prompt As String
 
     Public Sub Shiftorium_ListFeatures()
-        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium Available Feature(s)" & Environment.NewLine
+        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium Available Feature(s)" & Environment.NewLine
         If Strings.AvailableFeature(11) = "0" Then
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(key | 5 CP) ShiftOS Key"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(key | 5 CP) ShiftOS Key"
         Else
             If Strings.AvailableFeature(0) = "0" Then
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(man | 10 CP) ShiftOS Help Manual"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(man | 10 CP) ShiftOS Help Manual"
             Else
                 If Strings.AvailableFeature(19) = "0" Then
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(username | 15 CP) Custom Username"
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(username | 15 CP) Custom Username"
                 End If
                 If Strings.AvailableFeature(20) = "0" Then
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(hostname | 15 CP) Custom hostname"
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(hostname | 15 CP) Custom hostname"
                 End If
             End If
                 If Strings.AvailableFeature(1) = "0" Then
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(clear | 20 CP) Clear Terminal Screen"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(clear | 20 CP) Clear Terminal Screen"
             Else
                 If Strings.AvailableFeature(2) = "0" Then
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(print | 25 CP) Print Terminal Screen"
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(print | 25 CP) Print Terminal Screen"
                 Else
                     If Strings.AvailableFeature(3) = "0" Then
-                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(termdspdrv | 40 CP) Terminal Display Driver"
+                        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(termdspdrv | 40 CP) Terminal Display Driver"
                     Else
                         If Strings.AvailableFeature(4) = "0" Then
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(infobar | 50 CP) Terminal InfoBar"
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(infobar | 50 CP) Terminal InfoBar"
                         End If
                         If Strings.AvailableFeature(8) = "0" Then
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(shiftfetch | 55 CP) Shiftfetch"
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(shiftfetch | 55 CP) Shiftfetch"
                         End If
                         If Strings.AvailableFeature(10) = "0" Then
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(2bitcolor | 60 CP) 2-bit Color Support"
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(2bitcolor | 60 CP) 2-bit Color Support"
                         Else
                             If Strings.AvailableFeature(13) = "0" Then
-                                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(rgb | 70 CP) Red, Green, and Blue"
+                                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(rgb | 70 CP) Red, Green, and Blue"
                             Else
                                 If Strings.AvailableFeature(14) = "0" Then
-                                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(rgb2 | 75 CP) RGB Variant"
+                                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(rgb2 | 75 CP) RGB Variant"
                                 Else
                                     If Strings.AvailableFeature(15) = "0" Then
-                                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(4bitcolor | 80 CP) 4-bit Color Support"
+                                        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(4bitcolor | 80 CP) 4-bit Color Support"
                                     Else
                                         If Strings.AvailableFeature(16) = "0" Then
-                                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(romdriver | 90 CP) Terminal Read-Only Memory Support"
+                                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(romdriver | 90 CP) Terminal Read-Only Memory Support"
                                         Else
                                             If Strings.AvailableFeature(17) = "0" Then
-                                                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(textpad | 100 CP) TextPad"
+                                                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(textpad | 100 CP) TextPad"
                                             End If
                                         End If
                                     End If
@@ -56,33 +56,37 @@
                         End If
                     End If
                     If Strings.AvailableFeature(18) = "0" Then
-                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(shiftkey | 45 CP) ShiftKey"
+                        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(shiftkey | 45 CP) ShiftKey"
                     End If
                     If Strings.AvailableFeature(21) = "0" Then
-                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(rev | 30 CP) Reverse String"
+                        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(rev | 30 CP) Reverse String"
                     Else
                         If Strings.AvailableFeature(22) = "0" Then
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(cowsay | 50 CP) Cowsay"
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(cowsay | 50 CP) Cowsay"
                         End If
                     End If
                 End If
                 If Strings.AvailableFeature(5) = "0" Then
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(stime | 10 CP) Time by Seconds"
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(stime | 10 CP) Time by Seconds"
                 Else
                     If Strings.AvailableFeature(6) = "0" Then
-                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(mtime | 20 CP) Time by Minutes"
+                        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(mtime | 20 CP) Time by Minutes"
                     Else
                         If Strings.AvailableFeature(7) = "0" Then
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(htime | 30 CP) Time by Hours"
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(htime | 30 CP) Time by Hours"
                         Else
                             If Strings.AvailableFeature(12) = "0" Then
-                                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(pmam | 40 CP) PM and AM"
+                                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(pmam | 40 CP) PM and AM"
+                            Else
+                                If Strings.AvailableFeature(23) = "0" Then
+                                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(hhmm | 50 CP) Time by Hours and Minutes"
+                                End If
                             End If
                         End If
                     End If
                 End If
                 If Strings.AvailableFeature(9) = "0" Then
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(bc | 55 CP) Basic Calculator"
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(bc | 55 CP) Basic Calculator"
                 End If
             End If
         End If
@@ -98,244 +102,254 @@
                 If Strings.AvailableFeature(0) = "0" Then
                     ManHeader(0) = "ShiftOS Help Manual (command: man)"
                     ManHeader(1) = "10 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows up any further help instruction on each command, its corresponding action and its example if necessary" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows up any further help instruction on each command, its corresponding action and its example if necessary" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "clear"
                 If Strings.AvailableFeature(1) = "0" Then
                     ManHeader(0) = "Clear Terminal Screen (command: clear)"
                     ManHeader(1) = "20 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Clears the terminal screen" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Clears the terminal screen" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "print"
                 If Strings.AvailableFeature(2) = "0" Then
                     ManHeader(0) = "Print Command (command: print)"
                     ManHeader(1) = "25 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Prints a corresponding text entered in the command" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Prints a corresponding text entered in the command" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "termdspdrv"
                 If Strings.AvailableFeature(3) = "0" Then
                     ManHeader(0) = "Terminal Display Driver"
                     ManHeader(1) = "40 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Display driver for ShiftOS' Terminal to utilize advantages such as Infobar, ASCII-based applications" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Display driver for ShiftOS' Terminal to utilize advantages such as Infobar, ASCII-based applications" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "infobar"
                 If Strings.AvailableFeature(4) = "0" Then
                     ManHeader(0) = "Terminal InfoBar"
                     ManHeader(1) = "50 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Panel bar at the bottom of the terminal to display basic informations" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Panel bar at the bottom of the terminal to display basic informations" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "stime"
                 If Strings.AvailableFeature(5) = "0" Then
                     ManHeader(0) = "Time by Seconds"
                     ManHeader(1) = "10 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in seconds form since midnight" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in seconds form since midnight" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "stime"
                 If Strings.AvailableFeature(6) = "0" Then
                     ManHeader(0) = "Time by Minutes"
                     ManHeader(1) = "20 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in minutes form since midnight" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in minutes form since midnight" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "htime"
                 If Strings.AvailableFeature(7) = "0" Then
                     ManHeader(0) = "Time by Hours"
                     ManHeader(1) = "30 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in hours form since midnight" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in hours form since midnight" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "shiftfetch"
                 If Strings.AvailableFeature(8) = "0" Then
                     ManHeader(0) = "Shiftfetch"
                     ManHeader(1) = "55 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "ShiftOS port of Neofetch, A command-line system information tool" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "ShiftOS port of Neofetch, A command-line system information tool" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "bc"
                 If Strings.AvailableFeature(9) = "0" Then
                     ManHeader(0) = "Basic Calculator"
                     ManHeader(1) = "55 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Basic Calculator for simple calculation" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Basic Calculator for simple calculation" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "2bitcolor"
                 If Strings.AvailableFeature(10) = "0" Then
                     ManHeader(0) = "2-bit Color Support"
                     ManHeader(1) = "60 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Adds 2 colours (Dark Gray, Light Gray) supports to the terminal" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Adds 2 colours (Dark Gray, Light Gray) supports to the terminal" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "key"
                 If Strings.AvailableFeature(11) = "0" Then
                     ManHeader(0) = "ShiftOS Key"
                     ManHeader(1) = "5 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "An encryption key to unlock advanced terminal feature for ShiftOS" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "An encryption key to unlock advanced terminal feature for ShiftOS" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "pmam"
                 If Strings.AvailableFeature(12) = "0" Then
                     ManHeader(0) = "PM and AM"
                     ManHeader(1) = "40 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in PM and AM format" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in PM and AM format" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "rgb"
                 If Strings.AvailableFeature(13) = "0" Then
                     ManHeader(0) = "Red, Green, and Blue"
                     ManHeader(1) = "70 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Adds Red, Green, and Blue support to the Display Driver" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Adds Red, Green, and Blue support to the Display Driver" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "rgb2"
                 If Strings.AvailableFeature(14) = "0" Then
                     ManHeader(0) = "RGB Variant"
                     ManHeader(1) = "75 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Adds lighter or darker variant of Red, Green, and Blue" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Adds lighter or darker variant of Red, Green, and Blue" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "4bitcolor"
                 If Strings.AvailableFeature(15) = "0" Then
                     ManHeader(0) = "4-bit Color Display"
                     ManHeader(1) = "80 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Adds to 16 colours support to the Display Driver" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Adds to 16 colours support to the Display Driver" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "romdriver"
                 If Strings.AvailableFeature(16) = "0" Then
                     ManHeader(0) = "Terminal Read-Only Memory Driver"
                     ManHeader(1) = "90 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "ShiftOS Read-Only Memory support for ShiftOS such as writing and reading permanent memory such as HDD, SDD, etc." & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "ShiftOS Read-Only Memory support for ShiftOS such as writing and reading permanent memory such as HDD, SDD, etc." & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "textpad"
                 If Strings.AvailableFeature(17) = "0" Then
                     ManHeader(0) = "TextPad"
                     ManHeader(1) = "100 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "A simple text-editor for ShiftOS" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "A simple text-editor for ShiftOS" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "shiftkey"
                 If Strings.AvailableFeature(18) = "0" Then
                     ManHeader(0) = "ShiftKey"
                     ManHeader(1) = "45 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Recall the previous command on terminal" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Recall the previous command on terminal" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "username"
                 If Strings.AvailableFeature(19) = "0" Then
                     ManHeader(0) = "Custom Username"
                     ManHeader(1) = "15 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Set custom username for ShfitOS" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Set custom username for ShfitOS" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "hostname"
                 If Strings.AvailableFeature(20) = "0" Then
                     ManHeader(0) = "Custom Hostname"
                     ManHeader(1) = "15 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Set custom hostname/computer name for ShfitOS" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Set custom hostname/computer name for ShfitOS" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "rev"
                 If Strings.AvailableFeature(21) = "0" Then
                     ManHeader(0) = "Reverse String"
                     ManHeader(1) = "30 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Reverse any text you entered in the terminal" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Reverse any text you entered in the terminal" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case "cowsay"
                 If Strings.AvailableFeature(22) = "0" Then
                     ManHeader(0) = "Cowsay"
                     ManHeader(1) = "50 CP"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Make the ASCII cow say anything you want to" & Environment.NewLine & Environment.NewLine & ManHeader(1)
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Make the ASCII cow say anything you want to" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
+                End If
+            Case "hhmm"
+                If Strings.AvailableFeature(23) = "0" Then
+                    ManHeader(0) = "Time by Hours and Minutes"
+                    ManHeader(1) = "50 CP"
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in Hours and Minutes format" & Environment.NewLine & Environment.NewLine & ManHeader(1)
+                    Console.BadCommand = False
                 End If
             Case Else
-                Terminal.BadCommand = False
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available"
+                Console.BadCommand = False
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available"
         End Select
     End Sub
 
     Public Sub Shiftorium_DetectInstallFeatures()
-        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Installing feature..."
+        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Installing feature..."
         Select Case prompt
             Case "man"
                 Shiftorium_InstallFeatures(True, "man", 0, 10)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "clear"
                 Shiftorium_InstallFeatures(True, "clear", 1, 20)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "print"
                 Shiftorium_InstallFeatures(True, "print", 2, 25)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "termdspdrv"
                 Shiftorium_InstallFeatures(True, "termdspdrv", 3, 40)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "infobar"
                 Shiftorium_InstallFeatures(True, "infobar", 4, 50)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "stime"
                 Shiftorium_InstallFeatures(True, "stime", 5, 10)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "mtime"
                 Shiftorium_InstallFeatures(True, "mtime", 6, 20)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "htime"
                 Shiftorium_InstallFeatures(True, "htime", 7, 30)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "shiftfetch"
                 Shiftorium_InstallFeatures(True, "shiftfetch", 8, 55)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "bc"
                 Shiftorium_InstallFeatures(True, "bc", 9, 55)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "2bitcolor"
                 Shiftorium_InstallFeatures(True, "2bitcolor", 10, 60)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "key"
                 Shiftorium_InstallFeatures(True, "key", 11, 5)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "pmam"
                 Shiftorium_InstallFeatures(True, "pmam", 12, 40)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "rgb"
                 Shiftorium_InstallFeatures(True, "rgb", 13, 70)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "rgb2"
                 Shiftorium_InstallFeatures(True, "rgb2", 14, 75)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "4bitcolor"
                 Shiftorium_InstallFeatures(True, "4bitcolor", 15, 80)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "romdriver"
                 Shiftorium_InstallFeatures(True, "romdriver", 16, 90)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "textpad"
                 Shiftorium_InstallFeatures(True, "textpad", 17, 100)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "shiftkey"
                 Shiftorium_InstallFeatures(True, "shiftkey", 18, 45)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "username"
                 Shiftorium_InstallFeatures(True, "username", 19, 15)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "hostname"
                 Shiftorium_InstallFeatures(True, "hostname", 20, 15)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "rev"
                 Shiftorium_InstallFeatures(True, "rev", 21, 30)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
             Case "cowsay"
                 Shiftorium_InstallFeatures(True, "cowsay", 22, 50)
-                Terminal.BadCommand = False
+                Console.BadCommand = False
+            Case "hhmm"
+                Shiftorium_InstallFeatures(True, "hhmm", 23, 50)
+                Console.BadCommand = False
             Case Else
-                Terminal.BadCommand = False
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available"
+                Console.BadCommand = False
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available"
         End Select
     End Sub
 
@@ -404,6 +418,7 @@
                         Case "pmam"
                             Strings.AvailableFeature(7) = "3"
                             Strings.AvailableFeature(12) = "1"
+                            Strings.AvailableFeature(23) = "0"
                             success = True
                         Case "rgb"
                             Strings.AvailableFeature(13) = "1"
@@ -439,36 +454,39 @@
                             success = True
                         Case "cowsay"
                             Strings.AvailableFeature(22) = "1"
+                        Case "hhmm"
+                            Strings.AvailableFeature(12) = "3"
+                            Strings.AvailableFeature(23) = "1"
                             success = True
                     End Select
                     If success = False Then
                         If IsCLI = True Then
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium: Invalid command or feature already installed"
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Invalid command or feature already installed"
                         End If
                     Else
                         Strings.ComputerInfo(4) = Strings.ComputerInfo(4) + 1
                         TempCP = TempCP - Codepoint
                         Strings.ComputerInfo(2) = Convert.ToString(TempCP)
                         If IsCLI = True Then
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Feature has been install succesfully"
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Feature has been install succesfully"
                         End If
                     End If
                 Else
                     If IsCLI = True Then
-                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium: Insufficent Codepoint"
+                        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Insufficent Codepoint"
                     End If
                 End If
             Case "1"
                 If IsCLI = True Then
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium: Feature has already been installed"
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Feature has already been installed"
                 End If
             Case "2"
                 If IsCLI = True Then
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium: Feature is not available"
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Feature is not available"
                 End If
             Case "3"
                 If IsCLI = True Then
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium: Feature is already upgraded to a newer one"
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Feature is already upgraded to a newer one"
                 End If
         End Select
     End Sub
diff --git a/ShiftOS-TheRevival/MainForms/Strings.vb b/ShiftOS-TheRevival/MainForms/Strings.vb
index bd49677..1e6eba9 100644
--- a/ShiftOS-TheRevival/MainForms/Strings.vb
+++ b/ShiftOS-TheRevival/MainForms/Strings.vb
@@ -3,7 +3,7 @@
     Public Shared ComputerInfo(6) As String
     Public Shared IsFree As Boolean
     Public Shared OnceInfo(8) As String
-    Public Shared AvailableFeature(22) As String
+    Public Shared AvailableFeature(24) As String
     Public Shared CLIInterpreter As String
     Public Shared SaveFile As String
     Public Shared Achievement As String
@@ -71,6 +71,8 @@
     '20 = Custom Hostname [Custom hostname for ShiftOS] (0.2.4) (default : 0)
     '21 = Reverse String [Reverse a text] (0.2.4) (default : 0)
     '22 = Cowsay [Cowsay] (0.2.4) (default : 0)
+    '23 = Time by Hours and Minutes [Shows time in Hours and Minutes format] (0.2.5) (default : 0)
+    '24 = fortune command [Shows random quote] (0.2.5) (default : 0)
     '
     'Features bought hierarchy :
     'ShiftOS Key (KEY) (5 CP)
@@ -81,6 +83,7 @@
     '>>Terminal Print (PRINT) (25 CP)
     '>>>Reverse String command (REV) (30 CP)
     '>>>>Cowsay (50 CP)
+    '>>>>Fortune command (55 CP)
     '>>>ShiftKey (ShOSKey) (45 CP)
     '>>>Terminal Display Driver (TERMDSPDRV) (40 CP)
     '>>>>Terminal InfoBar (INFOBAR) (50 CP)
@@ -96,4 +99,5 @@
     '>>>Time by Minutes (TIME, MTIME) (20 CP)
     '>>>>Time by Hours (Time, HTIME) (30 CP)
     '>>>>>PM and AM (Time, PMAM (40 CP))
+    '>>>>>>Time by Hours and Minutes (Time, HHMM (50 CP))
 End Class
diff --git a/ShiftOS-TheRevival/MainForms/TerminalAPI.vb b/ShiftOS-TheRevival/MainForms/TerminalAPI.vb
new file mode 100644
index 0000000..667d2ef
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/TerminalAPI.vb
@@ -0,0 +1,49 @@
+Module TerminalAPI
+    Public command As String
+    Public AdvancedCommand As Boolean
+    Public RawCommand As String
+
+    Public Sub Terminal_ReadCommand()
+        command = Console.TextBox1.Lines(Console.TextBox1.Lines.Length - 1)
+        If Console.DefaultPrompt = Nothing Then
+        Else
+            command = command.Replace(Console.DefaultPrompt, "")
+        End If
+        RawCommand = command
+        command = command.ToLower()
+    End Sub
+
+    Public Sub Terminal_PrintPrompt()
+        If Console.TextBox1.Text = Nothing Then
+            If Console.ChangeInterpreter = True Then
+                NewLine(Console.DefaultPrompt)
+            Else
+                If Strings.OnceInfo(0) = "Yes" Then
+                    ResetLine("root@" & Strings.ComputerInfo(0) & " #> ")
+                Else
+                    ResetLine(Strings.ComputerInfo(1) & "@" & Strings.ComputerInfo(0) & " $> ")
+                End If
+            End If
+        Else
+            If Console.ChangeInterpreter = True Then
+                NewLine(Console.DefaultPrompt)
+            Else
+                If Strings.OnceInfo(0) = "Yes" Then
+                    NewLine("root@" & Strings.ComputerInfo(0) & " #> ")
+                Else
+                    NewLine(Strings.ComputerInfo(1) & "@" & Strings.ComputerInfo(0) & " $> ")
+                End If
+            End If
+        End If
+    End Sub
+
+    Public Sub Terminal_AssignPrompt()
+        If Console.ChangeInterpreter = False Then
+            If Strings.OnceInfo(0) = "Yes" Then
+                Console.DefaultPrompt = "root@" & Strings.ComputerInfo(0) & " #> "
+            Else
+                Console.DefaultPrompt = Strings.ComputerInfo(1) & "@" & Strings.ComputerInfo(0) & " $> "
+            End If
+        End If
+    End Sub
+End Module
diff --git a/ShiftOS-TheRevival/MainForms/TerminalColorSystem.vb b/ShiftOS-TheRevival/MainForms/TerminalColorSystem.vb
index de97756..83a5e9e 100644
--- a/ShiftOS-TheRevival/MainForms/TerminalColorSystem.vb
+++ b/ShiftOS-TheRevival/MainForms/TerminalColorSystem.vb
@@ -13,48 +13,48 @@
     Public FgColor As Color
 
     Public Sub DisplayColors()
-        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "TERMINAL SUPPORTED COLORS" & Environment.NewLine & Environment.NewLine
+        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "TERMINAL SUPPORTED COLORS" & Environment.NewLine & Environment.NewLine
         If Strings.AvailableFeature(10) = "1" Then
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "0 = Black      8 = Gray"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "0 = Black      8 = Gray"
         Else
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "0 = Black      8 = ???"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "0 = Black      8 = ???"
         End If
         If Strings.AvailableFeature(14) = "1" Then
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "1 = Blue       9 = Light Blue"
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "2 = Green      A = Light Green"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "1 = Blue       9 = Light Blue"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "2 = Green      A = Light Green"
 
         Else
             If Strings.AvailableFeature(13) = "1" Then
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "1 = ???        9 = Light Blue"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "2 = Green      A = ???"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "1 = ???        9 = Light Blue"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "2 = Green      A = ???"
             Else
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "1 = ???        9 = ???"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "2 = ???        A = ???"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "1 = ???        9 = ???"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "2 = ???        A = ???"
             End If
         End If
         If Strings.AvailableFeature(15) = "1" Then
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "3 = Aqua       B = Light Aqua"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "3 = Aqua       B = Light Aqua"
         Else
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "3 = ???        B = ???"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "3 = ???        B = ???"
         End If
         If Strings.AvailableFeature(14) = "1" Then
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "4 = Red        C = Light Red"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "4 = Red        C = Light Red"
         ElseIf Strings.AvailableFeature(13) = "1" Then
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "4 = ???        C = Light Red"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "4 = ???        C = Light Red"
         Else
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "4 = ???        C = ???"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "4 = ???        C = ???"
         End If
         If Strings.AvailableFeature(15) = "1" Then
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "5 = Purple     D = Light Purple"
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "6 = Yellow     E = Yellow"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "5 = Purple     D = Light Purple"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "6 = Yellow     E = Yellow"
         Else
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "5 = ???        D = ???"
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "6 = ???        E = ???"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "5 = ???        D = ???"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "6 = ???        E = ???"
         End If
         If Strings.AvailableFeature(10) = "1" Then
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "7 = Dark Gray  F = White"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "7 = Dark Gray  F = White"
         Else
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "7 = ???        F = White"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "7 = ???        F = White"
         End If
     End Sub
 
@@ -68,7 +68,7 @@
                 FgColor = Color.Black
         End Select
         If Bg = Fg Then
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Background and Foreground Color cannot be same!"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Background and Foreground Color cannot be same!"
         Else
             If Strings.AvailableFeature(10) = "1" Then
                 Select Case Bg
@@ -91,7 +91,7 @@
                                     BgColor = Color.Red
                             End Select
                         Else
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available."
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available."
                         End If
                     Case "1", "4", "a"
                         If Strings.AvailableFeature(14) = "1" Then
@@ -104,7 +104,7 @@
                                     BgColor = Color.Lime
                             End Select
                         Else
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available."
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available."
                         End If
                     Case "3", "5", "6", "b", "d", "e"
                         If Strings.AvailableFeature(15) = "1" Then
@@ -123,7 +123,7 @@
                                     BgColor = Color.Yellow
                             End Select
                         Else
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available."
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available."
                         End If
                     Case Else
                         BgColor = Color.Black
@@ -148,7 +148,7 @@
                                     FgColor = Color.Red
                             End Select
                         Else
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available."
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available."
                         End If
                     Case "1", "4", "a"
                         If Strings.AvailableFeature(14) = "1" Then
@@ -161,7 +161,7 @@
                                     FgColor = Color.Lime
                             End Select
                         Else
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available."
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available."
                         End If
                     Case "3", "5", "6", "b", "d", "e"
                         If Strings.AvailableFeature(15) = "1" Then
@@ -180,13 +180,13 @@
                                     FgColor = Color.Yellow
                             End Select
                         Else
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available."
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available."
                         End If
                     Case Else
                         FgColor = Color.White
                 End Select
             Else
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Color is not supported for 1-bit Color Display"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Color is not supported for 1-bit Color Display"
                 Select Case App
                     Case "terminal"
                         BgColor = Color.Black
@@ -199,12 +199,12 @@
         End If
         Select Case App
             Case "infobar"
-                Terminal.InfoBar.BackColor = BgColor
-                Terminal.InfoBar.ForeColor = FgColor
+                Console.InfoBar.BackColor = BgColor
+                Console.InfoBar.ForeColor = FgColor
                 Strings.ComputerInfo(6) = Bg & Fg
             Case "terminal"
-                Terminal.TextBox1.BackColor = BgColor
-                Terminal.TextBox1.ForeColor = FgColor
+                Console.TextBox1.BackColor = BgColor
+                Console.TextBox1.ForeColor = FgColor
                 Strings.ComputerInfo(5) = Bg & Fg
         End Select
     End Sub
diff --git a/ShiftOS-TheRevival/MainForms/TerminalApps.vb b/ShiftOS-TheRevival/MainForms/TerminalExternalApps.vb
index dbfcaa1..a7b29b8 100644
--- a/ShiftOS-TheRevival/MainForms/TerminalApps.vb
+++ b/ShiftOS-TheRevival/MainForms/TerminalExternalApps.vb
@@ -1,6 +1,6 @@
 Imports System.IO
 
-Module TerminalApps
+Module TerminalExternalApps
     Public ShouldChange As Boolean = False
     Public KeyInput As Keys
     'This is for GTN's RAM
@@ -32,14 +32,14 @@ Module TerminalApps
     Public Sub AppHost(App As Object, UseToolBar As Boolean)
         Select Case App
             Case "bc"
-                Terminal.DefaultPrompt = "> "
-                Terminal.TextBox1.Text = "bc (Basic Calcultator)" & Environment.NewLine & "Copyright, Free Software Foundation." & Environment.NewLine & "ShiftOS port by DevX." & Environment.NewLine & "This is free software with ABSOLUTELY NO WARRANTY." & Environment.NewLine
-                Terminal.CurrentInterpreter = "bc"
+                Console.DefaultPrompt = "> "
+                Console.TextBox1.Text = "bc (Basic Calcultator)" & Environment.NewLine & "Copyright, Free Software Foundation." & Environment.NewLine & "ShiftOS port by DevX." & Environment.NewLine & "This is free software with ABSOLUTELY NO WARRANTY." & Environment.NewLine
+                Console.CurrentInterpreter = "bc"
                 ShouldChange = True
             Case "guess" 'Guess the Number
-                Terminal.DefaultPrompt = "Your answer: "
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Guess the Number" & Environment.NewLine & "Guess the correct number between 1 and 50 and you'll get anything between 1 to 10 Codepoints" & Environment.NewLine & "Type 'exit' to terminate this game"
-                Terminal.CurrentInterpreter = "guess"
+                Console.DefaultPrompt = "Your answer: "
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Guess the Number" & Environment.NewLine & "Guess the correct number between 1 and 50 and you'll get anything between 1 to 10 Codepoints" & Environment.NewLine & "Type 'exit' to terminate this game"
+                Console.CurrentInterpreter = "guess"
                 GTN_GenerateNumber()
                 ShouldChange = True
             'Revisit Later
@@ -50,27 +50,27 @@ Module TerminalApps
             '    FreezeText = Terminal.TextBox1.Text
             '    ShouldChange = True
             Case "shiftoriumfx" 'ShiftoriumFX : Advanced Shiftorium
-                Terminal.DefaultPrompt = "Navigate> "
-                Terminal.CurrentInterpreter = "shiftoriumfx"
+                Console.DefaultPrompt = "Navigate> "
+                Console.CurrentInterpreter = "shiftoriumfx"
                 ShiftoriumFX_DisplayPackages()
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & Environment.NewLine & "Type any package you want to investigate"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & Environment.NewLine & "Type any package you want to investigate"
                 ShouldChange = True
             Case "textpad"
-                Terminal.DefaultPrompt = Nothing
-                Terminal.TextBox1.Text = Nothing
-                Terminal.ToolBarUse = True
-                Terminal.CheckFeature()
-                Terminal.CurrentInterpreter = "textpad"
-                TextPad_CheckExist(Terminal.command)
-                Terminal.ToolBar.Text = "TextPad - " & Terminal.command & Environment.NewLine & "Ctrl-Q Exit | Ctrl-N New | Ctrl-O Open | Ctrl-S Save | F12 Save As"
-                Terminal.ReleaseCursor = True
+                Console.DefaultPrompt = Nothing
+                Console.TextBox1.Text = Nothing
+                Console.ToolBarUse = True
+                Console.CheckFeature()
+                Console.CurrentInterpreter = "textpad"
+                TextPad_CheckExist(command)
+                Console.ToolBar.Text = "TextPad - " & command & Environment.NewLine & "Ctrl-Q Exit | Ctrl-N New | Ctrl-O Open | Ctrl-S Save | F12 Save As"
+                Console.ReleaseCursor = True
         End Select
-        If Terminal.ReleaseCursor = True Then
+        If Console.ReleaseCursor = True Then
             'Strings.OnceInfo(5) = Terminal.TrackPos
             'Terminal.TrackPos = Nothing
         End If
         If ShouldChange = True Then
-            Terminal.ChangeInterpreter = True
+            Console.ChangeInterpreter = True
             ShouldChange = False
         End If
     End Sub
@@ -78,104 +78,104 @@ Module TerminalApps
     Public Sub CaptureKeyBinding(KeysInput As Keys)
         Select Case KeysInput
             Case (Keys.S + Keys.Control)
-                Select Case Terminal.CurrentInterpreter
+                Select Case Console.CurrentInterpreter
                     Case "textpad"
-                        If File.Exists(Terminal.CurrentDirectory & "\" & Terminal.command) = True Then
-                            Dim TempCompare As String = File.ReadAllText(Terminal.CurrentDirectory & "\" & Terminal.command)
-                            If Terminal.TextBox1.Text = TempCompare Then
+                        If File.Exists(Console.CurrentDirectory & "\" & command) = True Then
+                            Dim TempCompare As String = File.ReadAllText(Console.CurrentDirectory & "\" & command)
+                            If Console.TextBox1.Text = TempCompare Then
 
                             Else
                                 Dim BeforeCP As Integer = Strings.ComputerInfo(2)
-                                SaveFile(Terminal.command)
+                                SaveFile(command)
                                 TextPad_GenerateCP_SavedFile()
                                 Dim AfterCP As Integer = Strings.ComputerInfo(2) - BeforeCP
-                                Terminal.ToolBar.Text = "TextPad - " & Terminal.command & " - You've got " & AfterCP & " Codepoints" & Environment.NewLine & "Ctrl-Q Exit | Ctrl-N New | Ctrl-O Open | Ctrl-S Save | F12 Save As"
+                                Console.ToolBar.Text = "TextPad - " & command & " - You've got " & AfterCP & " Codepoints" & Environment.NewLine & "Ctrl-Q Exit | Ctrl-N New | Ctrl-O Open | Ctrl-S Save | F12 Save As"
                             End If
                         Else
                             Dim BeforeCP As Integer = Strings.ComputerInfo(2)
-                            SaveFile(Terminal.command)
+                            SaveFile(command)
                             TextPad_GenerateCP_SavedFile()
                             Dim AfterCP As Integer = Strings.ComputerInfo(2) - BeforeCP
-                            Terminal.ToolBar.Text = "TextPad - " & Terminal.command & " - You've got " & AfterCP & " Codepoints" & Environment.NewLine & "Ctrl-Q Exit | Ctrl-N New | Ctrl-O Open | Ctrl-S Save | F12 Save As"
+                            Console.ToolBar.Text = "TextPad - " & command & " - You've got " & AfterCP & " Codepoints" & Environment.NewLine & "Ctrl-Q Exit | Ctrl-N New | Ctrl-O Open | Ctrl-S Save | F12 Save As"
                         End If
                 End Select
             Case (Keys.N + Keys.Control)
-                Select Case Terminal.CurrentInterpreter
+                Select Case Console.CurrentInterpreter
                     Case "textpad"
-                        Terminal.TextBox1.Text = Nothing
+                        Console.TextBox1.Text = Nothing
                 End Select
         End Select
     End Sub
 
     Public Sub TerminateApp(KeyInput As Keys)
-        Select Case Terminal.CurrentInterpreter
+        Select Case Console.CurrentInterpreter
             Case "textpad"
                 Dim BeforeCP As Integer = Strings.ComputerInfo(2)
-                If File.Exists(Terminal.CurrentDirectory & "\" & Terminal.command) = True Then
-                    Dim TextCompare As String = My.Computer.FileSystem.ReadAllText(Terminal.CurrentDirectory & "\" & Terminal.command)
-                    If Terminal.TextBox1.Text = TextCompare Then
-                        Terminal.TextBox1.Text = Nothing
+                If File.Exists(Console.CurrentDirectory & "\" & command) = True Then
+                    Dim TextCompare As String = My.Computer.FileSystem.ReadAllText(Console.CurrentDirectory & "\" & command)
+                    If Console.TextBox1.Text = TextCompare Then
+                        Console.TextBox1.Text = Nothing
                     Else
-                        SaveFile(Terminal.command)
+                        SaveFile(command)
                         TextPad_GenerateCP_SavedFile()
                         Dim AfterCP As Integer = Strings.ComputerInfo(2) - BeforeCP
-                        Terminal.TextBox1.Text = "You've got " & AfterCP & " Codepoints"
+                        Console.TextBox1.Text = "You've got " & AfterCP & " Codepoints"
                     End If
                 Else
-                    SaveFile(Terminal.command)
+                    SaveFile(command)
                     TextPad_GenerateCP_SavedFile()
                     Dim AfterCP As Integer = Strings.ComputerInfo(2) - BeforeCP
-                    Terminal.TextBox1.Text = "You've got " & AfterCP & " Codepoints"
+                    Console.TextBox1.Text = "You've got " & AfterCP & " Codepoints"
                 End If
-                Terminal.ToolBarUse = False
-                Terminal.ChangeInterpreter = False
-                Terminal.ReleaseCursor = False
-                Terminal.CurrentInterpreter = "terminal"
-                Terminal.CheckFeature()
-                Terminal.AssignPrompt()
-                Terminal.PrintPrompt()
-                Terminal.TextRebind()
+                Console.ToolBarUse = False
+                Console.ChangeInterpreter = False
+                Console.ReleaseCursor = False
+                Console.CurrentInterpreter = "terminal"
+                Console.CheckFeature()
+                Terminal_AssignPrompt()
+                Terminal_PrintPrompt()
+                TextRebind()
             Case Else
-                Terminal.ToolBarUse = False
-                Terminal.ChangeInterpreter = False
-                Terminal.ReleaseCursor = False
-                Terminal.CurrentInterpreter = "terminal"
-                Terminal.CheckFeature()
-                Terminal.AssignPrompt()
-                Terminal.PrintPrompt()
-                Terminal.TextRebind()
+                Console.ToolBarUse = False
+                Console.ChangeInterpreter = False
+                Console.ReleaseCursor = False
+                Console.CurrentInterpreter = "terminal"
+                Console.CheckFeature()
+                Terminal_AssignPrompt()
+                Terminal_PrintPrompt()
+                TextRebind()
         End Select
     End Sub
 
     Public Sub DoChildCommand()
-        Select Case Terminal.CurrentInterpreter
+        Select Case Console.CurrentInterpreter
             Case "guess"
-                Select Case Terminal.command
+                Select Case command
                     Case "exit"
                         TerminateApp(Nothing)
                     Case Else
                         Try
                             GTN_CheckNumber()
                         Catch ex As Exception
-                            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Invalid value!"
+                            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Invalid value!"
                         End Try
                 End Select
             Case "shiftoriumfx"
-                Select Case Terminal.command
+                Select Case command
                     Case ""
 
                     Case "exit"
                         TerminateApp(Nothing)
                     Case Else
                         ShiftoriumFX_DisplayPackages()
-                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & Environment.NewLine & "Type any package you want to investigate" & Environment.NewLine & "Invalid package or bad command"
+                        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & Environment.NewLine & "Type any package you want to investigate" & Environment.NewLine & "Invalid package or bad command"
                 End Select
             Case "bc"
-                Select Case Terminal.command
+                Select Case command
                     Case "jim"
-                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "69, the funni number" & Environment.NewLine & "gotcha!"
+                        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "69, the funni number" & Environment.NewLine & "gotcha!"
                     Case "ojas"
-                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "dis calculator is very gud" & Environment.NewLine & "it counts from another universe"
+                        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "dis calculator is very gud" & Environment.NewLine & "it counts from another universe"
                     Case "exit"
                         TerminateApp(Nothing)
                     Case Else
@@ -189,7 +189,7 @@ Module TerminalApps
                         Dim GetText As String
                         Try
                             Do
-                                GetText = Terminal.command.Chars(BC_ReadNumbers)
+                                GetText = command.Chars(BC_ReadNumbers)
                                 Select Case GetText
                                     Case "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"
                                         BC_CurrentNumber = BC_CurrentNumber & GetText
@@ -212,7 +212,7 @@ Module TerminalApps
                                         End Select
                                         BC_Operation2 = GetText
                                     Case "."
-                                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & "Decimals aren't supported yet!"
+                                        Console.TextBox1.Text = Console.TextBox1.Text & "Decimals aren't supported yet!"
                                     Case Else
                                         'BC_Counting(BC_Numbers1, BC_Numbers2, BC_Operation2)
                                 End Select
@@ -224,7 +224,7 @@ Module TerminalApps
                         End Try
                         BC_Counting(BC_Numbers1, BC_Numbers2, BC_Operation2)
                         BC_ThriceMoreValue = Nothing
-                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & BC_Result
+                        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & BC_Result
                 End Select
         End Select
     End Sub
@@ -248,45 +248,45 @@ Module TerminalApps
     End Sub
 
     Public Sub GTN_CheckNumber()
-        Dim TheirNumber As Integer = Convert.ToInt32(Terminal.command)
+        Dim TheirNumber As Integer = Convert.ToInt32(command)
         If TheirNumber > 0 And TheirNumber < 51 Then
             If TheirNumber = TheNumber Then
                 Dim GetCP As New Random
                 Dim GotCP As Integer = GetCP.Next(1, 11)
                 ChangeCP(True, GotCP)
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "You are correct!, you got " & GotCP & " Codepoint(s)" & Environment.NewLine & "Guess the new number between 1 and 50."
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "You are correct!, you got " & GotCP & " Codepoint(s)" & Environment.NewLine & "Guess the new number between 1 and 50."
                 GTN_GenerateNumber()
             Else
                 If TheirNumber < TheNumber Then
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Higher!"
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Higher!"
                 ElseIf TheirNumber > TheNumber Then
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Lower!"
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Lower!"
                 End If
             End If
         End If
     End Sub
 
     Public Sub ShOSKey_InputCommand(lastcommand As String)
-        Terminal.ShOSKey = lastcommand
+        Console.ShOSKey = lastcommand
     End Sub
 
     Public Sub ShOSKey_Display()
-        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Terminal.ShOSKey
+        Console.TextBox1.Text = Console.TextBox1.Text & Console.ShOSKey
         Try
-            Terminal.TrackPos = Terminal.ShOSKey.Length
+            Console.TrackPos = Console.ShOSKey.Length
         Catch ex As Exception
-            Terminal.TrackPos = 0
+            Console.TrackPos = 0
         End Try
     End Sub
 
     Public Sub TextPad_CheckExist(TxtFileName As String)
-        If File.Exists(Terminal.CurrentDirectory & "\" & TxtFileName) = True Then
-            Terminal.TextBox1.Text = My.Computer.FileSystem.ReadAllText(Terminal.CurrentDirectory & "\" & TxtFileName)
+        If File.Exists(Console.CurrentDirectory & "\" & TxtFileName) = True Then
+            Console.TextBox1.Text = My.Computer.FileSystem.ReadAllText(Console.CurrentDirectory & "\" & TxtFileName)
         End If
     End Sub
 
     Public Sub TextPad_GenerateCP_SavedFile()
-        Select Case Terminal.TextBox1.TextLength
+        Select Case Console.TextBox1.TextLength
             Case 1 To 9
                 Dim GetCP As New Random
                 Dim GotCP As Integer = GetCP.Next(1, 3)
@@ -307,7 +307,7 @@ Module TerminalApps
     End Sub
 
     Public Sub ShiftoriumFX_DisplayPackages()
-        Terminal.TextBox1.Text = "Shiftorium FX!" & Environment.NewLine & "The place to shiftisize the ShiftOS" & Environment.NewLine & Environment.NewLine & "Available Package(s)"
+        Console.TextBox1.Text = "Shiftorium FX!" & Environment.NewLine & "The place to shiftisize the ShiftOS" & Environment.NewLine & Environment.NewLine & "Available Package(s)"
         Shiftorium_ListFeatures()
     End Sub
 End Module
diff --git a/ShiftOS-TheRevival/MainForms/TerminalInternalApps.vb b/ShiftOS-TheRevival/MainForms/TerminalInternalApps.vb
index 4a7aa65..c4db4bd 100644
--- a/ShiftOS-TheRevival/MainForms/TerminalInternalApps.vb
+++ b/ShiftOS-TheRevival/MainForms/TerminalInternalApps.vb
@@ -3,54 +3,54 @@
         Select Case Say.Length
             Case 1 To 40
                 Dim SubtractLength As Integer = Say.Length + 1
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & " "
+                NewLine(" ")
                 Do
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & "_"
+                    AddLine("_")
                     SubtractLength = SubtractLength - 1
                     If SubtractLength = 0 Then
-                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & "_"
+                        AddLine("_")
                         SubtractLength = Say.Length + 1
                         Exit Do
                     End If
                 Loop
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "< " & Say & " >"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & " "
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "< " & Say & " >"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " "
                 Do
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & "-"
+                    Console.TextBox1.Text = Console.TextBox1.Text & "-"
                     SubtractLength = SubtractLength - 1
                     If SubtractLength = 0 Then
-                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & "-"
+                        Console.TextBox1.Text = Console.TextBox1.Text & "-"
                         SubtractLength = Say.Length + 1
                         Exit Do
                     End If
                 Loop
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "        \   ^__^"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "         \  (oo)\_______"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "            (__)\       )\/\"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "                ||----w |"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "                ||     ||"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "        \   ^__^"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "         \  (oo)\_______"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "            (__)\       )\/\"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "                ||----w |"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "                ||     ||"
             Case 41 To 80
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & " __________________________________________ "
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "/ " & Say.Substring(0, 40) & " \"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " __________________________________________ "
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "/ " & Say.Substring(0, 40) & " \"
                 Say = Say.Substring(40, Say.Length - 40)
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "\ " & Say
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "\ " & Say
                 Dim Spaces As Integer = 40 - Say.Length
                 Do
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & " "
+                    Console.TextBox1.Text = Console.TextBox1.Text & " "
                     If Spaces = 0 Then
-                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & "/"
+                        Console.TextBox1.Text = Console.TextBox1.Text & "/"
                         Exit Do
                     End If
                     Spaces = Spaces - 1
                 Loop
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & " ------------------------------------------ "
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "        \   ^__^"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "         \  (oo)\_______"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "            (__)\       )\/\"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "                ||----w |"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "                ||     ||"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " ------------------------------------------ "
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "        \   ^__^"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "         \  (oo)\_______"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "            (__)\       )\/\"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "                ||----w |"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "                ||     ||"
             Case >= 81
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "cowsay: Character limit exceeded"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "cowsay: Character limit exceeded"
                 'Dim SubtractLength As Integer = Say.Length + 1
                 'Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & " __________________________________________ "
                 'Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "/ " & Say.Substring(0, 40) & " \"
@@ -92,7 +92,7 @@
         'Summary of the command's action
         '
         'Example usage : command
-        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "ShiftOS Help Manual" & Environment.NewLine
+        Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "ShiftOS Help Manual" & Environment.NewLine
         'Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & command.Substring(4)
         Dim mancommand As String = Command.Replace("man ", "")
         Dim TempUsage As String = "'" & mancommand & "' Usage: "
@@ -101,143 +101,143 @@
             Case "bc"
                 If Strings.AvailableFeature(9) = "1" Then
                     TempUsage = TempUsage & "bc"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_bc & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_bc & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "cd"
                 If Strings.AvailableFeature(16) = "1" Then
                     TempUsage = TempUsage & "cd [DIRECTORY]"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_cd & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_cd & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "clear"
                 If Strings.AvailableFeature(1) = "1" Then
                     TempUsage = TempUsage & "clear"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_clear & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_clear & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "color"
                 TempUsage = TempUsage & "color [bg][fg]"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_color & Environment.NewLine
-                Terminal.BadCommand = False
+                Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_color & Environment.NewLine
+                Console.BadCommand = False
             Case "colors"
                 TempUsage = TempUsage & "colors"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_colors & Environment.NewLine
-                Terminal.BadCommand = False
+                Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_colors & Environment.NewLine
+                Console.BadCommand = False
             Case "cowsay"
                 If Strings.AvailableFeature(22) = 1 Then
                     TempUsage = TempUsage & "cowsay [STRING]"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_cowsay & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_cowsay & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "codepoint"
                 TempUsage = TempUsage & "codepoint"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_codepoint & Environment.NewLine
-                Terminal.BadCommand = False
+                Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_codepoint & Environment.NewLine
+                Console.BadCommand = False
             Case "del"
                 If Strings.AvailableFeature(16) = 1 Then
                     TempUsage = TempUsage & "del [FILENAME.TXT]"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_del & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_del & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "dir"
                 If Strings.AvailableFeature(16) = "1" Then
                     TempUsage = TempUsage & "dir"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_dir & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_dir & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "guess"
                 TempUsage = TempUsage & "guess"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_guess & Environment.NewLine
-                Terminal.BadCommand = False
+                Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_guess & Environment.NewLine
+                Console.BadCommand = False
             Case "help"
                 TempUsage = TempUsage & "help"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_help & Environment.NewLine
-                Terminal.BadCommand = False
+                Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_help & Environment.NewLine
+                Console.BadCommand = False
             Case "hostname"
                 If Strings.AvailableFeature(20) = 1 Then
                     TempUsage = TempUsage & "hostname [HOSTNAME]"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_hostname & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_hostname & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "infobar"
                 If Strings.AvailableFeature(4) = 1 Then
                     TempUsage = TempUsage & "infobar [ON|OFF] [OPTION]"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_infobar & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_infobar & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "man"
                 If Strings.AvailableFeature(0) = "1" Then
                     TempUsage = TempUsage & "man [command]"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_man & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_man & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "mkdir"
                 If Strings.AvailableFeature(16) = "1" Then
                     TempUsage = TempUsage & "mkdir [DIRECTORY]"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_mkdir & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_mkdir & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "print"
                 If Strings.AvailableFeature(2) = "1" Then
                     TempUsage = TempUsage & "print [text]"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_print & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_print & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "pwd"
                 If Strings.AvailableFeature(16) = "1" Then
                     TempUsage = TempUsage & "pwd"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_pwd & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_pwd & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "reboot"
                 TempUsage = TempUsage & "reboot"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_reboot & Environment.NewLine
-                Terminal.BadCommand = False
+                Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_reboot & Environment.NewLine
+                Console.BadCommand = False
             Case "rmdir"
                 If Strings.AvailableFeature(16) = "1" Then
                     TempUsage = TempUsage & "rmdir [DIRECTORY]"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_rmdir & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_rmdir & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "shiftfetch"
                 If Strings.AvailableFeature(8) = "1" Then
                     TempUsage = TempUsage & "shiftfetch"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_shiftfetch & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_shiftfetch & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "shiftorium"
                 TempUsage = TempUsage & "shiftorium [option] [featureName]"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_shiftorium & Environment.NewLine
-                Terminal.BadCommand = False
+                Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_shiftorium & Environment.NewLine
+                Console.BadCommand = False
             Case "shutdown"
                 TempUsage = TempUsage & "shutdown"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_shutdown & Environment.NewLine
-                Terminal.BadCommand = False
+                Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_shutdown & Environment.NewLine
+                Console.BadCommand = False
             Case "textpad"
                 If Strings.AvailableFeature(17) = "1" Then
                     TempUsage = TempUsage & "textpad [FILENAME.TXT]"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_textpad & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_textpad & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "time"
                 If Strings.AvailableFeature(17) = "1" Then
                     TempUsage = TempUsage & "time"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_time & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_time & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "username"
                 If Strings.AvailableFeature(19) = "1" Then
                     TempUsage = TempUsage & "username"
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_username & Environment.NewLine
-                    Terminal.BadCommand = False
+                    Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_username & Environment.NewLine
+                    Console.BadCommand = False
                 End If
             Case "ver"
                 TempUsage = TempUsage & "ver"
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_ver & Environment.NewLine
-                Terminal.BadCommand = False
+                Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_ver & Environment.NewLine
+                Console.BadCommand = False
             Case Else
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "MAN : Invalid command"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "MAN : Invalid command"
         End Select
     End Sub
 End Module
diff --git a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj
index 7dfac67..e499099 100644
--- a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj
+++ b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj
@@ -99,6 +99,18 @@
     <Compile Include="MainForms\BugSlap.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="MainForms\ConsoleRTF.Designer.vb">
+      <DependentUpon>ConsoleRTF.vb</DependentUpon>
+    </Compile>
+    <Compile Include="MainForms\ConsoleRTF.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainForms\DebugWindow.Designer.vb">
+      <DependentUpon>DebugWindow.vb</DependentUpon>
+    </Compile>
+    <Compile Include="MainForms\DebugWindow.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="MainForms\DirectoryManagements.vb" />
     <Compile Include="MainForms\Epilepsy.Designer.vb">
       <DependentUpon>Epilepsy.vb</DependentUpon>
@@ -129,13 +141,15 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="MainForms\Strings.vb" />
-    <Compile Include="MainForms\Terminal.Designer.vb">
-      <DependentUpon>Terminal.vb</DependentUpon>
+    <Compile Include="MainForms\Console.Designer.vb">
+      <DependentUpon>Console.vb</DependentUpon>
     </Compile>
-    <Compile Include="MainForms\Terminal.vb">
+    <Compile Include="MainForms\Console.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MainForms\TerminalApps.vb" />
+    <Compile Include="MainForms\ConsoleAPI.vb" />
+    <Compile Include="MainForms\TerminalAPI.vb" />
+    <Compile Include="MainForms\TerminalExternalApps.vb" />
     <Compile Include="MainForms\TerminalColorSystem.vb" />
     <Compile Include="MainForms\TerminalInternalApps.vb" />
     <Compile Include="MainForms\TheUpdater.vb" />
@@ -160,6 +174,12 @@
     <EmbeddedResource Include="MainForms\BugSlap.resx">
       <DependentUpon>BugSlap.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="MainForms\ConsoleRTF.resx">
+      <DependentUpon>ConsoleRTF.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MainForms\DebugWindow.resx">
+      <DependentUpon>DebugWindow.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MainForms\Epilepsy.resx">
       <DependentUpon>Epilepsy.vb</DependentUpon>
     </EmbeddedResource>
@@ -169,8 +189,8 @@
     <EmbeddedResource Include="MainForms\ShiftOSUpdater.resx">
       <DependentUpon>ShiftOSUpdater.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="MainForms\Terminal.resx">
-      <DependentUpon>Terminal.vb</DependentUpon>
+    <EmbeddedResource Include="MainForms\Console.resx">
+      <DependentUpon>Console.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="My Project\Resources.resx">
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>