diff --git a/Dashboard/MainWindow.xaml b/Dashboard/MainWindow.xaml
index c285a568..3f7997c9 100644
--- a/Dashboard/MainWindow.xaml
+++ b/Dashboard/MainWindow.xaml
@@ -4,6 +4,7 @@
         xmlns:controls="clr-namespace:PerformanceMonitorDashboard.Controls"
         Title="Performance Monitor Dashboard"
         Height="700" Width="1400"
+        MinHeight="600" MinWidth="900"
         WindowStartupLocation="CenterScreen"
         WindowState="Maximized"
         Background="{DynamicResource BackgroundBrush}">
diff --git a/Dashboard/Themes/DarkTheme.xaml b/Dashboard/Themes/DarkTheme.xaml
index 7390435c..146ed70a 100644
--- a/Dashboard/Themes/DarkTheme.xaml
+++ b/Dashboard/Themes/DarkTheme.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     <!-- ============================================ -->
     <!-- Darling Data Dark Theme                      -->
@@ -33,6 +34,18 @@
     <Color x:Key="ErrorColor">#E57373</Color>
     <Color x:Key="InfoColor">#2eaef1</Color>
 
+    <!-- Spacing Scale -->
+    <sys:Double x:Key="SpacingXS">2</sys:Double>
+    <sys:Double x:Key="SpacingSm">4</sys:Double>
+    <sys:Double x:Key="SpacingMd">8</sys:Double>
+    <sys:Double x:Key="SpacingLg">12</sys:Double>
+    <sys:Double x:Key="SpacingXL">16</sys:Double>
+
+    <!-- Corner Radius -->
+    <CornerRadius x:Key="CornerRadiusSm">2</CornerRadius>
+    <CornerRadius x:Key="CornerRadiusMd">4</CornerRadius>
+    <CornerRadius x:Key="CornerRadiusLg">6</CornerRadius>
+
     <!-- Brushes -->
     <SolidColorBrush x:Key="AccentBrush" Color="{StaticResource AccentColor}"/>
     <SolidColorBrush x:Key="AccentHoverBrush" Color="{StaticResource AccentHoverColor}"/>
diff --git a/InstallerGui/MainWindow.xaml b/InstallerGui/MainWindow.xaml
index 5f032534..61b4046f 100644
--- a/InstallerGui/MainWindow.xaml
+++ b/InstallerGui/MainWindow.xaml
@@ -6,8 +6,8 @@
         MinHeight="600" MinWidth="700"
         WindowStartupLocation="CenterScreen"
         WindowState="Maximized"
-        Background="#333333"
-        Foreground="#FFFFFF">
+        Background="{DynamicResource BackgroundBrush}"
+        Foreground="{DynamicResource ForegroundBrush}">
 
     <Grid Margin="20">
         <Grid.RowDefinitions>
diff --git a/InstallerGui/Themes/DarkTheme.xaml b/InstallerGui/Themes/DarkTheme.xaml
index bfcd3e56..2b9092e5 100644
--- a/InstallerGui/Themes/DarkTheme.xaml
+++ b/InstallerGui/Themes/DarkTheme.xaml
@@ -11,15 +11,15 @@
     <SolidColorBrush x:Key="AccentHoverBrush" Color="#5bc4f5"/>
     <SolidColorBrush x:Key="AccentPressedBrush" Color="#1a9ae0"/>
 
-    <SolidColorBrush x:Key="BackgroundDarkBrush" Color="#252525"/>
-    <SolidColorBrush x:Key="BackgroundBrush" Color="#333333"/>
-    <SolidColorBrush x:Key="BackgroundLightBrush" Color="#404040"/>
-    <SolidColorBrush x:Key="BackgroundLighterBrush" Color="#4a4a4a"/>
+    <SolidColorBrush x:Key="BackgroundDarkBrush" Color="#111217"/>
+    <SolidColorBrush x:Key="BackgroundBrush" Color="#181b1f"/>
+    <SolidColorBrush x:Key="BackgroundLightBrush" Color="#22252b"/>
+    <SolidColorBrush x:Key="BackgroundLighterBrush" Color="#2a2d35"/>
 
-    <SolidColorBrush x:Key="ForegroundBrush" Color="#FFFFFF"/>
-    <SolidColorBrush x:Key="ForegroundMutedBrush" Color="#858585"/>
+    <SolidColorBrush x:Key="ForegroundBrush" Color="#E4E6EB"/>
+    <SolidColorBrush x:Key="ForegroundMutedBrush" Color="#6B7280"/>
 
-    <SolidColorBrush x:Key="BorderBrush" Color="#555555"/>
+    <SolidColorBrush x:Key="BorderBrush" Color="#2a2d35"/>
 
     <!-- ============================================ -->
     <!-- TextBlock Style                              -->
diff --git a/Lite/MainWindow.xaml b/Lite/MainWindow.xaml
index c57bb020..60b8aa8c 100644
--- a/Lite/MainWindow.xaml
+++ b/Lite/MainWindow.xaml
@@ -4,6 +4,7 @@
         xmlns:controls="clr-namespace:PerformanceMonitorLite.Controls"
         Title="Performance Monitor Lite"
         Height="700" Width="1200"
+        MinHeight="600" MinWidth="900"
         WindowStartupLocation="CenterScreen"
         WindowState="Maximized"
         Icon="EDD.ico"
diff --git a/Lite/Themes/DarkTheme.xaml b/Lite/Themes/DarkTheme.xaml
index 44df319b..21742340 100644
--- a/Lite/Themes/DarkTheme.xaml
+++ b/Lite/Themes/DarkTheme.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     <!-- ============================================ -->
     <!-- Darling Data Dark Theme                      -->
@@ -33,6 +34,18 @@
     <Color x:Key="ErrorColor">#E57373</Color>
     <Color x:Key="InfoColor">#2eaef1</Color>
 
+    <!-- Spacing Scale -->
+    <sys:Double x:Key="SpacingXS">2</sys:Double>
+    <sys:Double x:Key="SpacingSm">4</sys:Double>
+    <sys:Double x:Key="SpacingMd">8</sys:Double>
+    <sys:Double x:Key="SpacingLg">12</sys:Double>
+    <sys:Double x:Key="SpacingXL">16</sys:Double>
+
+    <!-- Corner Radius -->
+    <CornerRadius x:Key="CornerRadiusSm">2</CornerRadius>
+    <CornerRadius x:Key="CornerRadiusMd">4</CornerRadius>
+    <CornerRadius x:Key="CornerRadiusLg">6</CornerRadius>
+
     <!-- Brushes -->
     <SolidColorBrush x:Key="AccentBrush" Color="{StaticResource AccentColor}"/>
     <SolidColorBrush x:Key="AccentHoverBrush" Color="{StaticResource AccentHoverColor}"/>