diff --git a/ShiftOS.WinForms/DesktopWidgets/CommandRunner.cs b/ShiftOS.WinForms/DesktopWidgets/CommandRunner.cs
deleted file mode 100644
index 29f20ed..0000000
--- a/ShiftOS.WinForms/DesktopWidgets/CommandRunner.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using ShiftOS.Engine;
-using ShiftOS.WinForms.Tools;
-
-namespace ShiftOS.WinForms.DesktopWidgets
-{
-    [DesktopWidget("Terminal Widget", "Run commands in a miniature Terminal.")]
-    public partial class CommandRunner : UserControl, IDesktopWidget
-    {
-        public CommandRunner()
-        {
-            InitializeComponent();
-        }
-
-        public void OnSkinLoad()
-        {
-            ControlManager.SetupControls(this);
-        }
-
-        public void OnUpgrade()
-        {
-
-        }
-
-        public void Setup()
-        {
-        }
-    }
-}
diff --git a/ShiftOS.WinForms/DesktopWidgets/CommandRunner.Designer.cs b/ShiftOS.WinForms/DesktopWidgets/TerminalWidget.Designer.cs
similarity index 75%
rename from ShiftOS.WinForms/DesktopWidgets/CommandRunner.Designer.cs
rename to ShiftOS.WinForms/DesktopWidgets/TerminalWidget.Designer.cs
index 6569247..e8e24c6 100644
--- a/ShiftOS.WinForms/DesktopWidgets/CommandRunner.Designer.cs
+++ b/ShiftOS.WinForms/DesktopWidgets/TerminalWidget.Designer.cs
@@ -1,6 +1,6 @@
 namespace ShiftOS.WinForms.DesktopWidgets
 {
-    partial class CommandRunner
+    partial class TerminalWidget
     {
         /// <summary> 
         /// Required designer variable.
@@ -28,8 +28,16 @@
         /// </summary>
         private void InitializeComponent()
         {
-            components = new System.ComponentModel.Container();
+            this.SuspendLayout();
+            // 
+            // TerminalWidget
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Name = "TerminalWidget";
+            this.Size = new System.Drawing.Size(185, 133);
+            this.ResumeLayout(false);
+
         }
 
         #endregion
diff --git a/ShiftOS.WinForms/DesktopWidgets/TerminalWidget.cs b/ShiftOS.WinForms/DesktopWidgets/TerminalWidget.cs
new file mode 100644
index 0000000..1dcd08c
--- /dev/null
+++ b/ShiftOS.WinForms/DesktopWidgets/TerminalWidget.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ShiftOS.WinForms.DesktopWidgets
+{
+    [DesktopWidget("Terminal Widget", "Run commands inside a miniature Terminal.")]
+    public partial class TerminalWidget : Applications.Terminal, IDesktopWidget
+    {
+        public TerminalWidget() : base()
+        {
+            this.Size = new Size(320, 200);
+        }
+
+        public void Setup()
+        {
+            OnLoad();
+        }
+    }
+}
diff --git a/ShiftOS.WinForms/DesktopWidgets/TerminalWidget.resx b/ShiftOS.WinForms/DesktopWidgets/TerminalWidget.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/ShiftOS.WinForms/DesktopWidgets/TerminalWidget.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.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index d426139..3f7c463 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -270,11 +270,11 @@
     <Compile Include="DesktopWidgets\Clock.Designer.cs">
       <DependentUpon>Clock.cs</DependentUpon>
     </Compile>
-    <Compile Include="DesktopWidgets\CommandRunner.cs">
+    <Compile Include="DesktopWidgets\TerminalWidget.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DesktopWidgets\CommandRunner.Designer.cs">
-      <DependentUpon>CommandRunner.cs</DependentUpon>
+    <Compile Include="DesktopWidgets\TerminalWidget.Designer.cs">
+      <DependentUpon>TerminalWidget.cs</DependentUpon>
     </Compile>
     <Compile Include="DesktopWidgets\UpgradePercentage.cs">
       <SubType>UserControl</SubType>
@@ -434,6 +434,9 @@
     <EmbeddedResource Include="DesktopWidgets\Clock.resx">
       <DependentUpon>Clock.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DesktopWidgets\TerminalWidget.resx">
+      <DependentUpon>TerminalWidget.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DesktopWidgets\UpgradePercentage.resx">
       <DependentUpon>UpgradePercentage.cs</DependentUpon>
     </EmbeddedResource>