diff --git a/WinNUT_V2/WinNUT-Client/Controls/UPSVarGauge.Designer.vb b/WinNUT_V2/WinNUT-Client/Controls/UPSVarGauge.Designer.vb
index 50c2b7f..8ac0f8e 100644
--- a/WinNUT_V2/WinNUT-Client/Controls/UPSVarGauge.Designer.vb
+++ b/WinNUT_V2/WinNUT-Client/Controls/UPSVarGauge.Designer.vb
@@ -11,7 +11,7 @@ Namespace Controls
 
     <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
     Partial Class UPSVarGauge
-        Inherits AGauge
+        Inherits AGaugeClassic.AGauge
 
         'Control overrides dispose to clean up the component list.
         <System.Diagnostics.DebuggerNonUserCode()>
diff --git a/WinNUT_V2/WinNUT-Client/Controls/UPSVarGauge.vb b/WinNUT_V2/WinNUT-Client/Controls/UPSVarGauge.vb
index a4acd7c..5255bce 100644
--- a/WinNUT_V2/WinNUT-Client/Controls/UPSVarGauge.vb
+++ b/WinNUT_V2/WinNUT-Client/Controls/UPSVarGauge.vb
@@ -9,6 +9,7 @@
 
 Imports System.ComponentModel
 Imports System.Drawing.Drawing2D
+Imports AGaugeClassic
 
 Namespace Controls
 
diff --git a/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj b/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
index 153d853..c86c9dd 100644
--- a/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
+++ b/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
@@ -435,7 +435,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AGauge.Classic">
-      <Version>2.1.0-prerelease.1</Version>
+      <Version>2.1.1-prerelease.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
       <Version>7.1.3</Version>
diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.Designer.vb b/WinNUT_V2/WinNUT-Client/WinNUT.Designer.vb
index 9870146..4479ca2 100644
--- a/WinNUT_V2/WinNUT-Client/WinNUT.Designer.vb
+++ b/WinNUT_V2/WinNUT-Client/WinNUT.Designer.vb
@@ -459,10 +459,10 @@ Partial Class WinNUT
         Me.AG_InF.MaxValue = 100.0!
         Me.AG_InF.MinValue = 0!
         Me.AG_InF.Name = "AG_InF"
-        Me.AG_InF.NeedleColor1 = AGaugeNeedleColor.Gray
+        Me.AG_InF.NeedleColor1 = AGaugeClassic.AGaugeNeedleColor.Gray
         Me.AG_InF.NeedleColor2 = System.Drawing.Color.DimGray
         Me.AG_InF.NeedleRadius = 32
-        Me.AG_InF.NeedleType = System.Windows.Forms.NeedleType.Advance
+        Me.AG_InF.NeedleType = AGaugeClassic.NeedleType.Advance
         Me.AG_InF.NeedleWidth = 2
         Me.AG_InF.ScaleLinesInterColor = System.Drawing.Color.Black
         Me.AG_InF.ScaleLinesInterInnerRadius = 40
@@ -502,10 +502,10 @@ Partial Class WinNUT
         Me.AG_InV.MaxValue = 100.0!
         Me.AG_InV.MinValue = 0!
         Me.AG_InV.Name = "AG_InV"
-        Me.AG_InV.NeedleColor1 = AGaugeNeedleColor.Gray
+        Me.AG_InV.NeedleColor1 = AGaugeClassic.AGaugeNeedleColor.Gray
         Me.AG_InV.NeedleColor2 = System.Drawing.Color.DimGray
         Me.AG_InV.NeedleRadius = 32
-        Me.AG_InV.NeedleType = System.Windows.Forms.NeedleType.Advance
+        Me.AG_InV.NeedleType = AGaugeClassic.NeedleType.Advance
         Me.AG_InV.NeedleWidth = 2
         Me.AG_InV.ScaleLinesInterColor = System.Drawing.Color.Black
         Me.AG_InV.ScaleLinesInterInnerRadius = 40
@@ -545,10 +545,10 @@ Partial Class WinNUT
         Me.AG_BattV.MaxValue = 100.0!
         Me.AG_BattV.MinValue = 0!
         Me.AG_BattV.Name = "AG_BattV"
-        Me.AG_BattV.NeedleColor1 = AGaugeNeedleColor.Gray
+        Me.AG_BattV.NeedleColor1 = AGaugeClassic.AGaugeNeedleColor.Gray
         Me.AG_BattV.NeedleColor2 = System.Drawing.Color.DimGray
         Me.AG_BattV.NeedleRadius = 32
-        Me.AG_BattV.NeedleType = System.Windows.Forms.NeedleType.Advance
+        Me.AG_BattV.NeedleType = AGaugeClassic.NeedleType.Advance
         Me.AG_BattV.NeedleWidth = 2
         Me.AG_BattV.ScaleLinesInterColor = System.Drawing.Color.Black
         Me.AG_BattV.ScaleLinesInterInnerRadius = 40
@@ -588,10 +588,10 @@ Partial Class WinNUT
         Me.AG_Load.MaxValue = 100.0!
         Me.AG_Load.MinValue = 0!
         Me.AG_Load.Name = "AG_Load"
-        Me.AG_Load.NeedleColor1 = AGaugeNeedleColor.Gray
+        Me.AG_Load.NeedleColor1 = AGaugeClassic.AGaugeNeedleColor.Gray
         Me.AG_Load.NeedleColor2 = System.Drawing.Color.DimGray
         Me.AG_Load.NeedleRadius = 32
-        Me.AG_Load.NeedleType = System.Windows.Forms.NeedleType.Advance
+        Me.AG_Load.NeedleType = AGaugeClassic.NeedleType.Advance
         Me.AG_Load.NeedleWidth = 2
         Me.AG_Load.ScaleLinesInterColor = System.Drawing.Color.Black
         Me.AG_Load.ScaleLinesInterInnerRadius = 40
@@ -631,10 +631,10 @@ Partial Class WinNUT
         Me.AG_OutV.MaxValue = 100.0!
         Me.AG_OutV.MinValue = 0!
         Me.AG_OutV.Name = "AG_OutV"
-        Me.AG_OutV.NeedleColor1 = AGaugeNeedleColor.Gray
+        Me.AG_OutV.NeedleColor1 = AGaugeClassic.AGaugeNeedleColor.Gray
         Me.AG_OutV.NeedleColor2 = System.Drawing.Color.DimGray
         Me.AG_OutV.NeedleRadius = 32
-        Me.AG_OutV.NeedleType = System.Windows.Forms.NeedleType.Advance
+        Me.AG_OutV.NeedleType = AGaugeClassic.NeedleType.Advance
         Me.AG_OutV.NeedleWidth = 2
         Me.AG_OutV.ScaleLinesInterColor = System.Drawing.Color.Black
         Me.AG_OutV.ScaleLinesInterInnerRadius = 40
@@ -674,10 +674,10 @@ Partial Class WinNUT
         Me.AG_BattCh.MaxValue = 100.0!
         Me.AG_BattCh.MinValue = 0!
         Me.AG_BattCh.Name = "AG_BattCh"
-        Me.AG_BattCh.NeedleColor1 = AGaugeNeedleColor.Gray
+        Me.AG_BattCh.NeedleColor1 = AGaugeClassic.AGaugeNeedleColor.Gray
         Me.AG_BattCh.NeedleColor2 = System.Drawing.Color.DimGray
         Me.AG_BattCh.NeedleRadius = 32
-        Me.AG_BattCh.NeedleType = System.Windows.Forms.NeedleType.Advance
+        Me.AG_BattCh.NeedleType = AGaugeClassic.NeedleType.Advance
         Me.AG_BattCh.NeedleWidth = 2
         Me.AG_BattCh.ScaleLinesInterColor = System.Drawing.Color.Black
         Me.AG_BattCh.ScaleLinesInterInnerRadius = 40