diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Calendar/Calendar/CalendarTui.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Calendar/Calendar/CalendarTui.cs
index 6c0b01d52..5382833c3 100644
--- a/public/Nitrocid.Addons/Nitrocid.Extras.Calendar/Calendar/CalendarTui.cs
+++ b/public/Nitrocid.Addons/Nitrocid.Extras.Calendar/Calendar/CalendarTui.cs
@@ -173,8 +173,8 @@ private static void RenderStatus(ref Screen screen)
             {
                 var builder = new StringBuilder();
                 builder.Append(
-                    $"{KernelColorTools.GetColor(KernelColorType.TuiForeground).VTSequenceForeground}" +
-                    $"{KernelColorTools.GetColor(KernelColorType.Background).VTSequenceBackground}" +
+                    $"{ColorTools.RenderSetConsoleColor(KernelColorTools.GetColor(KernelColorType.TuiForeground))}" +
+                    $"{ColorTools.RenderSetConsoleColor(KernelColorTools.GetColor(KernelColorType.Background), true)}" +
                     $"{TextWriterWhereColor.RenderWhere(status + ConsoleClearing.GetClearLineToRightSequence(), 0, 0)}"
                 );
                 return builder.ToString();
@@ -197,8 +197,8 @@ private static void RenderViewBox(ref Screen screen)
 
                 // Render the box
                 builder.Append(
-                    $"{KernelColorTools.GetColor(KernelColorType.TuiPaneSeparator).VTSequenceForeground}" +
-                    $"{KernelColorTools.GetColor(KernelColorType.Background).VTSequenceBackground}" +
+                    $"{ColorTools.RenderSetConsoleColor(KernelColorTools.GetColor(KernelColorType.TuiPaneSeparator))}" +
+                    $"{ColorTools.RenderSetConsoleColor(KernelColorTools.GetColor(KernelColorType.Background), true)}" +
                     $"{BorderColor.RenderBorderPlain(0, SeparatorMinimumHeight, SeparatorConsoleWidthInterior, SeparatorMaximumHeightInterior)}"
                 );
                 return builder.ToString();
@@ -311,8 +311,8 @@ private static void RenderCalendar((int Year, int Month, int Day, CalendarTypes
                     CurrentDayMark = $"{markStart}{CurrentDay}{markEnd}";
                     builder.Append(
                         CsiSequences.GenerateCsiCursorPosition(dayPosX + 1, dayPosY + 1) +
-                        $"{foreground.VTSequenceForeground}" +
-                        $"{background.VTSequenceBackground}" +
+                        $"{ColorTools.RenderSetConsoleColor(foreground)}" +
+                        $"{ColorTools.RenderSetConsoleColor(background, true)}" +
                         CurrentDayMark
                     );
                 }
@@ -326,8 +326,8 @@ private static void RenderCalendar((int Year, int Month, int Day, CalendarTypes
                     char dayChar = char.ToUpper(dayName[0]);
                     builder.Append(
                         CsiSequences.GenerateCsiCursorPosition(dayIndicatorPosX + (6 * i) + 2, dayIndicatorPosY + 1) +
-                        $"{boxForeground.VTSequenceForeground}" +
-                        $"{background.VTSequenceBackground}" +
+                        $"{ColorTools.RenderSetConsoleColor(boxForeground)}" +
+                        $"{ColorTools.RenderSetConsoleColor(background, true)}" +
                         dayChar
                     );
                 }
@@ -433,8 +433,8 @@ private static void RenderCalendar((int Year, int Month, int Day, CalendarTypes
 
                 // Finalize everything
                 builder.Append(
-                    $"{KernelColorTools.GetColor(KernelColorType.TuiForeground).VTSequenceForeground}" +
-                    $"{background.VTSequenceBackground}"
+                    $"{ColorTools.RenderSetConsoleColor(KernelColorTools.GetColor(KernelColorType.TuiForeground))}" +
+                    $"{ColorTools.RenderSetConsoleColor(background, true)}"
                 );
                 return builder.ToString();
             });