diff --git a/PerformanceOverlay/Overlays.cs b/PerformanceOverlay/Overlays.cs
index 3d090a6..f7d5d99 100644
--- a/PerformanceOverlay/Overlays.cs
+++ b/PerformanceOverlay/Overlays.cs
@@ -97,9 +97,8 @@ namespace PerformanceOverlay
                         new Entry("<C4><A3>{BATT_%}<A><A1><S1> %<C><S><A>") { Include = { OverlayMode.FPSWithBattery }, IgnoreMissing = true },
                         new Entry("<C4><A4>{BATT_W}<A><A1><S1> W<C><S><A>") { Include = { OverlayMode.FPSWithBattery }, IgnoreMissing = true },
                         new Entry("<C4><A3>{BATT_MIN}<A><A1><S1> min<C><S><A>") { Include = { OverlayMode.FPSWithBattery }, IgnoreMissing = true },
-                        new Entry("<C4><FR><C><A><A1><S1><C4>{CURR_TIME}<C><S><A>") { Include = { OverlayMode.FPSWithBattery, OverlayMode.FPS } }
+                        new Entry("<C250>|<C> <C4><A3>{CURR_TIME}<A><A1><S1><C><S><A>") { Include = { OverlayMode.FPSWithBattery, OverlayMode.FPS } }
                     },
-                    Separator = "<C250>|<C> ",
                     Include = { OverlayMode.FPS, OverlayMode.FPSWithBattery }
                 },
                 // Battery
@@ -109,10 +108,10 @@ namespace PerformanceOverlay
                         new Entry("<C4><A3>{BATT_%}<A><A1><S1> %<C><S><A>") { Include = { OverlayMode.Battery }, IgnoreMissing = true },
                         new Entry("<C4><A4>{BATT_W}<A><A1><S1> W<C><S><A>") { Include = { OverlayMode.Battery }, IgnoreMissing = true },
                         new Entry("<C4><A3>{BATT_MIN}<A><A1><S1> min<C><S><A>") { Include = { OverlayMode.Battery }, IgnoreMissing = true },
-                        new Entry("<C4><FR><C><A><A1><S1><C4>{CURR_TIME}<C><S><A>") { Include = { OverlayMode.BatteryWithTime } }
+                        new Entry("<C250>|<C> <C4><A3>{CURR_TIME}<A><A1><S1><C><S><A>") { Include = { OverlayMode.BatteryWithTime } }
                     },
                     Separator = "<C250>|<C> ",
-                    Include = { OverlayMode.FPS, OverlayMode.FPSWithBattery }
+                    Include = { OverlayMode.Battery, OverlayMode.BatteryWithTime }
                 },
 
                 // Minimal and Detail
@@ -173,7 +172,11 @@ namespace PerformanceOverlay
                         },
                         new Entry
                         {
-                            Text = "<C4><A4><FR><C><A><A1><S1><C4>{CURR_TIME}<C><S><A>",
+                            Text = "<C1>TIME<C>",
+                            Nested =
+                            {
+                                new Entry("<C4><A4>{CURR_TIME}<A><C>")
+                            }
                             Include = { OverlayMode.Minimal }
                         }
                     },
@@ -235,14 +238,14 @@ namespace PerformanceOverlay
                                 new Entry("<A5>C{BATT_CHARGE_W}<A><A1><S1> W<S><A>") { IgnoreMissing = true }
                             }
                         },
-                        new Entry("<C2><S1>Frametime<S>"),
-                        new Entry("[OBJ_FT_LARGE]<S1> <A0><FT><A><A1> ms<A><S><C>"),
                         new Entry("<C1>TIME<C>\t  ")
                         {
                             Nested = {
                                 new Entry("<A5>{CURR_TIME}<A>"),
                             }
                         },
+                        new Entry("<C2><S1>Frametime<S>"),
+                        new Entry("[OBJ_FT_LARGE]<S1> <A0><FT><A><A1> ms<A><S><C>")
                     },
                     Separator = "\r\n",
                     Include = { OverlayMode.Full }