diff --git a/PerformanceOverlay/Overlays.cs b/PerformanceOverlay/Overlays.cs
index 7ea9fbf..355eaeb 100644
--- a/PerformanceOverlay/Overlays.cs
+++ b/PerformanceOverlay/Overlays.cs
@@ -83,7 +83,7 @@ namespace PerformanceOverlay
         public static readonly String[] Helpers =
         {
             "<C0=008040><C1=0080C0><C2=C08080><C3=FF0000><C4=FFFFFF><C250=FF8000>",
-            "<A0=-4><A1=5><A2=-2><A5=-5><S0=-50><S1=50>",
+            "<A0=-4><A1=5><A2=-2><A3=-3><A4=-4><A5=-5><S0=-50><S1=50>",
         };
 
         public static readonly Entry OSD = new Entry
@@ -98,12 +98,13 @@ namespace PerformanceOverlay
                     {
                         new Entry
                         {
-                            Text = "<C1>BATT<C>",
+                            Text = "<C1>BAT<C>",
                             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("C<C4><A0>{BATT_CHARGE_W}<A><A1><S1> W<S><A>") { IgnoreMissing = true, Include = { OverlayMode.Detail } }
+                                new Entry("<C4><A3>{BATT_%}<A><A1><S1> %<S><A>"),
+                                new Entry("<C4><A4>{BATT_W}<A><A1><S1> W<S><A>") { IgnoreMissing = true },
+                                new Entry("<C4><A3>{BATT_MIN}<A><A1><S1> min<S><A>") { IgnoreMissing = true },
+                                new Entry("C<C4><A4>{BATT_CHARGE_W}<A><A1><S1> W<S><A>") { IgnoreMissing = true, Include = { OverlayMode.Detail } }
                             }
                         },
                         new Entry
@@ -111,9 +112,9 @@ namespace PerformanceOverlay
                             Text = "<C1>GPU<C>",
                             Nested =
                             {
-                                new Entry("<C4><A0>{GPU_%}<A><A1><S1> %<S><A>"),
-                                new Entry("<C4><A0>{GPU_W}<A><A1><S1> W<S><A>"),
-                                new Entry("<C4><A0>{GPU_T}<A><A1><S1> C<S><A>") { IgnoreMissing = true, Include = { OverlayMode.Detail } }
+                                new Entry("<C4><A3>{GPU_%}<A><A1><S1> %<S><A>"),
+                                new Entry("<C4><A4>{GPU_W}<A><A1><S1> W<S><A>"),
+                                new Entry("<C4><A4>{GPU_T}<A><A1><S1> C<S><A>") { IgnoreMissing = true, Include = { OverlayMode.Detail } }
                             }
                         },
                         new Entry
@@ -121,9 +122,9 @@ namespace PerformanceOverlay
                             Text = "<C1>CPU<C>",
                             Nested =
                             {
-                                new Entry("<C4><A0>{CPU_%}<A><A1><S1> %<S><A>"),
-                                new Entry("<C4><A0>{CPU_W}<A><A1><S1> W<S><A>"),
-                                new Entry("<C4><A0>{CPU_T}<A><A1><S1> C<S><A>") { IgnoreMissing = true, Include = { OverlayMode.Detail } }
+                                new Entry("<C4><A3>{CPU_%}<A><A1><S1> %<S><A>"),
+                                new Entry("<C4><A4>{CPU_W}<A><A1><S1> W<S><A>"),
+                                new Entry("<C4><A4>{CPU_T}<A><A1><S1> C<S><A>") { IgnoreMissing = true, Include = { OverlayMode.Detail } }
                             }
                         },
                         new Entry
@@ -140,7 +141,7 @@ namespace PerformanceOverlay
                         new Entry
                         {
                             Text = "<C2><APP><C>",
-                            Nested = { new Entry("<A0><C4><FR><C><A><A1><S1><C4> FPS<C><S><A>") }
+                            Nested = { new Entry("<C4><A4><FR><C><A><A1><S1><C4> FPS<C><S><A>") }
                         },
                         new Entry
                         {
@@ -155,16 +156,43 @@ namespace PerformanceOverlay
                 new Entry {
                     Nested =
                     {
-                        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>   ") {
+                        new Entry("<C1>CPU<C>\t  ")
+                        {
                             Nested = {
-                                new Entry("<A0>{BATT_%}<A><A1><S1> %<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("<A5>{CPU_%}<A><A1><S1> %<S><A>"),
+                                new Entry("<A5>{CPU_W}<A><A1><S1> W<S>"),
+                                new Entry("<A5>{MEM_MB}<A><A1><S1> MB<S>"),
+                                new Entry("<A5>{CPU_T}<A><A1><S1> C<S><A>") { IgnoreMissing = true },
+                            }
+                        },
+                        new Entry("<C1>GPU<C>\t  ")
+                        {
+                            Nested = {
+                                new Entry("<A5>{GPU_%}<A><A1><S1> %<S><A>"),
+                                new Entry("<A5>{GPU_W}<A><A1><S1> W<S><A>"),
+                                new Entry("<A5>{GPU_MB}<A><A1><S1> MB<S><A>"),
+                                new Entry("<A5>{GPU_T}<A><A1><S1> C<S><A>") { IgnoreMissing = true },
+                            }
+                        },
+                        new Entry("<C1>FAN<C>\t  ")
+                        {
+                            Nested = {
+                                new Entry("<A5>{FAN_RPM}<A><A1><S1> RPM<S><A>"),
+                            }
+                        },
+                        new Entry("<C2><APP><C>\t  ")
+                        {
+                            Nested = {
+                                new Entry("<A5><C4><FR><C><A><A1><S1><C4> FPS<C><S><A>"),
+                                new Entry("<A5><C4><FT><C><A><A1><S1><C4> ms<C><S><A>"),
+                            }
+                        },
+                        new Entry("<C1>BAT<C>\t  ") {
+                            Nested = {
+                                new Entry("<A5>{BATT_%}<A><A1><S1> %<S><A>"),
+                                new Entry("<A5>{BATT_W}<A><A1><S1> W<S><A>") { IgnoreMissing = true },
+                                new Entry("<A5>{BATT_MIN}<A><A1><S1> min<S><A>") { IgnoreMissing = true },
+                                new Entry("<A5>C{BATT_CHARGE_W}<A><A1><S1> W<S><A>") { IgnoreMissing = true }
                             }
                         },
                         new Entry("<C2><S1>Frametime<S>"),
diff --git a/PerformanceOverlay/Sensors.cs b/PerformanceOverlay/Sensors.cs
index 4857244..36858da 100644
--- a/PerformanceOverlay/Sensors.cs
+++ b/PerformanceOverlay/Sensors.cs
@@ -215,6 +215,16 @@ namespace PerformanceOverlay
                     Format = "F0"
                 }
             },
+            {
+                "BATT_MIN", new HardwareSensor()
+                {
+                    HardwareType = HardwareType.Battery,
+                    SensorType = SensorType.TimeSpan,
+                    SensorName = "Remaining Time (Estimated)",
+                    Format = "F0",
+                    Multiplier = 1.0f/60.0f
+                }
+            },
             {
                 "BATT_W", new HardwareSensor()
                 {
diff --git a/RELEASE.md b/RELEASE.md
index 9baed19..561a22e 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -5,5 +5,6 @@
 - Add Volume Up/Down controls (disable with `EnableVolumeControl` in `PowerControl.dll.config`)
 - Add `0` brightness
 - Support any battery model
+- Add battery remaining
 
 If you found it useful buy me [Ko-fi](https://ko-fi.com/ayufan).