diff --git a/Aaru.Tui/App.axaml b/Aaru.Tui/App.axaml
index ae591df8d..96ed98966 100644
--- a/Aaru.Tui/App.axaml
+++ b/Aaru.Tui/App.axaml
@@ -2,8 +2,16 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:console="https://github.com/jinek/consolonia"
              x:Class="Aaru.Tui.App"
-             RequestedThemeVariant="Light">
+             RequestedThemeVariant="Dark">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source="avares://Aaru.Tui/Themes/CyberpunkColors.axaml" />
+                <ResourceInclude Source="avares://Aaru.Tui/Themes/TurboVisionCyberpunkColors.axaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
     <Application.Styles>
-        <console:TurboVisionTheme />
+        <console:ModernContrastTheme /> <StyleInclude Source="avares://Aaru.Tui/Themes/CyberpunkOverrides.axaml" />
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/Aaru.Tui/Themes/CyberpunkColors.axaml b/Aaru.Tui/Themes/CyberpunkColors.axaml
new file mode 100644
index 000000000..a314d6ad1
--- /dev/null
+++ b/Aaru.Tui/Themes/CyberpunkColors.axaml
@@ -0,0 +1,56 @@
+<?xml version="1.0"
+      encoding="utf-8"?>
+
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Cyberpunk Color Scheme - Neon inspired -->
+
+    <!-- Primary Colors -->
+    <Color x:Key="CyberBlack">#000000</Color> <Color x:Key="CyberNeonCyan">#00FFFF</Color>
+    <Color x:Key="CyberNeonMagenta">#FF00FF</Color> <Color x:Key="CyberNeonLime">#00FF00</Color>
+    <Color x:Key="CyberNeonPink">#FF006E</Color> <Color x:Key="CyberNeonPurple">#7B00FF</Color>
+    <Color x:Key="CyberNeonOrange">#FF6B00</Color> <Color x:Key="CyberNeonYellow">#FFFF00</Color>
+
+    <!-- Dark Colors -->
+    <Color x:Key="CyberDarkGray">#0A0A0A</Color> <Color x:Key="CyberDarkGray2">#1A1A1A</Color>
+    <Color x:Key="CyberDarkGray3">#2A2A2A</Color>
+
+    <!-- Accent Colors -->
+    <Color x:Key="CyberAccentPrimary">#00FFFF</Color> <Color x:Key="CyberAccentSecondary">#FF00FF</Color>
+    <Color x:Key="CyberAccentTertiary">#00FF00</Color>
+
+    <!-- Text Colors -->
+    <Color x:Key="CyberTextPrimary">#00FFFF</Color> <Color x:Key="CyberTextSecondary">#00FF80</Color>
+    <Color x:Key="CyberTextAccent">#FF00FF</Color> <Color x:Key="CyberTextWarning">#FFFF00</Color>
+    <Color x:Key="CyberTextDanger">#FF006E</Color> <Color x:Key="CyberTextSuccess">#00FF00</Color>
+
+    <!-- Background Colors -->
+    <Color x:Key="CyberBackgroundPrimary">#000000</Color> <Color x:Key="CyberBackgroundSecondary">#0A0A0A</Color>
+    <Color x:Key="CyberBackgroundTertiary">#1A1A1A</Color>
+
+    <!-- Border Colors -->
+    <Color x:Key="CyberBorderPrimary">#00FFFF</Color> <Color x:Key="CyberBorderSecondary">#FF00FF</Color>
+    <Color x:Key="CyberBorderAccent">#00FF00</Color>
+
+    <!-- Brushes -->
+    <SolidColorBrush x:Key="CyberBackgroundBrush">#000000</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberBackgroundPrimaryBrush">#000000</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberBackgroundSecondaryBrush">#0A0A0A</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberBackgroundTertiaryBrush">#1A1A1A</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberTextPrimaryBrush">#00FFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberTextSecondaryBrush">#00FF80</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberTextAccentBrush">#FF00FF</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberTextWarningBrush">#FFFF00</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberTextDangerBrush">#FF006E</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberTextSuccessBrush">#00FF00</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberBorderPrimaryBrush">#00FFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberBorderSecondaryBrush">#FF00FF</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberBorderAccentBrush">#00FF00</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberNeonCyanBrush">#00FFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberNeonMagentaBrush">#FF00FF</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberNeonLimeBrush">#00FF00</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberNeonPinkBrush">#FF006E</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberNeonPurpleBrush">#7B00FF</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberNeonOrangeBrush">#FF6B00</SolidColorBrush>
+    <SolidColorBrush x:Key="CyberNeonYellowBrush">#FFFF00</SolidColorBrush>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Aaru.Tui/Themes/CyberpunkOverrides.axaml b/Aaru.Tui/Themes/CyberpunkOverrides.axaml
new file mode 100644
index 000000000..4d31c8df9
--- /dev/null
+++ b/Aaru.Tui/Themes/CyberpunkOverrides.axaml
@@ -0,0 +1,208 @@
+<?xml version="1.0"
+      encoding="utf-8"?>
+
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Styles.Resources>
+        <!-- Global override brushes -->
+        <SolidColorBrush x:Key="ThemeBackgroundBrush"
+                         Color="{DynamicResource CyberBlack}" />
+        <SolidColorBrush x:Key="ThemeForegroundBrush"
+                         Color="{DynamicResource CyberTextPrimary}" />
+        <SolidColorBrush x:Key="ThemeBorderHighBrush"
+                         Color="{DynamicResource CyberNeonCyan}" />
+        <SolidColorBrush x:Key="ThemeBorderLowBrush"
+                         Color="{DynamicResource CyberNeonMagenta}" />
+        <SolidColorBrush x:Key="ThemeAccentBrush"
+                         Color="{DynamicResource CyberNeonMagenta}" />
+        <SolidColorBrush x:Key="ThemeAccentForegroundBrush"
+                         Color="{DynamicResource CyberBlack}" />
+    </Styles.Resources>
+
+    <Style Selector="Window">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundPrimaryBrush}" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberTextPrimaryBrush}" />
+    </Style>
+
+    <Style Selector="Panel">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundPrimaryBrush}" />
+    </Style>
+
+    <Style Selector="Border">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource CyberNeonCyanBrush}" />
+        <Setter Property="BorderThickness"
+                Value="1" />
+    </Style>
+
+    <Style Selector="TextBlock">
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberTextPrimaryBrush}" />
+    </Style>
+
+    <Style Selector="TextBlock.heading">
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberNeonMagentaBrush}" />
+    </Style>
+    <Style Selector="TextBlock.subheading">
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberNeonLimeBrush}" />
+    </Style>
+
+    <Style Selector="Button">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundTertiaryBrush}" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberNeonCyanBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource CyberNeonMagentaBrush}" />
+        <Setter Property="BorderThickness"
+                Value="1" />
+        <Setter Property="Padding"
+                Value="2,0" />
+    </Style>
+    <Style Selector="Button:pointerover">
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberNeonMagentaBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource CyberNeonCyanBrush}" />
+    </Style>
+    <Style Selector="Button:pressed">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberDarkGray3}" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberNeonYellowBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource CyberNeonYellowBrush}" />
+    </Style>
+
+    <Style Selector="TextBox">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundTertiaryBrush}" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberTextPrimaryBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource CyberNeonCyanBrush}" />
+        <Setter Property="BorderThickness"
+                Value="1" />
+    </Style>
+    <Style Selector="TextBox:focus">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource CyberNeonMagentaBrush}" />
+        <Setter Property="BorderThickness"
+                Value="2" />
+    </Style>
+
+    <Style Selector="ListBoxItem:selected">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundSecondaryBrush}" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberNeonMagentaBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource CyberNeonMagentaBrush}" />
+        <Setter Property="BorderThickness"
+                Value="1" />
+    </Style>
+    <Style Selector="ListBoxItem:pointerover">
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberNeonCyanBrush}" />
+    </Style>
+
+    <Style Selector="ProgressBar">
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberNeonLimeBrush}" />
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundSecondaryBrush}" />
+    </Style>
+
+    <Style Selector="TextBlock.status-success">
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberTextSuccessBrush}" />
+    </Style>
+    <Style Selector="TextBlock.status-error">
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberTextDangerBrush}" />
+    </Style>
+    <Style Selector="TextBlock.status-warn">
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberTextWarningBrush}" />
+    </Style>
+
+    <!-- Container controls - force black backgrounds -->
+    <Style Selector="DockPanel">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundPrimaryBrush}" />
+    </Style>
+
+    <Style Selector="Grid">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundPrimaryBrush}" />
+    </Style>
+
+    <Style Selector="StackPanel">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundPrimaryBrush}" />
+    </Style>
+
+    <Style Selector="ScrollViewer">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundPrimaryBrush}" />
+    </Style>
+
+    <Style Selector="ListBox">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundPrimaryBrush}" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberTextPrimaryBrush}" />
+    </Style>
+
+    <Style Selector="TreeView">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundPrimaryBrush}" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberTextPrimaryBrush}" />
+    </Style>
+
+    <Style Selector="Menu">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundPrimaryBrush}" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberTextPrimaryBrush}" />
+    </Style>
+
+    <Style Selector="MenuItem">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundPrimaryBrush}" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberTextPrimaryBrush}" />
+    </Style>
+
+    <Style Selector="MenuItem:selected">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundSecondaryBrush}" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberNeonMagentaBrush}" />
+    </Style>
+
+    <Style Selector="MenuItem:pointerover">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundTertiaryBrush}" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberNeonCyanBrush}" />
+    </Style>
+
+    <Style Selector="DataGrid">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundPrimaryBrush}" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource CyberTextPrimaryBrush}" />
+    </Style>
+
+    <Style Selector="UserControl">
+        <Setter Property="Background"
+                Value="{DynamicResource CyberBackgroundPrimaryBrush}" />
+    </Style>
+</Styles>
\ No newline at end of file
diff --git a/Aaru.Tui/Themes/TurboVisionCyberpunkColors.axaml b/Aaru.Tui/Themes/TurboVisionCyberpunkColors.axaml
new file mode 100644
index 000000000..9283898b4
--- /dev/null
+++ b/Aaru.Tui/Themes/TurboVisionCyberpunkColors.axaml
@@ -0,0 +1,114 @@
+<?xml version="1.0"
+      encoding="utf-8"?>
+
+<!-- Overrides of TurboVisionDefaultColors.axaml adapted to cyberpunk style.
+     If any key here does not match the upstream file, copy the exact keys
+     from TurboVisionDefaultColors.axaml into this file and adjust colors. -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Global window/frame -->
+    <SolidColorBrush x:Key="WindowBackgroundBrush"
+                     Color="#000000" />
+    <SolidColorBrush x:Key="WindowForegroundBrush"
+                     Color="#00FFFF" />
+    <SolidColorBrush x:Key="FrameBorderBrush"
+                     Color="#00FFFF" />
+    <SolidColorBrush x:Key="FrameCaptionForegroundBrush"
+                     Color="#FF00FF" />
+
+    <!-- Menus / menu bar -->
+    <SolidColorBrush x:Key="MenuBarBackgroundBrush"
+                     Color="#000000" />
+    <SolidColorBrush x:Key="MenuBarForegroundBrush"
+                     Color="#00FFFF" />
+    <SolidColorBrush x:Key="MenuBackgroundBrush"
+                     Color="#000000" />
+    <SolidColorBrush x:Key="MenuForegroundBrush"
+                     Color="#00FFFF" />
+    <SolidColorBrush x:Key="MenuSelectedBackgroundBrush"
+                     Color="#1A1A1A" />
+    <SolidColorBrush x:Key="MenuSelectedForegroundBrush"
+                     Color="#FF00FF" />
+    <SolidColorBrush x:Key="MenuShortcutForegroundBrush"
+                     Color="#00FF00" />
+
+    <!-- Buttons -->
+    <SolidColorBrush x:Key="ButtonBackgroundBrush"
+                     Color="#0A0A0A" />
+    <SolidColorBrush x:Key="ButtonForegroundBrush"
+                     Color="#00FFFF" />
+    <SolidColorBrush x:Key="ButtonHotKeyForegroundBrush"
+                     Color="#FF00FF" />
+    <SolidColorBrush x:Key="ButtonPressedBackgroundBrush"
+                     Color="#1A1A1A" />
+    <SolidColorBrush x:Key="ButtonPressedForegroundBrush"
+                     Color="#00FF00" />
+
+    <!-- Inputs / text fields -->
+    <SolidColorBrush x:Key="InputFieldBackgroundBrush"
+                     Color="#0A0A0A" />
+    <SolidColorBrush x:Key="InputFieldForegroundBrush"
+                     Color="#00FFFF" />
+    <SolidColorBrush x:Key="InputFieldFocusedBackgroundBrush"
+                     Color="#1A1A1A" />
+    <SolidColorBrush x:Key="InputFieldFocusedForegroundBrush"
+                     Color="#FF00FF" />
+
+    <!-- Lists -->
+    <SolidColorBrush x:Key="ListBoxBackgroundBrush"
+                     Color="#000000" />
+    <SolidColorBrush x:Key="ListBoxForegroundBrush"
+                     Color="#00FFFF" />
+    <SolidColorBrush x:Key="ListBoxSelectedBackgroundBrush"
+                     Color="#1A1A1A" />
+    <SolidColorBrush x:Key="ListBoxSelectedForegroundBrush"
+                     Color="#FF00FF" />
+
+    <!-- ScrollBar -->
+    <SolidColorBrush x:Key="ScrollBarBackgroundBrush"
+                     Color="#000000" />
+    <SolidColorBrush x:Key="ScrollBarForegroundBrush"
+                     Color="#00FFFF" />
+
+    <!-- Status bar -->
+    <SolidColorBrush x:Key="StatusBarBackgroundBrush"
+                     Color="#000000" />
+    <SolidColorBrush x:Key="StatusBarForegroundBrush"
+                     Color="#00FFFF" />
+    <SolidColorBrush x:Key="StatusBarHotKeyForegroundBrush"
+                     Color="#FF00FF" />
+
+    <!-- Accents / misc -->
+    <SolidColorBrush x:Key="HighlightForegroundBrush"
+                     Color="#FF00FF" />
+    <SolidColorBrush x:Key="HighlightBackgroundBrush"
+                     Color="#1A1A1A" />
+    <SolidColorBrush x:Key="SeparatorBrush"
+                     Color="#2A2A2A" />
+
+    <!-- Fallback generic theme keys (if used by Consolonia) -->
+    <SolidColorBrush x:Key="ThemeBackgroundBrush"
+                     Color="#000000" />
+    <SolidColorBrush x:Key="ThemeForegroundBrush"
+                     Color="#00FFFF" />
+    <SolidColorBrush x:Key="ThemeAccentBrush"
+                     Color="#FF00FF" />
+    <SolidColorBrush x:Key="ThemeAccentForegroundBrush"
+                     Color="#000000" />
+
+    <!-- Additional probable keys -->
+    <SolidColorBrush x:Key="ErrorForegroundBrush"
+                     Color="#FF006E" />
+    <SolidColorBrush x:Key="WarningForegroundBrush"
+                     Color="#FFFF00" />
+    <SolidColorBrush x:Key="SuccessForegroundBrush"
+                     Color="#00FF00" />
+    <SolidColorBrush x:Key="InfoForegroundBrush"
+                     Color="#00FFFF" />
+    <SolidColorBrush x:Key="DisabledForegroundBrush"
+                     Color="#444444" />
+    <SolidColorBrush x:Key="FocusedBorderBrush"
+                     Color="#FF00FF" />
+    <SolidColorBrush x:Key="UnfocusedBorderBrush"
+                     Color="#00FFFF" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Aaru.Tui/Views/Dialogs/GoToPathDialog.axaml b/Aaru.Tui/Views/Dialogs/GoToPathDialog.axaml
index 91d7c01c6..ca8e74533 100644
--- a/Aaru.Tui/Views/Dialogs/GoToPathDialog.axaml
+++ b/Aaru.Tui/Views/Dialogs/GoToPathDialog.axaml
@@ -16,17 +16,24 @@
     <Design.DataContext>
         <dialogs:GoToPathDialogViewModel />
     </Design.DataContext>
-    <Border BorderThickness="1">
+    <Border BorderThickness="1"
+            Background="{DynamicResource CyberBackgroundPrimaryBrush}">
         <Border.BorderBrush>
             <brushes:LineBrush LineStyle="DoubleLine"
-                               Brush="Blue" />
+                               Brush="Cyan" />
         </Border.BorderBrush>
         <StackPanel>
-            <TextBlock Text="{x:Static localization:Resources.DestinationPath_Text}" />
+            <TextBlock Text="{x:Static localization:Resources.DestinationPath_Text}"
+                       Foreground="{DynamicResource CyberNeonMagentaBrush}"
+                       FontWeight="Bold" />
             <TextBox Text="{Binding Path, Mode=TwoWay}"
+                     Background="{DynamicResource CyberBackgroundTertiaryBrush}"
+                     Foreground="{DynamicResource CyberNeonCyanBrush}"
+                     BorderBrush="{DynamicResource CyberNeonCyanBrush}"
+                     BorderThickness="1"
                      Watermark="{x:Static localization:Resources.DestinationPath_Watermark}" />
             <TextBlock Text="{Binding ErrorMessage, Mode=OneWay}"
-                       Foreground="Red"
+                       Foreground="{DynamicResource CyberNeonPinkBrush}"
                        IsVisible="{Binding HasError, Mode=OneWay}" />
             <StackPanel Orientation="Horizontal"
                         HorizontalAlignment="Right"
diff --git a/Aaru.Tui/Views/Dialogs/GoToSectorDialog.axaml b/Aaru.Tui/Views/Dialogs/GoToSectorDialog.axaml
index 24855183b..44f3d0a81 100644
--- a/Aaru.Tui/Views/Dialogs/GoToSectorDialog.axaml
+++ b/Aaru.Tui/Views/Dialogs/GoToSectorDialog.axaml
@@ -14,17 +14,24 @@
     <Design.DataContext>
         <vm:GoToSectorDialogViewModel />
     </Design.DataContext>
-    <Border BorderThickness="1">
+    <Border BorderThickness="1"
+            Background="{DynamicResource CyberBackgroundPrimaryBrush}">
         <Border.BorderBrush>
             <brushes:LineBrush LineStyle="DoubleLine"
-                               Brush="Blue" />
+                               Brush="Cyan" />
         </Border.BorderBrush>
         <StackPanel>
-            <TextBlock Text="{x:Static localization:Resources.SectorNumber_Text}" />
+            <TextBlock Text="{x:Static localization:Resources.SectorNumber_Text}"
+                       Foreground="{DynamicResource CyberNeonMagentaBrush}"
+                       FontWeight="Bold" />
             <TextBox Text="{Binding SectorNumber, Mode=TwoWay}"
+                     Background="{DynamicResource CyberBackgroundTertiaryBrush}"
+                     Foreground="{DynamicResource CyberNeonCyanBrush}"
+                     BorderBrush="{DynamicResource CyberNeonCyanBrush}"
+                     BorderThickness="1"
                      Watermark="{x:Static localization:Resources.SectorNumber_Watermark}" />
             <TextBlock Text="{Binding ErrorMessage, Mode=OneWay}"
-                       Foreground="Red"
+                       Foreground="{DynamicResource CyberNeonPinkBrush}"
                        IsVisible="{Binding HasError, Mode=OneWay}" />
             <StackPanel Orientation="Horizontal"
                         HorizontalAlignment="Right"
diff --git a/Aaru.Tui/Views/Dialogs/HexViewHelpDialog.axaml b/Aaru.Tui/Views/Dialogs/HexViewHelpDialog.axaml
index d98d253c0..f2ac0319e 100644
--- a/Aaru.Tui/Views/Dialogs/HexViewHelpDialog.axaml
+++ b/Aaru.Tui/Views/Dialogs/HexViewHelpDialog.axaml
@@ -13,79 +13,79 @@
                              Width="40"
                              Height="11"
                              WindowStartupLocation="CenterScreen"
-                             BorderBrush="Blue"
                              CanResize="False"
                              Title="{x:Static localization:Resources.Help_Title}">
     <Design.DataContext>
         <dialogs:HexViewHelpDialogViewModel />
     </Design.DataContext>
-    <Border BorderThickness="1">
+    <Border BorderThickness="1"
+            Background="{DynamicResource CyberBackgroundPrimaryBrush}">
         <Border.BorderBrush>
             <brushes:LineBrush LineStyle="DoubleLine"
-                               Brush="Blue" />
+                               Brush="Cyan" />
         </Border.BorderBrush>
         <StackPanel>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="ESC" />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.GoBack_Text}" />
             </Grid>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="F1 " />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.ShowHelp_Text}" />
             </Grid>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="F2 " />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.GoNextSector_Text}" />
             </Grid>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="F3 " />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.GoPreviousSector_Text}" />
             </Grid>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="F4 " />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.GoSpecifiedSector_Text}" />
             </Grid>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="F5 " />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.ToggleLongMode_Text}" />
             </Grid>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="F10" />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.ExitApplication_Text}" />
             </Grid>
             <StackPanel Orientation="Horizontal"
diff --git a/Aaru.Tui/Views/Dialogs/ImageHelpDialog.axaml b/Aaru.Tui/Views/Dialogs/ImageHelpDialog.axaml
index 16eec5c1d..709ad94f6 100644
--- a/Aaru.Tui/Views/Dialogs/ImageHelpDialog.axaml
+++ b/Aaru.Tui/Views/Dialogs/ImageHelpDialog.axaml
@@ -13,43 +13,43 @@
                              Width="40"
                              Height="8"
                              WindowStartupLocation="CenterScreen"
-                             BorderBrush="Blue"
                              CanResize="False"
                              Title="{x:Static localization:Resources.Help_Title}">
     <Design.DataContext>
         <dialogs:ImageHelpDialogViewModel />
     </Design.DataContext>
-    <Border BorderThickness="1">
+    <Border BorderThickness="1"
+            Background="{DynamicResource CyberBackgroundPrimaryBrush}">
         <Border.BorderBrush>
             <brushes:LineBrush LineStyle="DoubleLine"
-                               Brush="Blue" />
+                               Brush="Cyan" />
         </Border.BorderBrush>
         <StackPanel>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="ESC" />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.GoBack_Text}" />
             </Grid>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="F1 " />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.ShowHelp_Text}" />
             </Grid>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="F10" />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.ExitApplication_Text}" />
             </Grid>
             <StackPanel Orientation="Horizontal"
diff --git a/Aaru.Tui/Views/Dialogs/MainHelpDialog.axaml b/Aaru.Tui/Views/Dialogs/MainHelpDialog.axaml
index b3b5947ca..ab61aec59 100644
--- a/Aaru.Tui/Views/Dialogs/MainHelpDialog.axaml
+++ b/Aaru.Tui/Views/Dialogs/MainHelpDialog.axaml
@@ -13,52 +13,52 @@
                              Width="40"
                              Height="8"
                              WindowStartupLocation="CenterScreen"
-                             BorderBrush="Blue"
                              CanResize="False"
                              Title="{x:Static localization:Resources.Help_Title}">
     <Design.DataContext>
         <dialogs:MainHelpDialogViewModel />
     </Design.DataContext>
-    <Border BorderThickness="1">
+    <Border BorderThickness="1"
+            Background="{DynamicResource CyberBackgroundPrimaryBrush}">
         <Border.BorderBrush>
             <brushes:LineBrush LineStyle="DoubleLine"
-                               Brush="Blue" />
+                               Brush="Cyan" />
         </Border.BorderBrush>
         <StackPanel>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="F1 " />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.ShowHelp_Text}" />
             </Grid>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="F2 " />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.SectorViewer_Text}" />
             </Grid>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="F4 " />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.GoToSpecifiedPath_Text}" />
             </Grid>
             <Grid ColumnDefinitions="Auto,*"
                   ColumnSpacing="2">
                 <TextBlock Grid.Column="0"
-                           Foreground="Aqua"
+                           Foreground="{DynamicResource CyberNeonCyanBrush}"
                            Text="F10" />
                 <TextBlock Grid.Column="1"
-                           Foreground="SlateBlue"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
                            Text="{x:Static localization:Resources.ExitApplication_Text}" />
             </Grid>
             <StackPanel Orientation="Horizontal"
diff --git a/Aaru.Tui/Views/Windows/FileView.axaml b/Aaru.Tui/Views/Windows/FileView.axaml
index ad8b42ff8..b0b582eb9 100644
--- a/Aaru.Tui/Views/Windows/FileView.axaml
+++ b/Aaru.Tui/Views/Windows/FileView.axaml
@@ -13,7 +13,10 @@
         <windows:FileViewViewModel />
     </Design.DataContext>
     <DockPanel>
-        <Menu DockPanel.Dock="Bottom">
+        <Menu DockPanel.Dock="Bottom"
+              Background="{DynamicResource CyberBackgroundPrimaryBrush}"
+              Foreground="{DynamicResource CyberNeonCyanBrush}"
+              HorizontalAlignment="Stretch">
             <MenuItem Header="ESC     " />
             <MenuItem Header="{x:Static localization:Resources.Help_Header}"
                       Command="{Binding HelpCommand, Mode=OneWay}"
@@ -29,86 +32,94 @@
                       Command="{Binding ExitCommand, Mode=OneWay}"
                       HotKey="F10" />
         </Menu>
-        <Border BorderThickness="1">
+        <Border BorderThickness="1"
+                Background="{DynamicResource CyberBackgroundPrimaryBrush}">
             <Border.BorderBrush>
                 <console:LineBrush LineStyle="DoubleLine"
-                                   Brush="Blue" />
+                                   Brush="Cyan" />
             </Border.BorderBrush>
             <Grid RowDefinitions="*,Auto">
                 <Grid ColumnDefinitions="*,*"
                       Grid.Row="0">
-                    <ListBox Grid.Column="0"
-                             ItemsSource="{Binding Files, Mode=OneWay}"
-                             BorderThickness="1"
-                             Background="Transparent"
-                             SelectedItem="{Binding SelectedFile, Mode=TwoWay}"
-                             KeyDown="ListBox_OnKeyDown">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate DataType="models:FileModel">
-                                <TextBox Text="{Binding Filename, Mode=OneWay}"
-                                         Foreground="{Binding ForegroundBrush, Mode=OneWay}"
-                                         Background="Transparent" />
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                        <ListBox.BorderBrush>
-                            <console:LineBrush LineStyle="DoubleLine"
-                                               Brush="Blue" />
-                        </ListBox.BorderBrush>
-                    </ListBox>
-                    <Border Grid.Column="1"
-                            BorderThickness="1">
+                    <Border Grid.Column="0"
+                            BorderThickness="1"
+                            Background="{DynamicResource CyberBackgroundPrimaryBrush}">
                         <Border.BorderBrush>
                             <console:LineBrush LineStyle="DoubleLine"
-                                               Brush="Blue" />
+                                               Brush="Cyan" />
+                        </Border.BorderBrush>
+                        <ListBox ItemsSource="{Binding Files, Mode=OneWay}"
+                                 Background="{DynamicResource CyberBackgroundPrimaryBrush}"
+                                 SelectedItem="{Binding SelectedFile, Mode=TwoWay}"
+                                 KeyDown="ListBox_OnKeyDown"
+                                 BorderThickness="0">
+                            <ListBox.ItemTemplate>
+                                <DataTemplate DataType="models:FileModel">
+                                    <TextBox Text="{Binding Filename, Mode=OneWay}"
+                                             Foreground="{Binding ForegroundBrush, Mode=OneWay}"
+                                             Background="{DynamicResource CyberBackgroundPrimaryBrush}" />
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+                    </Border>
+                    <Border Grid.Column="1"
+                            BorderThickness="1"
+                            Background="{DynamicResource CyberBackgroundPrimaryBrush}">
+                        <Border.BorderBrush>
+                            <console:LineBrush LineStyle="DoubleLine"
+                                               Brush="Magenta" />
                         </Border.BorderBrush>
                         <Grid RowDefinitions="Auto,Auto,Auto,*"
                               VerticalAlignment="Top">
                             <Border Grid.Row="0"
-                                    BorderThickness="1">
+                                    BorderThickness="1"
+                                    Background="{DynamicResource CyberBackgroundPrimaryBrush}">
                                 <Border.BorderBrush>
                                     <console:LineBrush LineStyle="DoubleLine"
-                                                       Brush="Blue" />
+                                                       Brush="Magenta" />
                                 </Border.BorderBrush>
                                 <StackPanel VerticalAlignment="Top"
                                             HorizontalAlignment="Center">
                                     <TextBlock Text="Aaru Data Preservation Suite"
-                                               Foreground="Red"
+                                               Foreground="{DynamicResource CyberNeonMagentaBrush}"
                                                FontWeight="Bold" />
                                     <TextBlock Text="{Binding InformationalVersion, Mode=OneWay}"
-                                               Foreground="Green"
+                                               Foreground="{DynamicResource CyberNeonLimeBrush}"
                                                FontWeight="Bold" />
                                     <TextBlock Text="{Binding Copyright, Mode=OneWay}"
-                                               Foreground="Blue"
+                                               Foreground="{DynamicResource CyberNeonCyanBrush}"
                                                FontWeight="Bold" />
                                 </StackPanel>
                             </Border>
                             <Border Grid.Row="1"
-                                    BorderThickness="1">
+                                    BorderThickness="1"
+                                    Background="{DynamicResource CyberBackgroundPrimaryBrush}">
                                 <Border.BorderBrush>
                                     <console:LineBrush LineStyle="DoubleLine"
-                                                       Brush="Blue" />
+                                                       Brush="Magenta" />
                                 </Border.BorderBrush>
                                 <Grid ColumnDefinitions="Auto, *">
                                     <TextBlock Grid.Column="0"
                                                Text="Path: "
-                                               Foreground="SlateBlue" />
+                                               Foreground="{DynamicResource CyberNeonCyanBrush}" />
                                     <TextBlock Grid.Column="1"
                                                Text="{Binding CurrentPath, Mode=OneWay}"
-                                               Foreground="Green" />
+                                               Foreground="{DynamicResource CyberNeonLimeBrush}" />
                                 </Grid>
                             </Border>
                             <Border Grid.Row="2"
                                     BorderThickness="1"
-                                    IsVisible="{Binding IsFileInfoAvailable, Mode=OneWay}">
+                                    IsVisible="{Binding IsFileInfoAvailable, Mode=OneWay}"
+                                    Background="{DynamicResource CyberBackgroundPrimaryBrush}">
                                 <Border.BorderBrush>
                                     <console:LineBrush LineStyle="DoubleLine"
-                                                       Brush="Blue" />
+                                                       Brush="Magenta" />
                                 </Border.BorderBrush>
                                 <Grid RowDefinitions="Auto, *, *, *, *">
                                     <TextBlock Text="{x:Static localization:Resources.FileInformation_Text}"
                                                Grid.Row="0"
                                                HorizontalAlignment="Center"
-                                               Foreground="SlateBlue" />
+                                               Foreground="{DynamicResource CyberNeonCyanBrush}" />
                                     <Grid ColumnDefinitions="Auto, *"
                                           Grid.Row="1"
                                           ColumnSpacing="1"
@@ -117,7 +128,7 @@
                                                    Text="{x:Static localization:Resources.FileLength_Text}" />
                                         <TextBlock Grid.Column="1"
                                                    Text="{Binding SelectedFileLength, Mode=OneWay}"
-                                                   Foreground="Aqua" />
+                                                   Foreground="{DynamicResource CyberNeonCyanBrush}" />
                                     </Grid>
                                     <Grid ColumnDefinitions="Auto, *"
                                           Grid.Row="2"
@@ -126,7 +137,7 @@
                                                    Text="{x:Static localization:Resources.FileCreationTime_Text}" />
                                         <TextBlock Grid.Column="1"
                                                    Text="{Binding SelectedFileCreationTime, Mode=OneWay}"
-                                                   Foreground="Yellow" />
+                                                   Foreground="{DynamicResource CyberNeonYellowBrush}" />
                                     </Grid>
                                     <Grid ColumnDefinitions="Auto, *"
                                           Grid.Row="3"
@@ -135,46 +146,47 @@
                                                    Text="{x:Static localization:Resources.FileLastWriteTime_Text}" />
                                         <TextBlock Grid.Column="1"
                                                    Text="{Binding SelectedFileLastWriteTime, Mode=OneWay}"
-                                                   Foreground="Yellow" />
+                                                   Foreground="{DynamicResource CyberNeonYellowBrush}" />
+                                    </Grid>
+                                    <Grid Grid.Row="4">
+                                        <OnPlatform>
+                                            <OnPlatform.Windows>
+                                                <Grid ColumnDefinitions="Auto, *"
+                                                      ColumnSpacing="1">
+                                                    <TextBlock Grid.Column="0"
+                                                               Text="{x:Static localization:Resources.FileAttributes_Text}" />
+                                                    <TextBlock Grid.Column="1"
+                                                               Text="{Binding SelectedFileAttributes, Mode=OneWay}"
+                                                               Foreground="{DynamicResource CyberNeonLimeBrush}" />
+                                                </Grid>
+                                            </OnPlatform.Windows>
+                                            <OnPlatform.Default>
+                                                <Grid ColumnDefinitions="Auto, *"
+                                                      ColumnSpacing="1">
+                                                    <TextBlock Grid.Column="0"
+                                                               Text="{x:Static localization:Resources.FileMode_Text}" />
+                                                    <TextBlock Grid.Column="1"
+                                                               Text="{Binding SelectedFileUnixMode, Mode=OneWay}"
+                                                               Foreground="{DynamicResource CyberNeonLimeBrush}" />
+                                                </Grid>
+                                            </OnPlatform.Default>
+                                        </OnPlatform>
                                     </Grid>
-                                    <OnPlatform>
-                                        <OnPlatform.Windows>
-                                            <Grid ColumnDefinitions="Auto, *"
-                                                  Grid.Row="4"
-                                                  ColumnSpacing="1">
-                                                <TextBlock Grid.Column="0"
-                                                           Text="{x:Static localization:Resources.FileAttributes_Text}" />
-                                                <TextBlock Grid.Column="1"
-                                                           Text="{Binding SelectedFileAttributes, Mode=OneWay}"
-                                                           Foreground="Green" />
-                                            </Grid>
-                                        </OnPlatform.Windows>
-                                        <OnPlatform.Default>
-                                            <Grid ColumnDefinitions="Auto, *"
-                                                  Grid.Row="4"
-                                                  ColumnSpacing="1">
-                                                <TextBlock Grid.Column="0"
-                                                           Text="{x:Static localization:Resources.FileMode_Text}" />
-                                                <TextBlock Grid.Column="1"
-                                                           Text="{Binding SelectedFileUnixMode, Mode=OneWay}"
-                                                           Foreground="Green" />
-                                            </Grid>
-                                        </OnPlatform.Default>
-                                    </OnPlatform>
                                 </Grid>
                             </Border>
                             <Border Grid.Row="3"
                                     IsVisible="{Binding SelectedFileHasInformation, Mode=OneWay}"
-                                    BorderThickness="1">
+                                    BorderThickness="1"
+                                    Background="{DynamicResource CyberBackgroundPrimaryBrush}">
                                 <Border.BorderBrush>
                                     <console:LineBrush LineStyle="DoubleLine"
-                                                       Brush="Blue" />
+                                                       Brush="Magenta" />
                                 </Border.BorderBrush>
                                 <ScrollViewer>
                                     <StackPanel VerticalAlignment="Top"
                                                 HorizontalAlignment="Stretch">
                                         <TextBlock Text="{x:Static localization:Resources.FileInformation_Text}"
-                                                   Foreground="SlateBlue"
+                                                   Foreground="{DynamicResource CyberNeonCyanBrush}"
                                                    FontWeight="Bold"
                                                    HorizontalAlignment="Center" />
                                         <controls:SpectreTextBlock
@@ -189,7 +201,8 @@
                 </Grid>
                 <TextBlock Grid.Row="1"
                            Text="{Binding Status, Mode=OneWay}"
-                           IsVisible="{Binding IsStatusVisible, Mode=OneWay}" />
+                           IsVisible="{Binding IsStatusVisible, Mode=OneWay}"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}" />
             </Grid>
         </Border>
     </DockPanel>
diff --git a/Aaru.Tui/Views/Windows/HexViewWindow.axaml b/Aaru.Tui/Views/Windows/HexViewWindow.axaml
index c93d3493e..3309fc117 100644
--- a/Aaru.Tui/Views/Windows/HexViewWindow.axaml
+++ b/Aaru.Tui/Views/Windows/HexViewWindow.axaml
@@ -10,8 +10,11 @@
     <Design.DataContext>
         <windows:HexViewWindowViewModel />
     </Design.DataContext>
-    <DockPanel>
-        <Menu DockPanel.Dock="Bottom">
+    <DockPanel Background="{DynamicResource CyberBackgroundPrimaryBrush}">
+        <Menu DockPanel.Dock="Bottom"
+              Background="{DynamicResource CyberBackgroundPrimaryBrush}"
+              Foreground="{DynamicResource CyberNeonCyanBrush}"
+              HorizontalAlignment="Stretch">
             <MenuItem Header="{x:Static localization:Resources.Back_Header}"
                       HotKey="Escape"
                       Command="{Binding BackCommand, Mode=OneWay}" />
@@ -34,14 +37,15 @@
                       HotKey="F10"
                       Command="{Binding ExitCommand, Mode=OneWay}" />
         </Menu>
-        <Border BorderThickness="1">
+        <Border BorderThickness="1"
+                Background="{DynamicResource CyberBackgroundPrimaryBrush}">
             <Border.BorderBrush>
                 <console:LineBrush LineStyle="DoubleLine"
-                                   Brush="Blue" />
+                                   Brush="Cyan" />
             </Border.BorderBrush>
             <Grid RowDefinitions="Auto,Auto,*,Auto">
                 <TextBlock Grid.Row="0"
-                           Foreground="Green"
+                           Foreground="{DynamicResource CyberNeonLimeBrush}"
                            Text="{Binding FilePath, Mode=OneWay}" />
                 <!-- Header -->
                 <Grid Grid.Row="1"
@@ -49,23 +53,23 @@
                     <TextBlock Grid.Column="0"
                                Text="{x:Static localization:Resources.Offset_Text}"
                                HorizontalAlignment="Left"
-                               Foreground="Cyan"
+                               Foreground="{DynamicResource CyberNeonCyanBrush}"
                                FontWeight="Bold" />
                     <TextBlock Grid.Column="1"
                                HorizontalAlignment="Center"
                                Text="00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F"
-                               Foreground="Cyan"
+                               Foreground="{DynamicResource CyberNeonCyanBrush}"
                                FontWeight="Bold" />
                     <TextBlock Grid.Column="2"
                                Text="{x:Static localization:Resources.ASCII_Text}"
                                HorizontalAlignment="Left"
-                               Foreground="Cyan"
+                               Foreground="{DynamicResource CyberNeonCyanBrush}"
                                FontWeight="Bold" />
                 </Grid>
 
                 <!-- Hex View Content -->
                 <ScrollViewer Grid.Row="2"
-                              Background="Transparent"
+                              Background="{DynamicResource CyberBackgroundPrimaryBrush}"
                               x:Name="HexScrollViewer">
                     <ItemsControl ItemsSource="{Binding Lines, Mode=OneWay}">
                         <ItemsControl.ItemTemplate>
@@ -74,28 +78,29 @@
                                     <!-- Offset Column -->
                                     <TextBlock Grid.Column="0"
                                                Text="{Binding OffsetString, Mode=OneWay}"
-                                               Foreground="Yellow" />
+                                               Foreground="{DynamicResource CyberNeonYellowBrush}" />
 
                                     <!-- Hex Column -->
                                     <TextBlock Grid.Column="1"
                                                HorizontalAlignment="Center"
                                                Text="{Binding HexString, Mode=OneWay}"
-                                               Foreground="White" />
+                                               Foreground="{DynamicResource CyberNeonMagentaBrush}" />
 
                                     <!-- ASCII Column -->
                                     <TextBlock Grid.Column="2"
                                                Text="{Binding AsciiString, Mode=OneWay}"
-                                               Foreground="LightGreen" />
+                                               Foreground="{DynamicResource CyberNeonLimeBrush}" />
                                 </Grid>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
                 </ScrollViewer>
                 <StackPanel Orientation="Horizontal"
-                            Grid.Row="3">
-                    <TextBlock Foreground="SlateBlue"
+                            Grid.Row="3"
+                            Background="{DynamicResource CyberBackgroundPrimaryBrush}">
+                    <TextBlock Foreground="{DynamicResource CyberNeonCyanBrush}"
                                Text="{x:Static localization:Resources.CurrentSector_Text}" />
-                    <TextBlock Foreground="Lime"
+                    <TextBlock Foreground="{DynamicResource CyberNeonLimeBrush}"
                                Text="{Binding CurrentSector, Mode=OneWay}" />
                 </StackPanel>
             </Grid>
diff --git a/Aaru.Tui/Views/Windows/ImageWindow.axaml b/Aaru.Tui/Views/Windows/ImageWindow.axaml
index e6886cefa..1ddf0ca2e 100644
--- a/Aaru.Tui/Views/Windows/ImageWindow.axaml
+++ b/Aaru.Tui/Views/Windows/ImageWindow.axaml
@@ -15,8 +15,11 @@
     <Design.DataContext>
         <windows:ImageWindowViewModel />
     </Design.DataContext>
-    <DockPanel>
-        <Menu DockPanel.Dock="Bottom">
+    <DockPanel Background="{DynamicResource CyberBackgroundPrimaryBrush}">
+        <Menu DockPanel.Dock="Bottom"
+              Background="{DynamicResource CyberBackgroundPrimaryBrush}"
+              Foreground="{DynamicResource CyberNeonCyanBrush}"
+              HorizontalAlignment="Stretch">
             <MenuItem Header="{x:Static localization:Resources.Back_Header}"
                       Command="{Binding BackCommand, Mode=OneWay}"
                       HotKey="Escape" />
@@ -28,149 +31,166 @@
                       Command="{Binding ExitCommand, Mode=OneWay}"
                       HotKey="F10" />
         </Menu>
-        <Border BorderThickness="1">
+        <Border BorderThickness="1"
+                Background="{DynamicResource CyberBackgroundPrimaryBrush}">
             <Border.BorderBrush>
                 <brushes:LineBrush LineStyle="DoubleLine"
-                                   Brush="Blue" />
+                                   Brush="Cyan" />
             </Border.BorderBrush>
             <Grid RowDefinitions="Auto,*,Auto">
                 <TextBlock Grid.Row="0"
                            Text="{Binding FilePath, Mode=OneWay}"
-                           Foreground="Green"
+                           Foreground="{DynamicResource CyberNeonLimeBrush}"
                            HorizontalAlignment="Center" />
                 <Grid ColumnDefinitions="*,*"
                       Grid.Row="1">
-                    <TreeView Grid.Column="0"
-                              ItemsSource="{Binding Nodes, Mode=OneWay}"
-                              BorderThickness="1"
-                              SelectedItem="{Binding SelectedNode, Mode=TwoWay}">
-                        <TreeView.BorderBrush>
-                            <brushes:LineBrush LineStyle="DoubleLine"
-                                               Brush="Blue" />
-                        </TreeView.BorderBrush>
-                        <TreeView.ItemTemplate>
-                            <TreeDataTemplate ItemsSource="{Binding SubNodes, Mode=OneWay}">
-                                <TextBlock Text="{Binding Title, Mode=OneWay}" />
-                            </TreeDataTemplate>
-                        </TreeView.ItemTemplate>
-                    </TreeView>
                     <Border BorderThickness="1"
-                            Grid.Column="1"
-                            IsVisible="{Binding IsPartitionInformationVisible, Mode=OneWay}">
+                            Grid.Column="0"
+                            Background="{DynamicResource CyberBackgroundPrimaryBrush}">
                         <Border.BorderBrush>
                             <brushes:LineBrush LineStyle="DoubleLine"
-                                               Brush="Blue" />
+                                               Brush="Cyan" />
                         </Border.BorderBrush>
-                        <StackPanel HorizontalAlignment="Stretch">
-                            <TextBlock Text="{x:Static localization:Resources.PartitionInformation_Text}"
-                                       Foreground="SlateBlue"
-                                       HorizontalAlignment="Center" />
-                            <Grid ColumnDefinitions="Auto,*"
-                                  ColumnSpacing="1">
-                                <TextBlock Grid.Column="0"
-                                           Foreground="SlateBlue"
-                                           Text="{x:Static localization:Resources.PartitionSequence_Text}" />
-                                <TextBlock Grid.Column="1"
-                                           Foreground="LawnGreen"
-                                           Text="{Binding PartitionSequence, Mode=OneWay}" />
-                            </Grid>
-                            <Grid ColumnDefinitions="Auto,*"
-                                  ColumnSpacing="1">
-                                <TextBlock Grid.Column="0"
-                                           Foreground="SlateBlue"
-                                           Text="{x:Static localization:Resources.PartitionName_Text}" />
-                                <TextBlock Grid.Column="1"
-                                           Foreground="DarkGreen"
-                                           Text="{Binding PartitionName, Mode=OneWay}" />
-                            </Grid>
-                            <Grid ColumnDefinitions="Auto,*"
-                                  ColumnSpacing="1">
-                                <TextBlock Grid.Column="0"
-                                           Foreground="SlateBlue"
-                                           Text="{x:Static localization:Resources.PartitionType_Text}" />
-                                <TextBlock Grid.Column="1"
-                                           Foreground="Olive"
-                                           Text="{Binding PartitionType, Mode=OneWay}" />
-                            </Grid>
-                            <Grid ColumnDefinitions="Auto,*"
-                                  ColumnSpacing="1">
-                                <TextBlock Grid.Column="0"
-                                           Foreground="SlateBlue"
-                                           Text="{x:Static localization:Resources.PartitionStartingSector_Text}" />
-                                <TextBlock Grid.Column="1"
-                                           Foreground="Violet"
-                                           Text="{Binding PartitionStart, Mode=OneWay}" />
-                            </Grid>
-                            <Grid ColumnDefinitions="Auto,*"
-                                  ColumnSpacing="1">
-                                <TextBlock Grid.Column="0"
-                                           Foreground="SlateBlue"
-                                           Text="{x:Static localization:Resources.PartitionOffset_Text}" />
-                                <TextBlock Grid.Column="1"
-                                           Foreground="Lime"
-                                           Text="{Binding PartitionOffset, Mode=OneWay}" />
-                            </Grid>
-                            <Grid ColumnDefinitions="Auto,*"
-                                  ColumnSpacing="1">
-                                <TextBlock Grid.Column="0"
-                                           Foreground="SlateBlue"
-                                           Text="{x:Static localization:Resources.PartitionLength_Text}" />
-                                <TextBlock Grid.Column="1"
-                                           Foreground="Violet"
-                                           Text="{Binding PartitionLength, Mode=OneWay}" />
-                            </Grid>
-                            <Grid ColumnDefinitions="Auto,*"
-                                  ColumnSpacing="1">
-                                <TextBlock Grid.Column="0"
-                                           Foreground="SlateBlue"
-                                           Text="{x:Static localization:Resources.PartitionSize_Text}" />
-                                <TextBlock Grid.Column="1"
-                                           Foreground="Lime"
-                                           Text="{Binding PartitionSize, Mode=OneWay}" />
-                            </Grid>
-                            <Grid ColumnDefinitions="Auto,*"
-                                  ColumnSpacing="1">
-                                <TextBlock Grid.Column="0"
-                                           Foreground="SlateBlue"
-                                           Text="{x:Static localization:Resources.PartitionScheme_Text}" />
-                                <TextBlock Grid.Column="1"
-                                           Foreground="Purple"
-                                           Text="{Binding PartitionScheme, Mode=OneWay}" />
-                            </Grid>
-                            <Grid ColumnDefinitions="Auto,*"
-                                  ColumnSpacing="1">
-                                <TextBlock Grid.Column="0"
-                                           Foreground="SlateBlue"
-                                           Text="{x:Static localization:Resources.PartitionDescription_Text}" />
-                                <TextBlock Grid.Column="1"
-                                           Foreground="Fuchsia"
-                                           Text="{Binding PartitionDescription, Mode=OneWay}" />
-                            </Grid>
-                        </StackPanel>
+                        <TreeView ItemsSource="{Binding Nodes, Mode=OneWay}"
+                                  Background="{DynamicResource CyberBackgroundPrimaryBrush}"
+                                  Foreground="{DynamicResource CyberNeonCyanBrush}"
+                                  SelectedItem="{Binding SelectedNode, Mode=TwoWay}"
+                                  BorderThickness="0">
+                            <TreeView.ItemTemplate>
+                                <TreeDataTemplate ItemsSource="{Binding SubNodes, Mode=OneWay}">
+                                    <TextBlock Text="{Binding Title, Mode=OneWay}"
+                                               Foreground="{DynamicResource CyberNeonCyanBrush}" />
+                                </TreeDataTemplate>
+                            </TreeView.ItemTemplate>
+                        </TreeView>
                     </Border>
                     <Border BorderThickness="1"
                             Grid.Column="1"
-                            IsVisible="{Binding IsFilesystemInformationVisible, Mode=OneWay}">
+                            IsVisible="{Binding IsPartitionInformationVisible, Mode=OneWay}"
+                            Background="{DynamicResource CyberBackgroundPrimaryBrush}">
                         <Border.BorderBrush>
                             <brushes:LineBrush LineStyle="DoubleLine"
-                                               Brush="Blue" />
+                                               Brush="Magenta" />
+                        </Border.BorderBrush>
+                        <ScrollViewer>
+                            <StackPanel HorizontalAlignment="Stretch">
+                                <TextBlock Text="{x:Static localization:Resources.PartitionInformation_Text}"
+                                           Foreground="{DynamicResource CyberNeonMagentaBrush}"
+                                           HorizontalAlignment="Center"
+                                           FontWeight="Bold" />
+                                <Grid ColumnDefinitions="Auto,*"
+                                      ColumnSpacing="1">
+                                    <TextBlock Grid.Column="0"
+                                               Foreground="{DynamicResource CyberNeonCyanBrush}"
+                                               Text="{x:Static localization:Resources.PartitionSequence_Text}" />
+                                    <TextBlock Grid.Column="1"
+                                               Foreground="{DynamicResource CyberNeonLimeBrush}"
+                                               Text="{Binding PartitionSequence, Mode=OneWay}" />
+                                </Grid>
+                                <Grid ColumnDefinitions="Auto,*"
+                                      ColumnSpacing="1">
+                                    <TextBlock Grid.Column="0"
+                                               Foreground="{DynamicResource CyberNeonCyanBrush}"
+                                               Text="{x:Static localization:Resources.PartitionName_Text}" />
+                                    <TextBlock Grid.Column="1"
+                                               Foreground="{DynamicResource CyberNeonLimeBrush}"
+                                               Text="{Binding PartitionName, Mode=OneWay}" />
+                                </Grid>
+                                <Grid ColumnDefinitions="Auto,*"
+                                      ColumnSpacing="1">
+                                    <TextBlock Grid.Column="0"
+                                               Foreground="{DynamicResource CyberNeonCyanBrush}"
+                                               Text="{x:Static localization:Resources.PartitionType_Text}" />
+                                    <TextBlock Grid.Column="1"
+                                               Foreground="{DynamicResource CyberNeonMagentaBrush}"
+                                               Text="{Binding PartitionType, Mode=OneWay}" />
+                                </Grid>
+                                <Grid ColumnDefinitions="Auto,*"
+                                      ColumnSpacing="1">
+                                    <TextBlock Grid.Column="0"
+                                               Foreground="{DynamicResource CyberNeonCyanBrush}"
+                                               Text="{x:Static localization:Resources.PartitionStartingSector_Text}" />
+                                    <TextBlock Grid.Column="1"
+                                               Foreground="{DynamicResource CyberNeonYellowBrush}"
+                                               Text="{Binding PartitionStart, Mode=OneWay}" />
+                                </Grid>
+                                <Grid ColumnDefinitions="Auto,*"
+                                      ColumnSpacing="1">
+                                    <TextBlock Grid.Column="0"
+                                               Foreground="{DynamicResource CyberNeonCyanBrush}"
+                                               Text="{x:Static localization:Resources.PartitionOffset_Text}" />
+                                    <TextBlock Grid.Column="1"
+                                               Foreground="{DynamicResource CyberNeonLimeBrush}"
+                                               Text="{Binding PartitionOffset, Mode=OneWay}" />
+                                </Grid>
+                                <Grid ColumnDefinitions="Auto,*"
+                                      ColumnSpacing="1">
+                                    <TextBlock Grid.Column="0"
+                                               Foreground="{DynamicResource CyberNeonCyanBrush}"
+                                               Text="{x:Static localization:Resources.PartitionLength_Text}" />
+                                    <TextBlock Grid.Column="1"
+                                               Foreground="{DynamicResource CyberNeonYellowBrush}"
+                                               Text="{Binding PartitionLength, Mode=OneWay}" />
+                                </Grid>
+                                <Grid ColumnDefinitions="Auto,*"
+                                      ColumnSpacing="1">
+                                    <TextBlock Grid.Column="0"
+                                               Foreground="{DynamicResource CyberNeonCyanBrush}"
+                                               Text="{x:Static localization:Resources.PartitionSize_Text}" />
+                                    <TextBlock Grid.Column="1"
+                                               Foreground="{DynamicResource CyberNeonLimeBrush}"
+                                               Text="{Binding PartitionSize, Mode=OneWay}" />
+                                </Grid>
+                                <Grid ColumnDefinitions="Auto,*"
+                                      ColumnSpacing="1">
+                                    <TextBlock Grid.Column="0"
+                                               Foreground="{DynamicResource CyberNeonCyanBrush}"
+                                               Text="{x:Static localization:Resources.PartitionScheme_Text}" />
+                                    <TextBlock Grid.Column="1"
+                                               Foreground="{DynamicResource CyberNeonMagentaBrush}"
+                                               Text="{Binding PartitionScheme, Mode=OneWay}" />
+                                </Grid>
+                                <Grid ColumnDefinitions="Auto,*"
+                                      ColumnSpacing="1">
+                                    <TextBlock Grid.Column="0"
+                                               Foreground="{DynamicResource CyberNeonCyanBrush}"
+                                               Text="{x:Static localization:Resources.PartitionDescription_Text}" />
+                                    <TextBlock Grid.Column="1"
+                                               Foreground="{DynamicResource CyberNeonPinkBrush}"
+                                               Text="{Binding PartitionDescription, Mode=OneWay}" />
+                                </Grid>
+                            </StackPanel>
+                        </ScrollViewer>
+                    </Border>
+                    <Border BorderThickness="1"
+                            Grid.Column="1"
+                            IsVisible="{Binding IsFilesystemInformationVisible, Mode=OneWay}"
+                            Background="{DynamicResource CyberBackgroundPrimaryBrush}">
+                        <Border.BorderBrush>
+                            <brushes:LineBrush LineStyle="DoubleLine"
+                                               Brush="Magenta" />
                         </Border.BorderBrush>
                         <ScrollViewer>
                             <StackPanel>
-                                <TextBlock Foreground="SlateBlue"
+                                <TextBlock Foreground="{DynamicResource CyberNeonMagentaBrush}"
                                            Text="{x:Static localization:Resources.FilesystemInformation_Text}"
-                                           HorizontalAlignment="Center" />
-                                <TextBox Background="Transparent"
+                                           HorizontalAlignment="Center"
+                                           FontWeight="Bold" />
+                                <TextBox Background="{DynamicResource CyberBackgroundTertiaryBrush}"
+                                         Foreground="{DynamicResource CyberNeonCyanBrush}"
                                          TextWrapping="Wrap"
                                          Text="{Binding FilesystemInformation, Mode=OneWay}"
-                                         IsReadOnly="True" />
+                                         IsReadOnly="True"
+                                         BorderBrush="{DynamicResource CyberNeonCyanBrush}"
+                                         BorderThickness="1" />
                             </StackPanel>
                         </ScrollViewer>
                     </Border>
                 </Grid>
                 <TextBlock Grid.Row="2"
                            Text="{Binding Status, Mode=OneWay}"
-                           IsVisible="{Binding IsStatusVisible, Mode=OneWay}" />
+                           IsVisible="{Binding IsStatusVisible, Mode=OneWay}"
+                           Foreground="{DynamicResource CyberNeonMagentaBrush}" />
             </Grid>
         </Border>
     </DockPanel>