diff --git a/Correlator/Style/FunctionButtonStyle.xaml b/Correlator/Style/FunctionButtonStyle.xaml
index 2a4934c..a7a99dd 100644
--- a/Correlator/Style/FunctionButtonStyle.xaml
+++ b/Correlator/Style/FunctionButtonStyle.xaml
@@ -3,8 +3,8 @@
         x:Key="FunctionButtonStyle"
         BasedOn="{StaticResource ButtonBaseStyle}"
         TargetType="Button">
-        <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MainThemeColor}" />
+        <Setter Property="Background" Value="{StaticResource DarkPrimaryBrush}" />
+        <Setter Property="BorderBrush" Value="{StaticResource DarkPrimaryBrush}" />
         <Setter Property="Foreground" Value="White" />
         <Setter Property="FontSize" Value="16" />
         <Setter Property="Height" Value="44" />

diff --git a/Correlator/Style/FunctionButtonStyle.xaml b/Correlator/Style/FunctionButtonStyle.xaml
index 2a4934c..a7a99dd 100644
--- a/Correlator/Style/FunctionButtonStyle.xaml
+++ b/Correlator/Style/FunctionButtonStyle.xaml
@@ -3,8 +3,8 @@
         x:Key="FunctionButtonStyle"
         BasedOn="{StaticResource ButtonBaseStyle}"
         TargetType="Button">
-        <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MainThemeColor}" />
+        <Setter Property="Background" Value="{StaticResource DarkPrimaryBrush}" />
+        <Setter Property="BorderBrush" Value="{StaticResource DarkPrimaryBrush}" />
         <Setter Property="Foreground" Value="White" />
         <Setter Property="FontSize" Value="16" />
         <Setter Property="Height" Value="44" />
diff --git a/Correlator/Style/RadioButtonStyle.xaml b/Correlator/Style/RadioButtonStyle.xaml
index 47723d0..2bc4693 100644
--- a/Correlator/Style/RadioButtonStyle.xaml
+++ b/Correlator/Style/RadioButtonStyle.xaml
@@ -16,7 +16,7 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="RadioButtonBorder" Property="Background" Value="{StaticResource MainThemeColor}" />
+                            <Setter TargetName="RadioButtonBorder" Property="Background" Value="{StaticResource DarkPrimaryBrush}" />
                             <Setter TargetName="RadioButtonBorder" Property="TextBlock.Foreground" Value="White" />
                         </Trigger>
 

diff --git a/Correlator/Style/FunctionButtonStyle.xaml b/Correlator/Style/FunctionButtonStyle.xaml
index 2a4934c..a7a99dd 100644
--- a/Correlator/Style/FunctionButtonStyle.xaml
+++ b/Correlator/Style/FunctionButtonStyle.xaml
@@ -3,8 +3,8 @@
         x:Key="FunctionButtonStyle"
         BasedOn="{StaticResource ButtonBaseStyle}"
         TargetType="Button">
-        <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MainThemeColor}" />
+        <Setter Property="Background" Value="{StaticResource DarkPrimaryBrush}" />
+        <Setter Property="BorderBrush" Value="{StaticResource DarkPrimaryBrush}" />
         <Setter Property="Foreground" Value="White" />
         <Setter Property="FontSize" Value="16" />
         <Setter Property="Height" Value="44" />
diff --git a/Correlator/Style/RadioButtonStyle.xaml b/Correlator/Style/RadioButtonStyle.xaml
index 47723d0..2bc4693 100644
--- a/Correlator/Style/RadioButtonStyle.xaml
+++ b/Correlator/Style/RadioButtonStyle.xaml
@@ -16,7 +16,7 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="RadioButtonBorder" Property="Background" Value="{StaticResource MainThemeColor}" />
+                            <Setter TargetName="RadioButtonBorder" Property="Background" Value="{StaticResource DarkPrimaryBrush}" />
                             <Setter TargetName="RadioButtonBorder" Property="TextBlock.Foreground" Value="White" />
                         </Trigger>
 
diff --git a/Correlator/Style/StaticColorResource.xaml b/Correlator/Style/StaticColorResource.xaml
index 9b1d412..a370b40 100644
--- a/Correlator/Style/StaticColorResource.xaml
+++ b/Correlator/Style/StaticColorResource.xaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="PopupBackgroundColor" Color="#88000000" />
-    <SolidColorBrush x:Key="MainThemeColor" Color="#FF224f86" />
+    <SolidColorBrush x:Key="MainThemeColor" Color="#FF224F86" />
 </ResourceDictionary>
\ No newline at end of file

diff --git a/Correlator/Style/FunctionButtonStyle.xaml b/Correlator/Style/FunctionButtonStyle.xaml
index 2a4934c..a7a99dd 100644
--- a/Correlator/Style/FunctionButtonStyle.xaml
+++ b/Correlator/Style/FunctionButtonStyle.xaml
@@ -3,8 +3,8 @@
         x:Key="FunctionButtonStyle"
         BasedOn="{StaticResource ButtonBaseStyle}"
         TargetType="Button">
-        <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MainThemeColor}" />
+        <Setter Property="Background" Value="{StaticResource DarkPrimaryBrush}" />
+        <Setter Property="BorderBrush" Value="{StaticResource DarkPrimaryBrush}" />
         <Setter Property="Foreground" Value="White" />
         <Setter Property="FontSize" Value="16" />
         <Setter Property="Height" Value="44" />
diff --git a/Correlator/Style/RadioButtonStyle.xaml b/Correlator/Style/RadioButtonStyle.xaml
index 47723d0..2bc4693 100644
--- a/Correlator/Style/RadioButtonStyle.xaml
+++ b/Correlator/Style/RadioButtonStyle.xaml
@@ -16,7 +16,7 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="RadioButtonBorder" Property="Background" Value="{StaticResource MainThemeColor}" />
+                            <Setter TargetName="RadioButtonBorder" Property="Background" Value="{StaticResource DarkPrimaryBrush}" />
                             <Setter TargetName="RadioButtonBorder" Property="TextBlock.Foreground" Value="White" />
                         </Trigger>
 
diff --git a/Correlator/Style/StaticColorResource.xaml b/Correlator/Style/StaticColorResource.xaml
index 9b1d412..a370b40 100644
--- a/Correlator/Style/StaticColorResource.xaml
+++ b/Correlator/Style/StaticColorResource.xaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="PopupBackgroundColor" Color="#88000000" />
-    <SolidColorBrush x:Key="MainThemeColor" Color="#FF224f86" />
+    <SolidColorBrush x:Key="MainThemeColor" Color="#FF224F86" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Correlator/Views/MainWindow.xaml b/Correlator/Views/MainWindow.xaml
index b81a439..353b067 100644
--- a/Correlator/Views/MainWindow.xaml
+++ b/Correlator/Views/MainWindow.xaml
@@ -78,7 +78,7 @@
                         <Border
                             Width="30"
                             Height="30"
-                            Background="{StaticResource MainThemeColor}"
+                            Background="{StaticResource DarkPrimaryBrush}"
                             CornerRadius="15">
                             <TextBlock
                                 HorizontalAlignment="Center"
@@ -128,7 +128,7 @@
                         <Border
                             Width="30"
                             Height="30"
-                            Background="{StaticResource MainThemeColor}"
+                            Background="{StaticResource DarkPrimaryBrush}"
                             CornerRadius="15">
                             <TextBlock
                                 HorizontalAlignment="Center"
@@ -181,7 +181,7 @@
                         <Border
                             Width="30"
                             Height="30"
-                            Background="{StaticResource MainThemeColor}"
+                            Background="{StaticResource DarkPrimaryBrush}"
                             CornerRadius="15">
                             <TextBlock
                                 HorizontalAlignment="Center"
@@ -231,7 +231,7 @@
                         <Border
                             Width="30"
                             Height="30"
-                            Background="{StaticResource MainThemeColor}"
+                            Background="{StaticResource DarkPrimaryBrush}"
                             CornerRadius="15">
                             <TextBlock
                                 HorizontalAlignment="Center"
@@ -284,7 +284,7 @@
                         <Border
                             Width="30"
                             Height="30"
-                            Background="{StaticResource MainThemeColor}"
+                            Background="{StaticResource DarkPrimaryBrush}"
                             CornerRadius="15">
                             <TextBlock
                                 HorizontalAlignment="Center"
@@ -337,7 +337,7 @@
                         <Border
                             Width="30"
                             Height="30"
-                            Background="{StaticResource MainThemeColor}"
+                            Background="{StaticResource DarkPrimaryBrush}"
                             CornerRadius="15">
                             <TextBlock
                                 HorizontalAlignment="Center"