diff --git a/.clang-format b/.clang-format
index 6458773b9..faaca4630 100644
--- a/.clang-format
+++ b/.clang-format
@@ -105,7 +105,9 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Left
 ReflowComments:  true
-SortIncludes:    false
+SortIncludes:
+  Enabled: true
+  IgnoreCase: true
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
diff --git a/.clang-format-ignore b/.clang-format-ignore
new file mode 100644
index 000000000..61476c7f2
--- /dev/null
+++ b/.clang-format-ignore
@@ -0,0 +1 @@
+resource/resource.h
\ No newline at end of file
diff --git a/resource/UKControllerPlugin.rc b/resource/UKControllerPlugin.rc
index dc9898b2c..19b7956ad 100644
--- a/resource/UKControllerPlugin.rc
+++ b/resource/UKControllerPlugin.rc
@@ -122,6 +122,8 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,25,118,10
     CONTROL         "Notify Departure Release Activity In Chat Area",IDC_RELEASE_CHAT_MESSAGE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,34,152,10
+    COMBOBOX        IDC_COLOUR_PALETTE,178,16,48,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Colour Palette",IDC_STATIC,230,18,43,8
 END
 
 IDD_TIMER_CONFIGURATION DIALOGEX 0, 0, 179, 158
@@ -391,6 +393,8 @@ BEGIN
         RIGHTMARGIN, 302
         TOPMARGIN, 7
         BOTTOMMARGIN, 169
+        HORZGUIDE, 16
+        HORZGUIDE, 22
     END
 
     IDD_TIMER_CONFIGURATION, DIALOG
diff --git a/resource/resource.h b/resource/resource.h
index a151d55ec..9eb83c667 100644
--- a/resource/resource.h
+++ b/resource/resource.h
@@ -37,6 +37,7 @@
 #define IDC_TRAIL_TYPE                  1004
 #define IDC_TRAIL_LENGTH                1005
 #define IDC_TRAIL_COLOUR                1009
+#define IDC_COLOUR_PALETTE              1146
 #define IDC_SPIN_LENGTH                 1010
 #define IDC_DOT_SIZE                    1012
 #define GS_DIALOG_PRENOTE_TITLE         1012
@@ -214,7 +215,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        147
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1146
+#define _APS_NEXT_CONTROL_VALUE         1147
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt
index dd818321f..baf02eb68 100644
--- a/src/plugin/CMakeLists.txt
+++ b/src/plugin/CMakeLists.txt
@@ -304,6 +304,9 @@ set(src__graphics
     "graphics/GdiGraphicsWrapper.cpp"
     "graphics/GdiGraphicsWrapper.h"
     "graphics/GdiplusBrushes.h"
+    "graphics/GdiplusBrushes.cpp"
+    "graphics/Theme.h"
+    "graphics/Theme.cpp"
         graphics/FontManager.cpp graphics/FontManager.h graphics/StringFormatManager.cpp graphics/StringFormatManager.h)
 source_group("src\\graphics" FILES ${src__graphics})
 
diff --git a/src/plugin/approach/ApproachBootstrapProvider.cpp b/src/plugin/approach/ApproachBootstrapProvider.cpp
index ac4bdadbc..f1204cc82 100644
--- a/src/plugin/approach/ApproachBootstrapProvider.cpp
+++ b/src/plugin/approach/ApproachBootstrapProvider.cpp
@@ -1,7 +1,8 @@
+#include "ApproachBootstrapProvider.h"
+#include "aircraft/CallsignSelectionListFactory.h"
 #include "AircraftSelectionProvider.h"
 #include "AirfieldMinimumSeparationSelectorList.h"
 #include "AirfieldTargetSelectorList.h"
-#include "ApproachBootstrapProvider.h"
 #include "ApproachFlightplanEventHandler.h"
 #include "ApproachModuleFactory.h"
 #include "ApproachSequencerDisplay.h"
@@ -9,30 +10,33 @@
 #include "ApproachSequencerDisplayOptions.h"
 #include "ApproachSequencerOptionsLoader.h"
 #include "ApproachSpacingRingRenderer.h"
-#include "GlideslopeDeviationEstimator.h"
-#include "GlideslopeDeviationTagItem.h"
-#include "RemoveLandedAircraft.h"
-#include "SequencerAirfieldSelector.h"
-#include "TargetSelectorList.h"
-#include "ToggleApproachSequencerDisplay.h"
-#include "aircraft/CallsignSelectionListFactory.h"
 #include "bootstrap/ModuleFactories.h"
 #include "bootstrap/PersistenceContainer.h"
 #include "euroscope/AsrEventHandlerCollection.h"
 #include "euroscope/PluginSettingsProviderCollection.h"
 #include "flightplan/FlightPlanEventHandlerCollection.h"
+#include "GlideslopeDeviationEstimator.h"
+#include "GlideslopeDeviationTagItem.h"
+#include "graphics/GdiplusBrushes.h"
 #include "list/PopupListFactory.h"
 #include "radarscreen/MenuToggleableDisplayFactory.h"
 #include "radarscreen/RadarRenderableCollection.h"
+#include "RemoveLandedAircraft.h"
+#include "SequencerAirfieldSelector.h"
 #include "tag/TagItemCollection.h"
+#include "TargetSelectorList.h"
 #include "timedevent/TimedEventCollection.h"
+#include "ToggleApproachSequencerDisplay.h"
+
+using UKControllerPlugin::Windows::GdiplusBrushes;
 
 namespace UKControllerPlugin::Approach {
 
     void ApproachBootstrapProvider::BootstrapPlugin(Bootstrap::PersistenceContainer& container)
     {
-        container.pluginSettingsProviders->AddProvider(std::make_shared<ApproachSequencerOptionsLoader>(
-            container.moduleFactories->Approach().SequencerOptions(), *container.airfields));
+        container.pluginSettingsProviders->AddProvider(
+            std::make_shared<ApproachSequencerOptionsLoader>(
+                container.moduleFactories->Approach().SequencerOptions(), *container.airfields));
 
         container.timedHandler->RegisterEvent(
             std::make_shared<RemoveLandedAircraft>(
@@ -92,6 +96,7 @@ namespace UKControllerPlugin::Approach {
                         container.moduleFactories->Approach().SequencerOptions(), displayOptions),
                     "Toggle sequencer airfield separation selector"),
                 *container.plugin,
+                *container.brushes,
                 sequencerScreenObjectId),
             RadarScreen::RadarRenderableCollection::beforeTags);
 
diff --git a/src/plugin/approach/ApproachBootstrapProvider.h b/src/plugin/approach/ApproachBootstrapProvider.h
index bbb8c1a68..c4a61a327 100644
--- a/src/plugin/approach/ApproachBootstrapProvider.h
+++ b/src/plugin/approach/ApproachBootstrapProvider.h
@@ -1,6 +1,10 @@
 #pragma once
 #include "bootstrap/BootstrapProviderInterface.h"
 
+namespace UKControllerPlugin::Windows {
+    struct GdiplusBrushes;
+} // namespace UKControllerPlugin::Windows
+
 namespace UKControllerPlugin::Approach {
     class ApproachBootstrapProvider : public Bootstrap::BootstrapProviderInterface
     {
diff --git a/src/plugin/approach/ApproachSequencerDisplay.cpp b/src/plugin/approach/ApproachSequencerDisplay.cpp
index 4fd25a124..4d182a311 100644
--- a/src/plugin/approach/ApproachSequencerDisplay.cpp
+++ b/src/plugin/approach/ApproachSequencerDisplay.cpp
@@ -1,8 +1,8 @@
+#include "ApproachSequencerDisplay.h"
 #include "AirfieldApproachOptions.h"
 #include "ApproachSequence.h"
 #include "ApproachSequencedAircraft.h"
 #include "ApproachSequencer.h"
-#include "ApproachSequencerDisplay.h"
 #include "ApproachSequencerDisplayOptions.h"
 #include "ApproachSequencerOptions.h"
 #include "ApproachSpacingCalculator.h"
@@ -13,6 +13,7 @@
 #include "euroscope/EuroscopePluginLoopbackInterface.h"
 #include "graphics/FontManager.h"
 #include "graphics/GdiGraphicsInterface.h"
+#include "graphics/GdiplusBrushes.h"
 #include "graphics/StringFormatManager.h"
 #include "helper/HelperFunctions.h"
 #include "list/PopupListInterface.h"
@@ -21,6 +22,7 @@
 using UKControllerPlugin::Components::CollapsibleWindowTitleBar;
 using UKControllerPlugin::Number::To1Dp;
 using UKControllerPlugin::Number::To1DpWide;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 
 namespace UKControllerPlugin::Approach {
 
@@ -35,28 +37,31 @@ namespace UKControllerPlugin::Approach {
         std::shared_ptr<List::PopupListInterface> airfieldTargetSelector,
         std::shared_ptr<List::PopupListInterface> airfieldSeparationSelector,
         Euroscope::EuroscopePluginLoopbackInterface& plugin,
+        const GdiplusBrushes& brushes,
         int screenObjectId)
         : sequencer(sequencer), spacingCalculator(spacingCalculator), options(options),
           displayOptions(std::move(displayOptions)), airfieldSelector(std::move(airfieldSelector)),
           callsignSelector(std::move(callsignSelector)), targetSelector(std::move(targetSelector)),
           airfieldTargetSelector(std::move(airfieldTargetSelector)),
-          airfieldSeparationSelector(std::move(airfieldSeparationSelector)), plugin(plugin),
-          screenObjectId(screenObjectId), titleBar(CollapsibleWindowTitleBar::Create(
-                                              L"Approach Sequencer",
-                                              titleBarArea,
-                                              [this]() -> bool { return this->displayOptions->ContentCollapsed(); },
-                                              screenObjectId)),
-          airfieldClickspot(Components::ClickableArea::Create(
-              this->airfieldTextArea, screenObjectId, AIRFIELD_SELECTOR_CLICKSPOT, false)),
+          airfieldSeparationSelector(std::move(airfieldSeparationSelector)), plugin(plugin), brushes(brushes),
+          screenObjectId(screenObjectId), titleBar(
+                                              CollapsibleWindowTitleBar::Create(
+                                                  L"Approach Sequencer",
+                                                  titleBarArea,
+                                                  [this]() -> bool { return this->displayOptions->ContentCollapsed(); },
+                                                  screenObjectId,
+                                                  brushes)),
+          airfieldClickspot(
+              Components::ClickableArea::Create(
+                  this->airfieldTextArea, screenObjectId, AIRFIELD_SELECTOR_CLICKSPOT, false)),
           addClickspot(
               Components::ClickableArea::Create(this->addButton, screenObjectId, ADD_AIRCRAFT_CLICKSPOT, false)),
-          airfieldTargetClickspot(Components::ClickableArea::Create(
-              this->airfieldTargetTextArea, screenObjectId, AIRFIELD_TARGET_CLICKSPOT, false)),
-          airfieldSeparationClickspot(Components::ClickableArea::Create(
-              this->airfieldSeparationTextArea, screenObjectId, AIRFIELD_SEPARATION_CLICKSPOT, false)),
-          backgroundBrush(std::make_shared<Gdiplus::SolidBrush>(BACKGROUND_COLOUR)),
-          textBrush(std::make_shared<Gdiplus::SolidBrush>(TEXT_COLOUR)),
-          dividingPen(std::make_shared<Gdiplus::Pen>(TEXT_COLOUR))
+          airfieldTargetClickspot(
+              Components::ClickableArea::Create(
+                  this->airfieldTargetTextArea, screenObjectId, AIRFIELD_TARGET_CLICKSPOT, false)),
+          airfieldSeparationClickspot(
+              Components::ClickableArea::Create(
+                  this->airfieldSeparationTextArea, screenObjectId, AIRFIELD_SEPARATION_CLICKSPOT, false))
     {
     }
 
@@ -76,12 +81,12 @@ namespace UKControllerPlugin::Approach {
         graphics.Translated(
             displayOptions->Position().x, displayOptions->Position().y, [this, &graphics, &radarScreen]() {
                 if (this->displayOptions->ContentCollapsed()) {
-                    this->titleBar->Draw(graphics, radarScreen);
+                    this->titleBar->DrawTheme(graphics, radarScreen, brushes);
                     return;
                 }
 
                 this->RenderBackground(graphics);
-                this->titleBar->Draw(graphics, radarScreen);
+                this->titleBar->DrawTheme(graphics, radarScreen, brushes);
                 this->RenderAirfield(graphics, radarScreen);
                 this->RenderAddButton(graphics, radarScreen);
                 this->RenderAirfieldTarget(graphics, radarScreen);
@@ -173,7 +178,7 @@ namespace UKControllerPlugin::Approach {
         graphics.DrawString(
             L"Airfield:",
             airfieldStaticArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
 
@@ -181,7 +186,7 @@ namespace UKControllerPlugin::Approach {
             HelperFunctions::ConvertToWideString(
                 displayOptions->Airfield().empty() ? "--" : displayOptions->Airfield()),
             airfieldTextArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
         this->airfieldClickspot->Apply(graphics, radarScreen);
@@ -189,23 +194,23 @@ namespace UKControllerPlugin::Approach {
 
     void ApproachSequencerDisplay::RenderDivider(Windows::GdiGraphicsInterface& graphics)
     {
-        graphics.DrawLine(*dividingPen, dividerLeft, dividerRight);
+        graphics.DrawLine(*this->brushes.textPen, dividerLeft, dividerRight);
     }
 
     void ApproachSequencerDisplay::RenderHeaders(Windows::GdiGraphicsInterface& graphics)
     {
-        graphics.DrawString(L"#", numberHeader, *textBrush);
-        graphics.DrawString(L"Callsign", callsignHeader, *textBrush);
-        graphics.DrawString(L"Target", targetHeader, *textBrush);
-        graphics.DrawString(L"Actual", actualHeader, *textBrush);
-        graphics.DrawString(L"Actions", actionsHeader, *textBrush);
+        graphics.DrawString(L"#", numberHeader, *this->brushes.textBrush);
+        graphics.DrawString(L"Callsign", callsignHeader, *this->brushes.textBrush);
+        graphics.DrawString(L"Target", targetHeader, *this->brushes.textBrush);
+        graphics.DrawString(L"Actual", actualHeader, *this->brushes.textBrush);
+        graphics.DrawString(L"Actions", actionsHeader, *this->brushes.textBrush);
     }
 
     void ApproachSequencerDisplay::RenderAddButton(
         Windows::GdiGraphicsInterface& graphics, Euroscope::EuroscopeRadarLoopbackInterface& radarScreen)
     {
-        graphics.DrawRect(addButton, *dividingPen);
-        graphics.DrawString(L"Add Aircraft", addButton, *textBrush);
+        graphics.DrawRect(addButton, *this->brushes.textPen);
+        graphics.DrawString(L"Add Aircraft", addButton, *this->brushes.textBrush);
         addClickspot->Apply(graphics, radarScreen);
     }
 
@@ -248,15 +253,18 @@ namespace UKControllerPlugin::Approach {
         int sequenceNumber = 1;
 
         while (aircraftToProcess != nullptr) {
-            graphics.DrawString(std::to_wstring(sequenceNumber), numberRect, *textBrush);
+            graphics.DrawString(std::to_wstring(sequenceNumber), numberRect, *this->brushes.textBrush);
             graphics.DrawString(
-                HelperFunctions::ConvertToWideString(aircraftToProcess->Callsign()), callsignRect, *textBrush);
+                HelperFunctions::ConvertToWideString(aircraftToProcess->Callsign()),
+                callsignRect,
+                *this->brushes.textBrush);
 
             // The target distance / wake
             if (aircraftToProcess->Mode() == ApproachSequencingMode::WakeTurbulence) {
-                graphics.DrawString(L"Wake", targetRect, *textBrush);
+                graphics.DrawString(L"Wake", targetRect, *this->brushes.textBrush);
             } else {
-                graphics.DrawString(To1DpWide(aircraftToProcess->ExpectedDistance()), targetRect, *textBrush);
+                graphics.DrawString(
+                    To1DpWide(aircraftToProcess->ExpectedDistance()), targetRect, *this->brushes.textBrush);
             }
             Components::ClickableArea::Create(
                 targetRect, screenObjectId, "approachTarget" + aircraftToProcess->Callsign(), false)
@@ -264,30 +272,30 @@ namespace UKControllerPlugin::Approach {
 
             double requiredSpacing = spacingCalculator.Calculate(displayOptions->Airfield(), *aircraftToProcess);
             if (requiredSpacing == spacingCalculator.NoSpacing()) {
-                graphics.DrawString(L"--", actualRect, *textBrush);
+                graphics.DrawString(L"--", actualRect, *this->brushes.textBrush);
             } else {
-                graphics.DrawString(To1DpWide(requiredSpacing), actualRect, *textBrush);
+                graphics.DrawString(To1DpWide(requiredSpacing), actualRect, *this->brushes.textBrush);
             }
 
             auto upButton = Components::Button::Create(
                 upButtonRect,
                 screenObjectId,
                 "moveUp" + aircraftToProcess->Callsign(),
-                Components::UpArrow(TEXT_COLOUR));
+                Components::UpArrow(this->brushes.text));
             upButton->Draw(graphics, radarScreen);
 
             auto downButton = Components::Button::Create(
                 downButtonRect,
                 screenObjectId,
                 "moveDown" + aircraftToProcess->Callsign(),
-                Components::DownArrow(TEXT_COLOUR));
+                Components::DownArrow(this->brushes.text));
             downButton->Draw(graphics, radarScreen);
 
             auto deleteButton = Components::Button::Create(
                 deleteButtonRect,
                 screenObjectId,
                 "deleteButton" + aircraftToProcess->Callsign(),
-                Components::DeleteButton(TEXT_COLOUR));
+                Components::DeleteButton(this->brushes.text));
             deleteButton->Draw(graphics, radarScreen);
 
             auto toggleButton = Components::Button::Create(
@@ -297,13 +305,13 @@ namespace UKControllerPlugin::Approach {
                 [&aircraftToProcess, &radarScreen, this](
                     Windows::GdiGraphicsInterface& graphics, const Gdiplus::Rect& area) {
                     Gdiplus::Rect drawArea = {0, 0, area.Width, area.Height};
-                    graphics.FillCircle(drawArea, *textBrush);
+                    graphics.FillCircle(drawArea, *this->brushes.textBrush);
                     if (!aircraftToProcess->ShouldDraw()) {
                         Components::Button::Create(
                             drawArea,
                             screenObjectId,
                             "toggleDraw" + aircraftToProcess->Callsign(),
-                            Components::DeleteButton(BACKGROUND_COLOUR))
+                            Components::DeleteButton(this->brushes.background))
                             ->Draw(graphics, radarScreen);
                     }
                 });
@@ -332,7 +340,7 @@ namespace UKControllerPlugin::Approach {
             TITLE_BAR_HEIGHT,
             WINDOW_WIDTH,
             static_cast<INT>(callsignHeader.GetBottom() + INSETS + (numberOfCallsigns * callsignHeader.Height))};
-        graphics.FillRect(contentArea, *backgroundBrush);
+        graphics.FillRect(contentArea, *this->brushes.backgroundBrush);
     }
 
     void ApproachSequencerDisplay::RenderAirfieldTarget(
@@ -341,7 +349,7 @@ namespace UKControllerPlugin::Approach {
         graphics.DrawString(
             L"Target:",
             airfieldTargetStatic,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
 
@@ -356,7 +364,7 @@ namespace UKControllerPlugin::Approach {
         graphics.DrawString(
             targetString,
             airfieldTargetTextArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
         this->airfieldTargetClickspot->Apply(graphics, radarScreen);
@@ -368,7 +376,7 @@ namespace UKControllerPlugin::Approach {
         graphics.DrawString(
             L"Separation:",
             airfieldSeparationStatic,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
 
@@ -377,7 +385,7 @@ namespace UKControllerPlugin::Approach {
                 ? L"--"
                 : To1DpWide(options.Get(displayOptions->Airfield()).minimumSeparationRequirement),
             airfieldSeparationTextArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
         this->airfieldSeparationClickspot->Apply(graphics, radarScreen);
diff --git a/src/plugin/approach/ApproachSequencerDisplay.h b/src/plugin/approach/ApproachSequencerDisplay.h
index 483906d49..30a641274 100644
--- a/src/plugin/approach/ApproachSequencerDisplay.h
+++ b/src/plugin/approach/ApproachSequencerDisplay.h
@@ -12,6 +12,9 @@ namespace UKControllerPlugin {
     namespace List {
         class PopupListInterface;
     } // namespace List
+    namespace Windows {
+        struct GdiplusBrushes;
+    } // namespace Windows
 } // namespace UKControllerPlugin
 
 namespace UKControllerPlugin::Approach {
@@ -37,6 +40,7 @@ namespace UKControllerPlugin::Approach {
             std::shared_ptr<List::PopupListInterface> airfieldTargetSelector,
             std::shared_ptr<List::PopupListInterface> airfieldSeparationSelector,
             Euroscope::EuroscopePluginLoopbackInterface& plugin,
+            const UKControllerPlugin::Windows::GdiplusBrushes& brushes,
             int screenObjectId);
         [[nodiscard]] auto IsVisible() const -> bool override;
         void LeftClick(
@@ -67,7 +71,7 @@ namespace UKControllerPlugin::Approach {
 
         // Dimensions
         inline static const int WINDOW_WIDTH = 435;
-        inline static const int TITLE_BAR_HEIGHT = 20;
+        inline static const int TITLE_BAR_HEIGHT = 15;
         inline static const int INSETS = 5;
 
         // Clickspot
@@ -106,6 +110,9 @@ namespace UKControllerPlugin::Approach {
         // The plugin
         Euroscope::EuroscopePluginLoopbackInterface& plugin;
 
+        // Pens and brushes
+        const UKControllerPlugin::Windows::GdiplusBrushes& brushes;
+
         // The screen object id
         int screenObjectId;
 
@@ -137,11 +144,5 @@ namespace UKControllerPlugin::Approach {
         std::shared_ptr<Components::ClickableArea> addClickspot;
         std::shared_ptr<Components::ClickableArea> airfieldTargetClickspot;
         std::shared_ptr<Components::ClickableArea> airfieldSeparationClickspot;
-
-        const Gdiplus::Color BACKGROUND_COLOUR = Gdiplus::Color(64, 64, 64);
-        const Gdiplus::Color TEXT_COLOUR = Gdiplus::Color(225, 225, 225);
-        std::shared_ptr<Gdiplus::Brush> backgroundBrush;
-        std::shared_ptr<Gdiplus::Brush> textBrush;
-        std::shared_ptr<Gdiplus::Pen> dividingPen;
     };
 } // namespace UKControllerPlugin::Approach
diff --git a/src/plugin/bootstrap/InitialisePlugin.cpp b/src/plugin/bootstrap/InitialisePlugin.cpp
index c03462c08..8a6e44d51 100644
--- a/src/plugin/bootstrap/InitialisePlugin.cpp
+++ b/src/plugin/bootstrap/InitialisePlugin.cpp
@@ -1,17 +1,17 @@
+#include "bootstrap/InitialisePlugin.h"
 #include "aircraft/AircraftModule.h"
 #include "aircraft/CallsignSelectionListFactoryBootstrap.h"
 #include "airfield/AirfieldModule.h"
 #include "api/ApiFactory.h"
 #include "api/ApiRequestFactory.h"
 #include "api/BootstrapApi.h"
-#include "api/FirstTimeApiConfigLoader.h"
 #include "api/FirstTimeApiAuthorisationChecker.h"
+#include "api/FirstTimeApiConfigLoader.h"
 #include "bootstrap/BootstrapProviderCollection.h"
 #include "bootstrap/CollectionBootstrap.h"
 #include "bootstrap/EventHandlerCollectionBootstrap.h"
 #include "bootstrap/ExternalsBootstrap.h"
 #include "bootstrap/HelperBootstrap.h"
-#include "bootstrap/InitialisePlugin.h"
 #include "bootstrap/ModuleBootstrap.h"
 #include "bootstrap/PostInit.h"
 #include "controller/ControllerBootstrap.h"
@@ -22,11 +22,14 @@
 #include "dependency/UpdateDependencies.h"
 #include "euroscope/GeneralSettingsConfigurationBootstrap.h"
 #include "euroscope/PluginUserSettingBootstrap.h"
+#include "euroscope/UserSetting.h"
 #include "eventhandler/EventBusBootstrap.h"
 #include "filestatus/FileStatusModule.h"
 #include "flightinformationservice/FlightInformationServiceModule.h"
 #include "flightplan/FlightplanStorageBootstrap.h"
 #include "flightrule/FlightRuleModule.h"
+#include "graphics/GdiplusBrushes.h"
+#include "graphics/Theme.h"
 #include "handoff/HandoffModule.h"
 #include "historytrail/HistoryTrailModule.h"
 #include "hold/HoldModule.h"
@@ -83,6 +86,7 @@ using UKControllerPlugin::Duplicate::DuplicatePlugin;
 using UKControllerPlugin::Euroscope::GeneralSettingsConfigurationBootstrap;
 using UKControllerPlugin::Euroscope::PluginUserSettingBootstrap;
 using UKControllerPlugin::Flightplan::FlightplanStorageBootstrap;
+using UKControllerPlugin::Graphics::ThemeFromKey;
 using UKControllerPlugin::HistoryTrail::HistoryTrailModule;
 using UKControllerPlugin::InitialAltitude::InitialAltitudeModule;
 using UKControllerPlugin::Log::LoggerBootstrap;
@@ -240,13 +244,21 @@ namespace UKControllerPlugin {
         LoginModule::BootstrapPlugin(*this->container);
         SectorFile::BootstrapPlugin(*this->container);
 
+        // Apply the saved colour palette theme
+        {
+            auto& userSettings = *this->container->pluginUserSettingHandler;
+            std::string palette = userSettings.GetStringEntry("colourPalette", "default");
+            this->container->brushes->LoadTheme(ThemeFromKey(palette));
+        }
+
         // General settings config bootstrap
         GeneralSettingsConfigurationBootstrap::BootstrapPlugin(
             *this->container->dialogManager,
             *this->container->pluginUserSettingHandler,
             *this->container->userSettingHandlers,
             *this->container->settingsRepository,
-            *this->container->windows);
+            *this->container->windows,
+            *this->container->brushes);
 
         // Bootstrap the modules
         Metar::BootstrapPlugin(*this->container);
diff --git a/src/plugin/components/CollapsibleWindowTitleBar.cpp b/src/plugin/components/CollapsibleWindowTitleBar.cpp
index 80fa1cf65..56858de54 100644
--- a/src/plugin/components/CollapsibleWindowTitleBar.cpp
+++ b/src/plugin/components/CollapsibleWindowTitleBar.cpp
@@ -1,32 +1,44 @@
-#include "Button.h"
 #include "CollapsibleWindowTitleBar.h"
+#include "Button.h"
+#include "graphics/GdiplusBrushes.h"
 #include "StandardButtons.h"
 
 namespace UKControllerPlugin::Components {
 
     CollapsibleWindowTitleBar::CollapsibleWindowTitleBar(
-        std::wstring title, Gdiplus::Rect area, std::function<bool()> collapseState, int screenObjectId)
-        : TitleBar(title, area)
+        const std::wstring& title,
+        Gdiplus::Rect area,
+        const std::function<bool()>& collapseState,
+        int screenObjectId,
+        const Windows::GdiplusBrushes& brushes)
+        : TitleBar(title, area), brushes(brushes)
     {
         this->closeButton = Button::Create(
             {area.GetRight() - 20, area.GetTop() + 5, 10, 10},
             screenObjectId,
             "closeButton",
-            Components::CloseButton());
+            Components::CloseButton(this->brushes));
 
         this->collapseButton = Button::Create(
             {area.GetRight() - 35, area.GetTop() + 5, 10, 10},
             screenObjectId,
             "collapseButton",
-            Components::CollapseButton(collapseState));
+            Components::CollapseButton(this->brushes, collapseState));
     }
 
     std::shared_ptr<CollapsibleWindowTitleBar> CollapsibleWindowTitleBar::Create(
-        std::wstring title, Gdiplus::Rect area, std::function<bool()> collapseState, int screenObjectId)
+        const std::wstring& title,
+        Gdiplus::Rect area,
+        const std::function<bool()>& collapseState,
+        int screenObjectId,
+        const Windows::GdiplusBrushes& brushes)
     {
-        auto titlebar = std::shared_ptr<CollapsibleWindowTitleBar>(
-            new CollapsibleWindowTitleBar(title, area, collapseState, screenObjectId));
-        titlebar->WithDefaultBorder()->WithDefaultTextBrush()->WithDefaultBackgroundBrush()->WithDrag(screenObjectId);
+        auto titlebar =
+            std::make_shared<CollapsibleWindowTitleBar>(title, area, collapseState, screenObjectId, brushes);
+        titlebar->WithBackgroundBrush(brushes.headerBrush)
+            ->WithTextBrush(brushes.textBrush)
+            ->WithBorder(brushes.borderPen)
+            ->WithDrag(screenObjectId);
 
         return titlebar;
     }
@@ -38,4 +50,14 @@ namespace UKControllerPlugin::Components {
         this->closeButton->Draw(graphics, radarScreen);
         this->collapseButton->Draw(graphics, radarScreen);
     }
+
+    void CollapsibleWindowTitleBar::DrawTheme(
+        Windows::GdiGraphicsInterface& graphics,
+        Euroscope::EuroscopeRadarLoopbackInterface& radarScreen,
+        const Windows::GdiplusBrushes& themeBrushes) const
+    {
+        TitleBar::DrawTheme(graphics, radarScreen, themeBrushes);
+        this->closeButton->Draw(graphics, radarScreen);
+        this->collapseButton->Draw(graphics, radarScreen);
+    }
 } // namespace UKControllerPlugin::Components
diff --git a/src/plugin/components/CollapsibleWindowTitleBar.h b/src/plugin/components/CollapsibleWindowTitleBar.h
index 603e28789..89ef81897 100644
--- a/src/plugin/components/CollapsibleWindowTitleBar.h
+++ b/src/plugin/components/CollapsibleWindowTitleBar.h
@@ -11,16 +11,30 @@ namespace UKControllerPlugin::Components {
     class CollapsibleWindowTitleBar : public TitleBar
     {
         public:
-        static std::shared_ptr<CollapsibleWindowTitleBar>
-        Create(std::wstring title, Gdiplus::Rect area, std::function<bool()> collapseState, int screenObjectId);
+        static std::shared_ptr<CollapsibleWindowTitleBar> Create(
+            const std::wstring& title,
+            Gdiplus::Rect area,
+            const std::function<bool()>& collapseState,
+            int screenObjectId,
+            const Windows::GdiplusBrushes& brushes);
         void Draw(Windows::GdiGraphicsInterface& graphics, Euroscope::EuroscopeRadarLoopbackInterface& radarScreen)
             const override;
+        void DrawTheme(
+            Windows::GdiGraphicsInterface& graphics,
+            Euroscope::EuroscopeRadarLoopbackInterface& radarScreen,
+            const Windows::GdiplusBrushes& themeBrushes) const override;
 
-        protected:
         CollapsibleWindowTitleBar(
-            std::wstring title, Gdiplus::Rect area, std::function<bool()> collapseState, int screenObjectId);
+            const std::wstring& title,
+            Gdiplus::Rect area,
+            const std::function<bool()>& collapseState,
+            int screenObjectId,
+            const Windows::GdiplusBrushes& brushes);
 
         private:
+        // The brushes for theming
+        const Windows::GdiplusBrushes& brushes;
+
         // The close button
         std::shared_ptr<Button> closeButton;
 
diff --git a/src/plugin/components/StandardButtons.cpp b/src/plugin/components/StandardButtons.cpp
index 333c03409..fe1e4112c 100644
--- a/src/plugin/components/StandardButtons.cpp
+++ b/src/plugin/components/StandardButtons.cpp
@@ -1,5 +1,6 @@
 #include "StandardButtons.h"
 #include "graphics/GdiGraphicsInterface.h"
+#include "graphics/GdiplusBrushes.h"
 
 namespace UKControllerPlugin::Components {
 
@@ -13,7 +14,7 @@ namespace UKControllerPlugin::Components {
     Gdiplus::Point collapsePoints[3] = {Gdiplus::Point(0, -5), Gdiplus::Point(5, 5), Gdiplus::Point(-5, 5)};
 
     // The standard button sizing
-    Gdiplus::REAL buttonSize(10);
+    Gdiplus::REAL buttonSize(15);
 
     /*
      * Draws a standard X-shaped close button of the specified colour.
@@ -38,9 +39,10 @@ namespace UKControllerPlugin::Components {
         };
     }
 
-    std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)> CloseButton()
+    std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)>
+    CloseButton(const Windows::GdiplusBrushes& brushes)
     {
-        return CloseButton(Gdiplus::Color(227, 227, 227));
+        return CloseButton(brushes.text);
     }
 
     /*
@@ -71,10 +73,10 @@ namespace UKControllerPlugin::Components {
         };
     }
 
-    std::function<void(Windows::GdiGraphicsInterface& graphics, const Gdiplus::Rect&)>
-    CollapseButton(std::function<bool()> stateFunction)
+    std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)>
+    CollapseButton(const Windows::GdiplusBrushes& brushes, std::function<bool()> stateFunction)
     {
-        return CollapseButton(Gdiplus::Color(227, 227, 227), stateFunction);
+        return CollapseButton(brushes.text, std::move(stateFunction));
     }
 
     void ScalePen(const std::shared_ptr<Gdiplus::Pen>& pen, Gdiplus::REAL& scaleX, Gdiplus::REAL& scaleY)
@@ -88,9 +90,10 @@ namespace UKControllerPlugin::Components {
         return CloseButton(colour);
     }
 
-    std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)> DeleteButton()
+    std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)>
+    DeleteButton(const Windows::GdiplusBrushes& brushes)
     {
-        return CloseButton();
+        return CloseButton(brushes);
     }
 
     std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)> UpArrow(Gdiplus::Color colour)
@@ -98,8 +101,20 @@ namespace UKControllerPlugin::Components {
         return CollapseButton(colour, []() { return false; });
     }
 
+    std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)>
+    UpArrow(const Windows::GdiplusBrushes& brushes)
+    {
+        return CollapseButton(brushes, []() { return false; });
+    }
+
     std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)> DownArrow(Gdiplus::Color colour)
     {
         return CollapseButton(colour, []() { return true; });
     }
+
+    std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)>
+    DownArrow(const Windows::GdiplusBrushes& brushes)
+    {
+        return CollapseButton(brushes, []() { return true; });
+    }
 } // namespace UKControllerPlugin::Components
diff --git a/src/plugin/components/StandardButtons.h b/src/plugin/components/StandardButtons.h
index 36913fce4..059f98e50 100644
--- a/src/plugin/components/StandardButtons.h
+++ b/src/plugin/components/StandardButtons.h
@@ -2,6 +2,7 @@
 
 namespace UKControllerPlugin::Windows {
     class GdiGraphicsInterface;
+    struct GdiplusBrushes;
 } // namespace UKControllerPlugin::Windows
 
 namespace UKControllerPlugin::Components {
@@ -10,13 +11,15 @@ namespace UKControllerPlugin::Components {
      * Returns the draw function for a standard close button with a specified colour
      */
     std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)> CloseButton(Gdiplus::Color colour);
-    std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)> CloseButton();
+    std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)>
+    CloseButton(const Windows::GdiplusBrushes& brushes);
 
     /*
      * Returns the draw function for a standard delete button with a specified colour
      */
     std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)> DeleteButton(Gdiplus::Color colour);
-    std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)> DeleteButton();
+    std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)>
+    DeleteButton(const Windows::GdiplusBrushes& brushes);
 
     /*
      * Returns the draw function for a standard collapse button with a specified colour.
@@ -24,13 +27,17 @@ namespace UKControllerPlugin::Components {
     std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)>
     CollapseButton(Gdiplus::Color colour, std::function<bool(void)> stateFunction);
     std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)>
-    CollapseButton(std::function<bool(void)> stateFunction);
+    CollapseButton(const Windows::GdiplusBrushes& brushes, std::function<bool(void)> stateFunction);
 
     /*
      * Returns the draw function for up and down arrows.
      */
     std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)> UpArrow(Gdiplus::Color colour);
+    std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)>
+    UpArrow(const Windows::GdiplusBrushes& brushes);
     std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)> DownArrow(Gdiplus::Color colour);
+    std::function<void(Windows::GdiGraphicsInterface&, const Gdiplus::Rect&)>
+    DownArrow(const Windows::GdiplusBrushes& brushes);
 
     void ScalePen(const std::shared_ptr<Gdiplus::Pen>& pen, Gdiplus::REAL& scaleX, Gdiplus::REAL& scaleY);
 } // namespace UKControllerPlugin::Components
diff --git a/src/plugin/components/TitleBar.cpp b/src/plugin/components/TitleBar.cpp
index e8fc63aa2..ef35748b4 100644
--- a/src/plugin/components/TitleBar.cpp
+++ b/src/plugin/components/TitleBar.cpp
@@ -1,7 +1,8 @@
-#include "ClickableArea.h"
 #include "TitleBar.h"
+#include "ClickableArea.h"
 #include "euroscope/EuroscopeRadarLoopbackInterface.h"
 #include "graphics/GdiGraphicsInterface.h"
+#include "graphics/GdiplusBrushes.h"
 
 namespace UKControllerPlugin::Components {
     TitleBar::~TitleBar() = default;
@@ -70,6 +71,21 @@ namespace UKControllerPlugin::Components {
         }
     }
 
+    void TitleBar::DrawTheme(
+        Windows::GdiGraphicsInterface& graphics,
+        Euroscope::EuroscopeRadarLoopbackInterface& radarScreen,
+        const Windows::GdiplusBrushes& brushes) const
+    {
+        // Use theme brushes instead of instance brushes
+        graphics.FillRect(this->area, *brushes.headerBrush);
+        graphics.DrawString(this->title, this->area, *brushes.textBrush);
+        graphics.DrawRect(this->area, *brushes.borderPen);
+
+        if (this->clickableArea != nullptr) {
+            this->clickableArea->Apply(graphics, radarScreen);
+        }
+    }
+
     TitleBar::TitleBar(std::wstring title, Gdiplus::Rect area) : title(std::move(title)), area(area)
     {
     }
diff --git a/src/plugin/components/TitleBar.h b/src/plugin/components/TitleBar.h
index dce1bc30e..24b649f67 100644
--- a/src/plugin/components/TitleBar.h
+++ b/src/plugin/components/TitleBar.h
@@ -6,6 +6,7 @@ namespace UKControllerPlugin {
     } // namespace Euroscope
     namespace Windows {
         class GdiGraphicsInterface;
+        struct GdiplusBrushes;
     } // namespace Windows
 } // namespace UKControllerPlugin
 
@@ -30,6 +31,10 @@ namespace UKControllerPlugin::Components {
         std::shared_ptr<TitleBar> WithTitle(std::wstring title);
         virtual void
         Draw(Windows::GdiGraphicsInterface& graphics, Euroscope::EuroscopeRadarLoopbackInterface& radarScreen) const;
+        virtual void DrawTheme(
+            Windows::GdiGraphicsInterface& graphics,
+            Euroscope::EuroscopeRadarLoopbackInterface& radarScreen,
+            const Windows::GdiplusBrushes& brushes) const;
 
         protected:
         TitleBar(std::wstring title, Gdiplus::Rect area);
diff --git a/src/plugin/countdown/CountdownRenderer.cpp b/src/plugin/countdown/CountdownRenderer.cpp
index df164079e..4e5326e05 100644
--- a/src/plugin/countdown/CountdownRenderer.cpp
+++ b/src/plugin/countdown/CountdownRenderer.cpp
@@ -1,9 +1,9 @@
 #include "CountdownRenderer.h"
 #include "CountdownTimer.h"
-#include "TimerConfigurationManager.h"
 #include "euroscope/EuroscopeRadarLoopbackInterface.h"
 #include "graphics/GdiGraphicsInterface.h"
 #include "graphics/GdiplusBrushes.h"
+#include "TimerConfigurationManager.h"
 
 using UKControllerPlugin::Euroscope::EuroscopeRadarLoopbackInterface;
 using UKControllerPlugin::Euroscope::UserSetting;
@@ -164,18 +164,18 @@ namespace UKControllerPlugin::Countdown {
     {
         // Colour the text depending on how long is left, if we get 0, that means timer is up.
         if (secondsRemaining == 0) {
-            return *this->brushes.whiteBrush;
+            return *this->brushes.textBrush;
         }
 
         if (secondsRemaining > WARNING_SECONDS) {
-            return *this->brushes.greenBrush;
+            return *this->brushes.timerGreenBrush;
         }
 
         if (secondsRemaining > CRITICAL_SECONDS) {
-            return *this->brushes.yellowBrush;
+            return *this->brushes.timerYellowBrush;
         }
 
-        return *this->brushes.redBrush;
+        return *this->brushes.timerRedBrush;
     }
 
     /*
@@ -240,10 +240,10 @@ namespace UKControllerPlugin::Countdown {
                 continue;
             }
 
-            graphics.FillRect(this->timerButtonAreas[it->timerId], *this->brushes.euroscopeBackgroundBrush);
-            graphics.DrawRect(this->timerButtonAreas[it->timerId], *this->brushes.blackPen);
+            graphics.FillRect(this->timerButtonAreas[it->timerId], *this->brushes.backgroundBrush);
+            graphics.DrawRect(this->timerButtonAreas[it->timerId], *this->brushes.borderPen);
             graphics.DrawString(
-                std::to_wstring(it->timerDuration), this->timerButtonAreas[it->timerId], *this->brushes.whiteBrush);
+                std::to_wstring(it->timerDuration), this->timerButtonAreas[it->timerId], *this->brushes.textBrush);
             radarScreen.RegisterScreenObject(
                 this->functionsClickspotId,
                 "timer" + std::to_string(it->timerId) + "Toggle",
@@ -260,20 +260,20 @@ namespace UKControllerPlugin::Countdown {
                 this->timeDisplayArea.bottom,
                 this->timeDisplayArea.right,
                 this->timeDisplayArea.bottom + this->rowHeight};
-            graphics.FillRect(spaceToFill, *this->brushes.euroscopeBackgroundBrush);
-            graphics.DrawRect(spaceToFill, *this->brushes.blackPen);
+            graphics.FillRect(spaceToFill, *this->brushes.backgroundBrush);
+            graphics.DrawRect(spaceToFill, *this->brushes.borderPen);
         }
 
         // The close clickspot
-        graphics.FillRect(this->closeClickspotDisplayArea, *this->brushes.euroscopeBackgroundBrush);
-        graphics.DrawRect(this->closeClickspotDisplayArea, *this->brushes.blackPen);
-        graphics.DrawString(L"X", this->closeClickspotDisplayArea, *this->brushes.whiteBrush);
+        graphics.FillRect(this->closeClickspotDisplayArea, *this->brushes.backgroundBrush);
+        graphics.DrawRect(this->closeClickspotDisplayArea, *this->brushes.borderPen);
+        graphics.DrawString(L"X", this->closeClickspotDisplayArea, *this->brushes.textBrush);
         radarScreen.RegisterScreenObject(this->closeClickspotId, "", this->closeClickspotDisplayArea, false);
 
         // The reset button.
-        graphics.FillRect(this->resetDisplayArea, *this->brushes.euroscopeBackgroundBrush);
-        graphics.DrawRect(this->resetDisplayArea, *this->brushes.blackPen);
-        graphics.DrawString(L"R", this->resetDisplayArea, *this->brushes.whiteBrush);
+        graphics.FillRect(this->resetDisplayArea, *this->brushes.backgroundBrush);
+        graphics.DrawRect(this->resetDisplayArea, *this->brushes.borderPen);
+        graphics.DrawString(L"R", this->resetDisplayArea, *this->brushes.textBrush);
         radarScreen.RegisterScreenObject(this->functionsClickspotId, "R", this->resetDisplayArea, false);
     }
 
@@ -284,8 +284,8 @@ namespace UKControllerPlugin::Countdown {
     CountdownRenderer::RenderTimeDisplay(GdiGraphicsInterface& graphics, EuroscopeRadarLoopbackInterface& radarScreen)
     {
         // The time display
-        graphics.FillRect(this->timeDisplayArea, *this->brushes.euroscopeBackgroundBrush);
-        graphics.DrawRect(this->timeDisplayArea, *this->brushes.blackPen);
+        graphics.FillRect(this->timeDisplayArea, *this->brushes.backgroundBrush);
+        graphics.DrawRect(this->timeDisplayArea, *this->brushes.borderPen);
         radarScreen.RegisterScreenObject(this->timeDisplayClickspotId, "", this->timeDisplayArea, true);
 
         // Get the seconds remaining from the Countdown class and use that to draw the time to the screen.
diff --git a/src/plugin/departure/DepartureCoordinationList.cpp b/src/plugin/departure/DepartureCoordinationList.cpp
index 8c7bb539c..93d050008 100644
--- a/src/plugin/departure/DepartureCoordinationList.cpp
+++ b/src/plugin/departure/DepartureCoordinationList.cpp
@@ -13,6 +13,7 @@
 #include "euroscope/EuroscopeRadarLoopbackInterface.h"
 #include "euroscope/UserSetting.h"
 #include "graphics/GdiGraphicsInterface.h"
+#include "graphics/GdiplusBrushes.h"
 #include "helper/HelperFunctions.h"
 #include "prenote/PrenoteMessage.h"
 #include "prenote/PrenoteMessageCollection.h"
@@ -20,6 +21,8 @@
 #include "releases/DepartureReleaseRequest.h"
 #include "tag/TagData.h"
 
+using UKControllerPlugin::Windows::GdiplusBrushes;
+
 namespace UKControllerPlugin::Departure {
 
     DepartureCoordinationList::DepartureCoordinationList(
@@ -28,29 +31,29 @@ namespace UKControllerPlugin::Departure {
         Euroscope::EuroscopePluginLoopbackInterface& plugin,
         const Controller::ControllerPositionCollection& controllers,
         const Controller::ActiveCallsignCollection& activeCallsigns,
+        const GdiplusBrushes& brushes,
         const int screenObjectId)
-        : controllers(controllers), handler(handler), prenotes(prenotes), plugin(plugin),
-          activeCallsigns(activeCallsigns), textBrush(OFF_WHITE_COLOUR), screenObjectId(screenObjectId), visible(false),
-          contentCollapsed(false)
+        : controllers(controllers), handler(handler), prenotes(prenotes), brushes(brushes), plugin(plugin),
+          activeCallsigns(activeCallsigns), screenObjectId(screenObjectId)
     {
-        this->brushSwitcher = Components::BrushSwitcher::Create(
-                                  std::make_shared<Gdiplus::SolidBrush>(TITLE_BAR_BASE_COLOUR), std::chrono::seconds(2))
-                                  ->AdditionalBrush(std::make_shared<Gdiplus::SolidBrush>(TITLE_BAR_FLASH_COLOUR));
+        this->brushSwitcher = Components::BrushSwitcher::Create(this->brushes.headerBrush, std::chrono::seconds(2))
+                                  ->AdditionalBrush(this->brushes.highlightedHeaderBrush);
 
         this->titleBar = Components::TitleBar::Create(
                              L"Departure Coordination Requests", {0, 0, this->titleBarWidth, this->titleBarHeight})
                              ->WithDrag(this->screenObjectId)
-                             ->WithBorder(std::make_shared<Gdiplus::Pen>(OFF_WHITE_COLOUR))
-                             ->WithBackgroundBrush(std::make_shared<Gdiplus::SolidBrush>(TITLE_BAR_BASE_COLOUR))
-                             ->WithTextBrush(std::make_shared<Gdiplus::SolidBrush>(OFF_WHITE_COLOUR));
+                             ->WithBorder(this->brushes.borderPen)
+                             ->WithBackgroundBrush(this->brushes.headerBrush)
+                             ->WithTextBrush(this->brushes.textBrush);
 
         this->closeButton = Components::Button::Create(
-            closeButtonOffset, this->screenObjectId, "closeButton", Components::CloseButton());
+            closeButtonOffset, this->screenObjectId, "closeButton", Components::CloseButton(this->brushes));
 
         this->collapseButton = Components::Button::Create(
-            collapseButtonOffset, this->screenObjectId, "collapseButton", Components::CollapseButton([this]() -> bool {
-                return this->contentCollapsed;
-            }));
+            collapseButtonOffset,
+            this->screenObjectId,
+            "collapseButton",
+            Components::CollapseButton(this->brushes, [this] { return this->contentCollapsed; }));
     }
 
     void DepartureCoordinationList::LeftClick(
@@ -120,13 +123,25 @@ namespace UKControllerPlugin::Departure {
                     return;
                 }
 
+                // Calculate dynamic height based on number of items
+                const auto totalItems = static_cast<int>(decisions.size() + prenoteMessages.size());
+                const int headerHeight = 30; // Height for column headers
+                const int minHeight = 50;    // Minimum height even when no items
+                const int calculatedHeight = headerHeight + (totalItems * lineHeight);
+                const int dynamicHeight = calculatedHeight > minHeight ? calculatedHeight : minHeight;
+
+                // Update content area with dynamic height
+                this->contentArea = {0, 0, 435, dynamicHeight};
+
+                graphics.FillRect(this->contentArea, *this->brushes.backgroundBrush);
+
                 // Draw column headers
-                graphics.DrawString(L"Type", this->typeColumnHeader, this->textBrush);
-                graphics.DrawString(L"Callsign", this->callsignColumnHeader, this->textBrush);
-                graphics.DrawString(L"Controller", this->controllerColumnHeader, this->textBrush);
-                graphics.DrawString(L"Dept", this->airportColumnHeader, this->textBrush);
-                graphics.DrawString(L"SID", this->sidColumnHeader, this->textBrush);
-                graphics.DrawString(L"Dest", this->destColumnHeader, this->textBrush);
+                graphics.DrawString(L"Type", this->typeColumnHeader, *this->brushes.textBrush);
+                graphics.DrawString(L"Callsign", this->callsignColumnHeader, *this->brushes.textBrush);
+                graphics.DrawString(L"Controller", this->controllerColumnHeader, *this->brushes.textBrush);
+                graphics.DrawString(L"Dept", this->airportColumnHeader, *this->brushes.textBrush);
+                graphics.DrawString(L"SID", this->sidColumnHeader, *this->brushes.textBrush);
+                graphics.DrawString(L"Dest", this->destColumnHeader, *this->brushes.textBrush);
 
                 // Draw each aircraft that we care about
                 Gdiplus::Rect typeColumn = this->typeColumnHeader;
@@ -178,7 +193,8 @@ namespace UKControllerPlugin::Departure {
 
                     // Type column
                     const std::string itemType = listItem.index() == 0 ? "Rls" : "Pre";
-                    graphics.DrawString(HelperFunctions::ConvertToWideString(itemType), typeColumn, this->textBrush);
+                    graphics.DrawString(
+                        HelperFunctions::ConvertToWideString(itemType), typeColumn, *this->brushes.textBrush);
 
                     // Callsign column
                     const std::string callsign =
@@ -186,7 +202,7 @@ namespace UKControllerPlugin::Departure {
                             ? std::get<std::shared_ptr<Releases::DepartureReleaseRequest>>(listItem)->Callsign()
                             : std::get<std::shared_ptr<Prenote::PrenoteMessage>>(listItem)->GetCallsign();
                     graphics.DrawString(
-                        HelperFunctions::ConvertToWideString(callsign), callsignColumn, this->textBrush);
+                        HelperFunctions::ConvertToWideString(callsign), callsignColumn, *this->brushes.textBrush);
                     std::shared_ptr<Components::ClickableArea> callsignClickspot = Components::ClickableArea::Create(
                         callsignColumn, this->screenObjectId, itemType + "." + callsign, false);
                     callsignClickspot->Apply(graphics, radarScreen);
@@ -199,7 +215,7 @@ namespace UKControllerPlugin::Departure {
                             : std::get<std::shared_ptr<Prenote::PrenoteMessage>>(listItem)->GetSendingControllerId();
                     const std::wstring controller = HelperFunctions::ConvertToWideString(
                         this->controllers.FetchPositionById(controllerId)->GetCallsign());
-                    graphics.DrawString(controller, controllerColumn, this->textBrush);
+                    graphics.DrawString(controller, controllerColumn, *this->brushes.textBrush);
 
                     auto fp = this->plugin.GetFlightplanForCallsign(callsign);
                     if (!fp) {
@@ -208,19 +224,21 @@ namespace UKControllerPlugin::Departure {
 
                     // Remaining FP-driven columns
                     graphics.DrawString(
-                        HelperFunctions::ConvertToWideString(fp->GetOrigin()), airportColumn, this->textBrush);
+                        HelperFunctions::ConvertToWideString(fp->GetOrigin()), airportColumn, *this->brushes.textBrush);
 
                     graphics.DrawString(
-                        HelperFunctions::ConvertToWideString(fp->GetSidName()), sidColumn, this->textBrush);
+                        HelperFunctions::ConvertToWideString(fp->GetSidName()), sidColumn, *this->brushes.textBrush);
 
                     graphics.DrawString(
-                        HelperFunctions::ConvertToWideString(fp->GetDestination()), destColumn, this->textBrush);
+                        HelperFunctions::ConvertToWideString(fp->GetDestination()),
+                        destColumn,
+                        *this->brushes.textBrush);
                 } while (nextRelease != decisions.cend() || nextPrenote != prenoteMessages.cend());
             });
 
         // Translate to window position
         graphics.Translated(this->position.X, this->position.Y, [this, &graphics, &radarScreen] {
-            this->titleBar->Draw(graphics, radarScreen);
+            this->titleBar->DrawTheme(graphics, radarScreen, brushes);
             this->closeButton->Draw(graphics, radarScreen);
             this->collapseButton->Draw(graphics, radarScreen);
         });
diff --git a/src/plugin/departure/DepartureCoordinationList.h b/src/plugin/departure/DepartureCoordinationList.h
index 9bcdebf14..7d1bd9425 100644
--- a/src/plugin/departure/DepartureCoordinationList.h
+++ b/src/plugin/departure/DepartureCoordinationList.h
@@ -23,6 +23,10 @@ namespace UKControllerPlugin {
         class DepartureReleaseRequest;
         class DepartureReleaseEventHandler;
     } // namespace Releases
+    namespace Windows {
+        class GdiGraphicsInterface;
+        struct GdiplusBrushes;
+    } // namespace Windows
 } // namespace UKControllerPlugin
 
 namespace UKControllerPlugin::Departure {
@@ -41,6 +45,7 @@ namespace UKControllerPlugin::Departure {
             Euroscope::EuroscopePluginLoopbackInterface& plugin,
             const Controller::ControllerPositionCollection& controllers,
             const Controller::ActiveCallsignCollection& activeCallsigns,
+            const UKControllerPlugin::Windows::GdiplusBrushes& brushes,
             int screenObjectId);
         void LeftClick(
             Euroscope::EuroscopeRadarLoopbackInterface& radarScreen,
@@ -72,6 +77,9 @@ namespace UKControllerPlugin::Departure {
         // Contains all the prenote messages
         Prenote::PrenoteMessageCollection& prenotes;
 
+        // Pens and brushes
+        const UKControllerPlugin::Windows::GdiplusBrushes& brushes;
+
         // Provides interface with the plugin
         Euroscope::EuroscopePluginLoopbackInterface& plugin;
 
@@ -79,6 +87,7 @@ namespace UKControllerPlugin::Departure {
         const Controller::ActiveCallsignCollection& activeCallsigns;
 
         // Drawing RECTs
+        Gdiplus::Rect contentArea{0, 0, 435, 400};
         const Gdiplus::Rect typeColumnHeader{5, 5, 40, 25};
         const Gdiplus::Rect callsignColumnHeader{50, 5, 100, 25};
         const Gdiplus::Rect controllerColumnHeader{160, 5, 100, 25};
@@ -86,25 +95,17 @@ namespace UKControllerPlugin::Departure {
         const Gdiplus::Rect sidColumnHeader{320, 5, 65, 25};
         const Gdiplus::Rect destColumnHeader{395, 5, 40, 25};
 
-        // Some colours
-        const Gdiplus::Color OFF_WHITE_COLOUR = Gdiplus::Color(255, 255, 255);
-        const Gdiplus::Color TITLE_BAR_BASE_COLOUR = Gdiplus::Color(130, 50, 154);
-        const Gdiplus::Color TITLE_BAR_FLASH_COLOUR = Gdiplus::Color(179, 3, 0);
-
-        // Brushes
-        const Gdiplus::SolidBrush textBrush;
-
         // Clickspot identifier
         const int screenObjectId;
 
         // Is the window visible
-        bool visible;
+        bool visible = false;
 
         // Is the content collapsed
-        bool contentCollapsed;
+        bool contentCollapsed = false;
 
         // Height of title bar
-        const int titleBarHeight = 20;
+        const int titleBarHeight = 15;
 
         // Width of title bar
         const int titleBarWidth = 435;
diff --git a/src/plugin/departure/DepartureModule.cpp b/src/plugin/departure/DepartureModule.cpp
index 6feb396bb..52570a2c8 100644
--- a/src/plugin/departure/DepartureModule.cpp
+++ b/src/plugin/departure/DepartureModule.cpp
@@ -1,10 +1,8 @@
+#include "DepartureModule.h"
 #include "AircraftDepartedEvent.h"
+#include "bootstrap/PersistenceContainer.h"
 #include "DepartureCoordinationList.h"
-#include "DepartureModule.h"
 #include "DepartureMonitor.h"
-#include "ToggleDepartureCoordinationList.h"
-#include "UserShouldClearDepartureDataMonitor.h"
-#include "bootstrap/PersistenceContainer.h"
 #include "euroscope/AsrEventHandlerCollection.h"
 #include "euroscope/CallbackFunction.h"
 #include "eventhandler/EventBus.h"
@@ -14,6 +12,8 @@
 #include "radarscreen/ConfigurableDisplayCollection.h"
 #include "radarscreen/RadarRenderableCollection.h"
 #include "timedevent/TimedEventCollection.h"
+#include "ToggleDepartureCoordinationList.h"
+#include "UserShouldClearDepartureDataMonitor.h"
 
 using UKControllerPlugin::Euroscope::CallbackFunction;
 using UKControllerPluginUtils::EventHandler::EventBus;
@@ -49,6 +49,7 @@ namespace UKControllerPlugin::Departure {
             *container.plugin,
             *container.controllerPositions,
             *container.activeCallsigns,
+            *container.brushes,
             renderables.ReserveScreenObjectIdentifier(coordinationListRendererId));
 
         renderables.RegisterRenderer(coordinationListRendererId, coordinationList, renderables.afterLists);
diff --git a/src/plugin/euroscope/GeneralSettingsConfigurationBootstrap.cpp b/src/plugin/euroscope/GeneralSettingsConfigurationBootstrap.cpp
index 38bd476b0..ea44f7eb9 100644
--- a/src/plugin/euroscope/GeneralSettingsConfigurationBootstrap.cpp
+++ b/src/plugin/euroscope/GeneralSettingsConfigurationBootstrap.cpp
@@ -1,15 +1,16 @@
 #include "euroscope/GeneralSettingsConfigurationBootstrap.h"
-#include "euroscope/GeneralSettingsConfiguration.h"
-#include "radarscreen/ConfigurableDisplayCollection.h"
-#include "plugin/FunctionCallEventHandler.h"
-#include "dialog/DialogManager.h"
+#include "command/CommandHandlerCollection.h"
 #include "dialog/DialogData.h"
+#include "dialog/DialogManager.h"
 #include "euroscope/CallbackFunction.h"
-#include "command/CommandHandlerCollection.h"
+#include "euroscope/GeneralSettingsConfiguration.h"
 #include "euroscope/GeneralSettingsDialog.h"
 #include "euroscope/UserSettingAwareCollection.h"
-#include "setting/SettingRepository.h"
+#include "graphics/GdiplusBrushes.h"
+#include "plugin/FunctionCallEventHandler.h"
+#include "radarscreen/ConfigurableDisplayCollection.h"
 #include "setting/JsonFileSettingProvider.h"
+#include "setting/SettingRepository.h"
 #include "update/BootstrapReleaseChannelSettings.h"
 
 using UKControllerPlugin::Command::CommandHandlerCollection;
@@ -22,6 +23,7 @@ using UKControllerPlugin::Euroscope::UserSettingAwareCollection;
 using UKControllerPlugin::Plugin::FunctionCallEventHandler;
 using UKControllerPlugin::RadarScreen::ConfigurableDisplayCollection;
 using UKControllerPlugin::Setting::JsonFileSettingProvider;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 using UKControllerPlugin::Windows::WinApiInterface;
 using UKControllerPluginUtils::Update::BootstrapReleaseChannelSettings;
 
@@ -33,11 +35,12 @@ namespace UKControllerPlugin {
             UserSetting& userSettings,
             UserSettingAwareCollection& userSettingsHandlers,
             Setting::SettingRepository& settings,
-            WinApiInterface& windows)
+            WinApiInterface& windows,
+            Windows::GdiplusBrushes& brushes)
         {
             BootstrapReleaseChannelSettings(settings, windows);
             std::shared_ptr<GeneralSettingsDialog> dialog =
-                std::make_shared<GeneralSettingsDialog>(userSettings, userSettingsHandlers, settings);
+                std::make_shared<GeneralSettingsDialog>(userSettings, userSettingsHandlers, settings, brushes);
             dialogManager.AddDialog(
                 {IDD_GENERAL_SETTINGS,
                  "General Settings",
@@ -49,6 +52,7 @@ namespace UKControllerPlugin {
         void GeneralSettingsConfigurationBootstrap::BootstrapRadarScreen(
             FunctionCallEventHandler& functionHandler,
             ConfigurableDisplayCollection& configurableDisplays,
+            const UKControllerPlugin::Windows::GdiplusBrushes& brushes,
             CommandHandlerCollection& commandHandlers,
             const DialogManager& dialogManager)
         {
diff --git a/src/plugin/euroscope/GeneralSettingsConfigurationBootstrap.h b/src/plugin/euroscope/GeneralSettingsConfigurationBootstrap.h
index 17b800ef0..d1aa1585a 100644
--- a/src/plugin/euroscope/GeneralSettingsConfigurationBootstrap.h
+++ b/src/plugin/euroscope/GeneralSettingsConfigurationBootstrap.h
@@ -22,6 +22,7 @@ namespace UKControllerPlugin {
     } // namespace Setting
     namespace Windows {
         class WinApiInterface;
+        struct GdiplusBrushes;
     } // namespace Windows
 } // namespace UKControllerPlugin
 
@@ -39,11 +40,13 @@ namespace UKControllerPlugin {
                 UKControllerPlugin::Euroscope::UserSetting& userSettings,
                 UKControllerPlugin::Euroscope::UserSettingAwareCollection& userSettingsHandlers,
                 Setting::SettingRepository& settings,
-                Windows::WinApiInterface& windows);
+                Windows::WinApiInterface& windows,
+                Windows::GdiplusBrushes& brushes);
 
             static void BootstrapRadarScreen(
                 UKControllerPlugin::Plugin::FunctionCallEventHandler& functionCalls,
                 UKControllerPlugin::RadarScreen::ConfigurableDisplayCollection& configurableDisplays,
+                const UKControllerPlugin::Windows::GdiplusBrushes& brushes,
                 UKControllerPlugin::Command::CommandHandlerCollection& commandHandlers,
                 const UKControllerPlugin::Dialog::DialogManager& dialogManager);
         };
diff --git a/src/plugin/euroscope/GeneralSettingsDialog.cpp b/src/plugin/euroscope/GeneralSettingsDialog.cpp
index 44e8ed0ad..d395addd6 100644
--- a/src/plugin/euroscope/GeneralSettingsDialog.cpp
+++ b/src/plugin/euroscope/GeneralSettingsDialog.cpp
@@ -1,14 +1,18 @@
 #include "GeneralSettingsDialog.h"
-#include "GeneralSettingsEntries.h"
-#include "UserSettingAwareCollection.h"
-#include "UserSetting.h"
 #include "dialog/DialogCallArgument.h"
+#include "GeneralSettingsEntries.h"
+#include "graphics/GdiplusBrushes.h"
+#include "graphics/Theme.h"
 #include "setting/SettingRepository.h"
+#include "UserSetting.h"
+#include "UserSettingAwareCollection.h"
 
 using UKControllerPlugin::Dialog::DialogCallArgument;
 using UKControllerPlugin::Euroscope::GeneralSettingsEntries;
 using UKControllerPlugin::Euroscope::UserSetting;
 using UKControllerPlugin::Euroscope::UserSettingAwareCollection;
+using UKControllerPlugin::Graphics::ThemeFromKey;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 
 namespace UKControllerPlugin {
     namespace Euroscope {
@@ -16,14 +20,16 @@ namespace UKControllerPlugin {
         GeneralSettingsDialog::GeneralSettingsDialog(
             UserSetting& userSettings,
             const UserSettingAwareCollection& userSettingsHandlers,
-            Setting::SettingRepository& settings)
-            : userSettings(userSettings), userSettingsHandlers(userSettingsHandlers), settings(settings)
+            Setting::SettingRepository& settings,
+            GdiplusBrushes& brushes)
+            : userSettings(userSettings), brushes(brushes), userSettingsHandlers(userSettingsHandlers),
+              settings(settings)
         {
         }
 
         GeneralSettingsDialog::GeneralSettingsDialog(const GeneralSettingsDialog& newObject)
-            : userSettings(newObject.userSettings), userSettingsHandlers(newObject.userSettingsHandlers),
-              settings(newObject.settings)
+            : userSettings(newObject.userSettings), brushes(newObject.brushes),
+              userSettingsHandlers(newObject.userSettingsHandlers), settings(newObject.settings)
         {
         }
 
@@ -70,12 +76,12 @@ namespace UKControllerPlugin {
                 this->GetCheckboxStateFromSettings(GeneralSettingsEntries::unknownTimeFormatBlankKey));
 
             auto selectedChannel = this->settings.GetSetting("release_channel", DEFAULT_RELEASE_CHANNEL);
-            if (this->releaseChannelMap.count(selectedChannel) == 0) {
+            if (!this->releaseChannelMap.contains(selectedChannel)) {
                 selectedChannel = DEFAULT_RELEASE_CHANNEL;
             }
 
-            for (const auto& releaseChannel : this->releaseChannelMap) {
-                const auto channel = releaseChannel.second.c_str();
+            for (const auto& [channelKey, channelValue] : this->releaseChannelMap) {
+                const auto channel = channelValue.c_str();
                 int insertIndex = SendDlgItemMessage(
                     hwnd, IDC_RELEASE_CHANNEL, CB_INSERTSTRING, NULL, reinterpret_cast<LPARAM>(channel));
 
@@ -84,13 +90,38 @@ namespace UKControllerPlugin {
                     IDC_RELEASE_CHANNEL,
                     CB_SETITEMDATA,
                     insertIndex,
-                    reinterpret_cast<LPARAM>(releaseChannel.first.c_str()));
+                    reinterpret_cast<LPARAM>(channelKey.c_str()));
 
-                if (releaseChannel.first == selectedChannel) {
+                if (channelKey == selectedChannel) {
                     SendDlgItemMessage(hwnd, IDC_RELEASE_CHANNEL, CB_SETCURSEL, insertIndex, NULL);
                 }
             }
 
+            // Colour Palette
+            auto selectedColourPalette = this->userSettings.GetStringEntry(
+                GeneralSettingsEntries::colourPaletteSettingsKey, DEFAULT_COLOUR_PALETTE);
+
+            if (!this->colourPaletteMap.contains(selectedColourPalette)) {
+                selectedColourPalette = DEFAULT_COLOUR_PALETTE;
+            }
+
+            for (const auto& [paletteKey, paletteName] : this->colourPaletteMap) {
+                const auto paletteNameStr = paletteName.c_str();
+                int insertIndex = SendDlgItemMessage(
+                    hwnd, IDC_COLOUR_PALETTE, CB_INSERTSTRING, NULL, reinterpret_cast<LPARAM>(paletteNameStr));
+
+                SendDlgItemMessage(
+                    hwnd,
+                    IDC_COLOUR_PALETTE,
+                    CB_SETITEMDATA,
+                    insertIndex,
+                    reinterpret_cast<LPARAM>(paletteKey.c_str()));
+
+                if (paletteKey == selectedColourPalette) {
+                    SendDlgItemMessage(hwnd, IDC_COLOUR_PALETTE, CB_SETCURSEL, insertIndex, NULL);
+                }
+            }
+
             return TRUE;
         }
 
@@ -148,10 +179,25 @@ namespace UKControllerPlugin {
 
             const auto selectedReleaseChannelIndex = SendDlgItemMessage(hwnd, IDC_RELEASE_CHANNEL, CB_GETCURSEL, 0, 0);
 
-            const std::string selectedChannel = reinterpret_cast<const char*>(
+            const std::string selectedChannel = std::bit_cast<const char*>(
                 SendDlgItemMessage(hwnd, IDC_RELEASE_CHANNEL, CB_GETITEMDATA, selectedReleaseChannelIndex, 0));
 
             this->settings.UpdateSetting("release_channel", selectedChannel);
+
+            // Colour Palette
+            const auto selectedColourPaletteIndex = SendDlgItemMessage(hwnd, IDC_COLOUR_PALETTE, CB_GETCURSEL, 0, 0);
+
+            const std::string selectedColourPalette = std::bit_cast<const char*>(
+                SendDlgItemMessage(hwnd, IDC_COLOUR_PALETTE, CB_GETITEMDATA, selectedColourPaletteIndex, 0));
+
+            this->userSettings.Save(
+                GeneralSettingsEntries::colourPaletteSettingsKey,
+                GeneralSettingsEntries::colourPaletteSettingsDescription,
+                selectedColourPalette);
+
+            // Apply the selected theme
+            this->brushes.LoadTheme(ThemeFromKey(selectedColourPalette));
+
             this->userSettingsHandlers.UserSettingsUpdateEvent(this->userSettings);
         }
 
diff --git a/src/plugin/euroscope/GeneralSettingsDialog.h b/src/plugin/euroscope/GeneralSettingsDialog.h
index aa8cc84ab..cd6477c15 100644
--- a/src/plugin/euroscope/GeneralSettingsDialog.h
+++ b/src/plugin/euroscope/GeneralSettingsDialog.h
@@ -5,9 +5,16 @@ namespace UKControllerPlugin {
         class UserSetting;
         class UserSettingAwareCollection;
     } // namespace Euroscope
+    namespace Graphics {
+        struct Theme;
+        auto ThemeFromKey(const std::string& key) -> const Theme&;
+    } // namespace Graphics
     namespace Setting {
         class SettingRepository;
     } // namespace Setting
+    namespace Windows {
+        struct GdiplusBrushes;
+    } // namespace Windows
 } // namespace UKControllerPlugin
 
 namespace UKControllerPlugin::Euroscope {
@@ -21,7 +28,8 @@ namespace UKControllerPlugin::Euroscope {
         GeneralSettingsDialog(
             UKControllerPlugin::Euroscope::UserSetting& userSettings,
             const UKControllerPlugin::Euroscope::UserSettingAwareCollection& userSettingsHandlers,
-            Setting::SettingRepository& settings);
+            Setting::SettingRepository& settings,
+            UKControllerPlugin::Windows::GdiplusBrushes& brushes);
         GeneralSettingsDialog(const GeneralSettingsDialog& newObject);
 
         static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
@@ -33,16 +41,29 @@ namespace UKControllerPlugin::Euroscope {
         LRESULT InitDialog(HWND hwnd);
         void DestroyDialog(HWND hwnd);
 
-        const std::map<std::string, std::wstring> releaseChannelMap{
+        const std::map<std::string, std::wstring, std::less<>> releaseChannelMap{
             {"stable", L"Stable"},
             {"beta", L"Beta"},
         };
 
+        // Maps setting key to display name for the colour palette combo box
+        const std::map<std::string, std::wstring, std::less<>> colourPaletteMap{
+            {"default", L"Default"},
+            {"node", L"NODE"},
+            {"nerc", L"NERC"},
+            {"nova", L"NOVA"},
+            {"itec", L"iTEC"},
+        };
+
         const std::string DEFAULT_RELEASE_CHANNEL = "stable";
 
+        const std::string DEFAULT_COLOUR_PALETTE = "default";
+
         // A place where user settings are retrieved and stored
         UKControllerPlugin::Euroscope::UserSetting& userSettings;
 
+        UKControllerPlugin::Windows::GdiplusBrushes& brushes;
+
         // A set of handlers that want to know when user settings get updated
         const UKControllerPlugin::Euroscope::UserSettingAwareCollection& userSettingsHandlers;
 
diff --git a/src/plugin/euroscope/GeneralSettingsEntries.cpp b/src/plugin/euroscope/GeneralSettingsEntries.cpp
index c3be22922..4ad08a507 100644
--- a/src/plugin/euroscope/GeneralSettingsEntries.cpp
+++ b/src/plugin/euroscope/GeneralSettingsEntries.cpp
@@ -36,5 +36,10 @@ namespace UKControllerPlugin {
         const std::string GeneralSettingsEntries::initialHeadingToggleSettingsKey = "autoAssignInitialHeadings";
         const std::string GeneralSettingsEntries::initialHeadingToggleSettingsDescription =
             "Automatically assign initial headings";
+
+        // Colour Palette
+        const std::string GeneralSettingsEntries::colourPaletteSettingsKey = "colourPalette";
+        const std::string GeneralSettingsEntries::colourPaletteSettingsDescription = "UKCP Colour Palette";
+
     } // namespace Euroscope
 } // namespace UKControllerPlugin
diff --git a/src/plugin/euroscope/GeneralSettingsEntries.h b/src/plugin/euroscope/GeneralSettingsEntries.h
index 3b44d6d91..6270f6dc7 100644
--- a/src/plugin/euroscope/GeneralSettingsEntries.h
+++ b/src/plugin/euroscope/GeneralSettingsEntries.h
@@ -35,6 +35,10 @@ namespace UKControllerPlugin {
             // Initial Headings
             static const std::string initialHeadingToggleSettingsKey;
             static const std::string initialHeadingToggleSettingsDescription;
+
+            // Colour Palette
+            static const std::string colourPaletteSettingsKey;
+            static const std::string colourPaletteSettingsDescription;
         } GeneralSettingsEntries;
     } // namespace Euroscope
 } // namespace UKControllerPlugin
diff --git a/src/plugin/euroscope/LoadDefaultUserSettings.cpp b/src/plugin/euroscope/LoadDefaultUserSettings.cpp
index 76a149cd4..9a0363116 100644
--- a/src/plugin/euroscope/LoadDefaultUserSettings.cpp
+++ b/src/plugin/euroscope/LoadDefaultUserSettings.cpp
@@ -1,6 +1,6 @@
 #include "euroscope/LoadDefaultUserSettings.h"
-#include "euroscope/UserSetting.h"
 #include "euroscope/GeneralSettingsEntries.h"
+#include "euroscope/UserSetting.h"
 
 using UKControllerPlugin::Euroscope::GeneralSettingsEntries;
 using UKControllerPlugin::Euroscope::UserSetting;
@@ -54,6 +54,15 @@ namespace UKControllerPlugin {
                     GeneralSettingsEntries::unknownTimeFormatBlankDescription,
                     false);
             }
+
+            // Colour Palette
+            if (!userSetting.HasEntry(GeneralSettingsEntries::colourPaletteSettingsKey)) {
+                LogInfo("Loading default value for setting " + GeneralSettingsEntries::colourPaletteSettingsKey);
+                userSetting.Save(
+                    GeneralSettingsEntries::colourPaletteSettingsKey,
+                    GeneralSettingsEntries::colourPaletteSettingsDescription,
+                    "default");
+            }
         }
     } // namespace Euroscope
 } // namespace UKControllerPlugin
diff --git a/src/plugin/graphics/GdiplusBrushes.cpp b/src/plugin/graphics/GdiplusBrushes.cpp
new file mode 100644
index 000000000..da9c13977
--- /dev/null
+++ b/src/plugin/graphics/GdiplusBrushes.cpp
@@ -0,0 +1,44 @@
+#include "GdiplusBrushes.h"
+#include "Theme.h"
+
+using UKControllerPlugin::Graphics::Theme;
+
+namespace UKControllerPlugin::Windows {
+
+    GdiplusBrushes::GdiplusBrushes()
+    {
+        euroscopeBackground = Gdiplus::Color(255, 11, 65, 54);
+        green = Gdiplus::Color(255, 0, 255, 0);
+        LoadTheme(Graphics::DEFAULT_THEME);
+    }
+
+    void GdiplusBrushes::LoadTheme(const Theme& theme)
+    {
+        backgroundBrush = std::make_shared<Gdiplus::SolidBrush>(theme.background);
+        headerBrush = std::make_shared<Gdiplus::SolidBrush>(theme.header);
+        highlightedHeaderBrush = std::make_shared<Gdiplus::SolidBrush>(theme.highlightedHeader);
+        textBrush = std::make_shared<Gdiplus::SolidBrush>(theme.text);
+        highlightedTextBrush = std::make_shared<Gdiplus::SolidBrush>(theme.highlightedText);
+        mainAircraftTextBrush = std::make_shared<Gdiplus::SolidBrush>(theme.mainAircraftText);
+        highlightedAircraftTextBrush = std::make_shared<Gdiplus::SolidBrush>(theme.highlightedAircraftText);
+        timerGreenBrush = std::make_shared<Gdiplus::SolidBrush>(theme.timerGreen);
+        timerYellowBrush = std::make_shared<Gdiplus::SolidBrush>(theme.timerYellow);
+        timerRedBrush = std::make_shared<Gdiplus::SolidBrush>(theme.timerRed);
+        borderBrush = std::make_shared<Gdiplus::SolidBrush>(theme.border);
+        borderPen = std::make_shared<Gdiplus::Pen>(theme.border);
+        textPen = std::make_shared<Gdiplus::Pen>(theme.text);
+
+        background = theme.background;
+        header = theme.header;
+        highlightedHeader = theme.highlightedHeader;
+        acknowledge = theme.highlightedText;
+        border = theme.border;
+        text = theme.text;
+        mainAircraftText = theme.mainAircraftText;
+        highlightedAircraftText = theme.highlightedAircraftText;
+        timerGreen = theme.timerGreen;
+        timerYellow = theme.timerYellow;
+        timerRed = theme.timerRed;
+    }
+
+} // namespace UKControllerPlugin::Windows
diff --git a/src/plugin/graphics/GdiplusBrushes.h b/src/plugin/graphics/GdiplusBrushes.h
index 9c57482a1..bb40588bd 100644
--- a/src/plugin/graphics/GdiplusBrushes.h
+++ b/src/plugin/graphics/GdiplusBrushes.h
@@ -1,27 +1,52 @@
 #pragma once
 
-namespace UKControllerPlugin {
-    namespace Windows {
-
-        typedef struct GdiplusBrushes
-        {
-            const std::unique_ptr<const Gdiplus::Brush> whiteBrush =
-                std::make_unique<Gdiplus::SolidBrush>(Gdiplus::Color(255, 255, 255, 255));
-            const std::unique_ptr<const Gdiplus::Brush> yellowBrush =
-                std::make_unique<Gdiplus::SolidBrush>(Gdiplus::Color(255, 255, 255, 0));
-            const std::unique_ptr<const Gdiplus::Brush> euroscopeBackgroundBrush =
-                std::make_unique<Gdiplus::SolidBrush>(Gdiplus::Color(255, 11, 65, 54));
-            const std::unique_ptr<const Gdiplus::Brush> blackBrush =
-                std::make_unique<Gdiplus::SolidBrush>(Gdiplus::Color(255, 0, 0, 0));
-            const std::unique_ptr<const Gdiplus::Pen> blackPen =
-                std::make_unique<Gdiplus::Pen>(Gdiplus::Color(255, 0, 0, 0));
-            const std::unique_ptr<const Gdiplus::Brush> greyBrush =
-                std::make_unique<Gdiplus::SolidBrush>(Gdiplus::Color(255, 125, 125, 125));
-            const std::unique_ptr<const Gdiplus::Brush> redBrush =
-                std::make_unique<Gdiplus::SolidBrush>(Gdiplus::Color(255, 255, 0, 0));
-            const std::unique_ptr<const Gdiplus::Brush> greenBrush =
-                std::make_unique<Gdiplus::SolidBrush>(Gdiplus::Color(255, 0, 255, 0));
-        } GdiplusBrushes;
-
-    } // namespace Windows
-} // namespace UKControllerPlugin
+namespace UKControllerPlugin::Graphics {
+    struct Theme;
+} // namespace UKControllerPlugin::Graphics
+
+namespace UKControllerPlugin::Windows {
+
+    /*
+        Stores all GDI+ brush and pen objects used for rendering.
+
+        Consumers use the shared_ptr members directly
+    */
+    struct GdiplusBrushes
+    {
+        // themed brushes - reconstructed by LoadTheme
+        std::shared_ptr<Gdiplus::SolidBrush> backgroundBrush;
+        std::shared_ptr<Gdiplus::SolidBrush> headerBrush;
+        std::shared_ptr<Gdiplus::SolidBrush> highlightedHeaderBrush;
+        std::shared_ptr<Gdiplus::SolidBrush> textBrush;
+        std::shared_ptr<Gdiplus::SolidBrush> borderBrush;
+        std::shared_ptr<Gdiplus::SolidBrush> highlightedTextBrush;
+        std::shared_ptr<Gdiplus::SolidBrush> mainAircraftTextBrush;
+        std::shared_ptr<Gdiplus::SolidBrush> highlightedAircraftTextBrush;
+        std::shared_ptr<Gdiplus::SolidBrush> timerGreenBrush;
+        std::shared_ptr<Gdiplus::SolidBrush> timerYellowBrush;
+        std::shared_ptr<Gdiplus::SolidBrush> timerRedBrush;
+        std::shared_ptr<Gdiplus::Pen> borderPen;
+        std::shared_ptr<Gdiplus::Pen> textPen;
+
+        // static colours (not themeable)
+        Gdiplus::Color euroscopeBackground;
+        Gdiplus::Color green;
+
+        GdiplusBrushes();
+
+        void LoadTheme(const Graphics::Theme& theme);
+
+        Gdiplus::Color background;
+        Gdiplus::Color header;
+        Gdiplus::Color highlightedHeader;
+        Gdiplus::Color acknowledge;
+        Gdiplus::Color border;
+        Gdiplus::Color text;
+        Gdiplus::Color mainAircraftText;
+        Gdiplus::Color highlightedAircraftText;
+        Gdiplus::Color timerGreen;
+        Gdiplus::Color timerYellow;
+        Gdiplus::Color timerRed;
+    };
+
+} // namespace UKControllerPlugin::Windows
diff --git a/src/plugin/graphics/Theme.cpp b/src/plugin/graphics/Theme.cpp
new file mode 100644
index 000000000..12bf43045
--- /dev/null
+++ b/src/plugin/graphics/Theme.cpp
@@ -0,0 +1,95 @@
+#include "Theme.h"
+
+// When updating - please update the commented hex code as well ;)
+
+namespace UKControllerPlugin::Graphics {
+
+    // DEFAULT — same as current ColourPaletteDefinitions Default*
+    const Theme DEFAULT_THEME = {
+        Gdiplus::Color(58, 57, 58),    // background
+        Gdiplus::Color(215, 215, 215), // border
+        Gdiplus::Color(130, 50, 154),  // header
+        Gdiplus::Color(255, 153, 255), // highlightedHeader
+        Gdiplus::Color(227, 227, 227), // text
+        Gdiplus::Color(255, 255, 0),   // highlightedText
+        Gdiplus::Color(7, 237, 7),     // mainAircraftText
+        Gdiplus::Color(246, 181, 4),   // highlightedAircraftText
+        Gdiplus::Color(0, 255, 0),     // timerGreen
+        Gdiplus::Color(255, 255, 0),   // timerYellow
+        Gdiplus::Color(255, 0, 0),     // timerRed
+    };
+
+    const Theme NODE_THEME = {
+        Gdiplus::Color(0, 0, 0),       // background              #000000
+        Gdiplus::Color(255, 255, 255), // border                  #ffffff
+        Gdiplus::Color(160, 111, 112), // header                  #a06f70
+        Gdiplus::Color(255, 100, 50),  // highlightedHeader       #ff6432
+        Gdiplus::Color(255, 255, 255), // text                    #ffffff
+        Gdiplus::Color(232, 163, 0),   // highlightedText         #e8a300
+        Gdiplus::Color(104, 221, 69),  // mainAircraftText        #68dd45
+        Gdiplus::Color(232, 163, 0),   // highlightedAircraftText #e8a300
+        Gdiplus::Color(104, 221, 69),  // timerGreen              #68dd45
+        Gdiplus::Color(232, 163, 0),   // timerYellow             #e8a300
+        Gdiplus::Color(255, 100, 50),  // timerRed                #ff6432
+    };
+
+    const Theme NERC_THEME = {
+        Gdiplus::Color(150, 150, 150), // background                #969696
+        Gdiplus::Color(83, 83, 83),    // border                    #535353
+        Gdiplus::Color(135, 135, 135), // header                    #878787
+        Gdiplus::Color(255, 255, 255), // highlightedHeader         #ffffff
+        Gdiplus::Color(0, 0, 0),       // text                      #000000
+        Gdiplus::Color(255, 255, 255), // highlightedText           #ffffff
+        Gdiplus::Color(0, 0, 0),       // mainAircraftText          #000000
+        Gdiplus::Color(255, 255, 255), // highlightedAircraftText   #ffffff
+        Gdiplus::Color(180, 255, 125), // timerGreen                #B4FF7D
+        Gdiplus::Color(255, 216, 0),   // timerYellow               #FFD800
+        Gdiplus::Color(192, 0, 0),     // timerRed                  #C00000
+    };
+
+    const Theme NOVA_THEME = {
+        Gdiplus::Color(180, 180, 180), // background                #B4B4B4
+        Gdiplus::Color(83, 83, 83),    // border                    #535353
+        Gdiplus::Color(0, 140, 200),   // header                    #008CC8
+        Gdiplus::Color(255, 255, 255), // highlightedHeader         #ffffff
+        Gdiplus::Color(0, 0, 0),       // text                      #000000
+        Gdiplus::Color(255, 255, 255), // highlightedText           #ffffff
+        Gdiplus::Color(0, 0, 0),       // mainAircraftText          #000000
+        Gdiplus::Color(255, 255, 255), // highlightedAircraftText   #ffffff
+        Gdiplus::Color(255, 255, 255), // timerGreen                #ffffff
+        Gdiplus::Color(255, 216, 0),   // timerYellow               #FFD800
+        Gdiplus::Color(192, 0, 0),     // timerRed                  #C00000
+    };
+
+    const Theme ITEC_THEME = {
+        Gdiplus::Color(195, 195, 185), // background                #C3C3B9
+        Gdiplus::Color(0, 0, 0),       // border                    #000000
+        Gdiplus::Color(214, 216, 150), // header                    #D6D896
+        Gdiplus::Color(255, 255, 255), // highlightedHeader         #ffffff
+        Gdiplus::Color(0, 0, 0),       // text                      #000000
+        Gdiplus::Color(0, 0, 255),     // highlightedText           #0000FF
+        Gdiplus::Color(0, 0, 0),       // mainAircraftText          #000000
+        Gdiplus::Color(0, 0, 255),     // highlightedAircraftText   #0000FF
+        Gdiplus::Color(0, 0, 255),     // timerGreen                #0000FF
+        Gdiplus::Color(130, 111, 0),   // timerYellow               #826F00
+        Gdiplus::Color(192, 0, 0),     // timerRed                  #C00000
+    };
+
+    auto ThemeFromKey(const std::string& key) -> const Theme&
+    {
+        if (key == "node") {
+            return NODE_THEME;
+        }
+        if (key == "nerc") {
+            return NERC_THEME;
+        }
+        if (key == "nova") {
+            return NOVA_THEME;
+        }
+        if (key == "itec") {
+            return ITEC_THEME;
+        }
+        return DEFAULT_THEME;
+    }
+
+} // namespace UKControllerPlugin::Graphics
diff --git a/src/plugin/graphics/Theme.h b/src/plugin/graphics/Theme.h
new file mode 100644
index 000000000..04dc7d4b4
--- /dev/null
+++ b/src/plugin/graphics/Theme.h
@@ -0,0 +1,35 @@
+#pragma once
+
+namespace UKControllerPlugin::Graphics {
+
+    /*
+        used to populate GdiplusBrushes via LoadTheme()
+    */
+    struct Theme
+    {
+        Gdiplus::Color background;
+        Gdiplus::Color border;
+        Gdiplus::Color header;
+        Gdiplus::Color highlightedHeader;
+        Gdiplus::Color text;
+        Gdiplus::Color highlightedText;
+        Gdiplus::Color mainAircraftText;
+        Gdiplus::Color highlightedAircraftText;
+        Gdiplus::Color timerGreen;
+        Gdiplus::Color timerYellow;
+        Gdiplus::Color timerRed;
+    };
+
+    extern const Theme DEFAULT_THEME;
+    extern const Theme NODE_THEME;
+    extern const Theme NERC_THEME;
+    extern const Theme NOVA_THEME;
+    extern const Theme ITEC_THEME;
+
+    /*
+        Returns the Theme for a given palette key string.
+        If the key is not recognised, returns DEFAULT_THEME.
+    */
+    [[nodiscard]] auto ThemeFromKey(const std::string& key) -> const Theme&;
+
+} // namespace UKControllerPlugin::Graphics
diff --git a/src/plugin/hold/HoldDisplay.cpp b/src/plugin/hold/HoldDisplay.cpp
index 088900a47..f83e73eee 100644
--- a/src/plugin/hold/HoldDisplay.cpp
+++ b/src/plugin/hold/HoldDisplay.cpp
@@ -1,13 +1,6 @@
-#include "AbstractHoldLevelRestriction.h"
+#include "HoldDisplay.h"
+#include "AbstractHoldLevelRestriction.h"
 #include "DeemedSeparatedHold.h"
-#include "HoldDisplay.h"
-#include "HoldDisplayFunctions.h"
-#include "HoldManager.h"
-#include "HoldModule.h"
-#include "HoldingAircraft.h"
-#include "HoldingData.h"
-#include "ProximityHold.h"
-#include "PublishedHoldCollection.h"
 #include "dialog/DialogManager.h"
 #include "euroscope/EuroScopeCFlightPlanInterface.h"
 #include "euroscope/EuroScopeCRadarTargetInterface.h"
@@ -17,8 +10,16 @@
 #include "geometry/Measurement.h"
 #include "geometry/MeasurementUnit.h"
 #include "graphics/GdiGraphicsInterface.h"
+#include "graphics/GdiplusBrushes.h"
+#include "HoldDisplayFunctions.h"
+#include "HoldingAircraft.h"
+#include "HoldingData.h"
+#include "HoldManager.h"
+#include "HoldModule.h"
 #include "list/PopupListInterface.h"
 #include "navaids/Navaid.h"
+#include "ProximityHold.h"
+#include "PublishedHoldCollection.h"
 
 using UKControllerPlugin::Dialog::DialogManager;
 using UKControllerPlugin::Euroscope::EuroScopeCFlightPlanInterface;
@@ -28,6 +29,7 @@ using UKControllerPlugin::Euroscope::EuroscopeRadarLoopbackInterface;
 using UKControllerPlugin::Euroscope::UserSetting;
 using UKControllerPlugin::Hold::HoldManager;
 using UKControllerPlugin::Windows::GdiGraphicsInterface;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 
 namespace UKControllerPlugin {
     namespace Hold {
@@ -37,16 +39,13 @@ namespace UKControllerPlugin {
             const Navaids::Navaid& navaid,
             const PublishedHoldCollection& publishedHoldCollection,
             const DialogManager& dialogManager,
+            const GdiplusBrushes& brushes,
             std::shared_ptr<List::PopupListInterface> addAircraftSelector)
             : navaid(navaid), publishedHolds(publishedHoldCollection.GetForFix(navaid.identifier)),
               holdManager(holdManager), plugin(plugin), dialogManager(dialogManager),
               publishedHoldCollection(publishedHoldCollection), addAircraftSelector(addAircraftSelector),
-              titleBarTextBrush(Gdiplus::Color(227, 227, 227)), titleBarBrush(Gdiplus::Color(130, 50, 154)),
-              dataBrush(Gdiplus::Color(7, 237, 7)), clearedLevelBrush(Gdiplus::Color(246, 181, 4)),
-              blockedLevelBrush(Gdiplus::Color(123, 125, 123)), borderPen(Gdiplus::Color(215, 215, 215), 1.5f),
-              sameLevelBoxPen(Gdiplus::Color(7, 237, 7), 1.5f), verticalSpeedAscentPen(Gdiplus::Color(7, 237, 7), 2.5f),
-              verticalSpeedDescentPen(Gdiplus::Color(7, 237, 7), 2.5f), exitButtonBrush(Gdiplus::Color(0, 0, 0)),
-              backgroundBrush(Gdiplus::Color(58, 57, 58)), fontFamily(L"EuroScope"),
+              verticalSpeedAscentPen(Gdiplus::Color(7, 237, 7), 2.5f),
+              verticalSpeedDescentPen(Gdiplus::Color(7, 237, 7), 2.5f), brushes(brushes), fontFamily(L"EuroScope"),
               font(&fontFamily, 12, Gdiplus::FontStyleBold, Gdiplus::UnitPixel),
               plusFont(&fontFamily, 18, Gdiplus::FontStyleRegular, Gdiplus::UnitPixel),
               stringFormat(Gdiplus::StringFormatFlags::StringFormatFlagsNoClip), dataStartHeight(0),
@@ -678,7 +677,7 @@ namespace UKControllerPlugin {
             path.AddLine(rect.X, rect.Y + rect.Height - (radius * 2), rect.X, rect.Y + radius);
             path.AddArc(rect.X, rect.Y, radius * 2, radius * 2, 180, 90);
             path.CloseFigure();
-            graphics.DrawPath(path, this->borderPen);
+            graphics.DrawPath(path, *this->brushes.borderPen);
         }
 
         /*
@@ -693,8 +692,8 @@ namespace UKControllerPlugin {
             Gdiplus::Rect borderRect = {
                 this->windowPos.x, this->windowPos.y, this->windowWidth, this->informationDisplayWindowHeight};
 
-            graphics.FillRect(borderRect, this->backgroundBrush);
-            graphics.DrawRect(borderRect, this->borderPen);
+            graphics.FillRect(borderRect, *this->brushes.backgroundBrush);
+            graphics.DrawRect(borderRect, *this->brushes.borderPen);
 
             // Render the title bar
             this->RenderTitleBar(graphics, radarScreen, screenObjectId);
@@ -704,7 +703,7 @@ namespace UKControllerPlugin {
 
             // Render a message if no published holds
             if (this->publishedHolds.empty()) {
-                graphics.DrawString(std::wstring(L"No published holds found."), dataRect, this->dataBrush);
+                graphics.DrawString(std::wstring(L"No published holds found."), dataRect, *this->brushes.textBrush);
                 return;
             }
 
@@ -714,8 +713,8 @@ namespace UKControllerPlugin {
             Gdiplus::Rect buttonRect = {this->windowPos.x + 5, this->titleArea.GetBottom() + 5, 20, 20};
 
             // Left
-            graphics.DrawRect(buttonRect, this->sameLevelBoxPen);
-            graphics.DrawString(L"<", buttonRect, this->dataBrush);
+            graphics.DrawRect(buttonRect, *this->brushes.textPen);
+            graphics.DrawString(L"<", buttonRect, *this->brushes.textBrush);
             radarScreen.RegisterScreenObject(
                 screenObjectId,
                 this->navaid.identifier + "/prevhold",
@@ -724,8 +723,8 @@ namespace UKControllerPlugin {
 
             // Right
             buttonRect.X = this->titleArea.GetRight() - 25;
-            graphics.DrawRect(buttonRect, this->sameLevelBoxPen);
-            graphics.DrawString(L">", buttonRect, this->dataBrush);
+            graphics.DrawRect(buttonRect, *this->brushes.textPen);
+            graphics.DrawString(L">", buttonRect, *this->brushes.textBrush);
             radarScreen.RegisterScreenObject(
                 screenObjectId,
                 this->navaid.identifier + "/nexthold",
@@ -739,38 +738,41 @@ namespace UKControllerPlugin {
                 L"Hold " + std::to_wstring(this->selectedPublishedHoldIndex + 1) + L" of " +
                     std::to_wstring(this->publishedHolds.size()),
                 buttonRect,
-                this->dataBrush);
+                *this->brushes.textBrush);
 
             // Render the data
-            graphics.DrawString(ConvertToTchar(hold->description), dataRect, this->dataBrush);
+            graphics.DrawString(ConvertToTchar(hold->description), dataRect, *this->brushes.textBrush);
 
             dataRect.Y = dataRect.Y + this->lineHeight + 5;
             graphics.DrawString(
-                std::wstring(L"Fix: ") + ConvertToTchar(this->navaid.identifier), dataRect, this->dataBrush);
+                std::wstring(L"Fix: ") + ConvertToTchar(this->navaid.identifier), dataRect, *this->brushes.textBrush);
 
             dataRect.Y = dataRect.Y + this->lineHeight + 5;
-            graphics.DrawString(std::wstring(L"Inbound: ") + ConvertToTchar(hold->inbound), dataRect, this->dataBrush);
+            graphics.DrawString(
+                std::wstring(L"Inbound: ") + ConvertToTchar(hold->inbound), dataRect, *this->brushes.textBrush);
 
             dataRect.Y = dataRect.Y + this->lineHeight + 5;
             graphics.DrawString(
-                std::wstring(L"Turn: ") + ConvertToTchar(hold->turnDirection), dataRect, this->dataBrush);
+                std::wstring(L"Turn: ") + ConvertToTchar(hold->turnDirection), dataRect, *this->brushes.textBrush);
 
             dataRect.Y = dataRect.Y + this->lineHeight + 5;
-            graphics.DrawString(std::wstring(L"Maximum: ") + ConvertToTchar(hold->maximum), dataRect, this->dataBrush);
+            graphics.DrawString(
+                std::wstring(L"Maximum: ") + ConvertToTchar(hold->maximum), dataRect, *this->brushes.textBrush);
 
             dataRect.Y = dataRect.Y + this->lineHeight + 5;
-            graphics.DrawString(std::wstring(L"Minimum: ") + ConvertToTchar(hold->minimum), dataRect, this->dataBrush);
+            graphics.DrawString(
+                std::wstring(L"Minimum: ") + ConvertToTchar(hold->minimum), dataRect, *this->brushes.textBrush);
 
             dataRect.Y = dataRect.Y + this->lineHeight + 5;
 
             if (*hold->outboundLeg->unit == Geometry::MeasurementUnitType::None) {
-                graphics.DrawString(std::wstring(L"Outbound Leg: --"), dataRect, this->dataBrush);
+                graphics.DrawString(std::wstring(L"Outbound Leg: --"), dataRect, *this->brushes.textBrush);
             } else {
                 graphics.DrawString(
                     std::wstring(L"Outbound Leg: ") + FormatOutboundLegValue(hold->outboundLeg->value) + L" " +
                         ConvertToTchar(hold->outboundLeg->unit->description),
                     dataRect,
-                    this->dataBrush);
+                    *this->brushes.textBrush);
             }
         }
 
@@ -784,33 +786,33 @@ namespace UKControllerPlugin {
         {
             // Title bar
             radarScreen.RegisterScreenObject(screenObjectId, this->navaid.identifier, this->titleRect, true);
-            graphics.FillRect(this->titleArea, this->titleBarBrush);
-            graphics.DrawRect(this->titleArea, this->borderPen);
+            graphics.FillRect(this->titleArea, *this->brushes.headerBrush);
+            graphics.DrawRect(this->titleArea, *this->brushes.borderPen);
 
             std::wstring holdName = ConvertToTchar(this->navaid.identifier);
-            graphics.DrawString(ConvertToTchar(this->navaid.identifier), this->titleArea, this->titleBarTextBrush);
+            graphics.DrawString(ConvertToTchar(this->navaid.identifier), this->titleArea, *this->brushes.textBrush);
             graphics.DrawLine(
-                this->borderPen,
+                *this->brushes.borderPen,
                 Gdiplus::Point{this->titleArea.X, this->titleArea.Y + this->titleArea.Height},
                 Gdiplus::Point{this->titleArea.X + this->titleArea.Width, this->titleArea.Y + this->titleArea.Height});
 
             // Minimise Button
-            graphics.FillRect(this->minimiseButtonArea, this->backgroundBrush);
-            graphics.DrawRect(this->minimiseButtonArea, this->borderPen);
+            graphics.FillRect(this->minimiseButtonArea, *this->brushes.backgroundBrush);
+            graphics.DrawRect(this->minimiseButtonArea, *this->brushes.borderPen);
             radarScreen.RegisterScreenObject(
                 screenObjectId, this->navaid.identifier + "/minimise", this->minimiseClickRect, false);
 
             // Information button
-            graphics.FillRect(this->informationButtonArea, this->backgroundBrush);
-            graphics.DrawRect(this->informationButtonArea, this->borderPen);
-            graphics.DrawString(L"i", this->informationButtonArea, this->titleBarTextBrush);
+            graphics.FillRect(this->informationButtonArea, *this->brushes.backgroundBrush);
+            graphics.DrawRect(this->informationButtonArea, *this->brushes.borderPen);
+            graphics.DrawString(L"i", this->informationButtonArea, *this->brushes.textBrush);
             radarScreen.RegisterScreenObject(
                 screenObjectId, this->navaid.identifier + "/information", this->informationClickRect, false);
 
             // Options button
-            graphics.FillRect(this->optionsButtonArea, this->backgroundBrush);
-            graphics.DrawRect(this->optionsButtonArea, this->borderPen);
-            graphics.DrawString(L"o", this->optionsButtonArea, this->titleBarTextBrush);
+            graphics.FillRect(this->optionsButtonArea, *this->brushes.backgroundBrush);
+            graphics.DrawRect(this->optionsButtonArea, *this->brushes.borderPen);
+            graphics.DrawString(L"o", this->optionsButtonArea, *this->brushes.textBrush);
             radarScreen.RegisterScreenObject(
                 screenObjectId, this->navaid.identifier + "/options", this->optionsClickRect, false);
         }
@@ -821,26 +823,26 @@ namespace UKControllerPlugin {
             const int screenObjectId) const
         {
             this->DrawRoundRectangle(graphics, minusButtonRect, 5);
-            graphics.DrawString(L"-", minusButtonRect, this->titleBarTextBrush);
+            graphics.DrawString(L"-", minusButtonRect, *this->brushes.textBrush);
             radarScreen.RegisterScreenObject(
                 screenObjectId, this->navaid.identifier + "/minus", this->minusButtonClickRect, false);
 
             this->DrawRoundRectangle(graphics, plusButtonRect, 5);
-            graphics.DrawString(L"+", plusButtonRect, this->titleBarTextBrush);
+            graphics.DrawString(L"+", plusButtonRect, *this->brushes.textBrush);
             radarScreen.RegisterScreenObject(
                 screenObjectId, this->navaid.identifier + "/plus", this->plusButtonClickRect, false);
 
             this->DrawRoundRectangle(graphics, addButtonRect, 5);
-            graphics.DrawString(L"ADD", addButtonRect, this->titleBarTextBrush);
+            graphics.DrawString(L"ADD", addButtonRect, *this->brushes.textBrush);
             radarScreen.RegisterScreenObject(
                 screenObjectId, this->navaid.identifier + "/add", this->addButtonClickRect, false);
 
             this->DrawRoundRectangle(graphics, allButtonRect, 5);
-            graphics.DrawString(L"ALL", allButtonRect, this->titleBarTextBrush);
+            graphics.DrawString(L"ALL", allButtonRect, *this->brushes.textBrush);
             radarScreen.RegisterScreenObject(
                 screenObjectId, this->navaid.identifier + "/allLevels", this->allButtonClickRect, false);
 
-            graphics.DrawLine(this->borderPen, this->underButtonLineLeft, this->underButtonLineRight);
+            graphics.DrawLine(*this->brushes.borderPen, this->underButtonLineLeft, this->underButtonLineRight);
         }
 
         /*
@@ -857,7 +859,7 @@ namespace UKControllerPlugin {
 
             // Render the background
             Gdiplus::Rect backgroundRect = this->GetHoldViewBackgroundRender(holdingAircraft);
-            graphics.FillRect(backgroundRect, this->backgroundBrush);
+            graphics.FillRect(backgroundRect, *this->brushes.backgroundBrush);
 
             // Render the title bar
             this->RenderTitleBar(graphics, radarScreen, screenObjectId);
@@ -914,11 +916,11 @@ namespace UKControllerPlugin {
 
                     // Render the restrictions
                     if (levelRestricted) {
-                        graphics.FillRect(holdRow, this->blockedLevelBrush);
+                        graphics.FillRect(holdRow, *this->brushes.borderBrush);
                     }
 
                     // Render the numbers
-                    graphics.DrawString(GetLevelDisplayString(level), numbersDisplay, this->titleBarTextBrush);
+                    graphics.DrawString(GetLevelDisplayString(level), numbersDisplay, *this->brushes.textBrush);
 
                     // Increase the lines
                     holdRow.Y = holdRow.Y + this->lineHeight;
@@ -945,12 +947,12 @@ namespace UKControllerPlugin {
                          ++it) {
                         // Render the restrictions
                         if (levelRestricted) {
-                            graphics.FillRect(holdRow, this->blockedLevelBrush);
+                            graphics.FillRect(holdRow, *this->brushes.borderBrush);
                         }
 
                         // Render the numbers
                         if (aircraftIndex == 0) {
-                            graphics.DrawString(GetLevelDisplayString(level), numbersDisplay, this->titleBarTextBrush);
+                            graphics.DrawString(GetLevelDisplayString(level), numbersDisplay, *this->brushes.textBrush);
                         }
 
                         rt = this->plugin.GetRadarTargetForCallsign((*it)->GetCallsign());
@@ -963,7 +965,7 @@ namespace UKControllerPlugin {
 
                             // Callsign
                             std::wstring callsign = ConvertToTchar((*it)->GetCallsign());
-                            graphics.DrawString(callsign, callsignDisplay, this->dataBrush);
+                            graphics.DrawString(callsign, callsignDisplay, *this->brushes.textBrush);
                             radarScreen.RegisterScreenObject(
                                 screenObjectId,
                                 this->navaid.identifier + "/callsign/" + fp->GetCallsign(),
@@ -975,7 +977,9 @@ namespace UKControllerPlugin {
 
                             // Reported level
                             graphics.DrawString(
-                                GetLevelDisplayString(rt->GetFlightLevel()), actualLevelDisplay, this->dataBrush);
+                                GetLevelDisplayString(rt->GetFlightLevel()),
+                                actualLevelDisplay,
+                                *this->brushes.textBrush);
                             if (GetVerticalSpeedDirection(rt->GetVerticalSpeed()) == 1) {
                                 graphics.DrawLine(
                                     this->verticalSpeedAscentPen,
@@ -993,7 +997,7 @@ namespace UKControllerPlugin {
                                 fp->GetClearedAltitude() == 0 ? L"---"
                                                               : GetLevelDisplayString(fp->GetClearedAltitude()),
                                 clearedLevelDisplay,
-                                this->clearedLevelBrush);
+                                *this->brushes.highlightedAircraftTextBrush);
                             radarScreen.RegisterScreenObject(
                                 screenObjectId,
                                 this->navaid.identifier + "/cleared/" + fp->GetCallsign(),
@@ -1008,7 +1012,7 @@ namespace UKControllerPlugin {
                                 auto holdProximity = (*it)->GetProximityHold(navaid.identifier);
                                 if (holdProximity != nullptr && holdProximity->HasEntered()) {
                                     std::wstring timeString = GetTimeInHoldDisplayString(holdProximity->EnteredAt());
-                                    graphics.DrawString(timeString, timeInHoldDisplay, this->dataBrush);
+                                    graphics.DrawString(timeString, timeInHoldDisplay, *this->brushes.textBrush);
                                 }
                             }
                         }
@@ -1033,7 +1037,7 @@ namespace UKControllerPlugin {
                             holdRow.Y - (static_cast<INT>(aircraftAtLevel.size()) * this->lineHeight),
                             holdRow.Width - 20,
                             (static_cast<INT>(aircraftAtLevel.size()) * this->lineHeight)};
-                        graphics.DrawRect(boundingBox, this->sameLevelBoxPen);
+                        graphics.DrawRect(boundingBox, *this->brushes.textPen);
                     }
                 }
             }
@@ -1045,7 +1049,7 @@ namespace UKControllerPlugin {
                     this->windowPos.y,
                     this->windowPos.x + this->windowWidth,
                     holdRow.Y + this->lineHeight},
-                this->borderPen);
+                *this->brushes.borderPen);
         }
 
         void HoldDisplay::PaintWindow(
diff --git a/src/plugin/hold/HoldDisplay.h b/src/plugin/hold/HoldDisplay.h
index 8fab1d317..3c166474d 100644
--- a/src/plugin/hold/HoldDisplay.h
+++ b/src/plugin/hold/HoldDisplay.h
@@ -21,6 +21,7 @@ namespace UKControllerPlugin {
     } // namespace Navaids
     namespace Windows {
         class GdiGraphicsInterface;
+        struct GdiplusBrushes;
     } // namespace Windows
 } // namespace UKControllerPlugin
 
@@ -42,6 +43,7 @@ namespace UKControllerPlugin {
                 const Navaids::Navaid& navaid,
                 const PublishedHoldCollection& publishedHoldCollection,
                 const Dialog::DialogManager& dialogManager,
+                const UKControllerPlugin::Windows::GdiplusBrushes& brushes,
                 std::shared_ptr<List::PopupListInterface> addAircraftSelector);
             void ButtonClicked(std::string button);
             void ButtonRightClicked(const std::string& button);
@@ -171,17 +173,10 @@ namespace UKControllerPlugin {
             std::shared_ptr<List::PopupListInterface> addAircraftSelector;
 
             // Brushes
-            const Gdiplus::SolidBrush titleBarTextBrush;
-            const Gdiplus::SolidBrush titleBarBrush;
-            const Gdiplus::SolidBrush dataBrush;
-            const Gdiplus::SolidBrush clearedLevelBrush;
-            const Gdiplus::SolidBrush blockedLevelBrush;
-            const Gdiplus::Pen borderPen;
-            const Gdiplus::Pen sameLevelBoxPen;
             Gdiplus::Pen verticalSpeedAscentPen;
             Gdiplus::Pen verticalSpeedDescentPen;
-            const Gdiplus::SolidBrush exitButtonBrush;
-            const Gdiplus::SolidBrush backgroundBrush;
+
+            const UKControllerPlugin::Windows::GdiplusBrushes& brushes;
 
             // Fonts
             const Gdiplus::FontFamily fontFamily;
diff --git a/src/plugin/hold/HoldDisplayFactory.cpp b/src/plugin/hold/HoldDisplayFactory.cpp
index ad3c42f9f..9984cf164 100644
--- a/src/plugin/hold/HoldDisplayFactory.cpp
+++ b/src/plugin/hold/HoldDisplayFactory.cpp
@@ -1,20 +1,22 @@
+#include "HoldDisplayFactory.h"
 #include "AbstractHoldLevelRestriction.h"
 #include "AddToHoldCallsignProvider.h"
-#include "DeemedSeparatedHold.h"
-#include "HoldDisplay.h"
-#include "HoldDisplayFactory.h"
-#include "HoldManager.h"
-#include "PublishedHoldCollection.h"
 #include "aircraft/CallsignSelectionListFactory.h"
+#include "DeemedSeparatedHold.h"
 #include "dialog/DialogManager.h"
 #include "euroscope/EuroscopePluginLoopbackInterface.h"
+#include "graphics/GdiplusBrushes.h"
+#include "HoldDisplay.h"
+#include "HoldManager.h"
 #include "navaids/NavaidCollection.h"
+#include "PublishedHoldCollection.h"
 
 using UKControllerPlugin::Dialog::DialogManager;
 using UKControllerPlugin::Euroscope::EuroscopePluginLoopbackInterface;
 using UKControllerPlugin::Hold::HoldManager;
 using UKControllerPlugin::Navaids::Navaid;
 using UKControllerPlugin::Navaids::NavaidCollection;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 
 namespace UKControllerPlugin {
     namespace Hold {
@@ -25,9 +27,10 @@ namespace UKControllerPlugin {
             const NavaidCollection& navaids,
             const PublishedHoldCollection& holds,
             const DialogManager& dialogManager,
-            const Aircraft::CallsignSelectionListFactory& addAircraftListFactory)
+            const Aircraft::CallsignSelectionListFactory& addAircraftListFactory,
+            const GdiplusBrushes& brushes)
             : plugin(plugin), holdManager(holdManager), navaids(navaids), holds(holds), dialogManager(dialogManager),
-              addAircraftListFactory(addAircraftListFactory)
+              addAircraftListFactory(addAircraftListFactory), brushes(brushes)
         {
         }
 
@@ -48,6 +51,7 @@ namespace UKControllerPlugin {
                 navaidData,
                 holds,
                 dialogManager,
+                brushes,
                 addAircraftListFactory.Create(
                     std::make_shared<AddToHoldCallsignProvider>(navaidData, holdManager, plugin),
                     "Add to hold " + navaidData.identifier));
diff --git a/src/plugin/hold/HoldDisplayFactory.h b/src/plugin/hold/HoldDisplayFactory.h
index a1807d035..6c272b4ac 100644
--- a/src/plugin/hold/HoldDisplayFactory.h
+++ b/src/plugin/hold/HoldDisplayFactory.h
@@ -13,6 +13,9 @@ namespace UKControllerPlugin {
     namespace Navaids {
         class NavaidCollection;
     } // namespace Navaids
+    namespace Windows {
+        struct GdiplusBrushes;
+    } // namespace Windows
 } // namespace UKControllerPlugin
 
 namespace UKControllerPlugin {
@@ -33,7 +36,8 @@ namespace UKControllerPlugin {
                 const UKControllerPlugin::Navaids::NavaidCollection& navaids,
                 const UKControllerPlugin::Hold::PublishedHoldCollection& holds,
                 const UKControllerPlugin::Dialog::DialogManager& dialogManager,
-                const Aircraft::CallsignSelectionListFactory& addAircraftListFactory);
+                const Aircraft::CallsignSelectionListFactory& addAircraftListFactory,
+                const UKControllerPlugin::Windows::GdiplusBrushes& brushes);
             [[nodiscard]] auto Create(std::string navaid) const
                 -> std::unique_ptr<UKControllerPlugin::Hold::HoldDisplay>;
 
@@ -55,6 +59,9 @@ namespace UKControllerPlugin {
 
             // For creating the callsign selection lists
             const Aircraft::CallsignSelectionListFactory& addAircraftListFactory;
+
+            // Brushes
+            const UKControllerPlugin::Windows::GdiplusBrushes& brushes;
         };
     } // namespace Hold
 } // namespace UKControllerPlugin
diff --git a/src/plugin/hold/HoldModule.cpp b/src/plugin/hold/HoldModule.cpp
index 15968ce58..c83d1ce22 100644
--- a/src/plugin/hold/HoldModule.cpp
+++ b/src/plugin/hold/HoldModule.cpp
@@ -1,8 +1,20 @@
+#include "HoldModule.h"
 #include "AbstractHoldLevelRestriction.h"
 #include "AircraftEnteredHoldingAreaEventHandler.h"
 #include "AircraftExitedHoldingAreaEventHandler.h"
+#include "api/ApiException.h"
+#include "api/ApiInterface.h"
 #include "AssignHoldCommand.h"
+#include "bootstrap/BootstrapWarningMessage.h"
+#include "bootstrap/PersistenceContainer.h"
+#include "command/CommandHandlerCollection.h"
 #include "DeemedSeparatedHold.h"
+#include "dependency/DependencyLoaderInterface.h"
+#include "dialog/DialogData.h"
+#include "dialog/DialogManager.h"
+#include "euroscope/AsrEventHandlerCollection.h"
+#include "euroscope/CallbackFunction.h"
+#include "graphics/GdiplusBrushes.h"
 #include "HoldConfigurationDialog.h"
 #include "HoldConfigurationMenuItem.h"
 #include "HoldDisplayConfigurationDialog.h"
@@ -10,29 +22,18 @@
 #include "HoldDisplayManager.h"
 #include "HoldEventHandler.h"
 #include "HoldManager.h"
-#include "HoldModule.h"
 #include "HoldRenderer.h"
 #include "HoldSelectionMenu.h"
-#include "PublishedHoldCollection.h"
-#include "PublishedHoldCollectionFactory.h"
-#include "api/ApiException.h"
-#include "api/ApiInterface.h"
-#include "bootstrap/BootstrapWarningMessage.h"
-#include "bootstrap/PersistenceContainer.h"
-#include "command/CommandHandlerCollection.h"
-#include "dependency/DependencyLoaderInterface.h"
-#include "dialog/DialogData.h"
-#include "dialog/DialogManager.h"
-#include "euroscope/AsrEventHandlerCollection.h"
-#include "euroscope/CallbackFunction.h"
 #include "message/UserMessager.h"
 #include "plugin/FunctionCallEventHandler.h"
 #include "plugin/UKPlugin.h"
+#include "PublishedHoldCollection.h"
+#include "PublishedHoldCollectionFactory.h"
 #include "push/PushEventProcessorCollection.h"
 #include "radarscreen/ConfigurableDisplayCollection.h"
-#include "task/TaskRunnerInterface.h"
-#include "tag/TagItemCollection.h"
 #include "tag/TagFunction.h"
+#include "tag/TagItemCollection.h"
+#include "task/TaskRunnerInterface.h"
 #include "timedevent/TimedEventCollection.h"
 #include "windows/WinApiInterface.h"
 
@@ -56,6 +57,7 @@ using UKControllerPlugin::Plugin::FunctionCallEventHandler;
 using UKControllerPlugin::RadarScreen::ConfigurableDisplayCollection;
 using UKControllerPlugin::RadarScreen::RadarRenderableCollection;
 using UKControllerPlugin::Tag::TagFunction;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 using UKControllerPlugin::Windows::WinApiInterface;
 
 namespace UKControllerPlugin::Hold {
@@ -138,7 +140,8 @@ namespace UKControllerPlugin::Hold {
             *container.navaids,
             *container.publishedHolds,
             *container.dialogManager,
-            *container.callsignSelectionListFactory);
+            *container.callsignSelectionListFactory,
+            *container.brushes);
 
         // Command to assign holds
         container.commandHandlers->RegisterHandler(
@@ -190,6 +193,7 @@ namespace UKControllerPlugin::Hold {
         RadarRenderableCollection& radarRenderables,
         AsrEventHandlerCollection& asrEvents,
         CommandHandlerCollection& commandHandlers,
+        const GdiplusBrushes& brushes,
         const PersistenceContainer& container)
     {
         // Display manager
diff --git a/src/plugin/hold/HoldModule.h b/src/plugin/hold/HoldModule.h
index 86c2acd46..07cc8eb54 100644
--- a/src/plugin/hold/HoldModule.h
+++ b/src/plugin/hold/HoldModule.h
@@ -26,6 +26,9 @@ namespace UKControllerPlugin {
     namespace Command {
         class CommandHandlerCollection;
     } // namespace Command
+    namespace Windows {
+        struct GdiplusBrushes;
+    } // namespace Windows
 } // namespace UKControllerPlugin
 
 namespace UKControllerPlugin::Hold {
@@ -42,6 +45,7 @@ namespace UKControllerPlugin::Hold {
         UKControllerPlugin::RadarScreen::RadarRenderableCollection& radarRenderables,
         UKControllerPlugin::Euroscope::AsrEventHandlerCollection& asrEvents,
         UKControllerPlugin::Command::CommandHandlerCollection& commandHandlers,
+        const UKControllerPlugin::Windows::GdiplusBrushes& brushes,
         const UKControllerPlugin::Bootstrap::PersistenceContainer& container);
 
     [[nodiscard]] auto GetDependencyKey() -> std::string;
diff --git a/src/plugin/minstack/MinStackRenderer.cpp b/src/plugin/minstack/MinStackRenderer.cpp
index 5ee93898e..28fbf6759 100644
--- a/src/plugin/minstack/MinStackRenderer.cpp
+++ b/src/plugin/minstack/MinStackRenderer.cpp
@@ -1,11 +1,11 @@
-#include "MinStackLevel.h"
-#include "MinStackManager.h"
 #include "MinStackRenderer.h"
 #include "euroscope/EuroscopeRadarLoopbackInterface.h"
 #include "euroscope/UserSetting.h"
 #include "graphics/GdiGraphicsInterface.h"
 #include "graphics/GdiplusBrushes.h"
 #include "helper/HelperFunctions.h"
+#include "MinStackLevel.h"
+#include "MinStackManager.h"
 
 using UKControllerPlugin::HelperFunctions;
 using UKControllerPlugin::Dialog::DialogManager;
@@ -212,17 +212,17 @@ namespace UKControllerPlugin::MinStack {
             const MinStackLevel& mslData = this->minStackModule.GetMinStackLevel(minStack.key);
 
             // Draw the TMA title and rectangles
-            graphics.FillRect(tma, *this->brushes.greyBrush);
-            graphics.DrawRect(tma, *this->brushes.blackPen);
+            graphics.FillRect(tma, *this->brushes.backgroundBrush);
+            graphics.DrawRect(tma, *this->brushes.borderPen);
 
             graphics.DrawString(
                 HelperFunctions::ConvertToWideString(MinStackManager::GetNameFromKey(minStack.key)),
                 tma,
-                mslData.IsAcknowledged() ? *this->brushes.whiteBrush : *this->brushes.yellowBrush);
+                mslData.IsAcknowledged() ? *this->brushes.highlightedTextBrush : *this->brushes.textBrush);
 
             // Draw the MSL itself and associated rectangles
-            graphics.FillRect(msl, *this->brushes.greyBrush);
-            graphics.DrawRect(msl, *this->brushes.blackPen);
+            graphics.FillRect(msl, *this->brushes.backgroundBrush);
+            graphics.DrawRect(msl, *this->brushes.borderPen);
 
             std::string mslString =
                 mslData == this->minStackModule.InvalidMsl() ? "-" : std::to_string(mslData.msl).substr(0, 2);
@@ -230,7 +230,7 @@ namespace UKControllerPlugin::MinStack {
             graphics.DrawString(
                 HelperFunctions::ConvertToWideString(mslString),
                 msl,
-                mslData.IsAcknowledged() ? *this->brushes.whiteBrush : *this->brushes.yellowBrush);
+                mslData.IsAcknowledged() ? *this->brushes.highlightedTextBrush : *this->brushes.textBrush);
 
             // Add the clickable area.
             radarScreen.RegisterScreenObject(
@@ -259,7 +259,7 @@ namespace UKControllerPlugin::MinStack {
             this->topBarArea.top,
             this->leftColumnWidth + this->hideClickspotWidth,
             1 + ((numMinStacks) * this->rowHeight)};
-        graphics.DrawRect(area, *this->brushes.blackPen);
+        graphics.DrawRect(area, *this->brushes.borderPen);
     }
 
     /*
@@ -268,15 +268,15 @@ namespace UKControllerPlugin::MinStack {
     void MinStackRenderer::RenderTopBar(GdiGraphicsInterface& graphics, EuroscopeRadarLoopbackInterface& radarScreen)
     {
         // The title bar - the draggable bit
-        graphics.DrawRect(this->topBarRender, *this->brushes.blackPen);
-        graphics.FillRect(this->topBarRender, *this->brushes.euroscopeBackgroundBrush);
-        graphics.DrawString(L"MSL", this->topBarRender, *this->brushes.whiteBrush);
+        graphics.DrawRect(this->topBarRender, *this->brushes.borderPen);
+        graphics.FillRect(this->topBarRender, *this->brushes.headerBrush);
+        graphics.DrawString(L"MSL", this->topBarRender, *this->brushes.textBrush);
         radarScreen.RegisterScreenObject(this->menuBarClickspotId, "", this->topBarArea, true);
 
         // The toggle button - no draggable
-        graphics.DrawRect(this->hideSpotRender, *this->brushes.blackPen);
-        graphics.FillRect(this->hideSpotRender, *this->brushes.euroscopeBackgroundBrush);
-        graphics.DrawString(L"X", this->hideSpotRender, *this->brushes.whiteBrush);
+        graphics.DrawRect(this->hideSpotRender, *this->brushes.borderPen);
+        graphics.FillRect(this->hideSpotRender, *this->brushes.headerBrush);
+        graphics.DrawString(L"X", this->hideSpotRender, *this->brushes.textBrush);
         radarScreen.RegisterScreenObject(this->hideClickspotId, "", this->hideClickspotArea, false);
     }
 
diff --git a/src/plugin/minstack/MinStackRenderer.h b/src/plugin/minstack/MinStackRenderer.h
index 55fe06779..7b02db923 100644
--- a/src/plugin/minstack/MinStackRenderer.h
+++ b/src/plugin/minstack/MinStackRenderer.h
@@ -133,7 +133,7 @@ namespace UKControllerPlugin::MinStack {
         const int leftColumnWidth = 75;
 
         // Width of the right column
-        const int rowHeight = 20;
+        const int rowHeight = 15;
 
         // Width of the hide clickspot
         const int hideClickspotWidth = 25;
diff --git a/src/plugin/radarscreen/RadarScreenFactory.cpp b/src/plugin/radarscreen/RadarScreenFactory.cpp
index 743f675c4..565b901e8 100644
--- a/src/plugin/radarscreen/RadarScreenFactory.cpp
+++ b/src/plugin/radarscreen/RadarScreenFactory.cpp
@@ -1,30 +1,30 @@
-#include "ConfigurableDisplayCollection.h"
-#include "MenuToggleableDisplayFactory.h"
-#include "PositionResetCommand.h"
 #include "RadarScreenFactory.h"
-#include "ScreenControlsBootstrap.h"
-#include "UKRadarScreen.h"
 #include "api/BootstrapApi.h"
 #include "approach/ApproachBootstrapProvider.h"
 #include "bootstrap/BootstrapProviderCollection.h"
 #include "bootstrap/HelperBootstrap.h"
 #include "bootstrap/PersistenceContainer.h"
+#include "ConfigurableDisplayCollection.h"
 #include "countdown/CountdownModule.h"
 #include "departure/DepartureModule.h"
 #include "euroscope/GeneralSettingsConfigurationBootstrap.h"
 #include "graphics/GdiGraphicsWrapper.h"
 #include "historytrail/HistoryTrailModule.h"
 #include "hold/HoldModule.h"
+#include "MenuToggleableDisplayFactory.h"
 #include "minstack/MinStackModule.h"
 #include "missedapproach/MissedApproachModule.h"
 #include "notifications/NotificationsModule.h"
 #include "plugin/PluginInformationBootstrap.h"
 #include "plugin/UKPlugin.h"
+#include "PositionResetCommand.h"
 #include "prenote/PrenoteModule.h"
 #include "regional/RegionalPressureModule.h"
 #include "releases/ReleaseModule.h"
+#include "ScreenControlsBootstrap.h"
 #include "sectorfile/SectorFileBootstrap.h"
 #include "srd/SrdModule.h"
+#include "UKRadarScreen.h"
 #include "wake/WakeModule.h"
 
 using UKControllerPlugin::Api::BootstrapConfigurationMenuItem;
@@ -66,7 +66,11 @@ namespace UKControllerPlugin::RadarScreen {
         SectorFile::BootstrapRadarScreen(persistence, userSettingHandlers);
 
         GeneralSettingsConfigurationBootstrap::BootstrapRadarScreen(
-            *persistence.pluginFunctionHandlers, configurableDisplays, commandHandlers, *persistence.dialogManager);
+            *persistence.pluginFunctionHandlers,
+            configurableDisplays,
+            *persistence.brushes,
+            commandHandlers,
+            *persistence.dialogManager);
 
         HistoryTrailModule::BootstrapRadarScreen(
             *persistence.pluginFunctionHandlers,
@@ -106,7 +110,12 @@ namespace UKControllerPlugin::RadarScreen {
             userSettingHandlers);
 
         Hold::BootstrapRadarScreen(
-            configurableDisplays, renderers, userSettingHandlers, commandHandlers, this->persistence);
+            configurableDisplays,
+            renderers,
+            userSettingHandlers,
+            commandHandlers,
+            *persistence.brushes,
+            this->persistence);
 
         Srd::BootstrapRadarScreen(configurableDisplays);
         Notifications::BootstrapRadarScreen(this->persistence, configurableDisplays);
@@ -114,7 +123,8 @@ namespace UKControllerPlugin::RadarScreen {
         PrenoteModule::BootstrapRadarScreen(this->persistence, renderers);
         Departure::BootstrapRadarScreen(this->persistence, renderers, configurableDisplays, userSettingHandlers);
         MissedApproach::BootstrapRadarScreen(this->persistence, renderers, configurableDisplays, userSettingHandlers);
-        Wake::BootstrapRadarScreen(this->persistence, renderers, userSettingHandlers, displayFactory);
+        Wake::BootstrapRadarScreen(
+            this->persistence, renderers, userSettingHandlers, displayFactory, *persistence.brushes);
 
         this->persistence.bootstrapProviders->BootstrapRadarScreen(
             this->persistence, renderers, configurableDisplays, userSettingHandlers, displayFactory);
diff --git a/src/plugin/radarscreen/ScreenControls.cpp b/src/plugin/radarscreen/ScreenControls.cpp
index d418d39ee..4efed6f73 100644
--- a/src/plugin/radarscreen/ScreenControls.cpp
+++ b/src/plugin/radarscreen/ScreenControls.cpp
@@ -1,5 +1,5 @@
-#include "ConfigurableDisplayInterface.h"
 #include "ScreenControls.h"
+#include "ConfigurableDisplayInterface.h"
 #include "euroscope/EuroscopeRadarLoopbackInterface.h"
 #include "graphics/GdiGraphicsInterface.h"
 #include "graphics/GdiplusBrushes.h"
@@ -80,8 +80,8 @@ namespace UKControllerPlugin::RadarScreen {
         RECT radarArea = radarScreen.GetRadarViewport();
         Gdiplus::Rect renderArea = {
             radarArea.right - controlWidth, radarArea.bottom - controlHeight, controlWidth, controlHeight};
-        graphics.FillRect(renderArea, *this->brushes.euroscopeBackgroundBrush);
-        graphics.DrawString(L"OP", renderArea, *this->brushes.greenBrush);
+        graphics.FillRect(renderArea, Gdiplus::SolidBrush(this->brushes.euroscopeBackground));
+        graphics.DrawString(L"OP", renderArea, Gdiplus::SolidBrush(this->brushes.green));
         radarScreen.RegisterScreenObject(
             toggleboxIdEuroscope,
             "",
diff --git a/src/plugin/regional/RegionalPressureRenderer.cpp b/src/plugin/regional/RegionalPressureRenderer.cpp
index dab9beb5f..fd5315818 100644
--- a/src/plugin/regional/RegionalPressureRenderer.cpp
+++ b/src/plugin/regional/RegionalPressureRenderer.cpp
@@ -1,10 +1,10 @@
-#include "RegionalPressureManager.h"
 #include "RegionalPressureRenderer.h"
 #include "euroscope/EuroscopeRadarLoopbackInterface.h"
 #include "euroscope/UserSetting.h"
 #include "graphics/GdiGraphicsInterface.h"
 #include "graphics/GdiplusBrushes.h"
 #include "helper/HelperFunctions.h"
+#include "RegionalPressureManager.h"
 
 using UKControllerPlugin::HelperFunctions;
 using UKControllerPlugin::Dialog::DialogManager;
@@ -211,17 +211,17 @@ namespace UKControllerPlugin::Regional {
             const RegionalPressure& pressureData = this->manager.GetRegionalPressure(it->key);
 
             // Draw the TMA title and rectangles
-            graphics.FillRect(asr, *this->brushes.greyBrush);
-            graphics.DrawRect(asr, *this->brushes.blackPen);
+            graphics.FillRect(asr, *this->brushes.backgroundBrush);
+            graphics.DrawRect(asr, *this->brushes.borderPen);
 
             graphics.DrawString(
                 HelperFunctions::ConvertToWideString(this->manager.GetNameFromKey(it->key)),
                 asr,
-                pressureData.IsAcknowledged() ? *this->brushes.whiteBrush : *this->brushes.yellowBrush);
+                pressureData.IsAcknowledged() ? *this->brushes.highlightedTextBrush : *this->brushes.textBrush);
 
             // Draw the RPS itself and associated rectangles
-            graphics.FillRect(rps, *this->brushes.greyBrush);
-            graphics.DrawRect(rps, *this->brushes.blackPen);
+            graphics.FillRect(rps, *this->brushes.backgroundBrush);
+            graphics.DrawRect(rps, *this->brushes.borderPen);
 
             std::string rpsString;
             if (pressureData == this->manager.invalidPressure) {
@@ -235,7 +235,7 @@ namespace UKControllerPlugin::Regional {
             graphics.DrawString(
                 HelperFunctions::ConvertToWideString(rpsString),
                 rps,
-                pressureData.IsAcknowledged() ? *this->brushes.whiteBrush : *this->brushes.yellowBrush);
+                pressureData.IsAcknowledged() ? *this->brushes.highlightedTextBrush : *this->brushes.textBrush);
 
             // Add the clickable area.
             radarScreen.RegisterScreenObject(
@@ -261,7 +261,7 @@ namespace UKControllerPlugin::Regional {
             this->topBarArea.top,
             LEFT_COLUMN_WIDTH + HIDE_CLICKSPOT_WIDTH,
             1 + ((numRegionalPressures)*ROW_HEIGHT)};
-        graphics.DrawRect(area, *this->brushes.blackPen);
+        graphics.DrawRect(area, *this->brushes.borderPen);
     }
 
     /*
@@ -271,15 +271,15 @@ namespace UKControllerPlugin::Regional {
     RegionalPressureRenderer::RenderTopBar(GdiGraphicsInterface& graphics, EuroscopeRadarLoopbackInterface& radarScreen)
     {
         // The title bar - the draggable bit
-        graphics.DrawRect(this->topBarRender, *this->brushes.blackPen);
-        graphics.FillRect(this->topBarRender, *this->brushes.euroscopeBackgroundBrush);
-        graphics.DrawString(L"ASR", this->topBarRender, *this->brushes.whiteBrush);
+        graphics.DrawRect(this->topBarRender, *this->brushes.borderPen);
+        graphics.FillRect(this->topBarRender, *this->brushes.headerBrush);
+        graphics.DrawString(L"ASR", this->topBarRender, *this->brushes.textBrush);
         radarScreen.RegisterScreenObject(this->menuBarClickspotId, "", this->topBarArea, true);
 
         // The toggle button - no draggable
-        graphics.DrawRect(this->hideSpotRender, *this->brushes.blackPen);
-        graphics.FillRect(this->hideSpotRender, *this->brushes.euroscopeBackgroundBrush);
-        graphics.DrawString(L"X", this->hideSpotRender, *this->brushes.whiteBrush);
+        graphics.DrawRect(this->hideSpotRender, *this->brushes.borderPen);
+        graphics.FillRect(this->hideSpotRender, *this->brushes.headerBrush);
+        graphics.DrawString(L"X", this->hideSpotRender, *this->brushes.textBrush);
         radarScreen.RegisterScreenObject(this->hideClickspotId, "", this->hideClickspotArea, false);
     }
 
diff --git a/src/plugin/regional/RegionalPressureRenderer.h b/src/plugin/regional/RegionalPressureRenderer.h
index f80510b27..3bc24889a 100644
--- a/src/plugin/regional/RegionalPressureRenderer.h
+++ b/src/plugin/regional/RegionalPressureRenderer.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "RegionalPressureRendererConfiguration.h"
 #include "dialog/DialogManager.h"
 #include "euroscope/AsrEventHandlerInterface.h"
 #include "plugin/PopupMenuItem.h"
 #include "radarscreen/ConfigurableDisplayInterface.h"
 #include "radarscreen/RadarRenderableInterface.h"
+#include "RegionalPressureRendererConfiguration.h"
 
 namespace UKControllerPlugin {
     namespace Euroscope {
@@ -141,7 +141,7 @@ namespace UKControllerPlugin::Regional {
 
         inline static const int DEFAULT_POSITION = 100;
         inline static const int LEFT_COLUMN_WIDTH = 100;
-        inline static const int ROW_HEIGHT = 20;
+        inline static const int ROW_HEIGHT = 15;
         inline static const int HIDE_CLICKSPOT_WIDTH = 50;
         inline static const int APPEND_ZERO_LIMIT = 1000;
     };
diff --git a/src/plugin/wake/WakeCalculatorDisplay.cpp b/src/plugin/wake/WakeCalculatorDisplay.cpp
index 3895dda77..0df4d00be 100644
--- a/src/plugin/wake/WakeCalculatorDisplay.cpp
+++ b/src/plugin/wake/WakeCalculatorDisplay.cpp
@@ -1,20 +1,21 @@
-#include "ArrivalWakeInterval.h"
-#include "DepartureWakeInterval.h"
 #include "WakeCalculatorDisplay.h"
-#include "WakeCategory.h"
-#include "WakeCategoryMapperInterface.h"
-#include "WakeCalculatorOptions.h"
-#include "WakeIntervalFormatter.h"
+#include "ArrivalWakeInterval.h"
 #include "components/ClickableArea.h"
 #include "components/CollapsibleWindowTitleBar.h"
+#include "DepartureWakeInterval.h"
 #include "euroscope/EuroscopePluginLoopbackInterface.h"
 #include "euroscope/EuroscopeRadarLoopbackInterface.h"
 #include "euroscope/UserSetting.h"
 #include "graphics/FontManager.h"
 #include "graphics/GdiGraphicsInterface.h"
+#include "graphics/GdiplusBrushes.h"
 #include "graphics/StringFormatManager.h"
 #include "helper/HelperFunctions.h"
 #include "list/PopupListInterface.h"
+#include "WakeCalculatorOptions.h"
+#include "WakeCategory.h"
+#include "WakeCategoryMapperInterface.h"
+#include "WakeIntervalFormatter.h"
 
 namespace UKControllerPlugin::Wake {
 
@@ -24,6 +25,7 @@ namespace UKControllerPlugin::Wake {
         std::shared_ptr<List::PopupListInterface> followCallsignSelector,
         std::shared_ptr<List::PopupListInterface> wakeSchemeSelector,
         Euroscope::EuroscopePluginLoopbackInterface& plugin,
+        const Windows::GdiplusBrushes& brushes,
         int screenObjectId)
         : options(std::move(options)), leadCallsignSelector(std::move(leadCallsignSelector)),
           followCallsignSelector(std::move(followCallsignSelector)), wakeSchemeSelector(std::move(wakeSchemeSelector)),
@@ -32,11 +34,9 @@ namespace UKControllerPlugin::Wake {
                                   L"Wake Turbulence Calculator",
                                   TitleBarArea(),
                                   [this]() -> bool { return this->contentCollapsed; },
-                                  screenObjectId)),
-          backgroundBrush(std::make_shared<Gdiplus::SolidBrush>(BACKGROUND_COLOUR)),
-          textBrush(std::make_shared<Gdiplus::SolidBrush>(TEXT_COLOUR)),
-          resultBrush(std::make_shared<Gdiplus::SolidBrush>(RESULT_COLOUR)),
-          dividingLinePen(std::make_shared<Gdiplus::Pen>(TEXT_COLOUR)),
+                                  screenObjectId,
+                                  brushes)),
+          brushes(brushes),
           leadClickspot(Components::ClickableArea::Create(leadTextArea, screenObjectId, "leadcallsign", false)),
           followingClickspot(
               Components::ClickableArea::Create(followingTextArea, screenObjectId, "followcallsign", false)),
@@ -151,7 +151,7 @@ namespace UKControllerPlugin::Wake {
         graphics.Translated(windowPosition.x, windowPosition.y, [&graphics, &radarScreen, this]() {
             // Draw the content if not collapsed
             if (!this->contentCollapsed) {
-                graphics.FillRect(this->contentArea, *backgroundBrush);
+                graphics.FillRect(this->contentArea, *this->brushes.backgroundBrush);
                 this->RenderScheme(graphics, radarScreen);
                 this->RenderIntermediate(graphics, radarScreen);
                 this->RenderMode(graphics, radarScreen);
@@ -162,7 +162,7 @@ namespace UKControllerPlugin::Wake {
             }
 
             // Do title bar, so it's always on top.
-            titleBar->Draw(graphics, radarScreen);
+            titleBar->DrawTheme(graphics, radarScreen, this->brushes);
         });
     }
 
@@ -207,13 +207,13 @@ namespace UKControllerPlugin::Wake {
         graphics.DrawString(
             L"Scheme:",
             schemeStaticArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
         graphics.DrawString(
             HelperFunctions::ConvertToWideString(options->Scheme()),
             schemeTextArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
         this->schemeClickspot->Apply(graphics, radarScreen);
@@ -225,13 +225,13 @@ namespace UKControllerPlugin::Wake {
         graphics.DrawString(
             L"Mode:",
             departureArrivalStaticArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
         graphics.DrawString(
             options->Arrivals() ? L"Arrival" : L"Departure",
             departureArrivaTextArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
         this->departureArrivalClickspot->Apply(graphics, radarScreen);
@@ -244,13 +244,13 @@ namespace UKControllerPlugin::Wake {
         graphics.DrawString(
             L"Lead:",
             leadStaticArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
         graphics.DrawString(
             HelperFunctions::ConvertToWideString(lead.empty() ? "--" : lead),
             leadTextArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
         this->leadClickspot->Apply(graphics, radarScreen);
@@ -263,13 +263,13 @@ namespace UKControllerPlugin::Wake {
         graphics.DrawString(
             L"Follow:",
             followingStaticArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
         graphics.DrawString(
             HelperFunctions::ConvertToWideString(following.empty() ? "--" : following),
             followingTextArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
         this->followingClickspot->Apply(graphics, radarScreen);
@@ -281,13 +281,13 @@ namespace UKControllerPlugin::Wake {
         graphics.DrawString(
             L"Intermediate:",
             intermediateStaticArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
         graphics.DrawString(
             options->Intermediate() ? L"Yes" : L"No",
             intermediateTextArea,
-            *textBrush,
+            *this->brushes.textBrush,
             Graphics::StringFormatManager::Instance().GetLeftAlign(),
             Graphics::FontManager::Instance().GetDefault());
         this->intermediateClickspot->Apply(graphics, radarScreen);
@@ -295,7 +295,7 @@ namespace UKControllerPlugin::Wake {
 
     void WakeCalculatorDisplay::RenderDividingLine(Windows::GdiGraphicsInterface& graphics)
     {
-        graphics.DrawLine(*dividingLinePen, dividingLineStart, dividingLineEnd);
+        graphics.DrawLine(*this->brushes.borderPen, dividingLineStart, dividingLineEnd);
     }
 
     void WakeCalculatorDisplay::RenderSeparationRequirement(Windows::GdiGraphicsInterface& graphics)
@@ -308,7 +308,7 @@ namespace UKControllerPlugin::Wake {
             graphics.DrawString(
                 L"--",
                 calculationResultArea,
-                *resultBrush,
+                *this->brushes.mainAircraftTextBrush,
                 Graphics::StringFormatManager::Instance().GetCentreAlign(),
                 Graphics::FontManager::Instance().Get(16));
             return;
@@ -321,7 +321,7 @@ namespace UKControllerPlugin::Wake {
             graphics.DrawString(
                 L"--",
                 calculationResultArea,
-                *resultBrush,
+                *this->brushes.mainAircraftTextBrush,
                 Graphics::StringFormatManager::Instance().GetCentreAlign(),
                 Graphics::FontManager::Instance().Get(16));
             return;
@@ -333,7 +333,7 @@ namespace UKControllerPlugin::Wake {
                                                 HelperFunctions::ConvertToWideString(followingCategory->Code()) +
                                                 (options->Intermediate() ? L" (intermediate)" : L"");
 
-        graphics.DrawString(categoryComparison, comparisonTextArea, *textBrush);
+        graphics.DrawString(categoryComparison, comparisonTextArea, *this->brushes.textBrush);
 
         // Check for intervals and display if present
         const auto interval = RelevantInterval(*leadCategory, *followingCategory, options->Intermediate());
@@ -341,7 +341,7 @@ namespace UKControllerPlugin::Wake {
             graphics.DrawString(
                 L"N/A",
                 calculationResultArea,
-                *resultBrush,
+                *this->brushes.mainAircraftTextBrush,
                 Graphics::StringFormatManager::Instance().GetCentreAlign(),
                 Graphics::FontManager::Instance().Get(16));
             return;
@@ -350,7 +350,7 @@ namespace UKControllerPlugin::Wake {
         graphics.DrawString(
             FormatInterval(*interval),
             calculationResultArea,
-            *resultBrush,
+            *this->brushes.mainAircraftTextBrush,
             Graphics::StringFormatManager::Instance().GetCentreAlign(),
             Graphics::FontManager::Instance().Get(16));
     }
diff --git a/src/plugin/wake/WakeCalculatorDisplay.h b/src/plugin/wake/WakeCalculatorDisplay.h
index 210df9e24..b4c8dc5ea 100644
--- a/src/plugin/wake/WakeCalculatorDisplay.h
+++ b/src/plugin/wake/WakeCalculatorDisplay.h
@@ -14,6 +14,10 @@ namespace UKControllerPlugin {
     namespace Euroscope {
         class EuroscopePluginLoopbackInterface;
     } // namespace Euroscope
+    namespace Windows {
+        class GdiGraphicsInterface;
+        struct GdiplusBrushes;
+    } // namespace Windows
 } // namespace UKControllerPlugin
 
 namespace UKControllerPlugin::Wake {
@@ -32,6 +36,7 @@ namespace UKControllerPlugin::Wake {
             std::shared_ptr<List::PopupListInterface> followCallsignSelector,
             std::shared_ptr<List::PopupListInterface> wakeSchemeSelector,
             Euroscope::EuroscopePluginLoopbackInterface& plugin,
+            const UKControllerPlugin::Windows::GdiplusBrushes& brushes,
             int screenObjectId);
         [[nodiscard]] auto IsVisible() const -> bool override;
         [[nodiscard]] auto IsCollapsed() const -> bool;
@@ -75,7 +80,7 @@ namespace UKControllerPlugin::Wake {
         POINT windowPosition = DEFAULT_WINDOW_POSITION;
 
         inline static const int WINDOW_WIDTH = 350;
-        inline static const int TITLE_BAR_HEIGHT = 20;
+        inline static const int TITLE_BAR_HEIGHT = 15;
         inline static const int CONTENT_HEIGHT = 150;
         inline static const int TEXT_INSET = 5;
 
@@ -96,13 +101,7 @@ namespace UKControllerPlugin::Wake {
         std::shared_ptr<Components::TitleBar> titleBar;
 
         // Pens and brushes
-        const Gdiplus::Color BACKGROUND_COLOUR = Gdiplus::Color(64, 64, 64);
-        const Gdiplus::Color TEXT_COLOUR = Gdiplus::Color(225, 225, 225);
-        const Gdiplus::Color RESULT_COLOUR = Gdiplus::Color(55, 249, 1);
-        std::shared_ptr<Gdiplus::Brush> backgroundBrush;
-        std::shared_ptr<Gdiplus::Brush> textBrush;
-        std::shared_ptr<Gdiplus::Brush> resultBrush;
-        std::shared_ptr<Gdiplus::Pen> dividingLinePen;
+        const UKControllerPlugin::Windows::GdiplusBrushes& brushes;
 
         // Drawing rects
         Gdiplus::Rect contentArea;
diff --git a/src/plugin/wake/WakeModule.cpp b/src/plugin/wake/WakeModule.cpp
index 3a4856305..e0ad238e4 100644
--- a/src/plugin/wake/WakeModule.cpp
+++ b/src/plugin/wake/WakeModule.cpp
@@ -1,31 +1,33 @@
+#include "WakeModule.h"
 #include "aircraft/CallsignSelectionListFactory.h"
+#include "bootstrap/PersistenceContainer.h"
+#include "dependency/DependencyLoaderInterface.h"
+#include "euroscope/AsrEventHandlerCollection.h"
+#include "flightplan/FlightPlanEventHandlerCollection.h"
 #include "FlightplanWakeCategoryMapper.h"
 #include "FollowingWakeCallsignProvider.h"
+#include "graphics/GdiplusBrushes.h"
 #include "LeadWakeCallsignProvider.h"
+#include "list/PopupList.h"
+#include "list/PopupListFactory.h"
+#include "plugin/UKPlugin.h"
+#include "radarscreen/MenuToggleableDisplayFactory.h"
+#include "radarscreen/RadarRenderableCollection.h"
+#include "tag/TagItemCollection.h"
 #include "WakeCalculatorDisplay.h"
 #include "WakeCalculatorOptions.h"
 #include "WakeCategoryEventHandler.h"
 #include "WakeCategoryMapperCollection.h"
 #include "WakeCategoryMapperCollectionFactory.h"
-#include "WakeModule.h"
 #include "WakeScheme.h"
 #include "WakeSchemeCollection.h"
 #include "WakeSchemeCollectionFactory.h"
 #include "WakeSchemeProvider.h"
-#include "bootstrap/PersistenceContainer.h"
-#include "dependency/DependencyLoaderInterface.h"
-#include "euroscope/AsrEventHandlerCollection.h"
-#include "flightplan/FlightPlanEventHandlerCollection.h"
-#include "list/PopupList.h"
-#include "list/PopupListFactory.h"
-#include "plugin/UKPlugin.h"
-#include "radarscreen/MenuToggleableDisplayFactory.h"
-#include "radarscreen/RadarRenderableCollection.h"
-#include "tag/TagItemCollection.h"
 
 using UKControllerPlugin::Bootstrap::PersistenceContainer;
 using UKControllerPlugin::Dependency::DependencyLoaderInterface;
 using UKControllerPlugin::Wake::WakeCategoryEventHandler;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 
 namespace UKControllerPlugin::Wake {
 
@@ -74,7 +76,8 @@ namespace UKControllerPlugin::Wake {
         const Bootstrap::PersistenceContainer& container,
         RadarScreen::RadarRenderableCollection& renderables,
         Euroscope::AsrEventHandlerCollection& asrHandlers,
-        const RadarScreen::MenuToggleableDisplayFactory& toggleableDisplayFactory)
+        const RadarScreen::MenuToggleableDisplayFactory& toggleableDisplayFactory,
+        const GdiplusBrushes& brushes)
     {
         auto options = std::make_shared<WakeCalculatorOptions>();
         options->Scheme("UK");
@@ -99,6 +102,7 @@ namespace UKControllerPlugin::Wake {
                 std::make_shared<WakeSchemeProvider>(options, *container.wakeSchemes, *container.aircraftTypeMapper),
                 "Wake Calculator Scheme"),
             *container.plugin,
+            *container.brushes,
             renderables.ReserveScreenObjectIdentifier(rendererId));
 
         renderables.RegisterRenderer(rendererId, renderer, RadarScreen::RadarRenderableCollection::afterLists);
diff --git a/src/plugin/wake/WakeModule.h b/src/plugin/wake/WakeModule.h
index c07020672..8f79048a7 100644
--- a/src/plugin/wake/WakeModule.h
+++ b/src/plugin/wake/WakeModule.h
@@ -14,6 +14,9 @@ namespace UKControllerPlugin {
         class MenuToggleableDisplayFactory;
         class RadarRenderableCollection;
     } // namespace RadarScreen
+    namespace Windows {
+        struct GdiplusBrushes;
+    } // namespace Windows
 } // namespace UKControllerPlugin
 
 namespace UKControllerPlugin::Wake {
@@ -26,5 +29,6 @@ namespace UKControllerPlugin::Wake {
         const UKControllerPlugin::Bootstrap::PersistenceContainer& container,
         RadarScreen::RadarRenderableCollection& renderables,
         Euroscope::AsrEventHandlerCollection& asrHandlers,
-        const RadarScreen::MenuToggleableDisplayFactory& toggleableDisplayFactory);
+        const RadarScreen::MenuToggleableDisplayFactory& toggleableDisplayFactory,
+        const Windows::GdiplusBrushes& brushes);
 } // namespace UKControllerPlugin::Wake
diff --git a/test/plugin/CMakeLists.txt b/test/plugin/CMakeLists.txt
index 39b22dd37..b3ac41cd5 100644
--- a/test/plugin/CMakeLists.txt
+++ b/test/plugin/CMakeLists.txt
@@ -62,6 +62,7 @@ set(test__components
     "components/BrushSwitcherTest.cpp"
     "components/ButtonTest.cpp"
     "components/ClickableAreaTest.cpp"
+    "components/StandardButtonsTest.cpp"
     "components/TitleBarTest.cpp"
 )
 source_group("test\\components" FILES ${test__components})
@@ -159,6 +160,11 @@ set(test__geometry
         geometry/LengthTest.cpp)
 source_group("test\\geometry" FILES ${test__geometry})
 
+set(test__graphics
+    "graphics/GdiplusBrushesTest.cpp"
+    "graphics/ThemeTest.cpp")
+source_group("test\\graphics" FILES ${test__graphics})
+
 set(test__handoff
     "handoff/HandoffCollectionFactoryTest.cpp"
     "handoff/HandoffCollectionTest.cpp"
@@ -640,6 +646,7 @@ set(ALL_FILES
     ${test__flightplan}
     ${test__flightrule}
     ${test__geometry}
+    ${test__graphics}
     ${test__handoff}
     ${test__headings}
     ${test__historytrail}
diff --git a/test/plugin/approach/ApproachSequencerDisplayTest.cpp b/test/plugin/approach/ApproachSequencerDisplayTest.cpp
index acc9932e5..987e43b49 100644
--- a/test/plugin/approach/ApproachSequencerDisplayTest.cpp
+++ b/test/plugin/approach/ApproachSequencerDisplayTest.cpp
@@ -1,11 +1,12 @@
+#include "approach/ApproachSequencerDisplay.h"
+#include "airfield/AirfieldCollection.h"
 #include "approach/ApproachSequence.h"
 #include "approach/ApproachSequencedAircraft.h"
 #include "approach/ApproachSequencer.h"
-#include "approach/ApproachSequencerDisplay.h"
 #include "approach/ApproachSequencerDisplayOptions.h"
 #include "approach/ApproachSequencerOptions.h"
 #include "approach/ApproachSpacingCalculator.h"
-#include "airfield/AirfieldCollection.h"
+#include "graphics/GdiplusBrushes.h"
 #include "wake/WakeCategoryMapperCollection.h"
 
 using UKControllerPlugin::Airfield::AirfieldCollection;
@@ -16,6 +17,7 @@ using UKControllerPlugin::Approach::ApproachSequencerOptions;
 using UKControllerPlugin::Approach::ApproachSequencingMode;
 using UKControllerPlugin::Approach::ApproachSpacingCalculator;
 using UKControllerPlugin::Wake::WakeCategoryMapperCollection;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 
 namespace UKControllerPluginTest::Approach {
     class ApproachSequencerDisplayTest : public testing::Test
@@ -39,10 +41,12 @@ namespace UKControllerPluginTest::Approach {
                                                                                 airfieldTargetList,
                                                                                 airfieldSeparationList,
                                                                                 plugin,
+                                                                                brushes,
                                                                                 55)
         {
         }
 
+        GdiplusBrushes brushes;
         ApproachSequencerOptions sequencerOptions;
         testing::NiceMock<Euroscope::MockEuroscopePluginLoopbackInterface> plugin;
         AirfieldCollection airfields;
diff --git a/test/plugin/bootstrap/ExternalsBootstrapTest.cpp b/test/plugin/bootstrap/ExternalsBootstrapTest.cpp
index 9b3488c1b..0d8101da5 100644
--- a/test/plugin/bootstrap/ExternalsBootstrapTest.cpp
+++ b/test/plugin/bootstrap/ExternalsBootstrapTest.cpp
@@ -3,8 +3,8 @@
 #include "curl/CurlInterface.h"
 #include "curl/CurlRequest.h"
 #include "dialog/DialogManager.h"
-#include "graphics/GdiplusBrushes.h"
 #include "graphics/GdiGraphicsWrapper.h"
+#include "graphics/GdiplusBrushes.h"
 #include "helper/HelperFunctions.h"
 
 using UKControllerPlugin::HelperFunctions;
@@ -79,7 +79,7 @@ namespace UKControllerPluginTest::Bootstrap {
         HINSTANCE dll = 0;
         ExternalsBootstrap::Bootstrap(container, dll);
 
-        EXPECT_NO_THROW(container.brushes->euroscopeBackgroundBrush->GetType());
+        EXPECT_EQ(container.brushes->euroscopeBackground.GetR(), 11);
     }
 
     TEST_F(ExternalsBootstrapTest, BootstrapCreatesGraphicsWrapper)
diff --git a/test/plugin/components/StandardButtonsTest.cpp b/test/plugin/components/StandardButtonsTest.cpp
new file mode 100644
index 000000000..a6055d17f
--- /dev/null
+++ b/test/plugin/components/StandardButtonsTest.cpp
@@ -0,0 +1,42 @@
+#include "components/StandardButtons.h"
+#include "graphics/GdiplusBrushes.h"
+
+using testing::_;
+using UKControllerPlugin::Components::CloseButton;
+using UKControllerPlugin::Components::CollapseButton;
+using UKControllerPlugin::Windows::GdiplusBrushes;
+
+namespace UKControllerPluginTest::Components {
+
+    class StandardButtonsTest : public testing::Test
+    {
+        public:
+        StandardButtonsTest() = default;
+        GdiplusBrushes brushes;
+        testing::NiceMock<Windows::MockGraphicsInterface> mockGraphics;
+    };
+
+    TEST_F(StandardButtonsTest, CloseButtonThemedDoesNotCrash)
+    {
+        auto button = CloseButton(brushes);
+        EXPECT_NE(nullptr, button.target_type().name());
+    }
+
+    TEST_F(StandardButtonsTest, CollapseButtonThemedDoesNotCrash)
+    {
+        auto button = CollapseButton(brushes, []() { return false; });
+        EXPECT_NE(nullptr, button.target_type().name());
+    }
+
+    TEST_F(StandardButtonsTest, CloseButtonWithColorDoesNotCrash)
+    {
+        auto button = CloseButton(Gdiplus::Color(255, 0, 0));
+        EXPECT_NE(nullptr, button.target_type().name());
+    }
+
+    TEST_F(StandardButtonsTest, CollapseButtonWithColorDoesNotCrash)
+    {
+        auto button = CollapseButton(Gdiplus::Color(255, 0, 0), []() { return false; });
+        EXPECT_NE(nullptr, button.target_type().name());
+    }
+} // namespace UKControllerPluginTest::Components
diff --git a/test/plugin/components/TitleBarTest.cpp b/test/plugin/components/TitleBarTest.cpp
index d6b1c2eb3..6d99a9a4c 100644
--- a/test/plugin/components/TitleBarTest.cpp
+++ b/test/plugin/components/TitleBarTest.cpp
@@ -1,8 +1,10 @@
 #include "components/TitleBar.h"
+#include "graphics/GdiplusBrushes.h"
 
 using testing::_;
 using testing::Ref;
 using UKControllerPlugin::Components::TitleBar;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 
 namespace UKControllerPluginTest::Components {
     class TitleBarTest : public testing::Test
@@ -19,6 +21,7 @@ namespace UKControllerPluginTest::Components {
         std::shared_ptr<Gdiplus::Pen> pen;
         std::shared_ptr<Gdiplus::Brush> brush;
         std::shared_ptr<TitleBar> titlebar;
+        GdiplusBrushes brushes;
         testing::NiceMock<Windows::MockGraphicsInterface> mockGraphics;
         testing::NiceMock<Euroscope::MockEuroscopeRadarScreenLoopbackInterface> mockRadarScreen;
     };
@@ -90,4 +93,26 @@ namespace UKControllerPluginTest::Components {
 
         this->titlebar->Draw(mockGraphics, mockRadarScreen);
     }
+
+    TEST_F(TitleBarTest, DrawThemeFillsRectWithHeaderBrush)
+    {
+        EXPECT_CALL(this->mockGraphics, FillRectRect(GdiRectEq(Gdiplus::Rect{10, 20, 100, 100}), _)).Times(1);
+
+        this->titlebar->DrawTheme(mockGraphics, mockRadarScreen, this->brushes);
+    }
+
+    TEST_F(TitleBarTest, DrawThemeDrawsStringWithTextBrush)
+    {
+        EXPECT_CALL(this->mockGraphics, DrawStringRect(this->title, GdiRectEq(Gdiplus::Rect{10, 20, 100, 100}), _))
+            .Times(1);
+
+        this->titlebar->DrawTheme(mockGraphics, mockRadarScreen, this->brushes);
+    }
+
+    TEST_F(TitleBarTest, DrawThemeDrawsRectWithBorderPen)
+    {
+        EXPECT_CALL(this->mockGraphics, DrawRectRect(GdiRectEq(Gdiplus::Rect{10, 20, 100, 100}), _)).Times(1);
+
+        this->titlebar->DrawTheme(mockGraphics, mockRadarScreen, this->brushes);
+    }
 } // namespace UKControllerPluginTest::Components
diff --git a/test/plugin/departure/DepartureCoordinationListTest.cpp b/test/plugin/departure/DepartureCoordinationListTest.cpp
index 5eb7a702a..6157df298 100644
--- a/test/plugin/departure/DepartureCoordinationListTest.cpp
+++ b/test/plugin/departure/DepartureCoordinationListTest.cpp
@@ -1,10 +1,11 @@
+#include "departure/DepartureCoordinationList.h"
 #include "collection/Collection.h"
 #include "controller/ActiveCallsignCollection.h"
 #include "controller/ControllerPosition.h"
 #include "controller/ControllerPositionCollection.h"
-#include "departure/DepartureCoordinationList.h"
 #include "dialog/DialogManager.h"
 #include "euroscope/UserSetting.h"
+#include "graphics/GdiplusBrushes.h"
 #include "message/UserMessager.h"
 #include "prenote/PrenoteMessageCollection.h"
 #include "releases/DepartureReleaseEventHandler.h"
@@ -14,6 +15,7 @@ using testing::Test;
 using UKControllerPlugin::Departure::DepartureCoordinationList;
 using UKControllerPlugin::Message::UserMessager;
 using UKControllerPlugin::Prenote::PrenoteMessageCollection;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 
 namespace UKControllerPluginTest::Departure {
 
@@ -22,8 +24,9 @@ namespace UKControllerPluginTest::Departure {
         public:
         DepartureCoordinationListTest()
             : userSettings(mockAsrProvider), messager(mockPlugin),
-              list(std::make_shared<DepartureCoordinationList>(
-                  handler, prenotes, mockPlugin, controllers, activeCallsigns, 3)),
+              list(
+                  std::make_shared<DepartureCoordinationList>(
+                      handler, prenotes, mockPlugin, controllers, activeCallsigns, brushes, 3)),
               handler(
                   std::make_shared<UKControllerPlugin::Releases::DepartureReleaseRequestCollection>(),
                   mockApi,
@@ -57,6 +60,7 @@ namespace UKControllerPluginTest::Departure {
         testing::NiceMock<Euroscope::MockUserSettingProviderInterface> mockAsrProvider;
         UKControllerPlugin::Euroscope::UserSetting userSettings;
         UserMessager messager;
+        GdiplusBrushes brushes;
         std::shared_ptr<DepartureCoordinationList> list;
         UKControllerPlugin::Releases::DepartureReleaseEventHandler handler;
         UKControllerPlugin::Controller::ActiveCallsignCollection activeCallsigns;
diff --git a/test/plugin/departure/DepartureModuleTest.cpp b/test/plugin/departure/DepartureModuleTest.cpp
index 7a1edc2c2..2d32a17c6 100644
--- a/test/plugin/departure/DepartureModuleTest.cpp
+++ b/test/plugin/departure/DepartureModuleTest.cpp
@@ -1,23 +1,24 @@
 #include "departure/DepartureModule.h"
+#include "bootstrap/PersistenceContainer.h"
+#include "controller/HandoffEventHandlerCollection.h"
 #include "departure/AircraftDepartedEvent.h"
 #include "departure/UserShouldClearDepartureDataEvent.h"
 #include "departure/UserShouldClearDepartureDataMonitor.h"
+#include "dialog/DialogManager.h"
+#include "euroscope/AsrEventHandlerCollection.h"
+#include "eventhandler/EventBus.h"
+#include "eventhandler/EventStream.h"
 #include "flightplan/FlightPlanEventHandlerCollection.h"
+#include "graphics/GdiplusBrushes.h"
 #include "mock/MockDepartureHandoffResolver.h"
-#include "timedevent/TimedEventCollection.h"
-#include "bootstrap/PersistenceContainer.h"
-#include "push/PushEventProcessorCollection.h"
-#include "tag/TagItemCollection.h"
+#include "ownership/AirfieldServiceProviderCollection.h"
 #include "plugin/FunctionCallEventHandler.h"
-#include "controller/HandoffEventHandlerCollection.h"
-#include "dialog/DialogManager.h"
-#include "euroscope/AsrEventHandlerCollection.h"
-#include "radarscreen/RadarRenderableCollection.h"
+#include "push/PushEventProcessorCollection.h"
 #include "radarscreen/ConfigurableDisplayCollection.h"
-#include "ownership/AirfieldServiceProviderCollection.h"
+#include "radarscreen/RadarRenderableCollection.h"
+#include "tag/TagItemCollection.h"
 #include "test/EventBusTestCase.h"
-#include "eventhandler/EventBus.h"
-#include "eventhandler/EventStream.h"
+#include "timedevent/TimedEventCollection.h"
 #include <gmock/gmock-nice-strict.h>
 
 using ::testing::NiceMock;
@@ -36,6 +37,7 @@ using UKControllerPlugin::RadarScreen::ConfigurableDisplayCollection;
 using UKControllerPlugin::RadarScreen::RadarRenderableCollection;
 using UKControllerPlugin::Tag::TagItemCollection;
 using UKControllerPlugin::TimedEvent::TimedEventCollection;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 using UKControllerPluginTest::Dependency::MockDependencyLoader;
 using UKControllerPluginTest::Dialog::MockDialogProvider;
 using UKControllerPluginTest::Euroscope::MockEuroscopePluginLoopbackInterface;
@@ -58,6 +60,7 @@ namespace UKControllerPluginTest::Departure {
                 std::make_shared<testing::NiceMock<Handoff::MockDepartureHandoffResolver>>();
             container.airfieldOwnership =
                 std::make_shared<UKControllerPlugin::Ownership::AirfieldServiceProviderCollection>();
+            this->container.brushes = std::make_unique<GdiplusBrushes>();
         }
 
         PersistenceContainer container;
diff --git a/test/plugin/departure/ToggleDepartureCoordinationListTest.cpp b/test/plugin/departure/ToggleDepartureCoordinationListTest.cpp
index b6add9ffb..9c8f9c0dc 100644
--- a/test/plugin/departure/ToggleDepartureCoordinationListTest.cpp
+++ b/test/plugin/departure/ToggleDepartureCoordinationListTest.cpp
@@ -1,9 +1,10 @@
+#include "departure/ToggleDepartureCoordinationList.h"
 #include "collection/Collection.h"
 #include "controller/ActiveCallsignCollection.h"
 #include "controller/ControllerPositionCollection.h"
 #include "departure/DepartureCoordinationList.h"
-#include "departure/ToggleDepartureCoordinationList.h"
 #include "dialog/DialogManager.h"
+#include "graphics/GdiplusBrushes.h"
 #include "message/UserMessager.h"
 #include "prenote/PrenoteMessageCollection.h"
 #include "releases/DepartureReleaseEventHandler.h"
@@ -13,6 +14,7 @@ using UKControllerPlugin::Departure::DepartureCoordinationList;
 using UKControllerPlugin::Departure::ToggleDepartureCoordinationList;
 using UKControllerPlugin::Message::UserMessager;
 using UKControllerPlugin::Prenote::PrenoteMessageCollection;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 
 namespace UKControllerPluginTest::Departure {
 
@@ -33,8 +35,9 @@ namespace UKControllerPluginTest::Departure {
                   messager,
                   103,
                   104),
-              list(std::make_shared<DepartureCoordinationList>(
-                  handler, prenotes, mockPlugin, controllers, activeCallsigns, 3)),
+              brushes(), list(
+                             std::make_shared<DepartureCoordinationList>(
+                                 handler, prenotes, mockPlugin, controllers, activeCallsigns, brushes, 3)),
               dialogManager(dialogProvider)
         {
         }
@@ -54,6 +57,7 @@ namespace UKControllerPluginTest::Departure {
         UserMessager messager;
         PrenoteMessageCollection prenotes;
         UKControllerPlugin::Releases::DepartureReleaseEventHandler handler;
+        GdiplusBrushes brushes;
         std::shared_ptr<DepartureCoordinationList> list;
         UKControllerPlugin::Controller::ActiveCallsignCollection activeCallsigns;
         testing::NiceMock<Dialog::MockDialogProvider> dialogProvider;
diff --git a/test/plugin/euroscope/GeneralSettingsConfigurationBootstrapTest.cpp b/test/plugin/euroscope/GeneralSettingsConfigurationBootstrapTest.cpp
index 98bf62a52..28eb1f46f 100644
--- a/test/plugin/euroscope/GeneralSettingsConfigurationBootstrapTest.cpp
+++ b/test/plugin/euroscope/GeneralSettingsConfigurationBootstrapTest.cpp
@@ -1,10 +1,11 @@
 #include "euroscope/GeneralSettingsConfigurationBootstrap.h"
-#include "plugin/FunctionCallEventHandler.h"
-#include "radarscreen/ConfigurableDisplayCollection.h"
 #include "command/CommandHandlerCollection.h"
-#include "euroscope/UserSetting.h"
 #include "dialog/DialogManager.h"
+#include "euroscope/UserSetting.h"
 #include "euroscope/UserSettingAwareCollection.h"
+#include "graphics/GdiplusBrushes.h"
+#include "plugin/FunctionCallEventHandler.h"
+#include "radarscreen/ConfigurableDisplayCollection.h"
 #include "setting/SettingRepository.h"
 
 using UKControllerPlugin::Command::CommandHandlerCollection;
@@ -15,6 +16,7 @@ using UKControllerPlugin::Euroscope::UserSettingAwareCollection;
 using UKControllerPlugin::Plugin::FunctionCallEventHandler;
 using UKControllerPlugin::RadarScreen::ConfigurableDisplayCollection;
 using UKControllerPlugin::Setting::SettingRepository;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 using UKControllerPluginTest::Dialog::MockDialogProvider;
 using UKControllerPluginTest::Euroscope::MockUserSettingProviderInterface;
 
@@ -40,6 +42,7 @@ namespace UKControllerPluginTest {
             NiceMock<MockDialogProvider> mockDialogProvider;
             NiceMock<MockUserSettingProviderInterface> mockUserSettingProvider;
             NiceMock<Windows::MockWinApi> mockWindows;
+            GdiplusBrushes brushes;
             SettingRepository settings;
             DialogManager dialogManager;
         };
@@ -47,7 +50,11 @@ namespace UKControllerPluginTest {
         TEST_F(GeneralSettingsConfigurationBootstrapTest, BootstrapRadarScreenRegistersConfigurationCallback)
         {
             GeneralSettingsConfigurationBootstrap::BootstrapRadarScreen(
-                this->functionHandler, this->configurableDisplays, this->commandHandlers, this->dialogManager);
+                this->functionHandler,
+                this->configurableDisplays,
+                this->brushes,
+                this->commandHandlers,
+                this->dialogManager);
 
             EXPECT_EQ(1, this->functionHandler.CountCallbacks());
         }
@@ -55,7 +62,11 @@ namespace UKControllerPluginTest {
         TEST_F(GeneralSettingsConfigurationBootstrapTest, BootstrapRadarScreenRegistersInTheConfigurationMenu)
         {
             GeneralSettingsConfigurationBootstrap::BootstrapRadarScreen(
-                this->functionHandler, this->configurableDisplays, this->commandHandlers, this->dialogManager);
+                this->functionHandler,
+                this->configurableDisplays,
+                this->brushes,
+                this->commandHandlers,
+                this->dialogManager);
 
             EXPECT_EQ(1, this->configurableDisplays.CountDisplays());
         }
@@ -63,7 +74,11 @@ namespace UKControllerPluginTest {
         TEST_F(GeneralSettingsConfigurationBootstrapTest, BootstrapRadarScreenRegistersInTheCommandHandlers)
         {
             GeneralSettingsConfigurationBootstrap::BootstrapRadarScreen(
-                this->functionHandler, this->configurableDisplays, this->commandHandlers, this->dialogManager);
+                this->functionHandler,
+                this->configurableDisplays,
+                this->brushes,
+                this->commandHandlers,
+                this->dialogManager);
 
             EXPECT_EQ(1, this->commandHandlers.CountHandlers());
         }
@@ -71,7 +86,12 @@ namespace UKControllerPluginTest {
         TEST_F(GeneralSettingsConfigurationBootstrapTest, BootstrapPluginAddsDialogToDialogManager)
         {
             GeneralSettingsConfigurationBootstrap::BootstrapPlugin(
-                this->dialogManager, this->userSettings, this->userSettingCollection, settings, mockWindows);
+                this->dialogManager,
+                this->userSettings,
+                this->userSettingCollection,
+                settings,
+                mockWindows,
+                this->brushes);
 
             EXPECT_EQ(1, this->dialogManager.CountDialogs());
             EXPECT_TRUE(this->dialogManager.HasDialog(IDD_GENERAL_SETTINGS));
diff --git a/test/plugin/graphics/GdiplusBrushesTest.cpp b/test/plugin/graphics/GdiplusBrushesTest.cpp
new file mode 100644
index 000000000..c00924b18
--- /dev/null
+++ b/test/plugin/graphics/GdiplusBrushesTest.cpp
@@ -0,0 +1,117 @@
+#include "graphics/GdiplusBrushes.h"
+#include "graphics/Theme.h"
+
+using UKControllerPlugin::Graphics::DEFAULT_THEME;
+using UKControllerPlugin::Graphics::ITEC_THEME;
+using UKControllerPlugin::Graphics::NERC_THEME;
+using UKControllerPlugin::Graphics::NODE_THEME;
+using UKControllerPlugin::Graphics::NOVA_THEME;
+using UKControllerPlugin::Graphics::Theme;
+using UKControllerPlugin::Windows::GdiplusBrushes;
+
+namespace UKControllerPluginTest::Graphics {
+
+    class GdiplusBrushesTest : public testing::Test
+    {
+        public:
+        GdiplusBrushesTest() = default;
+        GdiplusBrushes brushes;
+    };
+
+    TEST_F(GdiplusBrushesTest, DefaultConstructorLoadsDefaultTheme)
+    {
+        EXPECT_NE(nullptr, brushes.backgroundBrush);
+        EXPECT_NE(nullptr, brushes.headerBrush);
+        EXPECT_NE(nullptr, brushes.highlightedHeaderBrush);
+        EXPECT_NE(nullptr, brushes.textBrush);
+        EXPECT_NE(nullptr, brushes.highlightedTextBrush);
+        EXPECT_NE(nullptr, brushes.mainAircraftTextBrush);
+        EXPECT_NE(nullptr, brushes.highlightedAircraftTextBrush);
+        EXPECT_NE(nullptr, brushes.timerGreenBrush);
+        EXPECT_NE(nullptr, brushes.timerYellowBrush);
+        EXPECT_NE(nullptr, brushes.timerRedBrush);
+        EXPECT_NE(nullptr, brushes.borderPen);
+        EXPECT_NE(nullptr, brushes.borderBrush);
+        EXPECT_NE(nullptr, brushes.textPen);
+    }
+
+    TEST_F(GdiplusBrushesTest, LoadThemeReplacesBrushes)
+    {
+        // Save old brush
+        auto oldHeaderBrush = brushes.headerBrush;
+
+        // Load a different theme
+        brushes.LoadTheme(NODE_THEME);
+
+        // New brush should be different from old
+        EXPECT_NE(oldHeaderBrush, brushes.headerBrush);
+    }
+
+    TEST_F(GdiplusBrushesTest, LoadThemeUpdatesCompatColorFields)
+    {
+        brushes.LoadTheme(NODE_THEME);
+
+        EXPECT_EQ(0, brushes.background.GetR());
+        EXPECT_EQ(0, brushes.background.GetG());
+        EXPECT_EQ(0, brushes.background.GetB());
+
+        EXPECT_EQ(255, brushes.text.GetR());
+        EXPECT_EQ(255, brushes.text.GetG());
+        EXPECT_EQ(255, brushes.text.GetB());
+    }
+
+    TEST_F(GdiplusBrushesTest, LoadThemeUpdatesStaticColorFields)
+    {
+        // euroscopeBackground and green should survive LoadTheme
+        EXPECT_EQ(255, brushes.euroscopeBackground.GetA());
+        EXPECT_EQ(255, brushes.green.GetA());
+    }
+
+    TEST_F(GdiplusBrushesTest, LoadThemeItecSetsCorrectBackground)
+    {
+        brushes.LoadTheme(ITEC_THEME);
+
+        EXPECT_EQ(195, brushes.background.GetR());
+        EXPECT_EQ(195, brushes.background.GetG());
+        EXPECT_EQ(185, brushes.background.GetB());
+    }
+
+    TEST_F(GdiplusBrushesTest, ReloadingDefaultThemeProducesExpectedColors)
+    {
+        brushes.LoadTheme(DEFAULT_THEME);
+
+        EXPECT_EQ(58, brushes.background.GetR());
+        EXPECT_EQ(57, brushes.background.GetG());
+        EXPECT_EQ(58, brushes.background.GetB());
+    }
+
+    TEST_F(GdiplusBrushesTest, LoadThemeNercSetsCorrectBorder)
+    {
+        brushes.LoadTheme(NERC_THEME);
+
+        EXPECT_EQ(83, brushes.border.GetR());
+        EXPECT_EQ(83, brushes.border.GetG());
+        EXPECT_EQ(83, brushes.border.GetB());
+    }
+
+    TEST_F(GdiplusBrushesTest, LoadThemeNovaSetsCorrectHeaders)
+    {
+        brushes.LoadTheme(NOVA_THEME);
+
+        EXPECT_EQ(0, brushes.header.GetR());
+        EXPECT_EQ(140, brushes.header.GetG());
+        EXPECT_EQ(200, brushes.header.GetB());
+    }
+
+    TEST_F(GdiplusBrushesTest, BorderBrushIsNotNullAfterLoadTheme)
+    {
+        brushes.LoadTheme(DEFAULT_THEME);
+        EXPECT_NE(nullptr, brushes.borderBrush);
+    }
+
+    TEST_F(GdiplusBrushesTest, TextPenIsNotNullAfterLoadTheme)
+    {
+        brushes.LoadTheme(NODE_THEME);
+        EXPECT_NE(nullptr, brushes.textPen);
+    }
+} // namespace UKControllerPluginTest::Graphics
diff --git a/test/plugin/graphics/ThemeTest.cpp b/test/plugin/graphics/ThemeTest.cpp
new file mode 100644
index 000000000..5f461f690
--- /dev/null
+++ b/test/plugin/graphics/ThemeTest.cpp
@@ -0,0 +1,98 @@
+#include "graphics/Theme.h"
+
+using UKControllerPlugin::Graphics::DEFAULT_THEME;
+using UKControllerPlugin::Graphics::ITEC_THEME;
+using UKControllerPlugin::Graphics::NERC_THEME;
+using UKControllerPlugin::Graphics::NODE_THEME;
+using UKControllerPlugin::Graphics::NOVA_THEME;
+
+namespace UKControllerPluginTest::Graphics {
+
+    class ThemeTest : public testing::Test
+    {
+    };
+
+    TEST_F(ThemeTest, DefaultThemeHasCorrectBackground)
+    {
+        EXPECT_EQ(58, DEFAULT_THEME.background.GetR());
+        EXPECT_EQ(57, DEFAULT_THEME.background.GetG());
+        EXPECT_EQ(58, DEFAULT_THEME.background.GetB());
+    }
+
+    TEST_F(ThemeTest, DefaultThemeHasCorrectText)
+    {
+        EXPECT_EQ(227, DEFAULT_THEME.text.GetR());
+        EXPECT_EQ(227, DEFAULT_THEME.text.GetG());
+        EXPECT_EQ(227, DEFAULT_THEME.text.GetB());
+    }
+
+    TEST_F(ThemeTest, NodeThemeHasCorrectBackground)
+    {
+        EXPECT_EQ(0, NODE_THEME.background.GetR());
+        EXPECT_EQ(0, NODE_THEME.background.GetG());
+        EXPECT_EQ(0, NODE_THEME.background.GetB());
+    }
+
+    TEST_F(ThemeTest, NodeThemeHasCorrectHeader)
+    {
+        EXPECT_EQ(160, NODE_THEME.header.GetR());
+        EXPECT_EQ(111, NODE_THEME.header.GetG());
+        EXPECT_EQ(112, NODE_THEME.header.GetB());
+    }
+
+    TEST_F(ThemeTest, NercThemeHasCorrectBackground)
+    {
+        EXPECT_EQ(150, NERC_THEME.background.GetR());
+        EXPECT_EQ(150, NERC_THEME.background.GetG());
+        EXPECT_EQ(150, NERC_THEME.background.GetB());
+    }
+
+    TEST_F(ThemeTest, NercThemeHasCorrectBorder)
+    {
+        EXPECT_EQ(83, NERC_THEME.border.GetR());
+        EXPECT_EQ(83, NERC_THEME.border.GetG());
+        EXPECT_EQ(83, NERC_THEME.border.GetB());
+    }
+
+    TEST_F(ThemeTest, NovaThemeHasCorrectBackground)
+    {
+        EXPECT_EQ(180, NOVA_THEME.background.GetR());
+        EXPECT_EQ(180, NOVA_THEME.background.GetG());
+        EXPECT_EQ(180, NOVA_THEME.background.GetB());
+    }
+
+    TEST_F(ThemeTest, NovaThemeHasCorrectHeader)
+    {
+        EXPECT_EQ(0, NOVA_THEME.header.GetR());
+        EXPECT_EQ(140, NOVA_THEME.header.GetG());
+        EXPECT_EQ(200, NOVA_THEME.header.GetB());
+    }
+
+    TEST_F(ThemeTest, ItecThemeHasCorrectBackground)
+    {
+        EXPECT_EQ(195, ITEC_THEME.background.GetR());
+        EXPECT_EQ(195, ITEC_THEME.background.GetG());
+        EXPECT_EQ(185, ITEC_THEME.background.GetB());
+    }
+
+    TEST_F(ThemeTest, ItecThemeHasCorrectBorder)
+    {
+        EXPECT_EQ(0, ITEC_THEME.border.GetR());
+        EXPECT_EQ(0, ITEC_THEME.border.GetG());
+        EXPECT_EQ(0, ITEC_THEME.border.GetB());
+    }
+
+    TEST_F(ThemeTest, NodeTimerGreenIsCorrect)
+    {
+        EXPECT_EQ(104, NODE_THEME.timerGreen.GetR());
+        EXPECT_EQ(221, NODE_THEME.timerGreen.GetG());
+        EXPECT_EQ(69, NODE_THEME.timerGreen.GetB());
+    }
+
+    TEST_F(ThemeTest, NercHighlightedTextIsCorrect)
+    {
+        EXPECT_EQ(255, NERC_THEME.highlightedText.GetR());
+        EXPECT_EQ(255, NERC_THEME.highlightedText.GetG());
+        EXPECT_EQ(255, NERC_THEME.highlightedText.GetB());
+    }
+} // namespace UKControllerPluginTest::Graphics
diff --git a/test/plugin/hold/HoldConfigurationMenuItemTest.cpp b/test/plugin/hold/HoldConfigurationMenuItemTest.cpp
index 5de01bc48..4c0998572 100644
--- a/test/plugin/hold/HoldConfigurationMenuItemTest.cpp
+++ b/test/plugin/hold/HoldConfigurationMenuItemTest.cpp
@@ -1,12 +1,13 @@
+#include "hold/HoldConfigurationMenuItem.h"
 #include "aircraft/CallsignSelectionListFactory.h"
+#include "dialog/DialogManager.h"
+#include "graphics/GdiplusBrushes.h"
 #include "hold/AbstractHoldLevelRestriction.h"
 #include "hold/DeemedSeparatedHold.h"
-#include "hold/HoldConfigurationMenuItem.h"
-#include "dialog/DialogManager.h"
 #include "hold/HoldDisplay.h"
+#include "hold/HoldDisplayFactory.h"
 #include "hold/HoldDisplayManager.h"
 #include "hold/HoldManager.h"
-#include "hold/HoldDisplayFactory.h"
 #include "hold/PublishedHoldCollection.h"
 #include "list/PopupListFactory.h"
 #include "navaids/NavaidCollection.h"
@@ -27,6 +28,7 @@ using UKControllerPlugin::List::PopupListFactory;
 using UKControllerPlugin::Navaids::NavaidCollection;
 using UKControllerPlugin::Plugin::FunctionCallEventHandler;
 using UKControllerPlugin::Plugin::PopupMenuItem;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 using UKControllerPluginTest::Api::MockApiInterface;
 using UKControllerPluginTest::Dialog::MockDialogProvider;
 using UKControllerPluginTest::Euroscope::MockEuroscopePluginLoopbackInterface;
@@ -41,7 +43,7 @@ namespace UKControllerPluginTest {
             HoldConfigurationMenuItemTest()
                 : popupFactory(functionHandlers, mockPlugin), listFactory(popupFactory), dialogManager(mockProvider),
                   holdManager(mockApi, mockTaskRunner),
-                  displayFactory(mockPlugin, holdManager, navaids, holds, dialogManager, listFactory),
+                  displayFactory(mockPlugin, holdManager, navaids, holds, dialogManager, listFactory, brushes),
                   displayManager(new HoldDisplayManager(displayFactory)), menuItem(dialogManager, displayManager, 1)
             {
                 this->dialogManager.AddDialog(this->dialogData);
@@ -59,6 +61,7 @@ namespace UKControllerPluginTest {
             NiceMock<MockDialogProvider> mockProvider;
             UKControllerPlugin::Dialog::DialogManager dialogManager;
             HoldManager holdManager;
+            GdiplusBrushes brushes;
             HoldDisplayFactory displayFactory;
             std::shared_ptr<HoldDisplayManager> displayManager;
             HoldConfigurationMenuItem menuItem;
diff --git a/test/plugin/hold/HoldDisplayFactoryTest.cpp b/test/plugin/hold/HoldDisplayFactoryTest.cpp
index 4dab3dc7b..d1d26f453 100644
--- a/test/plugin/hold/HoldDisplayFactoryTest.cpp
+++ b/test/plugin/hold/HoldDisplayFactoryTest.cpp
@@ -1,15 +1,16 @@
+#include "hold/HoldDisplayFactory.h"
 #include "aircraft/CallsignSelectionListFactory.h"
 #include "dialog/DialogManager.h"
+#include "graphics/GdiplusBrushes.h"
 #include "hold/AbstractHoldLevelRestriction.h"
 #include "hold/DeemedSeparatedHold.h"
 #include "hold/HoldDisplay.h"
-#include "hold/HoldDisplayFactory.h"
-#include "hold/HoldManager.h"
 #include "hold/HoldingData.h"
+#include "hold/HoldManager.h"
 #include "hold/PublishedHoldCollection.h"
 #include "list/PopupListFactory.h"
-#include "navaids/NavaidCollection.h"
 #include "navaids/Navaid.h"
+#include "navaids/NavaidCollection.h"
 #include "plugin/FunctionCallEventHandler.h"
 
 using ::testing::NiceMock;
@@ -25,6 +26,7 @@ using UKControllerPlugin::List::PopupListFactory;
 using UKControllerPlugin::Navaids::Navaid;
 using UKControllerPlugin::Navaids::NavaidCollection;
 using UKControllerPlugin::Plugin::FunctionCallEventHandler;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 using UKControllerPluginTest::Api::MockApiInterface;
 using UKControllerPluginTest::Dialog::MockDialogProvider;
 using UKControllerPluginTest::Euroscope::MockEuroscopePluginLoopbackInterface;
@@ -39,7 +41,7 @@ namespace UKControllerPluginTest::Hold {
             : dialogManager(dialogProvider), popupFactory(functionHandlers, mockPlugin),
               callsignSelectionFactory(popupFactory), navaid({1, "TIMBA", EuroScopePlugIn::CPosition()}),
               holdManager(mockApi, taskRunner),
-              factory(mockPlugin, holdManager, navaids, holds, dialogManager, callsignSelectionFactory)
+              factory(mockPlugin, holdManager, navaids, holds, dialogManager, callsignSelectionFactory, brushes)
 
         {
             this->navaids.AddNavaid(navaid);
@@ -59,6 +61,7 @@ namespace UKControllerPluginTest::Hold {
         Navaid navaid;
         NavaidCollection navaids;
         HoldManager holdManager;
+        GdiplusBrushes brushes;
         HoldDisplayFactory factory;
     };
 
diff --git a/test/plugin/hold/HoldDisplayManagerTest.cpp b/test/plugin/hold/HoldDisplayManagerTest.cpp
index 31a6f0169..cc88db07a 100644
--- a/test/plugin/hold/HoldDisplayManagerTest.cpp
+++ b/test/plugin/hold/HoldDisplayManagerTest.cpp
@@ -1,11 +1,12 @@
+#include "hold/HoldDisplayManager.h"
 #include "aircraft/CallsignSelectionListFactory.h"
 #include "dialog/DialogManager.h"
 #include "euroscope/UserSetting.h"
+#include "graphics/GdiplusBrushes.h"
 #include "hold/AbstractHoldLevelRestriction.h"
 #include "hold/DeemedSeparatedHold.h"
 #include "hold/HoldDisplay.h"
 #include "hold/HoldDisplayFactory.h"
-#include "hold/HoldDisplayManager.h"
 #include "hold/HoldManager.h"
 #include "hold/PublishedHoldCollection.h"
 #include "list/PopupListFactory.h"
@@ -28,6 +29,7 @@ using UKControllerPlugin::List::PopupListFactory;
 using UKControllerPlugin::Navaids::Navaid;
 using UKControllerPlugin::Navaids::NavaidCollection;
 using UKControllerPlugin::Plugin::FunctionCallEventHandler;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 using UKControllerPluginTest::Api::MockApiInterface;
 using UKControllerPluginTest::Dialog::MockDialogProvider;
 using UKControllerPluginTest::Euroscope::MockEuroscopePluginLoopbackInterface;
@@ -42,7 +44,7 @@ namespace UKControllerPluginTest::Hold {
         HoldDisplayManagerTest()
             : popupFactory(functionHandlers, mockPlugin), listFactory(popupFactory), dialogManager(dialogProvider),
               userSetting(mockUserSettingProvider), holdManager(mockApi, taskRunner),
-              displayFactory(mockPlugin, holdManager, navaids, holds, dialogManager, listFactory),
+              displayFactory(mockPlugin, holdManager, navaids, holds, dialogManager, listFactory, brushes),
               displayManager(displayFactory)
         {
             this->navaids.AddNavaid({1, "TIMBA", EuroScopePlugIn::CPosition()});
@@ -65,6 +67,7 @@ namespace UKControllerPluginTest::Hold {
         PublishedHoldCollection holds;
         NavaidCollection navaids;
         HoldManager holdManager;
+        GdiplusBrushes brushes;
         HoldDisplayFactory displayFactory;
         HoldDisplayManager displayManager;
     };
diff --git a/test/plugin/hold/HoldDisplayTest.cpp b/test/plugin/hold/HoldDisplayTest.cpp
index a9ad68fd4..0b632bfbe 100644
--- a/test/plugin/hold/HoldDisplayTest.cpp
+++ b/test/plugin/hold/HoldDisplayTest.cpp
@@ -1,16 +1,17 @@
+#include "hold/HoldDisplay.h"
+#include "dialog/DialogData.h"
+#include "dialog/DialogManager.h"
 #include "euroscope/UserSetting.h"
+#include "graphics/GdiplusBrushes.h"
 #include "hold/AbstractHoldLevelRestriction.h"
+#include "hold/CompareHoldingAircraft.h"
 #include "hold/DeemedSeparatedHold.h"
-#include "hold/HoldDisplay.h"
-#include "navaids/Navaid.h"
-#include "hold/HoldManager.h"
-#include "dialog/DialogManager.h"
-#include "dialog/DialogData.h"
 #include "hold/HoldingAircraft.h"
-#include "hold/CompareHoldingAircraft.h"
 #include "hold/HoldingData.h"
-#include "hold/PublishedHoldCollection.h"
+#include "hold/HoldManager.h"
 #include "hold/ProximityHold.h"
+#include "hold/PublishedHoldCollection.h"
+#include "navaids/Navaid.h"
 
 using testing::_;
 using testing::NiceMock;
@@ -29,6 +30,7 @@ using UKControllerPlugin::Hold::HoldManager;
 using UKControllerPlugin::Hold::ProximityHold;
 using UKControllerPlugin::Hold::PublishedHoldCollection;
 using UKControllerPlugin::Navaids::Navaid;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 using UKControllerPluginTest::Api::MockApiInterface;
 using UKControllerPluginTest::Dialog::MockDialogProvider;
 using UKControllerPluginTest::Euroscope::MockEuroScopeCFlightPlanInterface;
@@ -48,7 +50,7 @@ namespace UKControllerPluginTest {
                 : addAircraftList(std::make_shared<NiceMock<List::MockPopupList>>()), dialogManager(mockDialogProvider),
                   userSetting(mockUserSettingProvider), navaid({2, "TIMBA", EuroScopePlugIn::CPosition()}),
                   holdManager(mockApi, mockTaskRunner),
-                  display(mockPlugin, holdManager, navaid, publishedHolds, dialogManager, addAircraftList)
+                  display(mockPlugin, holdManager, navaid, publishedHolds, dialogManager, brushes, addAircraftList)
             {
                 this->dialogManager.AddDialog(this->holdDialogData);
                 this->navaid.coordinates.LoadFromStrings("E000.15.42.000", "N050.56.44.000");
@@ -77,6 +79,7 @@ namespace UKControllerPluginTest {
             UserSetting userSetting;
             Navaid navaid;
             HoldManager holdManager;
+            GdiplusBrushes brushes;
             HoldDisplay display;
         };
 
@@ -108,7 +111,8 @@ namespace UKControllerPluginTest {
         {
             this->publishedHolds.Add({1, "TIMBA", "TIMBA", 2000, 3000});
 
-            HoldDisplay display2(mockPlugin, holdManager, navaid, publishedHolds, dialogManager, addAircraftList);
+            HoldDisplay display2(
+                mockPlugin, holdManager, navaid, publishedHolds, dialogManager, this->brushes, addAircraftList);
             ON_CALL(this->mockUserSettingProvider, GetKey("holdTIMBAMinLevel")).WillByDefault(Return(""));
 
             display2.LoadDataFromAsr(userSetting);
@@ -134,7 +138,8 @@ namespace UKControllerPluginTest {
         TEST_F(HoldDisplayTest, ItLoadsMaximumLevelFromPublishedHoldIfNotInAsr)
         {
             this->publishedHolds.Add({1, "TIMBA", "TIMBA", 2000, 3000});
-            HoldDisplay display2(mockPlugin, holdManager, navaid, publishedHolds, dialogManager, addAircraftList);
+            HoldDisplay display2(
+                mockPlugin, holdManager, navaid, publishedHolds, dialogManager, this->brushes, addAircraftList);
             ON_CALL(this->mockUserSettingProvider, GetKey("holdTIMBAMaxLevel")).WillByDefault(Return(""));
 
             display2.LoadDataFromAsr(userSetting);
@@ -219,7 +224,8 @@ namespace UKControllerPluginTest {
             this->publishedHolds.Add({3, "TIMBA", "TIMBA", 2000, 3000});
             this->publishedHolds.Add({4, "TIMBA", "TIMBA", 2000, 3000});
 
-            HoldDisplay display2(mockPlugin, holdManager, navaid, publishedHolds, dialogManager, addAircraftList);
+            HoldDisplay display2(
+                mockPlugin, holdManager, navaid, publishedHolds, dialogManager, this->brushes, addAircraftList);
 
             EXPECT_EQ(0, display2.GetPublishedHoldIndex());
             display2.ButtonClicked("nexthold");
@@ -602,8 +608,9 @@ namespace UKControllerPluginTest {
                 this->display.GetDisplayPos().x, this->display.GetDisplayPos().y, this->display.windowWidth, 380};
             std::map<int, std::set<std::shared_ptr<HoldingAircraft>, CompareHoldingAircraft>> aircraft;
             aircraft[7000].insert(std::make_shared<HoldingAircraft>("BAW123", "TIMBA"));
-            aircraft[7000].insert(std::make_shared<HoldingAircraft>(
-                "EZY234", std::make_shared<ProximityHold>("BAW123", "TIMBA", std::chrono::system_clock::now())));
+            aircraft[7000].insert(
+                std::make_shared<HoldingAircraft>(
+                    "EZY234", std::make_shared<ProximityHold>("BAW123", "TIMBA", std::chrono::system_clock::now())));
             aircraft[8000].insert(std::make_shared<HoldingAircraft>("VIR25A", "TIMBA"));
             aircraft[8000].insert(std::make_shared<HoldingAircraft>("LOT123", "TIMBA"));
             aircraft[8000].insert(std::make_shared<HoldingAircraft>("RYR93", "TIMBA"));
@@ -618,10 +625,12 @@ namespace UKControllerPluginTest {
         {
             std::set<std::shared_ptr<HoldingAircraft>, CompareHoldingAircraft> aircraft;
             aircraft.insert(std::make_shared<HoldingAircraft>("BAW123", "TIMBA"));
-            aircraft.insert(std::make_shared<HoldingAircraft>(
-                "EZY234", std::make_shared<ProximityHold>("EZY234", "TIMBA", std::chrono::system_clock::now())));
-            aircraft.insert(std::make_shared<HoldingAircraft>(
-                "VIR25A", std::make_shared<ProximityHold>("VIR25A", "TIMBA", std::chrono::system_clock::now())));
+            aircraft.insert(
+                std::make_shared<HoldingAircraft>(
+                    "EZY234", std::make_shared<ProximityHold>("EZY234", "TIMBA", std::chrono::system_clock::now())));
+            aircraft.insert(
+                std::make_shared<HoldingAircraft>(
+                    "VIR25A", std::make_shared<ProximityHold>("VIR25A", "TIMBA", std::chrono::system_clock::now())));
             aircraft.insert(std::make_shared<HoldingAircraft>("RYR191", "TIMBA"));
             aircraft.insert(std::make_shared<HoldingAircraft>("BMI234", "TIMBA"));
             aircraft.insert(std::make_shared<HoldingAircraft>("LOT555", "TIMBA"));
@@ -701,7 +710,8 @@ namespace UKControllerPluginTest {
                 7000,
                 15000,
             });
-            HoldDisplay display2(mockPlugin, holdManager, navaid, publishedHolds, dialogManager, addAircraftList);
+            HoldDisplay display2(
+                mockPlugin, holdManager, navaid, publishedHolds, dialogManager, this->brushes, addAircraftList);
             display2.SetMinimumLevel(7000);
             display2.SetMaximumLevel(15000);
 
@@ -757,7 +767,8 @@ namespace UKControllerPluginTest {
                 7000,
                 15000,
             });
-            HoldDisplay display2(mockPlugin, holdManager, navaid, publishedHolds, dialogManager, addAircraftList);
+            HoldDisplay display2(
+                mockPlugin, holdManager, navaid, publishedHolds, dialogManager, this->brushes, addAircraftList);
             display2.SetMinimumLevel(7000);
             display2.SetMaximumLevel(15000);
 
@@ -814,7 +825,8 @@ namespace UKControllerPluginTest {
                 9000,
                 15000,
             });
-            HoldDisplay display2(mockPlugin, holdManager, navaid, publishedHolds, dialogManager, addAircraftList);
+            HoldDisplay display2(
+                mockPlugin, holdManager, navaid, publishedHolds, dialogManager, this->brushes, addAircraftList);
             display2.SetMinimumLevel(7000);
             display2.SetMaximumLevel(15000);
 
@@ -872,7 +884,8 @@ namespace UKControllerPluginTest {
                 7000,
                 15000,
             });
-            HoldDisplay display2(mockPlugin, holdManager, navaid, publishedHolds, dialogManager, addAircraftList);
+            HoldDisplay display2(
+                mockPlugin, holdManager, navaid, publishedHolds, dialogManager, this->brushes, addAircraftList);
             display2.SetMinimumLevel(7000);
             display2.SetMaximumLevel(15000);
 
@@ -935,7 +948,8 @@ namespace UKControllerPluginTest {
                 7000,
                 15000,
             });
-            HoldDisplay display2(mockPlugin, holdManager, navaid, publishedHolds, dialogManager, addAircraftList);
+            HoldDisplay display2(
+                mockPlugin, holdManager, navaid, publishedHolds, dialogManager, this->brushes, addAircraftList);
             display2.SetMinimumLevel(7000);
             display2.SetMaximumLevel(15000);
 
@@ -993,7 +1007,8 @@ namespace UKControllerPluginTest {
                 7000,
                 15000,
             });
-            HoldDisplay display2(mockPlugin, holdManager, navaid, publishedHolds, dialogManager, addAircraftList);
+            HoldDisplay display2(
+                mockPlugin, holdManager, navaid, publishedHolds, dialogManager, this->brushes, addAircraftList);
             display2.SetMinimumLevel(7000);
             display2.SetMaximumLevel(15000);
 
diff --git a/test/plugin/hold/HoldModuleTest.cpp b/test/plugin/hold/HoldModuleTest.cpp
index beeeb868a..5b38b486a 100644
--- a/test/plugin/hold/HoldModuleTest.cpp
+++ b/test/plugin/hold/HoldModuleTest.cpp
@@ -1,29 +1,30 @@
 #include "hold/HoldModule.h"
-#include "bootstrap/PersistenceContainer.h"
-#include "timedevent/TimedEventCollection.h"
-#include "hold/AbstractHoldLevelRestriction.h"
-#include "hold/DeemedSeparatedHold.h"
-#include "hold/HoldingAircraft.h"
-#include "hold/HoldingData.h"
+#include "api/ApiException.h"
 #include "bootstrap/BootstrapWarningMessage.h"
-#include "plugin/FunctionCallEventHandler.h"
-#include "radarscreen/ConfigurableDisplayCollection.h"
+#include "bootstrap/PersistenceContainer.h"
 #include "command/CommandHandlerCollection.h"
-#include "tag/TagItemCollection.h"
-#include "dialog/DialogManager.h"
 #include "dialog/DialogData.h"
-#include "radarscreen/RadarRenderableCollection.h"
+#include "dialog/DialogManager.h"
 #include "euroscope/AsrEventHandlerCollection.h"
-#include "hold/CompareHolds.h"
-#include "push/PushEventProcessorCollection.h"
-#include "api/ApiException.h"
 #include "flightplan/FlightPlanEventHandlerCollection.h"
-#include "hold/HoldManager.h"
-#include "hold/PublishedHoldCollection.h"
-#include "hold/HoldSelectionMenu.h"
 #include "geometry/Measurement.h"
 #include "geometry/MeasurementUnit.h"
 #include "geometry/MeasurementUnitFactory.h"
+#include "graphics/GdiplusBrushes.h"
+#include "hold/AbstractHoldLevelRestriction.h"
+#include "hold/CompareHolds.h"
+#include "hold/DeemedSeparatedHold.h"
+#include "hold/HoldingAircraft.h"
+#include "hold/HoldingData.h"
+#include "hold/HoldManager.h"
+#include "hold/HoldSelectionMenu.h"
+#include "hold/PublishedHoldCollection.h"
+#include "plugin/FunctionCallEventHandler.h"
+#include "push/PushEventProcessorCollection.h"
+#include "radarscreen/ConfigurableDisplayCollection.h"
+#include "radarscreen/RadarRenderableCollection.h"
+#include "tag/TagItemCollection.h"
+#include "timedevent/TimedEventCollection.h"
 
 using ::testing::_;
 using ::testing::NiceMock;
@@ -328,6 +329,7 @@ namespace UKControllerPluginTest::Hold {
             this->radarRenderables,
             this->asrEvents,
             this->radarScreenCommands,
+            *this->container.brushes,
             this->container);
 
         EXPECT_EQ(2, this->asrEvents.CountHandlers());
@@ -342,6 +344,7 @@ namespace UKControllerPluginTest::Hold {
             this->radarRenderables,
             this->asrEvents,
             this->radarScreenCommands,
+            *this->container.brushes,
             this->container);
 
         EXPECT_EQ(1, this->container.holdSelectionMenu->CountDisplayManagers());
@@ -356,6 +359,7 @@ namespace UKControllerPluginTest::Hold {
             this->radarRenderables,
             this->asrEvents,
             this->radarScreenCommands,
+            *this->container.brushes,
             this->container);
 
         EXPECT_EQ(1, this->radarRenderables.CountRenderers());
@@ -371,6 +375,7 @@ namespace UKControllerPluginTest::Hold {
             this->radarRenderables,
             this->asrEvents,
             this->radarScreenCommands,
+            *this->container.brushes,
             this->container);
 
         EXPECT_EQ(2, this->configurableDisplays.CountDisplays());
@@ -386,6 +391,7 @@ namespace UKControllerPluginTest::Hold {
             this->radarRenderables,
             this->asrEvents,
             this->radarScreenCommands,
+            *this->container.brushes,
             this->container);
 
         EXPECT_EQ(countBefore + 2, this->container.pluginFunctionHandlers->CountCallbacks());
@@ -400,6 +406,7 @@ namespace UKControllerPluginTest::Hold {
             this->radarRenderables,
             this->asrEvents,
             this->radarScreenCommands,
+            *this->container.brushes,
             this->container);
 
         EXPECT_EQ(1, this->radarScreenCommands.CountHandlers());
diff --git a/test/plugin/hold/HoldRendererTest.cpp b/test/plugin/hold/HoldRendererTest.cpp
index 1d58367f8..ad08b9298 100644
--- a/test/plugin/hold/HoldRendererTest.cpp
+++ b/test/plugin/hold/HoldRendererTest.cpp
@@ -1,18 +1,19 @@
+#include "hold/HoldRenderer.h"
 #include "aircraft/CallsignSelectionListFactory.h"
+#include "dialog/DialogManager.h"
 #include "euroscope/UserSetting.h"
+#include "graphics/GdiplusBrushes.h"
 #include "hold/AbstractHoldLevelRestriction.h"
 #include "hold/DeemedSeparatedHold.h"
-#include "hold/HoldRenderer.h"
 #include "hold/HoldDisplay.h"
+#include "hold/HoldDisplayFactory.h"
 #include "hold/HoldDisplayManager.h"
 #include "hold/HoldManager.h"
-#include "hold/HoldDisplayFactory.h"
+#include "hold/PublishedHoldCollection.h"
 #include "list/PopupListFactory.h"
+#include "navaids/NavaidCollection.h"
 #include "plugin/FunctionCallEventHandler.h"
 #include "plugin/PopupMenuItem.h"
-#include "navaids/NavaidCollection.h"
-#include "hold/PublishedHoldCollection.h"
-#include "dialog/DialogManager.h"
 
 using ::testing::NiceMock;
 using ::testing::Return;
@@ -29,6 +30,7 @@ using UKControllerPlugin::List::PopupListFactory;
 using UKControllerPlugin::Navaids::NavaidCollection;
 using UKControllerPlugin::Plugin::FunctionCallEventHandler;
 using UKControllerPlugin::Plugin::PopupMenuItem;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 using UKControllerPluginTest::Api::MockApiInterface;
 using UKControllerPluginTest::Dialog::MockDialogProvider;
 using UKControllerPluginTest::Euroscope::MockEuroscopePluginLoopbackInterface;
@@ -45,7 +47,8 @@ namespace UKControllerPluginTest {
             HoldRendererTest()
                 : popupFactory(functionHandlers, mockPlugin), callsignSelectionFactory(popupFactory),
                   dialogManager(mockDialog), userSetting(mockUserSettingProvider), holdManager(mockApi, mockTaskRunner),
-                  displayFactory(mockPlugin, holdManager, navaids, holds, dialogManager, callsignSelectionFactory),
+                  displayFactory(
+                      mockPlugin, holdManager, navaids, holds, dialogManager, callsignSelectionFactory, brushes),
                   displayManager(new HoldDisplayManager(displayFactory)), renderer(displayManager, 1, 2)
             {
                 this->holds.Add({1, "WILLO", "WILLO", 8000, 15000, 209, "left", {}});
@@ -80,6 +83,7 @@ namespace UKControllerPluginTest {
             HoldManager holdManager;
             NavaidCollection navaids;
             PublishedHoldCollection holds;
+            GdiplusBrushes brushes;
             HoldDisplayFactory displayFactory;
             std::shared_ptr<HoldDisplayManager> displayManager;
             HoldRenderer renderer;
diff --git a/test/plugin/hold/HoldSelectionMenuTest.cpp b/test/plugin/hold/HoldSelectionMenuTest.cpp
index 7967d9c8a..2db00160b 100644
--- a/test/plugin/hold/HoldSelectionMenuTest.cpp
+++ b/test/plugin/hold/HoldSelectionMenuTest.cpp
@@ -1,19 +1,19 @@
+#include "hold/HoldSelectionMenu.h"
 #include "aircraft/CallsignSelectionListFactory.h"
 #include "dialog/DialogManager.h"
 #include "euroscope/UserSetting.h"
+#include "graphics/GdiplusBrushes.h"
 #include "hold/AbstractHoldLevelRestriction.h"
 #include "hold/DeemedSeparatedHold.h"
-#include "hold/HoldingAircraft.h"
-#include "hold/HoldManager.h"
 #include "hold/HoldDisplay.h"
-#include "hold/HoldDisplayManager.h"
 #include "hold/HoldDisplayFactory.h"
-#include "hold/HoldSelectionMenu.h"
+#include "hold/HoldDisplayManager.h"
+#include "hold/HoldingAircraft.h"
+#include "hold/HoldManager.h"
 #include "hold/PublishedHoldCollection.h"
 #include "list/PopupListFactory.h"
 #include "navaids/NavaidCollection.h"
 #include "plugin/FunctionCallEventHandler.h"
-
 using ::testing::_;
 using ::testing::InSequence;
 using ::testing::NiceMock;
@@ -32,6 +32,7 @@ using UKControllerPlugin::List::PopupListFactory;
 using UKControllerPlugin::Navaids::NavaidCollection;
 using UKControllerPlugin::Plugin::FunctionCallEventHandler;
 using UKControllerPlugin::Plugin::PopupMenuItem;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 using UKControllerPluginTest::Api::MockApiInterface;
 using UKControllerPluginTest::Dialog::MockDialogProvider;
 using UKControllerPluginTest::Euroscope::MockEuroScopeCFlightPlanInterface;
@@ -49,7 +50,7 @@ namespace UKControllerPluginTest {
             HoldSelectionMenuTest()
                 : popupFactory(functionHandlers, mockPlugin), listFactory(popupFactory),
                   dialogManager(mockDialogProvider), userSetting(mockUserSettingProvider),
-                  displayFactory(mockPlugin, holdManager, navaids, holds, dialogManager, listFactory),
+                  displayFactory(mockPlugin, holdManager, navaids, holds, dialogManager, listFactory, brushes),
                   holdManager(mockApi, mockTaskRunner), holdSelectionMenu(holdManager, mockPlugin, 1)
             {
                 this->mockFlightplan.reset(new NiceMock<MockEuroScopeCFlightPlanInterface>);
@@ -80,6 +81,7 @@ namespace UKControllerPluginTest {
             NavaidCollection navaids;
             PublishedHoldCollection holds;
             UserSetting userSetting;
+            GdiplusBrushes brushes;
             HoldDisplayFactory displayFactory;
             HoldManager holdManager;
             HoldSelectionMenu holdSelectionMenu;
@@ -109,10 +111,11 @@ namespace UKControllerPluginTest {
             displayManager1->AsrLoadedEvent(this->userSetting);
             displayManager2->AsrLoadedEvent(this->userSetting);
             displayManager1->LoadSelectedHolds(std::vector<std::string>({"TIMBA", "WILLO"}));
-            displayManager2->LoadSelectedHolds(std::vector<std::string>({
-                "WILLO",
-                "MAY",
-            }));
+            displayManager2->LoadSelectedHolds(
+                std::vector<std::string>({
+                    "WILLO",
+                    "MAY",
+                }));
             this->holdSelectionMenu.AddDisplayManager(displayManager1);
             this->holdSelectionMenu.AddDisplayManager(displayManager2);
 
diff --git a/test/plugin/regional/RegionalPressureRendererTest.cpp b/test/plugin/regional/RegionalPressureRendererTest.cpp
index 9fd1c5f2c..e49e92848 100644
--- a/test/plugin/regional/RegionalPressureRendererTest.cpp
+++ b/test/plugin/regional/RegionalPressureRendererTest.cpp
@@ -1,10 +1,10 @@
+#include "regional/RegionalPressureRenderer.h"
 #include "dialog/DialogManager.h"
 #include "euroscope/UserSetting.h"
 #include "graphics/GdiplusBrushes.h"
 #include "helper/TestingFunctions.h"
 #include "plugin/PopupMenuItem.h"
 #include "regional/RegionalPressureManager.h"
-#include "regional/RegionalPressureRenderer.h"
 #include "regional/RegionalPressureRendererConfiguration.h"
 
 using ::testing::_;
@@ -38,7 +38,7 @@ namespace UKControllerPluginTest {
 
             inline static const int HIDE_CLICKSPOT_WIDTH = 50;
             inline static const int LEFT_COLUMN_WIDTH = 100;
-            inline static const int ROW_HEIGHT = 20;
+            inline static const int ROW_HEIGHT = 15;
             const std::string SELECTED_ASR_KEY = "SelectedRegionalPressures";
             const std::string SELECTED_ASR_DESC = "Selected Regional Pressures To Display";
             const std::string VISIBLE_ASR_KEY = "DisplayRegionalPressures";
diff --git a/test/plugin/test/BootstrapProviderTestCase.cpp b/test/plugin/test/BootstrapProviderTestCase.cpp
index 7d3a47f80..cbfd29e04 100644
--- a/test/plugin/test/BootstrapProviderTestCase.cpp
+++ b/test/plugin/test/BootstrapProviderTestCase.cpp
@@ -2,6 +2,7 @@
 #include "aircraft/CallsignSelectionListFactory.h"
 #include "bootstrap/ModuleBootstrap.h"
 #include "controller/ActiveCallsignCollection.h"
+#include "graphics/GdiplusBrushes.h"
 #include "list/PopupListFactory.h"
 #include "plugin/FunctionCallEventHandler.h"
 #include "plugin/UKPlugin.h"
@@ -14,6 +15,7 @@ using UKControllerPlugin::List::PopupListFactory;
 using UKControllerPlugin::Plugin::FunctionCallEventHandler;
 using UKControllerPlugin::Tag::TagItemCollection;
 using UKControllerPlugin::TimedEvent::TimedEventCollection;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 
 namespace UKControllerPluginTest {
 
@@ -46,6 +48,7 @@ namespace UKControllerPluginTest {
         container.tagHandler = std::make_unique<TagItemCollection>();
         container.timedHandler = std::make_unique<TimedEventCollection>();
         container.activeCallsigns = std::make_unique<UKControllerPlugin::Controller::ActiveCallsignCollection>();
+        container.brushes = std::make_unique<GdiplusBrushes>();
         return container;
     }
 } // namespace UKControllerPluginTest
diff --git a/test/plugin/wake/WakeCalculatorDisplayTest.cpp b/test/plugin/wake/WakeCalculatorDisplayTest.cpp
index ea6dcc841..7b2c6ff7b 100644
--- a/test/plugin/wake/WakeCalculatorDisplayTest.cpp
+++ b/test/plugin/wake/WakeCalculatorDisplayTest.cpp
@@ -1,10 +1,12 @@
-#include "euroscope/UserSetting.h"
 #include "wake/WakeCalculatorDisplay.h"
+#include "euroscope/UserSetting.h"
+#include "graphics/GdiplusBrushes.h"
 #include "wake/WakeCalculatorOptions.h"
 
 using UKControllerPlugin::Euroscope::UserSetting;
 using UKControllerPlugin::Wake::WakeCalculatorDisplay;
 using UKControllerPlugin::Wake::WakeCalculatorOptions;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 
 namespace UKControllerPluginTest::Wake {
     class WakeCalculatorDisplayTest : public testing::Test
@@ -16,7 +18,7 @@ namespace UKControllerPluginTest::Wake {
               followingCallsignSelector(std::make_shared<testing::NiceMock<List::MockPopupList>>()),
               wakesSchemeSelector(std::make_shared<testing::NiceMock<List::MockPopupList>>()),
               options(std::make_shared<WakeCalculatorOptions>()),
-              display(options, leadCallsignSelector, followingCallsignSelector, wakesSchemeSelector, plugin, 1)
+              display(options, leadCallsignSelector, followingCallsignSelector, wakesSchemeSelector, plugin, brushes, 1)
         {
         }
 
@@ -28,6 +30,7 @@ namespace UKControllerPluginTest::Wake {
         std::shared_ptr<testing::NiceMock<List::MockPopupList>> followingCallsignSelector;
         std::shared_ptr<testing::NiceMock<List::MockPopupList>> wakesSchemeSelector;
         std::shared_ptr<WakeCalculatorOptions> options;
+        GdiplusBrushes brushes;
         WakeCalculatorDisplay display;
     };
 
diff --git a/test/plugin/wake/WakeModuleTest.cpp b/test/plugin/wake/WakeModuleTest.cpp
index 4be32fe7c..9d17e1800 100644
--- a/test/plugin/wake/WakeModuleTest.cpp
+++ b/test/plugin/wake/WakeModuleTest.cpp
@@ -1,15 +1,16 @@
+#include "wake/WakeModule.h"
 #include "aircraft/CallsignSelectionListFactory.h"
 #include "bootstrap/PersistenceContainer.h"
 #include "euroscope/AsrEventHandlerCollection.h"
 #include "flightplan/FlightPlanEventHandlerCollection.h"
+#include "graphics/GdiplusBrushes.h"
 #include "list/PopupListFactory.h"
+#include "plugin/FunctionCallEventHandler.h"
 #include "radarscreen/ConfigurableDisplayCollection.h"
-#include "radarscreen/RadarRenderableCollection.h"
 #include "radarscreen/MenuToggleableDisplayFactory.h"
-#include "plugin/FunctionCallEventHandler.h"
+#include "radarscreen/RadarRenderableCollection.h"
 #include "tag/TagItemCollection.h"
 #include "wake/WakeCategoryMapperCollection.h"
-#include "wake/WakeModule.h"
 #include "wake/WakeSchemeCollection.h"
 
 using ::testing::NiceMock;
@@ -26,6 +27,7 @@ using UKControllerPlugin::RadarScreen::RadarRenderableCollection;
 using UKControllerPlugin::Tag::TagItemCollection;
 using UKControllerPlugin::Wake::BootstrapPlugin;
 using UKControllerPlugin::Wake::BootstrapRadarScreen;
+using UKControllerPlugin::Windows::GdiplusBrushes;
 using UKControllerPluginTest::Dependency::MockDependencyLoader;
 
 namespace UKControllerPluginTest::Wake {
@@ -40,6 +42,7 @@ namespace UKControllerPluginTest::Wake {
             container.popupListFactory = std::make_unique<PopupListFactory>(functionCalls, mockPlugin);
             container.callsignSelectionListFactory =
                 std::make_unique<CallsignSelectionListFactory>(*container.popupListFactory);
+            container.brushes = std::make_unique<GdiplusBrushes>();
         }
 
         ConfigurableDisplayCollection configurableDisplays;
@@ -119,7 +122,8 @@ namespace UKControllerPluginTest::Wake {
     TEST_F(WakeModuleTest, ItRegistersCalculatorForRenderers)
     {
         BootstrapPlugin(this->container, this->dependencies);
-        BootstrapRadarScreen(this->container, radarRenderables, asrEventHandlers, toggleableFactory);
+        BootstrapRadarScreen(
+            this->container, radarRenderables, asrEventHandlers, toggleableFactory, *this->container.brushes);
         EXPECT_EQ(1, radarRenderables.CountRenderers());
         EXPECT_EQ(1, radarRenderables.CountRenderersInPhase(radarRenderables.afterLists));
     }
@@ -127,35 +131,40 @@ namespace UKControllerPluginTest::Wake {
     TEST_F(WakeModuleTest, ItRegistersCalculatorForAsrEvents)
     {
         BootstrapPlugin(this->container, this->dependencies);
-        BootstrapRadarScreen(this->container, radarRenderables, asrEventHandlers, toggleableFactory);
+        BootstrapRadarScreen(
+            this->container, radarRenderables, asrEventHandlers, toggleableFactory, *this->container.brushes);
         EXPECT_EQ(1, asrEventHandlers.CountHandlers());
     }
 
     TEST_F(WakeModuleTest, ItRegistersLeadAircraftCallback)
     {
         BootstrapPlugin(this->container, this->dependencies);
-        BootstrapRadarScreen(this->container, radarRenderables, asrEventHandlers, toggleableFactory);
+        BootstrapRadarScreen(
+            this->container, radarRenderables, asrEventHandlers, toggleableFactory, *this->container.brushes);
         EXPECT_TRUE(functionCalls.HasCallbackByDescription("Wake Calculator Lead Aircraft"));
     }
 
     TEST_F(WakeModuleTest, ItRegistersFollowingAircraftCallback)
     {
         BootstrapPlugin(this->container, this->dependencies);
-        BootstrapRadarScreen(this->container, radarRenderables, asrEventHandlers, toggleableFactory);
+        BootstrapRadarScreen(
+            this->container, radarRenderables, asrEventHandlers, toggleableFactory, *this->container.brushes);
         EXPECT_TRUE(functionCalls.HasCallbackByDescription("Wake Calculator Following Aircraft"));
     }
 
     TEST_F(WakeModuleTest, ItRegistersSchemeCallback)
     {
         BootstrapPlugin(this->container, this->dependencies);
-        BootstrapRadarScreen(this->container, radarRenderables, asrEventHandlers, toggleableFactory);
+        BootstrapRadarScreen(
+            this->container, radarRenderables, asrEventHandlers, toggleableFactory, *this->container.brushes);
         EXPECT_TRUE(functionCalls.HasCallbackByDescription("Wake Calculator Scheme"));
     }
 
     TEST_F(WakeModuleTest, ItRegistersToggleableDisplay)
     {
         BootstrapPlugin(this->container, this->dependencies);
-        BootstrapRadarScreen(this->container, radarRenderables, asrEventHandlers, toggleableFactory);
+        BootstrapRadarScreen(
+            this->container, radarRenderables, asrEventHandlers, toggleableFactory, *this->container.brushes);
         EXPECT_TRUE(functionCalls.HasCallbackByDescription("Toggle Wake Turbulence Calculator"));
     }
 } // namespace UKControllerPluginTest::Wake