diff --git a/Aaru.Gui/Views/Tabs/AtaInfo.xaml b/Aaru.Gui/Views/Tabs/AtaInfo.xaml
index 0ccf7a7ab..681b9d2b3 100644
--- a/Aaru.Gui/Views/Tabs/AtaInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/AtaInfo.xaml
@@ -54,7 +54,7 @@
                    Text="{Binding AtaOrAtapiText, Mode=OneWay}" />
         <Border Grid.Row="1"
                 BorderThickness="1"
-                BorderBrush="LightGray"
+                BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                 CornerRadius="8">
             <ScrollViewer Padding="8">
                 <controls:SpectreTextBlock Text="{Binding AtaIdentifyText, Mode=OneWay}"
diff --git a/Aaru.Gui/Views/Tabs/BlurayInfo.xaml b/Aaru.Gui/Views/Tabs/BlurayInfo.xaml
index 366d6ee4b..12bb2ac24 100644
--- a/Aaru.Gui/Views/Tabs/BlurayInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/BlurayInfo.xaml
@@ -63,7 +63,7 @@
                       RowSpacing="8">
                     <Border Grid.Row="0"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -87,7 +87,7 @@
                       RowSpacing="8">
                     <Border Grid.Row="0"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -111,7 +111,7 @@
                       RowSpacing="8">
                     <Border Grid.Row="0"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -135,7 +135,7 @@
                       RowSpacing="8">
                     <Border Grid.Row="0"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -159,7 +159,7 @@
                       RowSpacing="8">
                     <Border Grid.Row="0"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -183,7 +183,7 @@
                       RowSpacing="8">
                     <Border Grid.Row="0"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -207,7 +207,7 @@
                       RowSpacing="8">
                     <Border Grid.Row="0"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock TextWrapping="Wrap"
diff --git a/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml b/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml
index dfcf7e2c5..2719d0d0f 100644
--- a/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml
@@ -89,7 +89,7 @@
                   RowSpacing="8">
                 <Border Grid.Row="0"
                         BorderThickness="1"
-                        BorderBrush="LightGray"
+                        BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                         CornerRadius="8">
                     <ScrollViewer Padding="8">
                         <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -113,7 +113,7 @@
                   RowSpacing="8">
                 <Border Grid.Row="0"
                         BorderThickness="1"
-                        BorderBrush="LightGray"
+                        BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                         CornerRadius="8">
                     <ScrollViewer Padding="8">
                         <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -135,7 +135,7 @@
                   RowSpacing="8">
                 <Border Grid.Row="0"
                         BorderThickness="1"
-                        BorderBrush="LightGray"
+                        BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                         CornerRadius="8">
                     <ScrollViewer Padding="8">
                         <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -157,7 +157,7 @@
                   RowSpacing="8">
                 <Border Grid.Row="0"
                         BorderThickness="1"
-                        BorderBrush="LightGray"
+                        BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                         CornerRadius="8">
                     <ScrollViewer Padding="8">
                         <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -179,7 +179,7 @@
                   RowSpacing="8">
                 <Border Grid.Row="0"
                         BorderThickness="1"
-                        BorderBrush="LightGray"
+                        BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                         CornerRadius="8">
                     <ScrollViewer Padding="8">
                         <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -201,7 +201,7 @@
                   RowSpacing="8">
                 <Border Grid.Row="0"
                         BorderThickness="1"
-                        BorderBrush="LightGray"
+                        BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                         CornerRadius="8">
                     <ScrollViewer Padding="8">
                         <controls:SpectreTextBlock TextWrapping="Wrap"
diff --git a/Aaru.Gui/Views/Tabs/DvdInfo.xaml b/Aaru.Gui/Views/Tabs/DvdInfo.xaml
index 1158b4393..20a8f6d56 100644
--- a/Aaru.Gui/Views/Tabs/DvdInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/DvdInfo.xaml
@@ -64,7 +64,7 @@
                       RowSpacing="8">
                     <Border Grid.Row="0"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -88,7 +88,7 @@
                       RowSpacing="8">
                     <Border Grid.Row="0"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock TextWrapping="Wrap"
diff --git a/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml b/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml
index 505cab1a3..f246b5e45 100644
--- a/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml
@@ -64,7 +64,7 @@
                       RowSpacing="8">
                     <Border Grid.Row="0"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -88,7 +88,7 @@
                       RowSpacing="8">
                     <Border Grid.Row="0"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock TextWrapping="Wrap"
@@ -112,7 +112,7 @@
                       RowSpacing="8">
                     <Border Grid.Row="0"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock TextWrapping="Wrap"
diff --git a/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml b/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml
index 2ff3f6fe6..654a1b662 100644
--- a/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml
@@ -90,7 +90,7 @@
             </DataGrid>
             <Border Grid.Column="1"
                     BorderThickness="1"
-                    BorderBrush="LightGray"
+                    BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                     CornerRadius="8">
                 <ScrollViewer Padding="8">
                     <controls:SpectreTextBlock HorizontalAlignment="Stretch"
diff --git a/Aaru.Gui/Views/Tabs/ScsiInfo.xaml b/Aaru.Gui/Views/Tabs/ScsiInfo.xaml
index c9dbfba66..1954a343d 100644
--- a/Aaru.Gui/Views/Tabs/ScsiInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/ScsiInfo.xaml
@@ -84,7 +84,7 @@
                   Margin="8">
                 <Border Grid.Row="0"
                         BorderThickness="1"
-                        BorderBrush="LightGray"
+                        BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                         CornerRadius="8">
                     <ScrollViewer Padding="8">
                         <controls:SpectreTextBlock Text="{Binding ScsiInquiryText, Mode=OneWay}"
@@ -127,7 +127,7 @@
                     </DataGrid>
                     <Border Grid.Column="1"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock HorizontalAlignment="Stretch"
@@ -174,7 +174,7 @@
                     </DataGrid>
                     <Border Grid.Column="1"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock HorizontalAlignment="Stretch"
@@ -218,7 +218,7 @@
                     </DataGrid>
                     <Border Grid.Column="1"
                             BorderThickness="1"
-                            BorderBrush="LightGray"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                             CornerRadius="8">
                         <ScrollViewer Padding="8">
                             <controls:SpectreTextBlock HorizontalAlignment="Stretch"
diff --git a/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml
index 47bf548bd..872b732ec 100644
--- a/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml
@@ -53,7 +53,7 @@
             </TabItem.Header>
             <Border Margin="8"
                     BorderThickness="1"
-                    BorderBrush="LightGray"
+                    BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                     CornerRadius="8">
                 <ScrollViewer Padding="8">
                     <controls:SpectreTextBlock Text="{Binding CidText, Mode=OneWay}"
@@ -67,7 +67,7 @@
             </TabItem.Header>
             <Border BorderThickness="1"
                     Margin="8"
-                    BorderBrush="LightGray"
+                    BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                     CornerRadius="8">
                 <ScrollViewer Padding="8">
                     <controls:SpectreTextBlock Text="{Binding CsdText, Mode=OneWay}"
@@ -81,7 +81,7 @@
             </TabItem.Header>
             <Border BorderThickness="1"
                     Margin="8"
-                    BorderBrush="LightGray"
+                    BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                     CornerRadius="8">
                 <ScrollViewer Padding="8">
                     <controls:SpectreTextBlock Text="{Binding OcrText, Mode=OneWay}"
@@ -95,7 +95,7 @@
             </TabItem.Header>
             <Border BorderThickness="1"
                     Margin="8"
-                    BorderBrush="LightGray"
+                    BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                     CornerRadius="8">
                 <ScrollViewer Padding="8">
                     <controls:SpectreTextBlock Text="{Binding ExtendedCsdText, Mode=OneWay}"
@@ -109,7 +109,7 @@
             </TabItem.Header>
             <Border BorderThickness="1"
                     Margin="8"
-                    BorderBrush="LightGray"
+                    BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                     CornerRadius="8">
                 <ScrollViewer Padding="8">
                     <controls:SpectreTextBlock Text="{Binding ScrText, Mode=OneWay}"