diff --git a/Assets/icon-themed.png b/Assets/icon-themed.png
new file mode 100644
index 0000000..d7b9bb9
Binary files /dev/null and b/Assets/icon-themed.png differ
diff --git a/Assets/signature-dark.png b/Assets/signature-dark.png
index 12be4fe..11baa39 100644
Binary files a/Assets/signature-dark.png and b/Assets/signature-dark.png differ
diff --git a/Assets/signature-light.png b/Assets/signature-light.png
index a1d490f..569b922 100644
Binary files a/Assets/signature-light.png and b/Assets/signature-light.png differ
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ddf284..d346f84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@
 
 <!-- The "## vX.Y.Z" section is the release notes and the Telegram post (.github/scripts/telegram-release.sh): Arabic bullets, then "**English**" and the same bullets in English. Keep it short. -->
 
+## v2.9.0
+- شكل جديد Material 3 Expressive: رمادي هادي وأزرق فاتح، مثل تطبيق الجوال والإضافة
+- كروت وأزرار بزوايا دائرية، ومفاتيح صغيرة بدل المربعات
+- الخيارات والتبويبات بشكل واحد في كل الصفحات
+- الأيقونة الرمادية في الشريط الجانبي وصفحة حول، واسم IFOKNR بالبنفسجي
+
+**English**
+- New Material 3 Expressive look: soft greys and light blue, like the phone app and the module
+- Rounded cards and pill buttons, and small switches instead of check boxes
+- Options and tabs share one shape on every page
+- The grey icon in the side bar and on About, and IFOKNR in violet
+
 ## v2.8.0
 - زر ؟ بكل صفحة: شرح وخطوات وتحذيرات بلغتك
 - جولة ترحيب، و«الجديد» يطلع بعد كل تحديث
diff --git a/DriverWindow.xaml b/DriverWindow.xaml
index 0034608..0778a88 100644
--- a/DriverWindow.xaml
+++ b/DriverWindow.xaml
@@ -7,7 +7,7 @@
         Foreground="{StaticResource Text}" FontFamily="{StaticResource UiFont}" FontSize="13" UseLayoutRounding="True">
     <!-- Samsung's USB driver: download from Samsung, check Samsung signed it, run its installer. -->
     <Border Margin="18" Background="{StaticResource Surface}" BorderBrush="{StaticResource Line}"
-            BorderThickness="1" CornerRadius="12">
+            BorderThickness="1" CornerRadius="28">
         <Border.Effect>
             <DropShadowEffect BlurRadius="26" ShadowDepth="6" Opacity="0.55" Color="#000000"/>
         </Border.Effect>
@@ -18,10 +18,10 @@
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
-            <Border x:Name="strip" Height="3" VerticalAlignment="Top" CornerRadius="11,11,0,0" Background="{StaticResource Accent}"/>
+            <Border x:Name="strip" Height="0" VerticalAlignment="Top" CornerRadius="27,27,0,0" Background="{StaticResource Accent}"/>
 
             <DockPanel x:Name="header" Margin="22,20,22,0" Background="Transparent">
-                <Border x:Name="badge" DockPanel.Dock="Left" Width="34" Height="34" CornerRadius="10" BorderThickness="1"
+                <Border x:Name="badge" DockPanel.Dock="Left" Width="34" Height="34" CornerRadius="17" BorderThickness="1"
                         Margin="0,0,14,0" VerticalAlignment="Top"
                         Background="{StaticResource AccentSoft}" BorderBrush="{StaticResource AccentLine}">
                     <Path FlowDirection="LeftToRight" x:Name="glyph" Width="18" Height="18" Stretch="Uniform" StrokeThickness="2"
@@ -39,7 +39,7 @@
             </StackPanel>
 
             <Border Grid.Row="2" Margin="0,18,0,0" Padding="22,14" Background="{StaticResource Bg}"
-                    BorderBrush="{StaticResource Line}" BorderThickness="0,1,0,0" CornerRadius="0,0,11,11">
+                    BorderBrush="{StaticResource Line}" BorderThickness="0,1,0,0" CornerRadius="0,0,27,27">
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                     <Button x:Name="secondary" MinWidth="96" Margin="0,0,10,0"/>
                     <Button x:Name="primary" MinWidth="120" Style="{StaticResource AccentButton}" IsDefault="True"/>
diff --git a/FastbootEnhance.csproj b/FastbootEnhance.csproj
index 5d6f8cb..0e5dd42 100644
--- a/FastbootEnhance.csproj
+++ b/FastbootEnhance.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>2.8.0</Version>
+    <Version>2.9.0</Version>
     <AssemblyTitle>Fastboot Studio</AssemblyTitle>
     <Product>Fastboot Studio</Product>
     <Authors>IFOKNR; LibXZR</Authors>
@@ -69,6 +69,7 @@
     <Resource Include="big_icon.png" />
     <Resource Include="Assets\signature-*.png" />
     <Resource Include="Assets\appname-*.png" />
+    <Resource Include="Assets\icon-themed.png" />
     <!-- Roboto and Noto Kufi Arabic, embedded so the interface looks the same on every PC. -->
     <Resource Include="Fonts\*.ttf" />
   </ItemGroup>
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 070e7d3..76a52e8 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -418,9 +418,9 @@
                                                     <GridViewColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <StackPanel Orientation="Horizontal">
-                                                                <Button Tag="{Binding}" Style="{StaticResource AccentButton}" Height="28" Padding="9,0"
+                                                                <Button Tag="{Binding}" Style="{StaticResource AccentButton}" Height="28" MinHeight="0" Padding="12,0"
                                                                         Content="{x:Static props:Resources.phone_copy}" Visibility="{Binding CopyVisibility}" IsEnabled="{Binding Idle}"/>
-                                                                <Button Tag="{Binding}" Height="28" Padding="9,0"
+                                                                <Button Tag="{Binding}" Height="28" MinHeight="0" Padding="12,0"
                                                                         Content="{x:Static props:Resources.phone_open}" Visibility="{Binding OpenVisibility}" IsEnabled="{Binding Idle}"/>
                                                             </StackPanel>
                                                         </DataTemplate>
@@ -891,6 +891,7 @@
                         <Border Style="{StaticResource Card}">
                             <StackPanel>
                                 <TextBlock Style="{StaticResource SectionLabel}" Text="{x:Static props:Resources.super_layout}"/>
+                                <Border Style="{StaticResource SegmentTrack}">
                                 <WrapPanel>
                                     <RadioButton x:Name="super_mode_vab" Style="{StaticResource Segment}" GroupName="super_mode" IsChecked="True"
                                                  Content="{x:Static props:Resources.super_mode_vab}"/>
@@ -901,6 +902,7 @@
                                     <RadioButton x:Name="super_mode_imported" Style="{StaticResource Segment}" GroupName="super_mode" Visibility="Collapsed"
                                                  Content="{x:Static props:Resources.super_mode_imported}"/>
                                 </WrapPanel>
+                                </Border>
                                 <TextBlock x:Name="super_mode_note" Style="{StaticResource Note}" Margin="0,0,0,12"/>
 
                                 <Grid>
@@ -987,12 +989,14 @@
                     <Border Grid.Column="2" Style="{StaticResource Card}" VerticalAlignment="Top">
                         <StackPanel>
                             <TextBlock Style="{StaticResource SectionLabel}" Text="{x:Static props:Resources.super_output}"/>
+                            <Border Style="{StaticResource SegmentTrack}">
                             <WrapPanel x:Name="super_format_panel">
                                 <RadioButton x:Name="super_format_sparse" Style="{StaticResource Segment}" GroupName="super_format" IsChecked="True"
                                              Content="{x:Static props:Resources.super_format_sparse}"/>
                                 <RadioButton x:Name="super_format_raw" Style="{StaticResource Segment}" GroupName="super_format"
                                              Content="{x:Static props:Resources.super_format_raw}"/>
                             </WrapPanel>
+                            </Border>
                             <TextBlock Style="{StaticResource Note}" Margin="0,0,0,12" Text="{x:Static props:Resources.super_format_note}"/>
                             <CheckBox x:Name="super_verify" IsChecked="True" Margin="0,0,0,14" Content="{x:Static props:Resources.super_verify}"/>
 
@@ -1538,11 +1542,13 @@
                             <StackPanel>
                                 <TextBlock Style="{StaticResource CardTitle}" Text="{x:Static props:Resources.root_step1}"/>
                                 <TextBlock Style="{StaticResource Note}" Margin="0,4,0,10" Text="{x:Static props:Resources.root_step1_note}"/>
-                                <WrapPanel x:Name="root_tools" FlowDirection="LeftToRight" Margin="0,0,0,6">
+                                <Border Style="{StaticResource SegmentTrack}" FlowDirection="LeftToRight">
+                                <WrapPanel x:Name="root_tools" FlowDirection="LeftToRight">
                                     <RadioButton x:Name="root_tool_magisk" Style="{StaticResource Segment}" GroupName="root_tool" Content="Magisk" IsChecked="True"/>
                                     <RadioButton x:Name="root_tool_kernelsu" Style="{StaticResource Segment}" GroupName="root_tool" Content="KernelSU"/>
                                     <RadioButton x:Name="root_tool_apatch" Style="{StaticResource Segment}" GroupName="root_tool" Content="APatch"/>
                                 </WrapPanel>
+                                </Border>
                                 <DockPanel>
                                     <Button x:Name="root_pick" DockPanel.Dock="Left" Style="{StaticResource AccentButton}" MinWidth="190"
                                             Content="{x:Static props:Resources.root_pick}"/>
@@ -1692,13 +1698,15 @@
                         <!-- About has no page header, so its ؟ sits in the card's corner. -->
                         <Button x:Name="about_help" Grid.Column="1" Style="{StaticResource HelpButton}" HorizontalAlignment="Right"
                                 VerticalAlignment="Top" Panel.ZIndex="1"/>
-                        <Border Width="112" Height="112" CornerRadius="22" ClipToBounds="True" VerticalAlignment="Top">
-                            <Image FlowDirection="LeftToRight" Source="big_icon.png" Stretch="UniformToFill"/>
-                        </Border>
+                        <!-- The matte grey icon on a scalloped "cookie", as in the other apps. -->
+                        <Grid Width="120" Height="120" VerticalAlignment="Top" FlowDirection="LeftToRight">
+                            <Path Fill="{StaticResource Raised}" Data="M60.0,0.0 L65.1,1.5 L69.7,5.0 L73.7,9.0 L77.6,11.5 L82.3,12.1 L87.9,11.7 L93.7,11.9 L98.6,14.0 L101.6,18.4 L102.7,24.1 L103.3,29.7 L104.7,34.2 L107.9,37.7 L112.4,40.9 L116.8,44.8 L119.1,49.6 L118.5,54.9 L115.8,60.0 L112.6,64.6 L110.8,69.0 L111.0,73.7 L112.4,79.1 L113.3,84.8 L112.0,90.0 L108.1,93.7 L102.7,95.9 L97.4,97.4 L93.2,99.5 L90.3,103.3 L87.9,108.3 L84.8,113.3 L80.5,116.4 L75.2,116.8 L69.7,115.0 L64.6,112.6 L60.0,111.6 L55.4,112.6 L50.3,115.0 L44.8,116.8 L39.5,116.4 L35.2,113.3 L32.1,108.3 L29.7,103.3 L26.8,99.5 L22.6,97.4 L17.3,95.9 L11.9,93.7 L8.0,90.0 L6.7,84.8 L7.6,79.1 L9.0,73.7 L9.2,69.0 L7.4,64.6 L4.2,60.0 L1.5,54.9 L0.9,49.6 L3.2,44.8 L7.6,40.9 L12.1,37.7 L15.3,34.2 L16.7,29.7 L17.3,24.1 L18.4,18.4 L21.4,14.0 L26.3,11.9 L32.1,11.7 L37.7,12.1 L42.4,11.5 L46.3,9.0 L50.3,5.0 L54.9,1.5 Z"/>
+                            <Image Source="/Assets/icon-themed.png" Width="78" Height="78" RenderOptions.BitmapScalingMode="HighQuality"/>
+                        </Grid>
                         <StackPanel Grid.Column="1" Margin="26,4,0,0">
                             <Image Source="{StaticResource AppName}" Height="21" HorizontalAlignment="Left" Margin="0,2,0,2" FlowDirection="LeftToRight"
                                    RenderOptions.BitmapScalingMode="HighQuality" AutomationProperties.Name="Fastboot Studio"/>
-                            <TextBlock Text="v2.8.0" FontFamily="{StaticResource Mono}" Foreground="{StaticResource Dim}" Margin="0,2,0,10"/>
+                            <TextBlock Text="v2.9.0" FontFamily="{StaticResource Mono}" Foreground="{StaticResource Dim}" Margin="0,2,0,10"/>
                             <TextBlock Style="{StaticResource Note}" Margin="0,0,0,20" Text="{x:Static props:Resources.about_engine}"/>
 
                             <TextBlock Style="{StaticResource SectionLabel}" Text="{x:Static props:Resources.about_developer}"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index a365f4a..c945ae2 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -11,7 +11,7 @@ namespace FastbootEnhance
     public partial class MainWindow : Window
     {
         public static MainWindow THIS;
-        internal const string version = "2.8.0";
+        internal const string version = "2.9.0";
 
         public MainWindow()
         {
diff --git a/OdinWindow.xaml b/OdinWindow.xaml
index ea84dba..0e4d7e0 100644
--- a/OdinWindow.xaml
+++ b/OdinWindow.xaml
@@ -7,7 +7,7 @@
         Foreground="{StaticResource Text}" FontFamily="{StaticResource UiFont}" FontSize="13" UseLayoutRounding="True">
     <!-- A Samsung phone in Download mode: how to get there, then a reading of its PIT and model. Reading only. -->
     <Border Margin="18" Background="{StaticResource Surface}" BorderBrush="{StaticResource Line}"
-            BorderThickness="1" CornerRadius="12">
+            BorderThickness="1" CornerRadius="28">
         <Border.Effect>
             <DropShadowEffect BlurRadius="26" ShadowDepth="6" Opacity="0.55" Color="#000000"/>
         </Border.Effect>
@@ -18,10 +18,10 @@
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
-            <Border x:Name="strip" Height="3" VerticalAlignment="Top" CornerRadius="11,11,0,0" Background="{StaticResource Accent}"/>
+            <Border x:Name="strip" Height="0" VerticalAlignment="Top" CornerRadius="27,27,0,0" Background="{StaticResource Accent}"/>
 
             <DockPanel x:Name="header" Margin="22,20,22,0" Background="Transparent">
-                <Border x:Name="badge" DockPanel.Dock="Left" Width="34" Height="34" CornerRadius="10" BorderThickness="1"
+                <Border x:Name="badge" DockPanel.Dock="Left" Width="34" Height="34" CornerRadius="17" BorderThickness="1"
                         Margin="0,0,14,0" VerticalAlignment="Top"
                         Background="{StaticResource AccentSoft}" BorderBrush="{StaticResource AccentLine}">
                     <Path FlowDirection="LeftToRight" x:Name="glyph" Width="18" Height="18" Stretch="Uniform" StrokeThickness="1.8"
@@ -96,7 +96,7 @@
             </Grid>
 
             <Border Grid.Row="2" Margin="0,18,0,0" Padding="22,14" Background="{StaticResource Bg}"
-                    BorderBrush="{StaticResource Line}" BorderThickness="0,1,0,0" CornerRadius="0,0,11,11">
+                    BorderBrush="{StaticResource Line}" BorderThickness="0,1,0,0" CornerRadius="0,0,27,27">
                 <DockPanel>
                     <Button x:Name="extra" DockPanel.Dock="Left" Style="{StaticResource GhostButton}" MinWidth="96" Visibility="Collapsed"/>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
diff --git a/ThemedDialog.xaml b/ThemedDialog.xaml
index 55220fb..f7aa07b 100644
--- a/ThemedDialog.xaml
+++ b/ThemedDialog.xaml
@@ -6,7 +6,7 @@
         Foreground="{StaticResource Text}" FontFamily="{StaticResource UiFont}" FontSize="13" UseLayoutRounding="True">
     <!-- The outer margin leaves room for the shadow. -->
     <Border Margin="18" Background="{StaticResource Surface}" BorderBrush="{StaticResource Line}"
-            BorderThickness="1" CornerRadius="12">
+            BorderThickness="1" CornerRadius="28">
         <Border.Effect>
             <DropShadowEffect BlurRadius="26" ShadowDepth="6" Opacity="0.55" Color="#000000"/>
         </Border.Effect>
@@ -17,11 +17,11 @@
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
-            <!-- A thin strip in the dialog's colour: teal, amber or red. -->
-            <Border x:Name="strip" Height="3" VerticalAlignment="Top" CornerRadius="11,11,0,0"/>
+            <!-- The dialog's colour strip; kept for the code that colours it, hidden (Height 0) in the round frame. -->
+            <Border x:Name="strip" Height="0" VerticalAlignment="Top" CornerRadius="27,27,0,0"/>
 
             <DockPanel x:Name="header" Margin="22,22,22,0" Background="Transparent">
-                <Border x:Name="badge" DockPanel.Dock="Left" Width="34" Height="34" CornerRadius="10"
+                <Border x:Name="badge" DockPanel.Dock="Left" Width="34" Height="34" CornerRadius="17"
                         BorderThickness="1" Margin="0,0,14,0" VerticalAlignment="Top">
                     <Path FlowDirection="LeftToRight" x:Name="glyph" Width="18" Height="18" Stretch="Uniform" StrokeThickness="2"
                           StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round"/>
@@ -43,7 +43,7 @@
             </StackPanel>
 
             <Border Grid.Row="2" Margin="0,22,0,0" Padding="22,14" Background="{StaticResource Bg}"
-                    BorderBrush="{StaticResource Line}" BorderThickness="0,1,0,0" CornerRadius="0,0,11,11">
+                    BorderBrush="{StaticResource Line}" BorderThickness="0,1,0,0" CornerRadius="0,0,27,27">
                 <StackPanel x:Name="buttons" Orientation="Horizontal" HorizontalAlignment="Right"/>
             </Border>
         </Grid>
diff --git a/Themes/Palette.Dark.xaml b/Themes/Palette.Dark.xaml
index 84b802e..d009366 100644
--- a/Themes/Palette.Dark.xaml
+++ b/Themes/Palette.Dark.xaml
@@ -4,36 +4,39 @@
 
     <!-- The dark palette. Palette.Light.xaml has the same keys; Theme.cs loads one of the two
          before Styles.xaml, whose styles take their colours from whichever is loaded. -->
-    <!-- One accent; amber and red are reserved for warnings and destructive actions. -->
-    <SolidColorBrush x:Key="Bg" Color="#0E1116"/>
-    <SolidColorBrush x:Key="Rail" Color="#0A0D12"/>
-    <SolidColorBrush x:Key="Well" Color="#11151C"/>
-    <SolidColorBrush x:Key="Surface" Color="#161A21"/>
-    <SolidColorBrush x:Key="Raised" Color="#1D222B"/>
-    <SolidColorBrush x:Key="Hover" Color="#252C37"/>
-    <SolidColorBrush x:Key="Line" Color="#2A313C"/>
-    <SolidColorBrush x:Key="Text" Color="#E8ECF2"/>
-    <SolidColorBrush x:Key="Dim" Color="#9AA6B6"/>
-    <SolidColorBrush x:Key="Faint" Color="#7C8899"/>
-    <SolidColorBrush x:Key="Accent" Color="#3DD6C4"/>
-    <SolidColorBrush x:Key="AccentInk" Color="#0A0D12"/>
-    <SolidColorBrush x:Key="AccentSoft" Color="#10251F"/>
-    <SolidColorBrush x:Key="AccentLine" Color="#2F6E66"/>
-    <SolidColorBrush x:Key="Warn" Color="#F0B341"/>
-    <SolidColorBrush x:Key="WarnSoft" Color="#1C1710"/>
-    <SolidColorBrush x:Key="WarnLine" Color="#5C4320"/>
-    <SolidColorBrush x:Key="Danger" Color="#F2615C"/>
-    <SolidColorBrush x:Key="DangerSoft" Color="#231315"/>
-    <SolidColorBrush x:Key="DangerLine" Color="#5C2B2B"/>
-    <SolidColorBrush x:Key="Ok" Color="#5BD97A"/>
-    <SolidColorBrush x:Key="Thumb" Color="#3A4350"/>
+    <!-- Material 3 Expressive, the same as Fastboot Studio Mobile and the Companion WebUI: muted
+         grey surfaces, a light periwinkle accent with dark text on it, and a slate tonal fill
+         (AccentSoft) for selections and buttons. Amber and red stay for warnings and destructive
+         actions. -->
+    <SolidColorBrush x:Key="Bg" Color="#2A2A2C"/>
+    <SolidColorBrush x:Key="Rail" Color="#2A2A2C"/>
+    <SolidColorBrush x:Key="Well" Color="#2F2F31"/>
+    <SolidColorBrush x:Key="Surface" Color="#353537"/>
+    <SolidColorBrush x:Key="Raised" Color="#3D3D40"/>
+    <SolidColorBrush x:Key="Hover" Color="#47474B"/>
+    <SolidColorBrush x:Key="Line" Color="#4A4A4F"/>
+    <SolidColorBrush x:Key="Text" Color="#E5E3E8"/>
+    <SolidColorBrush x:Key="Dim" Color="#C4C4CB"/>
+    <SolidColorBrush x:Key="Faint" Color="#8F8F95"/>
+    <SolidColorBrush x:Key="Accent" Color="#A8C4FF"/>
+    <SolidColorBrush x:Key="AccentInk" Color="#152C5E"/>
+    <SolidColorBrush x:Key="AccentSoft" Color="#3F455A"/>
+    <SolidColorBrush x:Key="AccentLine" Color="#56607E"/>
+    <SolidColorBrush x:Key="Warn" Color="#F2C46D"/>
+    <SolidColorBrush x:Key="WarnSoft" Color="#4A3A2C"/>
+    <SolidColorBrush x:Key="WarnLine" Color="#6D5530"/>
+    <SolidColorBrush x:Key="Danger" Color="#FFB4AB"/>
+    <SolidColorBrush x:Key="DangerSoft" Color="#6E2A27"/>
+    <SolidColorBrush x:Key="DangerLine" Color="#8C3A3A"/>
+    <SolidColorBrush x:Key="Ok" Color="#94D6A0"/>
+    <SolidColorBrush x:Key="Thumb" Color="#5A5A60"/>
 
     <!-- Default templates fill the corner where two scroll bars meet with the system control
          colour, which is near-white; this keeps it dark. -->
-    <SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="#161A21"/>
-    <SolidColorBrush x:Key="{x:Static SystemColors.ControlLightBrushKey}" Color="#161A21"/>
-    <SolidColorBrush x:Key="{x:Static SystemColors.ControlLightLightBrushKey}" Color="#161A21"/>
-    <SolidColorBrush x:Key="{x:Static SystemColors.ControlDarkBrushKey}" Color="#161A21"/>
+    <SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="#353537"/>
+    <SolidColorBrush x:Key="{x:Static SystemColors.ControlLightBrushKey}" Color="#353537"/>
+    <SolidColorBrush x:Key="{x:Static SystemColors.ControlLightLightBrushKey}" Color="#353537"/>
+    <SolidColorBrush x:Key="{x:Static SystemColors.ControlDarkBrushKey}" Color="#353537"/>
 
 
     <!-- IFOKNR, drawn in the Swamp Ninja lettering as a picture: no font file ships with the app. -->
diff --git a/Themes/Palette.Light.xaml b/Themes/Palette.Light.xaml
index 3cef2eb..fe2c3f4 100644
--- a/Themes/Palette.Light.xaml
+++ b/Themes/Palette.Light.xaml
@@ -2,36 +2,36 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:props="clr-namespace:FastbootEnhance.Properties">
 
-    <!-- The light palette: the same keys as Palette.Dark.xaml. The accent, amber and red are
-         darker here so they keep their contrast on white. -->
-    <SolidColorBrush x:Key="Bg" Color="#F3F5F8"/>
-    <SolidColorBrush x:Key="Rail" Color="#E9EDF2"/>
-    <SolidColorBrush x:Key="Well" Color="#F7F9FB"/>
-    <SolidColorBrush x:Key="Surface" Color="#FFFFFF"/>
-    <SolidColorBrush x:Key="Raised" Color="#EEF1F5"/>
-    <SolidColorBrush x:Key="Hover" Color="#E3E8EE"/>
-    <SolidColorBrush x:Key="Line" Color="#D3DAE3"/>
-    <SolidColorBrush x:Key="Text" Color="#141A22"/>
-    <SolidColorBrush x:Key="Dim" Color="#566273"/>
-    <SolidColorBrush x:Key="Faint" Color="#768293"/>
-    <SolidColorBrush x:Key="Accent" Color="#0B8F80"/>
+    <!-- The light palette: the same keys as Palette.Dark.xaml, in the same tones. The accent,
+         amber and red are darker here so they keep their contrast on a light page. -->
+    <SolidColorBrush x:Key="Bg" Color="#F8F7FB"/>
+    <SolidColorBrush x:Key="Rail" Color="#F8F7FB"/>
+    <SolidColorBrush x:Key="Well" Color="#F2F1F6"/>
+    <SolidColorBrush x:Key="Surface" Color="#ECEBF0"/>
+    <SolidColorBrush x:Key="Raised" Color="#E4E3E9"/>
+    <SolidColorBrush x:Key="Hover" Color="#DBDAE1"/>
+    <SolidColorBrush x:Key="Line" Color="#C6C6CE"/>
+    <SolidColorBrush x:Key="Text" Color="#1B1B1F"/>
+    <SolidColorBrush x:Key="Dim" Color="#45464F"/>
+    <SolidColorBrush x:Key="Faint" Color="#6C6D76"/>
+    <SolidColorBrush x:Key="Accent" Color="#3D5BA9"/>
     <SolidColorBrush x:Key="AccentInk" Color="#FFFFFF"/>
-    <SolidColorBrush x:Key="AccentSoft" Color="#E2F4F1"/>
-    <SolidColorBrush x:Key="AccentLine" Color="#97D3CA"/>
-    <SolidColorBrush x:Key="Warn" Color="#A86A12"/>
-    <SolidColorBrush x:Key="WarnSoft" Color="#FFF5E3"/>
-    <SolidColorBrush x:Key="WarnLine" Color="#EBCB8F"/>
-    <SolidColorBrush x:Key="Danger" Color="#C9332E"/>
-    <SolidColorBrush x:Key="DangerSoft" Color="#FDEDEC"/>
-    <SolidColorBrush x:Key="DangerLine" Color="#F0B6B3"/>
-    <SolidColorBrush x:Key="Ok" Color="#23904A"/>
-    <SolidColorBrush x:Key="Thumb" Color="#BFC8D3"/>
+    <SolidColorBrush x:Key="AccentSoft" Color="#DDE1F9"/>
+    <SolidColorBrush x:Key="AccentLine" Color="#B9C3E8"/>
+    <SolidColorBrush x:Key="Warn" Color="#7C5800"/>
+    <SolidColorBrush x:Key="WarnSoft" Color="#FFEFD0"/>
+    <SolidColorBrush x:Key="WarnLine" Color="#E3C178"/>
+    <SolidColorBrush x:Key="Danger" Color="#BA1A1A"/>
+    <SolidColorBrush x:Key="DangerSoft" Color="#FFDAD6"/>
+    <SolidColorBrush x:Key="DangerLine" Color="#F0ABA4"/>
+    <SolidColorBrush x:Key="Ok" Color="#2A6B36"/>
+    <SolidColorBrush x:Key="Thumb" Color="#C0C0C8"/>
 
     <!-- Scroll bar corners and other bits WPF draws in system colours. -->
-    <SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="#FFFFFF"/>
-    <SolidColorBrush x:Key="{x:Static SystemColors.ControlLightBrushKey}" Color="#FFFFFF"/>
-    <SolidColorBrush x:Key="{x:Static SystemColors.ControlLightLightBrushKey}" Color="#FFFFFF"/>
-    <SolidColorBrush x:Key="{x:Static SystemColors.ControlDarkBrushKey}" Color="#FFFFFF"/>
+    <SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="#ECEBF0"/>
+    <SolidColorBrush x:Key="{x:Static SystemColors.ControlLightBrushKey}" Color="#ECEBF0"/>
+    <SolidColorBrush x:Key="{x:Static SystemColors.ControlLightLightBrushKey}" Color="#ECEBF0"/>
+    <SolidColorBrush x:Key="{x:Static SystemColors.ControlDarkBrushKey}" Color="#ECEBF0"/>
 
     <!-- IFOKNR, drawn in the Swamp Ninja lettering as a picture: no font file ships with the app. -->
     <BitmapImage x:Key="Signature" UriSource="pack://application:,,,/Assets/signature-light.png"/>
diff --git a/Themes/Styles.xaml b/Themes/Styles.xaml
index 293db3b..b34c90e 100644
--- a/Themes/Styles.xaml
+++ b/Themes/Styles.xaml
@@ -77,12 +77,13 @@
     </Style>
 
     <!-- Surfaces -->
+    <!-- Material 3 Expressive: tonal surfaces without borders and 28 px corners. -->
     <Style x:Key="Card" TargetType="Border">
         <Setter Property="Background" Value="{StaticResource Surface}"/>
         <Setter Property="BorderBrush" Value="{StaticResource Line}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="CornerRadius" Value="12"/>
-        <Setter Property="Padding" Value="18,16"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="CornerRadius" Value="28"/>
+        <Setter Property="Padding" Value="20,18"/>
     </Style>
 
     <Style x:Key="WarnCard" TargetType="Border" BasedOn="{StaticResource Card}">
@@ -92,15 +93,15 @@
 
     <Style x:Key="PageHeader" TargetType="Border">
         <Setter Property="BorderBrush" Value="{StaticResource Line}"/>
-        <Setter Property="BorderThickness" Value="0,0,0,1"/>
-        <Setter Property="Padding" Value="28,16"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="28,18,28,10"/>
     </Style>
 
     <Style x:Key="Badge" TargetType="Border">
         <Setter Property="Background" Value="{StaticResource AccentSoft}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource AccentLine}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource AccentSoft}"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="CornerRadius" Value="13"/>
+        <Setter Property="CornerRadius" Value="8"/>
         <Setter Property="Padding" Value="11,3"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
     </Style>
@@ -109,19 +110,21 @@
         <Setter Property="Background" Value="{StaticResource Surface}"/>
         <Setter Property="BorderBrush" Value="{StaticResource Line}"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="CornerRadius" Value="9"/>
+        <Setter Property="CornerRadius" Value="8"/>
         <Setter Property="Padding" Value="12,6"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
     </Style>
 
     <!-- Buttons: one template; variants only change colours. -->
+    <!-- Pills 40 px tall. The plain button is tonal (slate), Accent is filled, Ghost is outlined. -->
     <Style TargetType="Button">
         <Setter Property="Foreground" Value="{StaticResource Text}"/>
-        <Setter Property="Background" Value="{StaticResource Raised}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource Line}"/>
+        <Setter Property="Background" Value="{StaticResource AccentSoft}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource AccentSoft}"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="14,0"/>
-        <Setter Property="MinHeight" Value="36"/>
+        <Setter Property="Padding" Value="18,0"/>
+        <Setter Property="MinHeight" Value="40"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
         <Setter Property="FontSize" Value="13"/>
         <Setter Property="Cursor" Value="Hand"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
@@ -132,7 +135,7 @@
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="8"
+                            CornerRadius="20"
                             Padding="{TemplateBinding Padding}">
                         <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" RecognizesAccessKey="True"/>
                     </Border>
@@ -165,7 +168,7 @@
 
     <Style x:Key="DangerButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="Background" Value="{StaticResource DangerSoft}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource DangerLine}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource DangerSoft}"/>
         <Setter Property="Foreground" Value="{StaticResource Danger}"/>
         <Setter Property="FontWeight" Value="SemiBold"/>
     </Style>
@@ -179,23 +182,24 @@
 
     <Style x:Key="GhostButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Faint}"/>
     </Style>
 
     <!-- The question mark in the corner of each page: opens that page's help at the side. -->
     <Style x:Key="HelpButton" TargetType="Button">
-        <Setter Property="Width" Value="34"/>
-        <Setter Property="Height" Value="34"/>
+        <Setter Property="Width" Value="40"/>
+        <Setter Property="Height" Value="40"/>
         <Setter Property="Cursor" Value="Hand"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Foreground" Value="{StaticResource Accent}"/>
+        <Setter Property="Foreground" Value="{StaticResource Dim}"/>
         <Setter Property="FontSize" Value="16"/>
         <Setter Property="FontWeight" Value="Bold"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
-                    <Border x:Name="bd" CornerRadius="17" Background="{StaticResource AccentSoft}"
-                            BorderBrush="{StaticResource AccentLine}" BorderThickness="1">
+                    <Border x:Name="bd" CornerRadius="20" Background="{StaticResource Raised}"
+                            BorderBrush="{StaticResource Raised}" BorderThickness="1">
                         <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -215,9 +219,9 @@
     <Style TargetType="TextBox">
         <Setter Property="Foreground" Value="{StaticResource Text}"/>
         <Setter Property="Background" Value="{StaticResource Bg}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource Line}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Faint}"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="Padding" Value="10,7"/>
         <Setter Property="CaretBrush" Value="{StaticResource Text}"/>
         <Setter Property="SelectionBrush" Value="{StaticResource Accent}"/>
         <Setter Property="FontSize" Value="13"/>
@@ -228,7 +232,7 @@
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="8">
+                            CornerRadius="12">
                         <Grid>
                             <ScrollViewer x:Name="PART_ContentHost" Margin="{TemplateBinding Padding}" Focusable="False"/>
                             <!-- Tag doubles as a placeholder, shown while the box is empty. -->
@@ -253,6 +257,9 @@
         </Setter>
     </Style>
 
+    <!-- Check boxes with a label are drawn as small switches, 44 x 26: off is outlined with a small
+         knob, on is filled in the accent with the knob at the end. FlowDirection mirrors it in
+         Arabic. A check box without a label (a row of a list) stays a small rounded box. -->
     <Style TargetType="CheckBox">
         <Setter Property="Foreground" Value="{StaticResource Text}"/>
         <Setter Property="FontSize" Value="12.5"/>
@@ -266,24 +273,40 @@
                             <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
-                        <Border x:Name="box" Width="18" Height="18" CornerRadius="5" VerticalAlignment="Top" Margin="0,1,0,0"
-                                Background="{StaticResource Bg}" BorderBrush="{StaticResource Line}" BorderThickness="1">
-                            <Path x:Name="mark" FlowDirection="LeftToRight" Data="M3.5,8.5 L7,12 L13,4.5" Stroke="{StaticResource AccentInk}"
-                                  StrokeThickness="2.2" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Visibility="Collapsed"/>
+                        <Border x:Name="track" Width="44" Height="26" CornerRadius="13" VerticalAlignment="Top"
+                                Background="{StaticResource Raised}" BorderBrush="{StaticResource Faint}" BorderThickness="2">
+                            <Ellipse x:Name="knob" Width="12" Height="12" Margin="5,0" HorizontalAlignment="Left"
+                                     VerticalAlignment="Center" Fill="{StaticResource Faint}"/>
+                        </Border>
+                        <Border x:Name="box" Width="18" Height="18" CornerRadius="6" VerticalAlignment="Center" Visibility="Collapsed"
+                                Background="Transparent" BorderBrush="{StaticResource Faint}" BorderThickness="2">
+                            <Path x:Name="mark" FlowDirection="LeftToRight" Data="M3,7.5 L6,10.5 L11,4" Stroke="{StaticResource AccentInk}"
+                                  StrokeThickness="2" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Visibility="Collapsed"/>
                         </Border>
-                        <ContentPresenter Grid.Column="1" Margin="10,0,0,0" VerticalAlignment="Center" RecognizesAccessKey="True"/>
+                        <ContentPresenter Grid.Column="1" Margin="12,3,0,0" VerticalAlignment="Top" RecognizesAccessKey="True"/>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="track" Property="Background" Value="{StaticResource Accent}"/>
+                            <Setter TargetName="track" Property="BorderBrush" Value="{StaticResource Accent}"/>
+                            <Setter TargetName="knob" Property="Width" Value="18"/>
+                            <Setter TargetName="knob" Property="Height" Value="18"/>
+                            <Setter TargetName="knob" Property="Margin" Value="2,0"/>
+                            <Setter TargetName="knob" Property="HorizontalAlignment" Value="Right"/>
+                            <Setter TargetName="knob" Property="Fill" Value="{StaticResource AccentInk}"/>
                             <Setter TargetName="box" Property="Background" Value="{StaticResource Accent}"/>
                             <Setter TargetName="box" Property="BorderBrush" Value="{StaticResource Accent}"/>
                             <Setter TargetName="mark" Property="Visibility" Value="Visible"/>
                         </Trigger>
+                        <Trigger Property="Content" Value="{x:Null}">
+                            <Setter TargetName="track" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="box" Property="Visibility" Value="Visible"/>
+                        </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="box" Property="BorderBrush" Value="{StaticResource Dim}"/>
+                            <Setter TargetName="track" Property="Opacity" Value="0.88"/>
                         </Trigger>
                         <Trigger Property="IsKeyboardFocused" Value="True">
-                            <Setter TargetName="box" Property="BorderBrush" Value="{StaticResource Accent}"/>
+                            <Setter TargetName="track" Property="BorderBrush" Value="{StaticResource Accent}"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Opacity" Value="0.45"/>
@@ -295,33 +318,43 @@
         </Setter>
     </Style>
 
-    <!-- A choice of a few options, drawn as a row of pills; the chosen one is in the accent. -->
+    <!-- A choice of a few options: one pill track (SegmentTrack, a Border around the panel)
+         with the chosen option a filled pill inside it, the same as tabs and the other apps. -->
+    <Style x:Key="SegmentTrack" TargetType="Border">
+        <Setter Property="Background" Value="{StaticResource Raised}"/>
+        <Setter Property="CornerRadius" Value="20"/>
+        <Setter Property="Padding" Value="3"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="Margin" Value="0,0,0,8"/>
+    </Style>
+
     <Style x:Key="Segment" TargetType="RadioButton">
         <Setter Property="Foreground" Value="{StaticResource Dim}"/>
         <Setter Property="FontSize" Value="12.5"/>
         <Setter Property="Cursor" Value="Hand"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="MinHeight" Value="32"/>
-        <Setter Property="Padding" Value="12,4"/>
-        <Setter Property="Margin" Value="0,0,6,6"/>
+        <Setter Property="MinHeight" Value="34"/>
+        <Setter Property="Padding" Value="16,4"/>
+        <Setter Property="Margin" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="RadioButton">
-                    <Border x:Name="bd" CornerRadius="8" Background="{StaticResource Bg}" BorderBrush="{StaticResource Line}"
+                    <Border x:Name="bd" CornerRadius="17" Background="Transparent" BorderBrush="Transparent"
                             BorderThickness="1" Padding="{TemplateBinding Padding}">
                         <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" RecognizesAccessKey="True"/>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="bd" Property="BorderBrush" Value="{StaticResource Dim}"/>
+                            <Setter Property="Foreground" Value="{StaticResource Text}"/>
                         </Trigger>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="bd" Property="Background" Value="{StaticResource AccentSoft}"/>
+                            <Setter TargetName="bd" Property="Background" Value="{StaticResource Accent}"/>
                             <Setter TargetName="bd" Property="BorderBrush" Value="{StaticResource Accent}"/>
-                            <Setter Property="Foreground" Value="{StaticResource Accent}"/>
+                            <Setter Property="Foreground" Value="{StaticResource AccentInk}"/>
+                            <Setter Property="FontWeight" Value="SemiBold"/>
                         </Trigger>
                         <Trigger Property="IsKeyboardFocused" Value="True">
-                            <Setter TargetName="bd" Property="BorderBrush" Value="{StaticResource Accent}"/>
+                            <Setter TargetName="bd" Property="BorderBrush" Value="{StaticResource Text}"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Opacity" Value="0.45"/>
@@ -334,14 +367,14 @@
     </Style>
 
     <Style TargetType="ProgressBar">
-        <Setter Property="Height" Value="6"/>
+        <Setter Property="Height" Value="4"/>
         <Setter Property="Foreground" Value="{StaticResource Accent}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ProgressBar">
                     <Grid>
-                        <Border x:Name="PART_Track" CornerRadius="3" Background="{StaticResource Raised}"/>
-                        <Border x:Name="PART_Indicator" CornerRadius="3" HorizontalAlignment="Left"
+                        <Border x:Name="PART_Track" CornerRadius="2" Background="{StaticResource Hover}"/>
+                        <Border x:Name="PART_Indicator" CornerRadius="2" HorizontalAlignment="Left"
                                 Background="{TemplateBinding Foreground}"/>
                     </Grid>
                     <ControlTemplate.Triggers>
@@ -360,7 +393,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Thumb">
-                    <Border CornerRadius="4" Background="{StaticResource Thumb}"/>
+                    <Border CornerRadius="3" Background="{StaticResource Thumb}"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -413,7 +446,7 @@
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Foreground" Value="{StaticResource Text}"/>
-        <Setter Property="FontSize" Value="12.5"/>
+        <Setter Property="FontSize" Value="12"/>
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -447,8 +480,8 @@
             <Setter.Value>
                 <ControlTemplate TargetType="GridViewColumnHeader">
                     <Grid>
-                        <Border Background="{StaticResource Rail}" BorderBrush="{StaticResource Line}" BorderThickness="0,0,0,1">
-                            <ContentPresenter Margin="10,8" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        <Border Background="Transparent" BorderThickness="0">
+                            <ContentPresenter Margin="14,6,10,6" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                               VerticalAlignment="Center" RecognizesAccessKey="True"/>
                         </Border>
                         <Thumb x:Name="PART_HeaderGripper" HorizontalAlignment="Right" Width="8" Cursor="SizeWE">
@@ -471,18 +504,18 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ListViewItem">
-                    <Border x:Name="bd" Background="Transparent" BorderBrush="{StaticResource Raised}"
-                            BorderThickness="0,0,0,1" Padding="4,7" SnapsToDevicePixels="True">
+                    <Border x:Name="bd" Background="{StaticResource Raised}" BorderBrush="Transparent" CornerRadius="9"
+                            BorderThickness="1" Padding="4,3" Margin="0,1.5" MinHeight="25" SnapsToDevicePixels="True">
                         <GridViewRowPresenter Columns="{TemplateBinding GridView.ColumnCollection}"
                                               Content="{TemplateBinding Content}" VerticalAlignment="Center"/>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="bd" Property="Background" Value="{StaticResource Raised}"/>
+                            <Setter TargetName="bd" Property="Background" Value="{StaticResource Hover}"/>
                         </Trigger>
                         <Trigger Property="IsSelected" Value="True">
                             <Setter TargetName="bd" Property="Background" Value="{StaticResource AccentSoft}"/>
-                            <Setter TargetName="bd" Property="BorderBrush" Value="{StaticResource AccentLine}"/>
+                            <Setter TargetName="bd" Property="BorderBrush" Value="{StaticResource AccentSoft}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -502,8 +535,8 @@
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="*"/>
                         </Grid.RowDefinitions>
-                        <Border Background="{StaticResource Rail}" BorderBrush="{StaticResource Line}" BorderThickness="1"
-                                CornerRadius="10" Padding="3" HorizontalAlignment="Left" Margin="0,0,0,14">
+                        <Border Background="{StaticResource Surface}" CornerRadius="20" Padding="3"
+                                HorizontalAlignment="Left" Margin="0,0,0,14">
                             <StackPanel Orientation="Horizontal" IsItemsHost="True" KeyboardNavigation.TabIndex="1"/>
                         </Border>
                         <ContentPresenter x:Name="PART_SelectedContentHost" Grid.Row="1" ContentSource="SelectedContent"/>
@@ -522,17 +555,20 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="TabItem">
-                    <Border x:Name="bd" Background="Transparent" CornerRadius="7" Padding="14,6" Margin="0,0,2,0" Cursor="Hand">
-                        <ContentPresenter ContentSource="Header" VerticalAlignment="Center" RecognizesAccessKey="True"/>
+                    <Border x:Name="bd" Background="Transparent" CornerRadius="17" Padding="16,8" Margin="0,0,2,0" Cursor="Hand">
+                        <ContentPresenter x:Name="header" ContentSource="Header" VerticalAlignment="Center" RecognizesAccessKey="True"/>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Foreground" Value="{StaticResource Text}"/>
                         </Trigger>
+                        <!-- The dark ink goes on the header only: the TabItem's own Foreground would
+                             also reach every text of the page it shows. -->
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="bd" Property="Background" Value="{StaticResource Line}"/>
+                            <Setter TargetName="bd" Property="Background" Value="{StaticResource Accent}"/>
+                            <Setter TargetName="header" Property="TextElement.Foreground" Value="{StaticResource AccentInk}"/>
+                            <Setter TargetName="header" Property="TextElement.FontWeight" Value="SemiBold"/>
                             <Setter Property="Foreground" Value="{StaticResource Text}"/>
-                            <Setter Property="FontWeight" Value="SemiBold"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -548,11 +584,9 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="TabItem">
-                    <Border x:Name="bd" Background="Transparent" CornerRadius="8" Height="38" Margin="0,1" Cursor="Hand">
+                    <Border x:Name="bd" Background="Transparent" CornerRadius="20" Height="40" Margin="0,1" Cursor="Hand">
                         <Grid>
-                            <Border x:Name="bar" Width="3" CornerRadius="2" Margin="0,10" HorizontalAlignment="Left"
-                                    Background="{StaticResource Accent}" Visibility="Collapsed"/>
-                            <StackPanel Orientation="Horizontal" Margin="13,0" VerticalAlignment="Center">
+                            <StackPanel Orientation="Horizontal" Margin="16,0" VerticalAlignment="Center">
                                 <Path Data="{Binding Tag, RelativeSource={RelativeSource TemplatedParent}}"
                                       Stroke="{TemplateBinding Foreground}" StrokeThickness="1.8"
                                       StrokeLineJoin="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round"
@@ -566,8 +600,7 @@
                             <Setter Property="Foreground" Value="{StaticResource Text}"/>
                         </Trigger>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="bd" Property="Background" Value="{StaticResource Raised}"/>
-                            <Setter TargetName="bar" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="bd" Property="Background" Value="{StaticResource AccentSoft}"/>
                             <Setter Property="Foreground" Value="{StaticResource Text}"/>
                             <Setter Property="FontWeight" Value="SemiBold"/>
                         </Trigger>
@@ -588,19 +621,20 @@
                             <ColumnDefinition Width="224"/>
                             <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
-                        <Border Background="{StaticResource Rail}" BorderBrush="{StaticResource Line}" BorderThickness="0,0,1,0">
+                        <Border Background="{StaticResource Rail}">
                             <DockPanel Margin="14,18,14,16">
                                 <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Margin="4,0,0,24">
-                                    <Image FlowDirection="LeftToRight" Source="/big_icon.png" Width="34" Height="34"
+                                    <!-- The matte grey version of the icon, to sit with the grey surfaces; the
+                                         window and taskbar keep the teal one (icon.ico). -->
+                                    <Image FlowDirection="LeftToRight" Source="/Assets/icon-themed.png" Width="36" Height="36"
                                            RenderOptions.BitmapScalingMode="HighQuality"/>
                                     <StackPanel Margin="11,0,0,0" VerticalAlignment="Center">
                                         <Image Source="{StaticResource AppName}" Height="14" HorizontalAlignment="Left" Margin="0,0,0,3" FlowDirection="LeftToRight"
                                                RenderOptions.BitmapScalingMode="HighQuality" AutomationProperties.Name="Fastboot Studio"/>
-                                        <TextBlock Text="v2.8.0" FontSize="11" FontFamily="{StaticResource Mono}" Foreground="{StaticResource Dim}"/>
+                                        <TextBlock Text="v2.9.0" FontSize="11" FontFamily="{StaticResource Mono}" Foreground="{StaticResource Dim}"/>
                                     </StackPanel>
                                 </StackPanel>
-                                <Border DockPanel.Dock="Bottom" Background="{StaticResource Well}" BorderBrush="{StaticResource Line}"
-                                        BorderThickness="1" CornerRadius="10" Padding="12,10">
+                                <Border DockPanel.Dock="Bottom" Background="{StaticResource Surface}" CornerRadius="18" Padding="14,10">
                                     <TextBlock Text="{Binding Tag, RelativeSource={RelativeSource TemplatedParent}}"
                                                FontSize="11.5" Foreground="{StaticResource Dim}" TextWrapping="Wrap"/>
                                 </Border>
@@ -609,8 +643,8 @@
                                         Cursor="Hand" Focusable="False">
                                     <Button.Template>
                                         <ControlTemplate TargetType="Button">
-                                            <Border x:Name="bd" Background="{StaticResource AccentSoft}" BorderBrush="{StaticResource AccentLine}"
-                                                    BorderThickness="1" CornerRadius="10" Padding="12,9">
+                                            <Border x:Name="bd" Background="{StaticResource AccentSoft}" BorderBrush="{StaticResource AccentSoft}"
+                                                    BorderThickness="1" CornerRadius="18" Padding="14,9">
                                                 <DockPanel>
                                                     <Ellipse DockPanel.Dock="Left" Width="8" Height="8" Fill="{StaticResource Accent}"
                                                              Margin="0,0,9,0" VerticalAlignment="Center"/>
diff --git a/UpdateWindow.xaml b/UpdateWindow.xaml
index 1a160fc..80e6f6d 100644
--- a/UpdateWindow.xaml
+++ b/UpdateWindow.xaml
@@ -7,7 +7,7 @@
         Foreground="{StaticResource Text}" FontFamily="{StaticResource UiFont}" FontSize="13" UseLayoutRounding="True">
     <!-- The update dialog: what is new, then download (checked against its SHA-256), later, or skip. -->
     <Border Margin="18" Background="{StaticResource Surface}" BorderBrush="{StaticResource Line}"
-            BorderThickness="1" CornerRadius="12">
+            BorderThickness="1" CornerRadius="28">
         <Border.Effect>
             <DropShadowEffect BlurRadius="26" ShadowDepth="6" Opacity="0.55" Color="#000000"/>
         </Border.Effect>
@@ -18,10 +18,10 @@
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
-            <Border x:Name="strip" Height="3" VerticalAlignment="Top" CornerRadius="11,11,0,0" Background="{StaticResource Accent}"/>
+            <Border x:Name="strip" Height="0" VerticalAlignment="Top" CornerRadius="27,27,0,0" Background="{StaticResource Accent}"/>
 
             <DockPanel x:Name="header" Margin="22,20,22,0" Background="Transparent">
-                <Border x:Name="badge" DockPanel.Dock="Left" Width="34" Height="34" CornerRadius="10" BorderThickness="1"
+                <Border x:Name="badge" DockPanel.Dock="Left" Width="34" Height="34" CornerRadius="17" BorderThickness="1"
                         Margin="0,0,14,0" VerticalAlignment="Top"
                         Background="{StaticResource AccentSoft}" BorderBrush="{StaticResource AccentLine}">
                     <Path FlowDirection="LeftToRight" x:Name="glyph" Width="18" Height="18" Stretch="Uniform" StrokeThickness="2"
@@ -59,7 +59,7 @@
             </StackPanel>
 
             <Border Grid.Row="2" Margin="0,18,0,0" Padding="22,14" Background="{StaticResource Bg}"
-                    BorderBrush="{StaticResource Line}" BorderThickness="0,1,0,0" CornerRadius="0,0,11,11">
+                    BorderBrush="{StaticResource Line}" BorderThickness="0,1,0,0" CornerRadius="0,0,27,27">
                 <DockPanel>
                     <Button x:Name="skip" DockPanel.Dock="Left" Style="{StaticResource GhostButton}"
                             Content="{x:Static props:Resources.update_skip}" Foreground="{StaticResource Faint}"/>
diff --git a/docs/screenshots/01-payload-basic-properties.png b/docs/screenshots/01-payload-basic-properties.png
index 70f389d..f7dec85 100644
Binary files a/docs/screenshots/01-payload-basic-properties.png and b/docs/screenshots/01-payload-basic-properties.png differ
diff --git a/docs/screenshots/02-payload-partitions.png b/docs/screenshots/02-payload-partitions.png
index b7f1183..d408d33 100644
Binary files a/docs/screenshots/02-payload-partitions.png and b/docs/screenshots/02-payload-partitions.png differ
diff --git a/docs/screenshots/03-payload-dynamic-partition-metadata.png b/docs/screenshots/03-payload-dynamic-partition-metadata.png
index a13aeb2..3f47b33 100644
Binary files a/docs/screenshots/03-payload-dynamic-partition-metadata.png and b/docs/screenshots/03-payload-dynamic-partition-metadata.png differ
diff --git a/docs/screenshots/04-device-list.png b/docs/screenshots/04-device-list.png
index 5c5beca..d3e88a3 100644
Binary files a/docs/screenshots/04-device-list.png and b/docs/screenshots/04-device-list.png differ
diff --git a/docs/screenshots/05-usb-check.png b/docs/screenshots/05-usb-check.png
index 3abcd85..1cf8f23 100644
Binary files a/docs/screenshots/05-usb-check.png and b/docs/screenshots/05-usb-check.png differ
diff --git a/docs/screenshots/06-device-basic-properties.png b/docs/screenshots/06-device-basic-properties.png
index 75a264d..8753d3d 100644
Binary files a/docs/screenshots/06-device-basic-properties.png and b/docs/screenshots/06-device-basic-properties.png differ
diff --git a/docs/screenshots/07-device-partitions.png b/docs/screenshots/07-device-partitions.png
index fbf03f9..b769e7a 100644
Binary files a/docs/screenshots/07-device-partitions.png and b/docs/screenshots/07-device-partitions.png differ
diff --git a/docs/screenshots/08-confirm-erase.png b/docs/screenshots/08-confirm-erase.png
index 48cb9e9..4becad7 100644
Binary files a/docs/screenshots/08-confirm-erase.png and b/docs/screenshots/08-confirm-erase.png differ
diff --git a/docs/screenshots/09-create-missing.png b/docs/screenshots/09-create-missing.png
index 4839635..818f50d 100644
Binary files a/docs/screenshots/09-create-missing.png and b/docs/screenshots/09-create-missing.png differ
diff --git a/docs/screenshots/10-both-slots.png b/docs/screenshots/10-both-slots.png
index fdfa5f9..871a744 100644
Binary files a/docs/screenshots/10-both-slots.png and b/docs/screenshots/10-both-slots.png differ
diff --git a/docs/screenshots/11-flash.png b/docs/screenshots/11-flash.png
index a128482..a82f38d 100644
Binary files a/docs/screenshots/11-flash.png and b/docs/screenshots/11-flash.png differ
diff --git a/docs/screenshots/12-slot-switch-blocked.png b/docs/screenshots/12-slot-switch-blocked.png
index 850c924..5a23b5b 100644
Binary files a/docs/screenshots/12-slot-switch-blocked.png and b/docs/screenshots/12-slot-switch-blocked.png differ
diff --git a/docs/screenshots/13-critical-confirm.png b/docs/screenshots/13-critical-confirm.png
index 78fc666..e020e60 100644
Binary files a/docs/screenshots/13-critical-confirm.png and b/docs/screenshots/13-critical-confirm.png differ
diff --git a/docs/screenshots/14-vbmeta-question.png b/docs/screenshots/14-vbmeta-question.png
index 8cda87a..172e7a1 100644
Binary files a/docs/screenshots/14-vbmeta-question.png and b/docs/screenshots/14-vbmeta-question.png differ
diff --git a/docs/screenshots/15-super-space.png b/docs/screenshots/15-super-space.png
index 2ceac4d..359202c 100644
Binary files a/docs/screenshots/15-super-space.png and b/docs/screenshots/15-super-space.png differ
diff --git a/docs/screenshots/16-super-full.png b/docs/screenshots/16-super-full.png
index 84d62a8..2b5fc89 100644
Binary files a/docs/screenshots/16-super-full.png and b/docs/screenshots/16-super-full.png differ
diff --git a/docs/screenshots/16a-boot-check-init-boot.png b/docs/screenshots/16a-boot-check-init-boot.png
index 63dfd72..2084989 100644
Binary files a/docs/screenshots/16a-boot-check-init-boot.png and b/docs/screenshots/16a-boot-check-init-boot.png differ
diff --git a/docs/screenshots/16b-boot-check-vendor-boot.png b/docs/screenshots/16b-boot-check-vendor-boot.png
index de6b3d1..dbe9dfd 100644
Binary files a/docs/screenshots/16b-boot-check-vendor-boot.png and b/docs/screenshots/16b-boot-check-vendor-boot.png differ
diff --git a/docs/screenshots/17-boot-once-init-boot.png b/docs/screenshots/17-boot-once-init-boot.png
index 3e3c29b..578cd43 100644
Binary files a/docs/screenshots/17-boot-once-init-boot.png and b/docs/screenshots/17-boot-once-init-boot.png differ
diff --git a/docs/screenshots/18-boot-once-started.png b/docs/screenshots/18-boot-once-started.png
index 298dcb7..b75b8d8 100644
Binary files a/docs/screenshots/18-boot-once-started.png and b/docs/screenshots/18-boot-once-started.png differ
diff --git a/docs/screenshots/19-backup-fastboot.png b/docs/screenshots/19-backup-fastboot.png
index 4be40ee..0bcee73 100644
Binary files a/docs/screenshots/19-backup-fastboot.png and b/docs/screenshots/19-backup-fastboot.png differ
diff --git a/docs/screenshots/20-backup-fastbootd-question.png b/docs/screenshots/20-backup-fastbootd-question.png
index d9e8aa9..4f3c95e 100644
Binary files a/docs/screenshots/20-backup-fastbootd-question.png and b/docs/screenshots/20-backup-fastbootd-question.png differ
diff --git a/docs/screenshots/21-backup-recovery-booted.png b/docs/screenshots/21-backup-recovery-booted.png
index 51bd625..4f93ad9 100644
Binary files a/docs/screenshots/21-backup-recovery-booted.png and b/docs/screenshots/21-backup-recovery-booted.png differ
diff --git a/docs/screenshots/22-backup-files.png b/docs/screenshots/22-backup-files.png
index 380e2a4..c7eb35f 100644
Binary files a/docs/screenshots/22-backup-files.png and b/docs/screenshots/22-backup-files.png differ
diff --git a/docs/screenshots/23-backup-partitions.png b/docs/screenshots/23-backup-partitions.png
index db5f58b..9775676 100644
Binary files a/docs/screenshots/23-backup-partitions.png and b/docs/screenshots/23-backup-partitions.png differ
diff --git a/docs/screenshots/24-backup-done.png b/docs/screenshots/24-backup-done.png
index 6431343..56878eb 100644
Binary files a/docs/screenshots/24-backup-done.png and b/docs/screenshots/24-backup-done.png differ
diff --git a/docs/screenshots/25-images-empty.png b/docs/screenshots/25-images-empty.png
index 9967885..1f1cb99 100644
Binary files a/docs/screenshots/25-images-empty.png and b/docs/screenshots/25-images-empty.png differ
diff --git a/docs/screenshots/26-images-super.png b/docs/screenshots/26-images-super.png
index d21a9cf..7357c37 100644
Binary files a/docs/screenshots/26-images-super.png and b/docs/screenshots/26-images-super.png differ
diff --git a/docs/screenshots/27-images-extracted.png b/docs/screenshots/27-images-extracted.png
index fe2c79f..2a5a8cb 100644
Binary files a/docs/screenshots/27-images-extracted.png and b/docs/screenshots/27-images-extracted.png differ
diff --git a/docs/screenshots/28-images-details.png b/docs/screenshots/28-images-details.png
index f53025a..d411fed 100644
Binary files a/docs/screenshots/28-images-details.png and b/docs/screenshots/28-images-details.png differ
diff --git a/docs/screenshots/29-images-qualcomm-pieces.png b/docs/screenshots/29-images-qualcomm-pieces.png
index 53984f2..d390d32 100644
Binary files a/docs/screenshots/29-images-qualcomm-pieces.png and b/docs/screenshots/29-images-qualcomm-pieces.png differ
diff --git a/docs/screenshots/29a-images-boot.png b/docs/screenshots/29a-images-boot.png
index 3896189..130e72a 100644
Binary files a/docs/screenshots/29a-images-boot.png and b/docs/screenshots/29a-images-boot.png differ
diff --git a/docs/screenshots/30-super-empty.png b/docs/screenshots/30-super-empty.png
index 363f885..8df6e54 100644
Binary files a/docs/screenshots/30-super-empty.png and b/docs/screenshots/30-super-empty.png differ
diff --git a/docs/screenshots/31-super-imported.png b/docs/screenshots/31-super-imported.png
index 36a31e8..c82105a 100644
Binary files a/docs/screenshots/31-super-imported.png and b/docs/screenshots/31-super-imported.png differ
diff --git a/docs/screenshots/32-super-built.png b/docs/screenshots/32-super-built.png
index 57bac65..f74d020 100644
Binary files a/docs/screenshots/32-super-built.png and b/docs/screenshots/32-super-built.png differ
diff --git a/docs/screenshots/33-root-patched.png b/docs/screenshots/33-root-patched.png
index 1df5e31..c47967f 100644
Binary files a/docs/screenshots/33-root-patched.png and b/docs/screenshots/33-root-patched.png differ
diff --git a/docs/screenshots/34-root-flashed.png b/docs/screenshots/34-root-flashed.png
index 2f152ea..f275da0 100644
Binary files a/docs/screenshots/34-root-flashed.png and b/docs/screenshots/34-root-flashed.png differ
diff --git a/docs/screenshots/34a-phone.png b/docs/screenshots/34a-phone.png
index c133342..b243885 100644
Binary files a/docs/screenshots/34a-phone.png and b/docs/screenshots/34a-phone.png differ
diff --git a/docs/screenshots/34b-phone-copied.png b/docs/screenshots/34b-phone-copied.png
index bab6d1d..61a3e76 100644
Binary files a/docs/screenshots/34b-phone-copied.png and b/docs/screenshots/34b-phone-copied.png differ
diff --git a/docs/screenshots/34c-phone-no-companion.png b/docs/screenshots/34c-phone-no-companion.png
index c6672c2..2a581de 100644
Binary files a/docs/screenshots/34c-phone-no-companion.png and b/docs/screenshots/34c-phone-no-companion.png differ
diff --git a/docs/screenshots/35-terminal.png b/docs/screenshots/35-terminal.png
index 51836d7..15f9b75 100644
Binary files a/docs/screenshots/35-terminal.png and b/docs/screenshots/35-terminal.png differ
diff --git a/docs/screenshots/36-samsung-firmware.png b/docs/screenshots/36-samsung-firmware.png
index 25e41fe..a4cc96b 100644
Binary files a/docs/screenshots/36-samsung-firmware.png and b/docs/screenshots/36-samsung-firmware.png differ
diff --git a/docs/screenshots/37-samsung-extracted.png b/docs/screenshots/37-samsung-extracted.png
index f7429a3..68047c2 100644
Binary files a/docs/screenshots/37-samsung-extracted.png and b/docs/screenshots/37-samsung-extracted.png differ
diff --git a/docs/screenshots/38-samsung-magisk.png b/docs/screenshots/38-samsung-magisk.png
index d0985a9..68bba1a 100644
Binary files a/docs/screenshots/38-samsung-magisk.png and b/docs/screenshots/38-samsung-magisk.png differ
diff --git a/docs/screenshots/39-samsung-magisk-checked.png b/docs/screenshots/39-samsung-magisk-checked.png
index 5561cac..034c0ab 100644
Binary files a/docs/screenshots/39-samsung-magisk-checked.png and b/docs/screenshots/39-samsung-magisk-checked.png differ
diff --git a/docs/screenshots/40-logs.png b/docs/screenshots/40-logs.png
index d428fd6..d645c1c 100644
Binary files a/docs/screenshots/40-logs.png and b/docs/screenshots/40-logs.png differ
diff --git a/docs/screenshots/41-about.png b/docs/screenshots/41-about.png
index 973b175..6aa720c 100644
Binary files a/docs/screenshots/41-about.png and b/docs/screenshots/41-about.png differ
diff --git a/docs/screenshots/ar-01-payload.png b/docs/screenshots/ar-01-payload.png
index 904fbaf..280a9b2 100644
Binary files a/docs/screenshots/ar-01-payload.png and b/docs/screenshots/ar-01-payload.png differ
diff --git a/docs/screenshots/ar-02-device.png b/docs/screenshots/ar-02-device.png
index bce14ee..477554f 100644
Binary files a/docs/screenshots/ar-02-device.png and b/docs/screenshots/ar-02-device.png differ
diff --git a/docs/screenshots/ar-03-flash.png b/docs/screenshots/ar-03-flash.png
index 4691dfb..121e4bf 100644
Binary files a/docs/screenshots/ar-03-flash.png and b/docs/screenshots/ar-03-flash.png differ
diff --git a/docs/screenshots/ar-04-backup-files.png b/docs/screenshots/ar-04-backup-files.png
index 2e64e99..46ac46d 100644
Binary files a/docs/screenshots/ar-04-backup-files.png and b/docs/screenshots/ar-04-backup-files.png differ
diff --git a/docs/screenshots/ar-05-backup-partitions.png b/docs/screenshots/ar-05-backup-partitions.png
index 9d8918f..01cba8c 100644
Binary files a/docs/screenshots/ar-05-backup-partitions.png and b/docs/screenshots/ar-05-backup-partitions.png differ
diff --git a/docs/screenshots/ar-06-about.png b/docs/screenshots/ar-06-about.png
index 67f6ff1..e6a994b 100644
Binary files a/docs/screenshots/ar-06-about.png and b/docs/screenshots/ar-06-about.png differ
diff --git a/docs/screenshots/ar-07-dialog.png b/docs/screenshots/ar-07-dialog.png
index db119a5..8b391ec 100644
Binary files a/docs/screenshots/ar-07-dialog.png and b/docs/screenshots/ar-07-dialog.png differ
diff --git a/docs/screenshots/ar-08-images-super.png b/docs/screenshots/ar-08-images-super.png
index 77bf7c4..f3d4db3 100644
Binary files a/docs/screenshots/ar-08-images-super.png and b/docs/screenshots/ar-08-images-super.png differ
diff --git a/docs/screenshots/ar-09-backup-fastboot.png b/docs/screenshots/ar-09-backup-fastboot.png
index 60671af..fb02c7c 100644
Binary files a/docs/screenshots/ar-09-backup-fastboot.png and b/docs/screenshots/ar-09-backup-fastboot.png differ
diff --git a/docs/screenshots/ar-10-super.png b/docs/screenshots/ar-10-super.png
index 46aa284..1441aee 100644
Binary files a/docs/screenshots/ar-10-super.png and b/docs/screenshots/ar-10-super.png differ
diff --git a/docs/screenshots/ar-11-phone.png b/docs/screenshots/ar-11-phone.png
index 076d890..868cfcb 100644
Binary files a/docs/screenshots/ar-11-phone.png and b/docs/screenshots/ar-11-phone.png differ
diff --git a/docs/screenshots/ar-help-device.png b/docs/screenshots/ar-help-device.png
index c4e3347..486719d 100644
Binary files a/docs/screenshots/ar-help-device.png and b/docs/screenshots/ar-help-device.png differ
diff --git a/docs/screenshots/ar-help-samsung.png b/docs/screenshots/ar-help-samsung.png
index b7b5adc..51940e1 100644
Binary files a/docs/screenshots/ar-help-samsung.png and b/docs/screenshots/ar-help-samsung.png differ
diff --git a/docs/screenshots/ar-odin-1-ready.png b/docs/screenshots/ar-odin-1-ready.png
index 2ed604f..1a0c584 100644
Binary files a/docs/screenshots/ar-odin-1-ready.png and b/docs/screenshots/ar-odin-1-ready.png differ
diff --git a/docs/screenshots/ar-odin-2-read.png b/docs/screenshots/ar-odin-2-read.png
index 335f1b0..79c3a54 100644
Binary files a/docs/screenshots/ar-odin-2-read.png and b/docs/screenshots/ar-odin-2-read.png differ
diff --git a/docs/screenshots/ar-update-01-dialog.png b/docs/screenshots/ar-update-01-dialog.png
index 7cf199c..0104d49 100644
Binary files a/docs/screenshots/ar-update-01-dialog.png and b/docs/screenshots/ar-update-01-dialog.png differ
diff --git a/docs/screenshots/ar-update-02-mismatch.png b/docs/screenshots/ar-update-02-mismatch.png
index c21d679..496b90a 100644
Binary files a/docs/screenshots/ar-update-02-mismatch.png and b/docs/screenshots/ar-update-02-mismatch.png differ
diff --git a/docs/screenshots/ar-welcome-1-language.png b/docs/screenshots/ar-welcome-1-language.png
index 33f9967..2a23156 100644
Binary files a/docs/screenshots/ar-welcome-1-language.png and b/docs/screenshots/ar-welcome-1-language.png differ
diff --git a/docs/screenshots/ar-welcome-2-pages.png b/docs/screenshots/ar-welcome-2-pages.png
index 62a3c6a..17175cc 100644
Binary files a/docs/screenshots/ar-welcome-2-pages.png and b/docs/screenshots/ar-welcome-2-pages.png differ
diff --git a/docs/screenshots/ar-welcome-3-check.png b/docs/screenshots/ar-welcome-3-check.png
index 94776bd..a9d5162 100644
Binary files a/docs/screenshots/ar-welcome-3-check.png and b/docs/screenshots/ar-welcome-3-check.png differ
diff --git a/docs/screenshots/ar-welcome-4-safety.png b/docs/screenshots/ar-welcome-4-safety.png
index ce976d6..5fd29e7 100644
Binary files a/docs/screenshots/ar-welcome-4-safety.png and b/docs/screenshots/ar-welcome-4-safety.png differ
diff --git a/docs/screenshots/ar-whats-new.png b/docs/screenshots/ar-whats-new.png
index 9e8814e..0467187 100644
Binary files a/docs/screenshots/ar-whats-new.png and b/docs/screenshots/ar-whats-new.png differ
diff --git a/docs/screenshots/en-help-device.png b/docs/screenshots/en-help-device.png
index 1501319..e627632 100644
Binary files a/docs/screenshots/en-help-device.png and b/docs/screenshots/en-help-device.png differ
diff --git a/docs/screenshots/en-help-samsung.png b/docs/screenshots/en-help-samsung.png
index 76cb222..04d3c34 100644
Binary files a/docs/screenshots/en-help-samsung.png and b/docs/screenshots/en-help-samsung.png differ
diff --git a/docs/screenshots/en-odin-1-ready.png b/docs/screenshots/en-odin-1-ready.png
index 180cf2e..b7a7898 100644
Binary files a/docs/screenshots/en-odin-1-ready.png and b/docs/screenshots/en-odin-1-ready.png differ
diff --git a/docs/screenshots/en-odin-2-read.png b/docs/screenshots/en-odin-2-read.png
index c894c40..78892a9 100644
Binary files a/docs/screenshots/en-odin-2-read.png and b/docs/screenshots/en-odin-2-read.png differ
diff --git a/docs/screenshots/en-odin-3-busy.png b/docs/screenshots/en-odin-3-busy.png
index c31dda1..e9b7c39 100644
Binary files a/docs/screenshots/en-odin-3-busy.png and b/docs/screenshots/en-odin-3-busy.png differ
diff --git a/docs/screenshots/en-welcome-1-language.png b/docs/screenshots/en-welcome-1-language.png
index 1b007c8..105cfec 100644
Binary files a/docs/screenshots/en-welcome-1-language.png and b/docs/screenshots/en-welcome-1-language.png differ
diff --git a/docs/screenshots/en-welcome-2-pages.png b/docs/screenshots/en-welcome-2-pages.png
index 4084059..d03894f 100644
Binary files a/docs/screenshots/en-welcome-2-pages.png and b/docs/screenshots/en-welcome-2-pages.png differ
diff --git a/docs/screenshots/en-welcome-3-check.png b/docs/screenshots/en-welcome-3-check.png
index 7bcbf6c..4fcf860 100644
Binary files a/docs/screenshots/en-welcome-3-check.png and b/docs/screenshots/en-welcome-3-check.png differ
diff --git a/docs/screenshots/en-welcome-4-safety.png b/docs/screenshots/en-welcome-4-safety.png
index c1ae93f..88ed095 100644
Binary files a/docs/screenshots/en-welcome-4-safety.png and b/docs/screenshots/en-welcome-4-safety.png differ
diff --git a/docs/screenshots/en-whats-new.png b/docs/screenshots/en-whats-new.png
index ab16284..97a207c 100644
Binary files a/docs/screenshots/en-whats-new.png and b/docs/screenshots/en-whats-new.png differ
diff --git a/docs/screenshots/light-01-payload.png b/docs/screenshots/light-01-payload.png
index 1504e94..de77fa3 100644
Binary files a/docs/screenshots/light-01-payload.png and b/docs/screenshots/light-01-payload.png differ
diff --git a/docs/screenshots/light-02-device.png b/docs/screenshots/light-02-device.png
index c495a63..5a7156c 100644
Binary files a/docs/screenshots/light-02-device.png and b/docs/screenshots/light-02-device.png differ
diff --git a/docs/screenshots/light-03-flash.png b/docs/screenshots/light-03-flash.png
index 78e377c..144b91d 100644
Binary files a/docs/screenshots/light-03-flash.png and b/docs/screenshots/light-03-flash.png differ
diff --git a/docs/screenshots/light-04-terminal.png b/docs/screenshots/light-04-terminal.png
index 5104ed5..13e3e47 100644
Binary files a/docs/screenshots/light-04-terminal.png and b/docs/screenshots/light-04-terminal.png differ
diff --git a/docs/screenshots/light-05-about.png b/docs/screenshots/light-05-about.png
index 16c1094..d16c7ea 100644
Binary files a/docs/screenshots/light-05-about.png and b/docs/screenshots/light-05-about.png differ
diff --git a/docs/screenshots/light-06-phone.png b/docs/screenshots/light-06-phone.png
index 3754b28..76378a6 100644
Binary files a/docs/screenshots/light-06-phone.png and b/docs/screenshots/light-06-phone.png differ
diff --git a/docs/screenshots/update-01-dialog.png b/docs/screenshots/update-01-dialog.png
index f05aa35..711d764 100644
Binary files a/docs/screenshots/update-01-dialog.png and b/docs/screenshots/update-01-dialog.png differ
diff --git a/docs/screenshots/update-02-done.png b/docs/screenshots/update-02-done.png
index 1e55bd0..340e31e 100644
Binary files a/docs/screenshots/update-02-done.png and b/docs/screenshots/update-02-done.png differ
diff --git a/docs/screenshots/update-03-about.png b/docs/screenshots/update-03-about.png
index 66b8c42..88785af 100644
Binary files a/docs/screenshots/update-03-about.png and b/docs/screenshots/update-03-about.png differ