diff --git a/PerformanceOverlay/Overlays.cs b/PerformanceOverlay/Overlays.cs
index cdde915..473d174 100644
--- a/PerformanceOverlay/Overlays.cs
+++ b/PerformanceOverlay/Overlays.cs
@@ -97,7 +97,7 @@ namespace PerformanceOverlay
         {
             Nested = {
                 // Simple just FPS
-                new Entry { Text = "<C4><FR><C><A><A1><S1><C4> FPS", Include = { Mode.FPS } },
+                new Entry("<C4><FR><C><A><A1><S1><C4> FPS") { Include = { Mode.FPS } },
 
                 // Minimal and Detail
                 new Entry {
@@ -109,7 +109,8 @@ namespace PerformanceOverlay
                             Nested =
                             {
                                 new Entry("<C4><A0>{BATT_%}<A><A1><S1> %<S><A>"),
-                                new Entry("<C4><A0>{BATT_W}<A><A1><S1> W<S><A>") { IgnoreMissing = true }
+                                new Entry("<C4><A0>{BATT_W}<A><A1><S1> W<S><A>") { IgnoreMissing = true },
+                                new Entry("C<C4><A0>{BATT_CHARGE_W}<A><A1><S1> W<S><A>") { IgnoreMissing = true, Include = { Mode.Detail } }
                             }
                         },
                         new Entry
@@ -119,7 +120,7 @@ namespace PerformanceOverlay
                             {
                                 new Entry("<C4><A0>{GPU_%}<A><A1><S1> %<S><A>"),
                                 new Entry("<C4><A0>{GPU_W}<A><A1><S1> W<S><A>"),
-                                new Entry { Text = "<C4><A0>{GPU_T}<A><A1><S1> C<S><A>", IgnoreMissing = true, Include = { Mode.Detail } }
+                                new Entry("<C4><A0>{GPU_T}<A><A1><S1> C<S><A>") { IgnoreMissing = true, Include = { Mode.Detail } }
                             }
                         },
                         new Entry
@@ -129,7 +130,7 @@ namespace PerformanceOverlay
                             {
                                 new Entry("<C4><A0>{CPU_%}<A><A1><S1> %<S><A>"),
                                 new Entry("<C4><A0>{CPU_W}<A><A1><S1> W<S><A>"),
-                                new Entry { Text = "<C4><A0>{CPU_T}<A><A1><S1> C<S><A>", IgnoreMissing = true, Include = { Mode.Detail } }
+                                new Entry("<C4><A0>{CPU_T}<A><A1><S1> C<S><A>") { IgnoreMissing = true, Include = { Mode.Detail } }
                             }
                         },
                         new Entry
@@ -161,20 +162,20 @@ namespace PerformanceOverlay
                 new Entry {
                     Nested =
                     {
-                        new Entry { Text = "<C1>CPU<C>   <A0>{CPU_%}<A><A1><S1> %<S><A> <A0>{CPU_T}<A><A1><S1> C<S><A>" },
-                        new Entry { Text = "<C1>GPU<C>   <A0>{GPU_%}<A><A1><S1> %<S><A> <A0>{GPU_T}<A><A1><S1> C<S><A>" },
-                        new Entry { Text = "<C1>RAM<C>   <A0>{MEM_MB}<A><A1><S1> MB<S><A0>{GPU_MB}<A><A1><S1> MB<S><A>" },
-                        new Entry { Text = "<C1>FAN<C>   <A0>{FAN_RPM}<A><A1><S1> RPM<S><A>" },
-                        new Entry { Text = "<C2><APP><C> <A0><C4><FR><C><A><A1><S1><C4> FPS<C><S><A> <A0><C4><FT><C><A><A1><S1><C4> ms<C><S><A>" },
-                        new Entry {
-                            Text = "<C1>BAT<C>  ",
+                        new Entry("<C1>CPU<C>   <A0>{CPU_%}<A><A1><S1> %<S><A> <A0>{CPU_T}<A><A1><S1> C<S><A>"),
+                        new Entry("<C1>GPU<C>   <A0>{GPU_%}<A><A1><S1> %<S><A> <A0>{GPU_T}<A><A1><S1> C<S><A>"),
+                        new Entry("<C1>RAM<C>   <A0>{MEM_MB}<A><A1><S1> MB<S> <A5>{GPU_MB}<A><A1><S1> MB<S><A>"),
+                        new Entry("<C1>FAN<C>   <A0>{FAN_RPM}<A><A1><S1> RPM<S><A>"),
+                        new Entry("<C2><APP><C>  <A0><C4><FR><C><A><A1><S1><C4> FPS<C><S><A> <A0><C4><FT><C><A><A1><S1><C4> ms<C><S><A>"),
+                        new Entry("<C1>BAT<C>   ") {
                             Nested = {
                                 new Entry("<A0>{BATT_%}<A><A1><S1> %<S><A>"),
-                                new Entry("<A0>{BATT_W}<A><A1><S1> W<S><A>")
+                                new Entry(" <A0>{BATT_W}<A><A1><S1> W<S><A>") { IgnoreMissing = true },
+                                new Entry("C<A0>{BATT_CHARGE_W}<A><A1><S1> W<S><A>") { IgnoreMissing = true }
                             }
                         },
-                        new Entry { Text = "<C2><S1>Frametime<S>" },
-                        new Entry { Text = "[OBJ_FT_LARGE]<S1> <A0><FT><A><A1> ms<A><S><C>" },
+                        new Entry("<C2><S1>Frametime<S>"),
+                        new Entry("[OBJ_FT_LARGE]<S1> <A0><FT><A><A1> ms<A><S><C>"),
                     },
                     Separator = "\r\n",
                     Include = { Mode.Full }
diff --git a/PerformanceOverlay/Sensors.cs b/PerformanceOverlay/Sensors.cs
index 212a5c9..39d9062 100644
--- a/PerformanceOverlay/Sensors.cs
+++ b/PerformanceOverlay/Sensors.cs
@@ -205,7 +205,17 @@ namespace PerformanceOverlay
                     HardwareType = HardwareType.Battery,
                     HardwareName = "GETAC",
                     SensorType = SensorType.Power,
-                    SensorName = "Charge/Discharge Rate",
+                    SensorName = "Discharge Rate",
+                    Format = "F1"
+                }
+            },
+            {
+                "BATT_CHARGE_W", new HardwareSensor()
+                {
+                    HardwareType = HardwareType.Battery,
+                    HardwareName = "GETAC",
+                    SensorType = SensorType.Power,
+                    SensorName = "Charge Rate",
                     Format = "F1"
                 }
             },