diff --git a/Daqifi.Desktop/Resources/DesignTokens.xaml b/Daqifi.Desktop/Resources/DesignTokens.xaml
index d8d31a7e..b0b0d421 100644
--- a/Daqifi.Desktop/Resources/DesignTokens.xaml
+++ b/Daqifi.Desktop/Resources/DesignTokens.xaml
@@ -29,4 +29,7 @@
     <SolidColorBrush x:Key="StatusAmber"    Color="#F59E0B"/>
     <SolidColorBrush x:Key="StatusRed"      Color="#F43F5E"/>
 
+    <!-- Overlays -->
+    <SolidColorBrush x:Key="Scrim"          Color="#CC000000"/>
+
 </ResourceDictionary>
diff --git a/Daqifi.Desktop/View/FirmwareDialog.xaml b/Daqifi.Desktop/View/FirmwareDialog.xaml
index 4af4bcc4..b9220acb 100644
--- a/Daqifi.Desktop/View/FirmwareDialog.xaml
+++ b/Daqifi.Desktop/View/FirmwareDialog.xaml
@@ -43,7 +43,7 @@
                 <Button DockPanel.Dock="Bottom" Content="Upload" Width="100" Height="30" HorizontalAlignment="Right" Style="{StaticResource MahApps.Styles.Button.Square.Accent }" controls:ControlsHelper.ContentCharacterCasing="Normal" Command="{Binding UploadFirmwareCommand}"/>
             </DockPanel>
 
-            <Grid Grid.RowSpan="4" Background="#ccffffff" Visibility="{Binding IsFirmwareUploading, Converter={StaticResource BoolToVis}}" >
+            <Grid Grid.RowSpan="4" Background="{StaticResource Scrim}" Visibility="{Binding IsFirmwareUploading, Converter={StaticResource BoolToVis}}" >
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*"/>
                     <RowDefinition Height="Auto"/>
@@ -51,8 +51,14 @@
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
                 <controls:MetroProgressBar Grid.Row="1" Height="25" Minimum="0" Maximum="100" Value="{Binding UploadFirmwareProgress}" />
-                <Label Grid.Row="2" Content="Loading Firmware... (this may take several minutes)."  HorizontalAlignment="Center" />
-                <Label Grid.Row="3" Content="{Binding UploadFirmwareProgressText}"  HorizontalAlignment="Center" />
+                <Label Grid.Row="2"
+                       Content="Loading Firmware... (this may take several minutes)."
+                       HorizontalAlignment="Center"
+                       Foreground="{StaticResource TextPrimary}" />
+                <Label Grid.Row="3"
+                       Content="{Binding UploadFirmwareProgressText}"
+                       HorizontalAlignment="Center"
+                       Foreground="{StaticResource TextPrimary}" />
             </Grid>
         </Grid>
 
diff --git a/Daqifi.Desktop/View/MigrationStatusWindow.xaml b/Daqifi.Desktop/View/MigrationStatusWindow.xaml
index 5ae665cb..87692d22 100644
--- a/Daqifi.Desktop/View/MigrationStatusWindow.xaml
+++ b/Daqifi.Desktop/View/MigrationStatusWindow.xaml
@@ -6,10 +6,14 @@
         WindowStyle="None"
         ResizeMode="NoResize"
         SizeToContent="WidthAndHeight"
-        Background="White"
+        Background="{StaticResource Surface}"
         Topmost="True"
         AllowsTransparency="True">
-    <Border BorderBrush="#E0E0E0" BorderThickness="1" CornerRadius="4" Padding="32,24">
+    <Border Background="{StaticResource Surface}"
+            BorderBrush="{StaticResource BorderDim}"
+            BorderThickness="1"
+            CornerRadius="4"
+            Padding="32,24">
         <StackPanel HorizontalAlignment="Center">
             <Image Source="/Images/DAQiFi.png"
                    Width="200"
@@ -17,13 +21,13 @@
                    RenderOptions.BitmapScalingMode="HighQuality" />
             <TextBlock Text="Upgrading database, please wait..."
                        FontSize="14"
-                       Foreground="#555555"
+                       Foreground="{StaticResource TextSecondary}"
                        HorizontalAlignment="Center"
                        Margin="0,0,0,12" />
             <ProgressBar IsIndeterminate="True"
                          Height="4"
                          Width="200"
-                         Foreground="#3498db" />
+                         Foreground="{StaticResource Accent}" />
         </StackPanel>
     </Border>
 </Window>