[Avalonia] Theme switching between light and dark, fixes, misc

src/PicView.Avalonia.MacOS/App.axaml

@@ -11,6 +11,6 @@
 
     <Application.Styles>
         <SimpleTheme />
-        <StyleInclude Source="avares://PicView.Avalonia/PicViewTheme/Main.axaml" />
+        <StyleInclude Source="avares://PicView.Avalonia/PicViewTheme/Index.axaml" />
     </Application.Styles>
 </Application>

src/PicView.Avalonia.Win32/App.axaml

@@ -6,6 +6,6 @@
 
     <Application.Styles>
         <SimpleTheme />
-        <StyleInclude Source="avares://PicView.Avalonia/PicViewTheme/Main.axaml" />
+        <StyleInclude Source="avares://PicView.Avalonia/PicViewTheme/Index.axaml" />
     </Application.Styles>
 </Application>

src/PicView.Avalonia.Win32/Views/AboutWindow.axaml

@@ -1,49 +1,49 @@
 <Window
+    BorderThickness="0"
+    CanResize="False"
+    CornerRadius="8"
+    SizeToContent="WidthAndHeight"
+    Title="Loading..."
+    mc:Ignorable="d"
     x:Class="PicView.Avalonia.Win32.Views.AboutWindow"
+    x:DataType="viewModels:MainViewModel"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels;assembly=PicView.Avalonia"
     xmlns:views="clr-namespace:PicView.Avalonia.Views;assembly=PicView.Avalonia"
-    Title="Loading..."
-    x:DataType="viewModels:MainViewModel"
-    BorderThickness="0"
-    CanResize="False"
-    CornerRadius="8"
-    SizeToContent="WidthAndHeight"
-    mc:Ignorable="d">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.DataContext>
         <viewModels:MainViewModel />
     </Design.DataContext>
     <Border
-        BorderBrush="{StaticResource MainBorderColor}"
+        BorderBrush="{DynamicResource WindowBorderColor}"
         BorderThickness="1"
-        CornerRadius="8">
+        CornerRadius="0,0,8,8">
         <StackPanel>
 
             <DockPanel
+                Background="{DynamicResource SecondaryBackgroundColor}"
                 Height="28"
-                Background="{StaticResource SecondaryBackgroundColor}"
                 PointerPressed="MoveWindow">
 
                 <Border
-                    Margin="0,0,23,0"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
                     CornerRadius="8,0,0,0"
-                    DockPanel.Dock="Left">
+                    DockPanel.Dock="Left"
+                    Margin="0,0,23,0">
                     <Image
-                        Width="20"
                         Height="25"
-                        Margin="7,1,7,1">
+                        Margin="7,1,7,1"
+                        Width="20">
                         <Image.Source>
                             <DrawingImage>
                                 <DrawingImage.Drawing>
                                     <DrawingGroup ClipGeometry="M0,0 V329.25937 H333.44974 V0 H0 Z">
                                         <DrawingGroup>
-                                            <GeometryDrawing Brush="{StaticResource AccentColor}" Geometry="F1 M333.44974,329.25937z M0,0z M329.796,130.208L311.354,177.826 304.172,196.392 286.112,243.011 280.229,258.204C279.6,259.845,277.133,259.397,277.133,257.644L277.133,214.336C277.133,214.143,277.164,213.949,277.236,213.776L289.486,182.156 296.669,163.58 306.194,138.991C306.514,138.176,306.101,137.259,305.265,136.953L278.155,126.723C277.536,126.488,277.123,125.897,277.123,125.245L277.123,109.094C277.123,107.983,278.248,107.219,279.3,107.617L328.888,126.346C311.406,53.8949 245.461,0 166.74,0 121.569,0 80.6197,17.7714 50.5885,46.5785L255.368,46.5785C257.928,46.5785,260.012,48.6267,260.012,51.164L260.012,263.198C260.012,265.725,257.938,267.783,255.368,267.783L40.6298,267.783C38.0705,267.783,35.9858,265.735,35.9858,263.198L35.9858,62.5258C13.4779,90.5891 0,126.05 0,164.63 0,255.555 74.6445,329.259 166.73,329.259 184.625,329.259 201.849,326.447 218.01,321.291L210.972,318.631 203.531,315.819 120.971,284.648 269.971,284.648 269.207,286.594 264.935,297.63C306.452,267.681 333.449,219.279 333.449,164.62 333.47,152.819 332.18,141.315 329.796,130.208L329.796,130.208z" />
-                                            <GeometryDrawing Brush="{StaticResource LogoAccentColor}" Geometry="F0 M333.44974,329.25937z M0,0z M62.2502,219.656L73.9737,219.656C80.4857,212.339 86.9666,205.033 93.4579,197.717 95.0265,195.944 96.6261,194.211 98.0709,192.357 98.8862,191.348 99.5054,191.287 100.537,191.99 105.563,195.403 110.63,198.725 115.646,202.19 117.018,203.138 117.689,203.464 118.752,201.629 125.14,190.543 131.725,179.609 138.154,168.543 138.928,167.228 139.403,167.452 140.362,168.135 147.432,173.118 154.532,178.08 161.621,183.053 162.375,183.573 163.149,184.062 163.913,184.582 171.384,169.297 178.784,154.154 186.379,138.625 188.484,142.762 190.425,146.553 192.365,150.343 204.191,173.454 216.018,196.545 227.835,219.656L236.514,219.656C239.083,219.656,241.147,217.597,241.147,215.06L241.147,69.4041C241.147,67.3967 239.847,65.7051 238.031,65.0835 237.556,64.9205 237.05,64.8084 236.524,64.8084L62.2502,64.8084C59.6806,64.8084,57.6166,66.8668,57.6166,69.4041L57.6166,215.06C57.6166,216.15 58.0191,217.149 58.6589,217.933 59.5051,218.973 60.7848,219.656 62.2502,219.656L62.2502,219.656z M105.119,125.969C116.203,126.631 124.583,135.619 124.284,146.654 123.953,159.188 114.16,166.963 103.375,166.739 90.7024,166.474 82.9521,156.773 82.8282,145.992 83.2721,134.039 92.8696,125.245 105.119,125.969L105.119,125.969z" />
+                                            <GeometryDrawing Brush="{DynamicResource AccentColor}" Geometry="F1 M333.44974,329.25937z M0,0z M329.796,130.208L311.354,177.826 304.172,196.392 286.112,243.011 280.229,258.204C279.6,259.845,277.133,259.397,277.133,257.644L277.133,214.336C277.133,214.143,277.164,213.949,277.236,213.776L289.486,182.156 296.669,163.58 306.194,138.991C306.514,138.176,306.101,137.259,305.265,136.953L278.155,126.723C277.536,126.488,277.123,125.897,277.123,125.245L277.123,109.094C277.123,107.983,278.248,107.219,279.3,107.617L328.888,126.346C311.406,53.8949 245.461,0 166.74,0 121.569,0 80.6197,17.7714 50.5885,46.5785L255.368,46.5785C257.928,46.5785,260.012,48.6267,260.012,51.164L260.012,263.198C260.012,265.725,257.938,267.783,255.368,267.783L40.6298,267.783C38.0705,267.783,35.9858,265.735,35.9858,263.198L35.9858,62.5258C13.4779,90.5891 0,126.05 0,164.63 0,255.555 74.6445,329.259 166.73,329.259 184.625,329.259 201.849,326.447 218.01,321.291L210.972,318.631 203.531,315.819 120.971,284.648 269.971,284.648 269.207,286.594 264.935,297.63C306.452,267.681 333.449,219.279 333.449,164.62 333.47,152.819 332.18,141.315 329.796,130.208L329.796,130.208z" />
+                                            <GeometryDrawing Brush="{DynamicResource LogoAccentColor}" Geometry="F0 M333.44974,329.25937z M0,0z M62.2502,219.656L73.9737,219.656C80.4857,212.339 86.9666,205.033 93.4579,197.717 95.0265,195.944 96.6261,194.211 98.0709,192.357 98.8862,191.348 99.5054,191.287 100.537,191.99 105.563,195.403 110.63,198.725 115.646,202.19 117.018,203.138 117.689,203.464 118.752,201.629 125.14,190.543 131.725,179.609 138.154,168.543 138.928,167.228 139.403,167.452 140.362,168.135 147.432,173.118 154.532,178.08 161.621,183.053 162.375,183.573 163.149,184.062 163.913,184.582 171.384,169.297 178.784,154.154 186.379,138.625 188.484,142.762 190.425,146.553 192.365,150.343 204.191,173.454 216.018,196.545 227.835,219.656L236.514,219.656C239.083,219.656,241.147,217.597,241.147,215.06L241.147,69.4041C241.147,67.3967 239.847,65.7051 238.031,65.0835 237.556,64.9205 237.05,64.8084 236.524,64.8084L62.2502,64.8084C59.6806,64.8084,57.6166,66.8668,57.6166,69.4041L57.6166,215.06C57.6166,216.15 58.0191,217.149 58.6589,217.933 59.5051,218.973 60.7848,219.656 62.2502,219.656L62.2502,219.656z M105.119,125.969C116.203,126.631 124.583,135.619 124.284,146.654 123.953,159.188 114.16,166.963 103.375,166.739 90.7024,166.474 82.9521,156.773 82.8282,145.992 83.2721,134.039 92.8696,125.245 105.119,125.969L105.119,125.969z" />
                                         </DrawingGroup>
                                     </DrawingGroup>
                                 </DrawingImage.Drawing>
@@ -53,51 +53,51 @@
                 </Border>
 
                 <Button
-                    Width="30"
-                    Background="{StaticResource MainButtonBackgroundColor}"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    Background="{DynamicResource MainButtonBackgroundColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
                     Classes="hover"
                     Click="Close"
-                    CornerRadius="0,8,0,0"
-                    DockPanel.Dock="Right">
+                    DockPanel.Dock="Right"
+                    Width="30">
                     <Path
-                        Width="10"
+                        Data="{StaticResource CloseGeometry}"
+                        Fill="{DynamicResource MainIconColor}"
                         Height="10"
-                        Data="M443.6,387.1L312.4,255.4l131.5-130c5.4-5.4,5.4-14.2,0-19.6l-37.4-37.6c-2.6-2.6-6.1-4-9.8-4c-3.7,0-7.2,1.5-9.8,4  L256,197.8L124.9,68.3c-2.6-2.6-6.1-4-9.8-4c-3.7,0-7.2,1.5-9.8,4L68,105.9c-5.4,5.4-5.4,14.2,0,19.6l131.5,130L68.4,387.1  c-2.6,2.6-4.1,6.1-4.1,9.8c0,3.7,1.4,7.2,4.1,9.8l37.4,37.6c2.7,2.7,6.2,4.1,9.8,4.1c3.5,0,7.1-1.3,9.8-4.1L256,313.1l130.7,131.1  c2.7,2.7,6.2,4.1,9.8,4.1c3.5,0,7.1-1.3,9.8-4.1l37.4-37.6c2.6-2.6,4.1-6.1,4.1-9.8C447.7,393.2,446.2,389.7,443.6,387.1z"
-                        Fill="{StaticResource MainIconColor}"
-                        Stretch="Fill" />
+                        Stretch="Fill"
+                        Width="10" />
                 </Button>
 
                 <Button
-                    Width="30"
-                    Background="{StaticResource MainButtonBackgroundColor}"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    Background="{DynamicResource MainButtonBackgroundColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="1,0,1,0"
                     Classes="hover"
                     Click="Minimize"
-                    DockPanel.Dock="Right">
-                    <Viewbox Width="12" Height="12">
+                    DockPanel.Dock="Right"
+                    Width="30">
+                    <Viewbox Height="12" Width="12">
                         <Path
-                            Data="M24,11c0-0.6-0.4-1-1-1H1c-0.6,0-1,0.4-1,1v2c0,0.6,0.4,1,1,1h22c0.6,0,1-0.4,1-1V11z"
-                            Fill="{StaticResource MainIconColor}"
+                            Data="{StaticResource MinimizeGeometry}"
+                            Fill="{DynamicResource MainIconColor}"
                             Stretch="Fill" />
                     </Viewbox>
                 </Button>
 
                 <TextBlock
                     Classes="txt"
+                    Foreground="{DynamicResource MainTextColor}"
                     Text="{CompiledBinding About}"
                     TextAlignment="Center" />
             </DockPanel>
 
-            <Rectangle Height="1" Fill="{StaticResource MainBorderColor}" />
+            <Rectangle Fill="{DynamicResource WindowBorderColor}" Height="1" />
 
             <views:AboutView
+                Background="{DynamicResource NoisyTexture}"
+                Focusable="True"
                 Margin="0"
                 Padding="10,2,5,10"
-                Background="{StaticResource NoisyTexture}"
-                Focusable="True"
                 PointerPressed="MoveWindow" />
         </StackPanel>
     </Border>

src/PicView.Avalonia.Win32/Views/ExifWindow.axaml

@@ -23,7 +23,7 @@
     </Design.DataContext>
     <DockPanel Background="Transparent" PointerPressed="MoveWindow">
         <StackPanel
-            Background="{StaticResource SecondaryBackgroundColor}"
+            Background="{DynamicResource SecondaryBackgroundColor}"
             DockPanel.Dock="Top"
             Height="28"
             Orientation="Horizontal">
@@ -47,7 +47,7 @@
             </Image>
 
             <Button
-                BorderBrush="{StaticResource MainBorderColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
                 BorderThickness="1,0,1,0"
                 Classes="noBorderHover"
                 Command="{CompiledBinding DuplicateFileCommand}"
@@ -55,29 +55,27 @@
                 Width="130">
                 <TextBlock
                     Classes="txt"
-                    Foreground="{StaticResource MainTextColor}"
                     HorizontalAlignment="Center"
                     Text="{CompiledBinding DuplicateFile}"
                     VerticalAlignment="Center" />
             </Button>
 
             <Button
-                BorderBrush="{StaticResource MainBorderColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
                 BorderThickness="0,0,1,0"
                 Classes="noBorderHover"
-                Command="{Binding RecycleFileCommand}"
+                Command="{CompiledBinding RecycleFileCommand}"
                 Height="28"
                 Width="130">
                 <TextBlock
                     Classes="txt"
-                    Foreground="{StaticResource MainTextColor}"
                     HorizontalAlignment="Center"
                     Text="{Binding DeleteFile}"
                     VerticalAlignment="Center" />
             </Button>
 
             <Button
-                BorderBrush="{StaticResource MainBorderColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
                 BorderThickness="0,0,1,0"
                 Classes="noBorderHover"
                 Command="{Binding OptimizeImageCommand}"
@@ -85,14 +83,13 @@
                 Width="130">
                 <TextBlock
                     Classes="txt"
-                    Foreground="{StaticResource MainTextColor}"
                     HorizontalAlignment="Center"
                     Text="{Binding OptimizeImage}"
                     VerticalAlignment="Center" />
             </Button>
 
             <Button
-                BorderBrush="{StaticResource MainBorderColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
                 BorderThickness="0,0,1,0"
                 Classes="noBorderHover"
                 Command="{CompiledBinding OpenWithCommand}"
@@ -102,14 +99,13 @@
                 Width="130">
                 <TextBlock
                     Classes="txt"
-                    Foreground="{StaticResource MainTextColor}"
                     HorizontalAlignment="Center"
                     Text="{Binding OpenWith}"
                     VerticalAlignment="Center" />
             </Button>
 
             <Button
-                BorderBrush="{StaticResource MainBorderColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
                 BorderThickness="0,0,1,0"
                 Classes="noBorderHover"
                 Command="{CompiledBinding LocateOnDiskCommand}"
@@ -119,19 +115,18 @@
                 Width="130">
                 <TextBlock
                     Classes="txt"
-                    Foreground="{StaticResource MainTextColor}"
                     HorizontalAlignment="Center"
                     Text="{Binding ShowInFolder}"
                     VerticalAlignment="Center" />
             </Button>
             <buttons:StarOutlineButtons
-                Background="{StaticResource FadedBackgroundColor}"
+                Background="{DynamicResource FadedBackgroundColor}"
                 Padding="5,0,0,3"
                 x:Name="StarOutlineButtons" />
 
             <Button
-                Background="{StaticResource MainButtonBackgroundColor}"
-                BorderBrush="{StaticResource MainBorderColor}"
+                Background="{DynamicResource MainButtonBackgroundColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
                 BorderThickness="1,0,1,0"
                 Classes="hover"
                 Click="Minimize"
@@ -146,8 +141,8 @@
             </Button>
 
             <Button
-                Background="{StaticResource MainButtonBackgroundColor}"
-                BorderBrush="{StaticResource MainBorderColor}"
+                Background="{DynamicResource MainButtonBackgroundColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
                 BorderThickness="0,0,1,0"
                 Classes="hover"
                 Click="Close"
@@ -163,7 +158,7 @@
         </StackPanel>
         <Rectangle
             DockPanel.Dock="Top"
-            Fill="{StaticResource MainBorderColor}"
+            Fill="{DynamicResource MainBorderColor}"
             Height="1"
             Width="899" />
         <views:ExifView Background="{StaticResource NoisyTexture}" x:Name="ExifView" />

src/PicView.Avalonia.Win32/Views/SettingsWindow.axaml

@@ -1,5 +1,5 @@
 <Window
-    CornerRadius="8"
+    CornerRadius="0,0,8,8"
     Height="300"
     MinHeight="260"
     SizeToContent="WidthAndHeight"
@@ -18,47 +18,42 @@
         <viewModels:MainViewModel />
     </Design.DataContext>
     <Border
-        BorderBrush="{StaticResource MainBorderColor}"
+        BorderBrush="{DynamicResource MainBorderColor}"
         BorderThickness="1"
-        CornerRadius="8">
+        CornerRadius="0,0,8,8"
+        Name="ParentBorder">
         <Panel>
-
             <Panel
-                Background="{StaticResource SecondaryBackgroundColor}"
+                Background="{DynamicResource SecondaryBackgroundColor}"
                 Height="28"
                 PointerPressed="MoveWindow"
                 VerticalAlignment="Top">
 
-                <Border
-                    BorderBrush="{StaticResource MainBorderColor}"
-                    BorderThickness="0"
-                    CornerRadius="8,0,0,0"
-                    HorizontalAlignment="Left">
-                    <Image
-                        Height="25"
-                        Margin="7,1,7,1"
-                        Width="20">
-                        <Image.Source>
-                            <DrawingImage>
-                                <DrawingImage.Drawing>
-                                    <DrawingGroup ClipGeometry="M0,0 V329.25937 H333.44974 V0 H0 Z">
-                                        <DrawingGroup>
-                                            <GeometryDrawing Brush="{StaticResource AccentColor}" Geometry="F1 M333.44974,329.25937z M0,0z M329.796,130.208L311.354,177.826 304.172,196.392 286.112,243.011 280.229,258.204C279.6,259.845,277.133,259.397,277.133,257.644L277.133,214.336C277.133,214.143,277.164,213.949,277.236,213.776L289.486,182.156 296.669,163.58 306.194,138.991C306.514,138.176,306.101,137.259,305.265,136.953L278.155,126.723C277.536,126.488,277.123,125.897,277.123,125.245L277.123,109.094C277.123,107.983,278.248,107.219,279.3,107.617L328.888,126.346C311.406,53.8949 245.461,0 166.74,0 121.569,0 80.6197,17.7714 50.5885,46.5785L255.368,46.5785C257.928,46.5785,260.012,48.6267,260.012,51.164L260.012,263.198C260.012,265.725,257.938,267.783,255.368,267.783L40.6298,267.783C38.0705,267.783,35.9858,265.735,35.9858,263.198L35.9858,62.5258C13.4779,90.5891 0,126.05 0,164.63 0,255.555 74.6445,329.259 166.73,329.259 184.625,329.259 201.849,326.447 218.01,321.291L210.972,318.631 203.531,315.819 120.971,284.648 269.971,284.648 269.207,286.594 264.935,297.63C306.452,267.681 333.449,219.279 333.449,164.62 333.47,152.819 332.18,141.315 329.796,130.208L329.796,130.208z" />
-                                            <GeometryDrawing Brush="{StaticResource LogoAccentColor}" Geometry="F0 M333.44974,329.25937z M0,0z M62.2502,219.656L73.9737,219.656C80.4857,212.339 86.9666,205.033 93.4579,197.717 95.0265,195.944 96.6261,194.211 98.0709,192.357 98.8862,191.348 99.5054,191.287 100.537,191.99 105.563,195.403 110.63,198.725 115.646,202.19 117.018,203.138 117.689,203.464 118.752,201.629 125.14,190.543 131.725,179.609 138.154,168.543 138.928,167.228 139.403,167.452 140.362,168.135 147.432,173.118 154.532,178.08 161.621,183.053 162.375,183.573 163.149,184.062 163.913,184.582 171.384,169.297 178.784,154.154 186.379,138.625 188.484,142.762 190.425,146.553 192.365,150.343 204.191,173.454 216.018,196.545 227.835,219.656L236.514,219.656C239.083,219.656,241.147,217.597,241.147,215.06L241.147,69.4041C241.147,67.3967 239.847,65.7051 238.031,65.0835 237.556,64.9205 237.05,64.8084 236.524,64.8084L62.2502,64.8084C59.6806,64.8084,57.6166,66.8668,57.6166,69.4041L57.6166,215.06C57.6166,216.15 58.0191,217.149 58.6589,217.933 59.5051,218.973 60.7848,219.656 62.2502,219.656L62.2502,219.656z M105.119,125.969C116.203,126.631 124.583,135.619 124.284,146.654 123.953,159.188 114.16,166.963 103.375,166.739 90.7024,166.474 82.9521,156.773 82.8282,145.992 83.2721,134.039 92.8696,125.245 105.119,125.969L105.119,125.969z" />
-                                        </DrawingGroup>
+                <Image
+                    Height="25"
+                    HorizontalAlignment="Left"
+                    Margin="7,1,7,1"
+                    Width="20">
+                    <Image.Source>
+                        <DrawingImage>
+                            <DrawingImage.Drawing>
+                                <DrawingGroup ClipGeometry="M0,0 V329.25937 H333.44974 V0 H0 Z">
+                                    <DrawingGroup>
+                                        <GeometryDrawing Brush="{DynamicResource AccentColor}" Geometry="F1 M333.44974,329.25937z M0,0z M329.796,130.208L311.354,177.826 304.172,196.392 286.112,243.011 280.229,258.204C279.6,259.845,277.133,259.397,277.133,257.644L277.133,214.336C277.133,214.143,277.164,213.949,277.236,213.776L289.486,182.156 296.669,163.58 306.194,138.991C306.514,138.176,306.101,137.259,305.265,136.953L278.155,126.723C277.536,126.488,277.123,125.897,277.123,125.245L277.123,109.094C277.123,107.983,278.248,107.219,279.3,107.617L328.888,126.346C311.406,53.8949 245.461,0 166.74,0 121.569,0 80.6197,17.7714 50.5885,46.5785L255.368,46.5785C257.928,46.5785,260.012,48.6267,260.012,51.164L260.012,263.198C260.012,265.725,257.938,267.783,255.368,267.783L40.6298,267.783C38.0705,267.783,35.9858,265.735,35.9858,263.198L35.9858,62.5258C13.4779,90.5891 0,126.05 0,164.63 0,255.555 74.6445,329.259 166.73,329.259 184.625,329.259 201.849,326.447 218.01,321.291L210.972,318.631 203.531,315.819 120.971,284.648 269.971,284.648 269.207,286.594 264.935,297.63C306.452,267.681 333.449,219.279 333.449,164.62 333.47,152.819 332.18,141.315 329.796,130.208L329.796,130.208z" />
+                                        <GeometryDrawing Brush="{DynamicResource LogoAccentColor}" Geometry="F0 M333.44974,329.25937z M0,0z M62.2502,219.656L73.9737,219.656C80.4857,212.339 86.9666,205.033 93.4579,197.717 95.0265,195.944 96.6261,194.211 98.0709,192.357 98.8862,191.348 99.5054,191.287 100.537,191.99 105.563,195.403 110.63,198.725 115.646,202.19 117.018,203.138 117.689,203.464 118.752,201.629 125.14,190.543 131.725,179.609 138.154,168.543 138.928,167.228 139.403,167.452 140.362,168.135 147.432,173.118 154.532,178.08 161.621,183.053 162.375,183.573 163.149,184.062 163.913,184.582 171.384,169.297 178.784,154.154 186.379,138.625 188.484,142.762 190.425,146.553 192.365,150.343 204.191,173.454 216.018,196.545 227.835,219.656L236.514,219.656C239.083,219.656,241.147,217.597,241.147,215.06L241.147,69.4041C241.147,67.3967 239.847,65.7051 238.031,65.0835 237.556,64.9205 237.05,64.8084 236.524,64.8084L62.2502,64.8084C59.6806,64.8084,57.6166,66.8668,57.6166,69.4041L57.6166,215.06C57.6166,216.15 58.0191,217.149 58.6589,217.933 59.5051,218.973 60.7848,219.656 62.2502,219.656L62.2502,219.656z M105.119,125.969C116.203,126.631 124.583,135.619 124.284,146.654 123.953,159.188 114.16,166.963 103.375,166.739 90.7024,166.474 82.9521,156.773 82.8282,145.992 83.2721,134.039 92.8696,125.245 105.119,125.969L105.119,125.969z" />
                                     </DrawingGroup>
-                                </DrawingImage.Drawing>
-                            </DrawingImage>
-                        </Image.Source>
-                    </Image>
-                </Border>
+                                </DrawingGroup>
+                            </DrawingImage.Drawing>
+                        </DrawingImage>
+                    </Image.Source>
+                </Image>
 
                 <TabControl
-                    Background="{StaticResource SecondaryBackgroundColor}"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    Background="{DynamicResource SecondaryBackgroundColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="1,0,0,0"
                     HorizontalAlignment="Center"
-                    Margin="27,0,52,0"
+                    Margin="0"
                     Padding="0"
                     PointerPressed="MoveWindow">
                     <TabItem PointerPressed="MoveWindow" x:Name="GeneralSettingsTabItem">
@@ -67,7 +62,7 @@
                             <StackPanel MinWidth="95" Orientation="Horizontal">
                                 <Path
                                     Data="{StaticResource CogGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="14"
                                     Margin="0,0,5,0"
                                     Stretch="Fill"
@@ -79,9 +74,12 @@
                             </StackPanel>
                         </TabItem.Header>
                     </TabItem>
-                    <TabItem PointerPressed="MoveWindow" x:Name="AppearanceTabItem">
+                    <TabItem
+                        MinWidth="95"
+                        PointerPressed="MoveWindow"
+                        x:Name="AppearanceTabItem">
                         <TabItem.Header>
-                            <StackPanel MinWidth="95" Orientation="Horizontal">
+                            <StackPanel Orientation="Horizontal">
                                 <Image
                                     Height="14"
                                     Margin="0,0,5,0"
@@ -97,8 +95,8 @@
                 </TabControl>
 
                 <Button
-                    Background="{StaticResource MainButtonBackgroundColor}"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    Background="{DynamicResource MainButtonBackgroundColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
                     Classes="hover"
                     Click="Minimize"
@@ -107,39 +105,45 @@
                     Width="30">
                     <Viewbox Height="12" Width="12">
                         <Path
-                            Data="M24,11c0-0.6-0.4-1-1-1H1c-0.6,0-1,0.4-1,1v2c0,0.6,0.4,1,1,1h22c0.6,0,1-0.4,1-1V11z"
-                            Fill="{StaticResource MainIconColor}"
+                            Data="{StaticResource MinimizeGeometry}"
+                            Fill="{DynamicResource MainIconColor}"
                             Stretch="Fill" />
                     </Viewbox>
                 </Button>
 
                 <Button
-                    Background="{StaticResource MainButtonBackgroundColor}"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    Background="{DynamicResource MainButtonBackgroundColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
                     Classes="hover"
                     Click="Close"
-                    CornerRadius="0,8,0,0"
                     HorizontalAlignment="Right"
                     Width="30">
                     <Path
-                        Data="M443.6,387.1L312.4,255.4l131.5-130c5.4-5.4,5.4-14.2,0-19.6l-37.4-37.6c-2.6-2.6-6.1-4-9.8-4c-3.7,0-7.2,1.5-9.8,4  L256,197.8L124.9,68.3c-2.6-2.6-6.1-4-9.8-4c-3.7,0-7.2,1.5-9.8,4L68,105.9c-5.4,5.4-5.4,14.2,0,19.6l131.5,130L68.4,387.1  c-2.6,2.6-4.1,6.1-4.1,9.8c0,3.7,1.4,7.2,4.1,9.8l37.4,37.6c2.7,2.7,6.2,4.1,9.8,4.1c3.5,0,7.1-1.3,9.8-4.1L256,313.1l130.7,131.1  c2.7,2.7,6.2,4.1,9.8,4.1c3.5,0,7.1-1.3,9.8-4.1l37.4-37.6c2.6-2.6,4.1-6.1,4.1-9.8C447.7,393.2,446.2,389.7,443.6,387.1z"
-                        Fill="{StaticResource MainIconColor}"
+                        Data="{StaticResource CloseGeometry}"
+                        Fill="{DynamicResource MainIconColor}"
                         Height="10"
                         Stretch="Fill"
                         Width="10" />
                 </Button>
             </Panel>
 
+            <Rectangle
+                Fill="{DynamicResource MainBorderColor}"
+                Height="1"
+                Margin="0,28,0,0"
+                VerticalAlignment="Top"
+                Width="{Binding #ParentBorder.Bounds.Width}"
+                ZIndex="1" />
             <ScrollViewer
-                Background="{StaticResource NoisyTexture}"
+                Background="{DynamicResource NoisyTexture}"
                 IsVisible="{Binding Path=IsSelected, ElementName=GeneralSettingsTabItem}"
                 Margin="0,28,0,0">
                 <views:GeneralSettingsView Background="Transparent" PointerPressed="MoveWindow" />
             </ScrollViewer>
 
             <ScrollViewer
-                Background="{StaticResource NoisyTexture}"
+                Background="{DynamicResource NoisyTexture}"
                 IsVisible="{Binding Path=IsSelected, ElementName=AppearanceTabItem}"
                 Margin="0,28,0,0">
                 <views:AppearanceView Background="Transparent" PointerPressed="MoveWindow" />

src/PicView.Avalonia.Win32/Views/WinMainWindow.axaml

@@ -1,6 +1,6 @@
 <Window
     CanResize="{CompiledBinding CanResize}"
-    CornerRadius="8"
+    CornerRadius="0,0,8,8"
     Icon="/icon.ico"
     MinHeight="{CompiledBinding WindowMinSize}"
     MinWidth="{CompiledBinding WindowMinSize}"
@@ -27,13 +27,13 @@
     </Design.DataContext>
 
     <Border
-        BorderBrush="{StaticResource WindowBorderColor}"
+        BorderBrush="{DynamicResource WindowBorderColor}"
         BorderThickness="1"
         CornerRadius="8">
         <DockPanel LastChildFill="True">
             <views1:WinTitleBar DockPanel.Dock="Top" x:Name="Titlebar" />
             <views:BottomBar DockPanel.Dock="Bottom" x:Name="BottomBar" />
-            <views:MainView Background="{StaticResource NoisyTexture}" x:Name="MainView" />
+            <views:MainView Background="{DynamicResource NoisyTexture}" x:Name="MainView" />
         </DockPanel>
     </Border>
 </Window>

src/PicView.Avalonia.Win32/Views/WinTitleBar.axaml

@@ -9,7 +9,6 @@
     x:Class="PicView.Avalonia.Win32.Views.WinTitleBar"
     x:DataType="vm:MainViewModel"
     xmlns="https://github.com/avaloniaui"
-    xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls;assembly=PicView.Avalonia"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:uc="clr-namespace:PicView.Avalonia.Views.UC;assembly=PicView.Avalonia"
@@ -21,16 +20,12 @@
     </Design.DataContext>
 
     <Border
-        Background="{StaticResource MainButtonBackgroundColor}"
-        BorderBrush="{StaticResource MainBorderColor}"
-        BorderThickness="0,0,0,1"
-        CornerRadius="8,8,0,0">
+        Background="{DynamicResource MainButtonBackgroundColor}"
+        BorderBrush="{DynamicResource MainBorderColor}"
+        BorderThickness="0,0,0,1">
         <DockPanel LastChildFill="True">
 
-            <Border
-                BorderBrush="{StaticResource MainBorderColor}"
-                BorderThickness="0,0,1,0"
-                CornerRadius="8,0,0,0">
+            <Border BorderBrush="{DynamicResource MainBorderColor}" BorderThickness="0,0,1,0">
                 <Image
                     DockPanel.Dock="Left"
                     Height="25"
@@ -41,8 +36,8 @@
                             <DrawingImage.Drawing>
                                 <DrawingGroup ClipGeometry="M0,0 V329.25937 H333.44974 V0 H0 Z">
                                     <DrawingGroup>
-                                        <GeometryDrawing Brush="{StaticResource AccentColor}" Geometry="F1 M333.44974,329.25937z M0,0z M329.796,130.208L311.354,177.826 304.172,196.392 286.112,243.011 280.229,258.204C279.6,259.845,277.133,259.397,277.133,257.644L277.133,214.336C277.133,214.143,277.164,213.949,277.236,213.776L289.486,182.156 296.669,163.58 306.194,138.991C306.514,138.176,306.101,137.259,305.265,136.953L278.155,126.723C277.536,126.488,277.123,125.897,277.123,125.245L277.123,109.094C277.123,107.983,278.248,107.219,279.3,107.617L328.888,126.346C311.406,53.8949 245.461,0 166.74,0 121.569,0 80.6197,17.7714 50.5885,46.5785L255.368,46.5785C257.928,46.5785,260.012,48.6267,260.012,51.164L260.012,263.198C260.012,265.725,257.938,267.783,255.368,267.783L40.6298,267.783C38.0705,267.783,35.9858,265.735,35.9858,263.198L35.9858,62.5258C13.4779,90.5891 0,126.05 0,164.63 0,255.555 74.6445,329.259 166.73,329.259 184.625,329.259 201.849,326.447 218.01,321.291L210.972,318.631 203.531,315.819 120.971,284.648 269.971,284.648 269.207,286.594 264.935,297.63C306.452,267.681 333.449,219.279 333.449,164.62 333.47,152.819 332.18,141.315 329.796,130.208L329.796,130.208z" />
-                                        <GeometryDrawing Brush="{StaticResource LogoAccentColor}" Geometry="F0 M333.44974,329.25937z M0,0z M62.2502,219.656L73.9737,219.656C80.4857,212.339 86.9666,205.033 93.4579,197.717 95.0265,195.944 96.6261,194.211 98.0709,192.357 98.8862,191.348 99.5054,191.287 100.537,191.99 105.563,195.403 110.63,198.725 115.646,202.19 117.018,203.138 117.689,203.464 118.752,201.629 125.14,190.543 131.725,179.609 138.154,168.543 138.928,167.228 139.403,167.452 140.362,168.135 147.432,173.118 154.532,178.08 161.621,183.053 162.375,183.573 163.149,184.062 163.913,184.582 171.384,169.297 178.784,154.154 186.379,138.625 188.484,142.762 190.425,146.553 192.365,150.343 204.191,173.454 216.018,196.545 227.835,219.656L236.514,219.656C239.083,219.656,241.147,217.597,241.147,215.06L241.147,69.4041C241.147,67.3967 239.847,65.7051 238.031,65.0835 237.556,64.9205 237.05,64.8084 236.524,64.8084L62.2502,64.8084C59.6806,64.8084,57.6166,66.8668,57.6166,69.4041L57.6166,215.06C57.6166,216.15 58.0191,217.149 58.6589,217.933 59.5051,218.973 60.7848,219.656 62.2502,219.656L62.2502,219.656z M105.119,125.969C116.203,126.631 124.583,135.619 124.284,146.654 123.953,159.188 114.16,166.963 103.375,166.739 90.7024,166.474 82.9521,156.773 82.8282,145.992 83.2721,134.039 92.8696,125.245 105.119,125.969L105.119,125.969z" />
+                                        <GeometryDrawing Brush="{DynamicResource AccentColor}" Geometry="F1 M333.44974,329.25937z M0,0z M329.796,130.208L311.354,177.826 304.172,196.392 286.112,243.011 280.229,258.204C279.6,259.845,277.133,259.397,277.133,257.644L277.133,214.336C277.133,214.143,277.164,213.949,277.236,213.776L289.486,182.156 296.669,163.58 306.194,138.991C306.514,138.176,306.101,137.259,305.265,136.953L278.155,126.723C277.536,126.488,277.123,125.897,277.123,125.245L277.123,109.094C277.123,107.983,278.248,107.219,279.3,107.617L328.888,126.346C311.406,53.8949 245.461,0 166.74,0 121.569,0 80.6197,17.7714 50.5885,46.5785L255.368,46.5785C257.928,46.5785,260.012,48.6267,260.012,51.164L260.012,263.198C260.012,265.725,257.938,267.783,255.368,267.783L40.6298,267.783C38.0705,267.783,35.9858,265.735,35.9858,263.198L35.9858,62.5258C13.4779,90.5891 0,126.05 0,164.63 0,255.555 74.6445,329.259 166.73,329.259 184.625,329.259 201.849,326.447 218.01,321.291L210.972,318.631 203.531,315.819 120.971,284.648 269.971,284.648 269.207,286.594 264.935,297.63C306.452,267.681 333.449,219.279 333.449,164.62 333.47,152.819 332.18,141.315 329.796,130.208L329.796,130.208z" />
+                                        <GeometryDrawing Brush="{DynamicResource LogoAccentColor}" Geometry="F0 M333.44974,329.25937z M0,0z M62.2502,219.656L73.9737,219.656C80.4857,212.339 86.9666,205.033 93.4579,197.717 95.0265,195.944 96.6261,194.211 98.0709,192.357 98.8862,191.348 99.5054,191.287 100.537,191.99 105.563,195.403 110.63,198.725 115.646,202.19 117.018,203.138 117.689,203.464 118.752,201.629 125.14,190.543 131.725,179.609 138.154,168.543 138.928,167.228 139.403,167.452 140.362,168.135 147.432,173.118 154.532,178.08 161.621,183.053 162.375,183.573 163.149,184.062 163.913,184.582 171.384,169.297 178.784,154.154 186.379,138.625 188.484,142.762 190.425,146.553 192.365,150.343 204.191,173.454 216.018,196.545 227.835,219.656L236.514,219.656C239.083,219.656,241.147,217.597,241.147,215.06L241.147,69.4041C241.147,67.3967 239.847,65.7051 238.031,65.0835 237.556,64.9205 237.05,64.8084 236.524,64.8084L62.2502,64.8084C59.6806,64.8084,57.6166,66.8668,57.6166,69.4041L57.6166,215.06C57.6166,216.15 58.0191,217.149 58.6589,217.933 59.5051,218.973 60.7848,219.656 62.2502,219.656L62.2502,219.656z M105.119,125.969C116.203,126.631 124.583,135.619 124.284,146.654 123.953,159.188 114.16,166.963 103.375,166.739 90.7024,166.474 82.9521,156.773 82.8282,145.992 83.2721,134.039 92.8696,125.245 105.119,125.969L105.119,125.969z" />
                                     </DrawingGroup>
                                 </DrawingGroup>
                             </DrawingImage.Drawing>
@@ -52,26 +47,28 @@
             </Border>
 
             <Button
-                Background="{StaticResource MainButtonBackgroundColor}"
-                BorderBrush="{StaticResource MainBorderColor}"
+                Background="{DynamicResource MainButtonBackgroundColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
                 BorderThickness="0,0,1,0"
                 Classes="hover"
                 Command="{CompiledBinding ToggleGalleryCommand}"
                 DockPanel.Dock="Left"
-                Name="GalleryButton"
                 Width="30">
                 <Image Width="17">
+                    <Image.Resources>
+                        <SolidColorBrush Color="{DynamicResource MainIconColor}" x:Key="Brush0" />
+                    </Image.Resources>
                     <DrawingImage>
                         <DrawingGroup>
-                            <GeometryDrawing Brush="{StaticResource MainIconColor}" Geometry="F1 M22 16L22 4C22 2.9 21.1 2 20 2L8 2C6.9 2 6 2.9 6 4L6 16C6 17.1 6.9 18 8 18L20 18C21.1 18 22 17.1 22 16ZM11 12L13.03 14.71L16 11L20 16L8 16L11 12ZM2 6L2 20C2 21.1 2.9 22 4 22L18 22L18 20L4 20L4 6L2 6Z" />
+                            <GeometryDrawing Brush="{StaticResource Brush0}" Geometry="F1 M22 16L22 4C22 2.9 21.1 2 20 2L8 2C6.9 2 6 2.9 6 4L6 16C6 17.1 6.9 18 8 18L20 18C21.1 18 22 17.1 22 16ZM11 12L13.03 14.71L16 11L20 16L8 16L11 12ZM2 6L2 20C2 21.1 2.9 22 4 22L18 22L18 20L4 20L4 6L2 6Z" />
                         </DrawingGroup>
                     </DrawingImage>
                 </Image>
             </Button>
 
             <Button
-                Background="{StaticResource MainButtonBackgroundColor}"
-                BorderBrush="{StaticResource MainBorderColor}"
+                Background="{DynamicResource MainButtonBackgroundColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
                 BorderThickness="0,0,1,0"
                 Classes="hover"
                 Command="{CompiledBinding RotateRightCommand}"
@@ -83,15 +80,15 @@
                 Width="30">
                 <Path
                     Data="M142.9 142.9c62.2-62.2 162.7-62.5 225.3-1L327 183c-6.9 6.9-8.9 17.2-5.2 26.2s12.5 14.8 22.2 14.8H463.5c0 0 0 0 0 0H472c13.3 0 24-10.7 24-24V72c0-9.7-5.8-18.5-14.8-22.2s-19.3-1.7-26.2 5.2L413.4 96.6c-87.6-86.5-228.7-86.2-315.8 1C73.2 122 55.6 150.7 44.8 181.4c-5.9 16.7 2.9 34.9 19.5 40.8s34.9-2.9 40.8-19.5c7.7-21.8 20.2-42.3 37.8-59.8zM16 312v7.6 .7V440c0 9.7 5.8 18.5 14.8 22.2s19.3 1.7 26.2-5.2l41.6-41.6c87.6 86.5 228.7 86.2 315.8-1c24.4-24.4 42.1-53.1 52.9-83.7c5.9-16.7-2.9-34.9-19.5-40.8s-34.9 2.9-40.8 19.5c-7.7 21.8-20.2 42.3-37.8 59.8c-62.2 62.2-162.7 62.5-225.3 1L185 329c6.9-6.9 8.9-17.2 5.2-26.2s-12.5-14.8-22.2-14.8H48.4h-.7H40c-13.3 0-24 10.7-24 24z"
-                    Fill="{StaticResource MainIconColor}"
+                    Fill="{DynamicResource MainIconColor}"
                     Height="13"
                     Stretch="Fill"
                     Width="13" />
             </Button>
 
             <Button
-                Background="{StaticResource MainButtonBackgroundColor}"
-                BorderBrush="{StaticResource MainBorderColor}"
+                Background="{DynamicResource MainButtonBackgroundColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
                 BorderThickness="0,0,1,0"
                 Classes="hover"
                 Command="{CompiledBinding FlipCommand}"
@@ -102,7 +99,7 @@
                 Width="30">
                 <Path
                     Data="M192,96v64h248c4.4,0,8,3.6,8,8v240c0,4.4-3.6,8-8,8H136c-4.4,0-8-3.6-8-8v-48c0-4.4,3.6-8,8-8h248V224H192v64L64,192  L192,96z"
-                    Fill="{StaticResource MainIconColor}"
+                    Fill="{DynamicResource MainIconColor}"
                     Height="13"
                     Stretch="Fill"
                     Width="13" />
@@ -112,25 +109,24 @@
             </Button>
 
             <Button
-                Background="{StaticResource MainButtonBackgroundColor}"
-                BorderBrush="{StaticResource MainBorderColor}"
+                Background="{DynamicResource MainButtonBackgroundColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
                 BorderThickness="0,0,1,0"
                 Classes="hover"
                 Command="{CompiledBinding ExitCommand}"
-                CornerRadius="0,8,0,0"
                 DockPanel.Dock="Right"
                 Width="35">
                 <Path
                     Data="{StaticResource CloseGeometry}"
-                    Fill="{StaticResource MainIconColor}"
+                    Fill="{DynamicResource MainIconColor}"
                     Height="10"
                     Stretch="Fill"
                     Width="10" />
             </Button>
 
             <Button
-                Background="{StaticResource MainButtonBackgroundColor}"
-                BorderBrush="{StaticResource MainBorderColor}"
+                Background="{DynamicResource MainButtonBackgroundColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
                 BorderThickness="0,0,1,0"
                 Classes="hover"
                 Command="{CompiledBinding ToggleFullscreenCommand}"
@@ -139,15 +135,15 @@
                 Width="35">
                 <Path
                     Data="{StaticResource FullscreenGeometry}"
-                    Fill="{StaticResource MainIconColor}"
+                    Fill="{DynamicResource MainIconColor}"
                     Height="12"
                     Stretch="Fill"
                     Width="12" />
             </Button>
 
             <Button
-                Background="{StaticResource MainButtonBackgroundColor}"
-                BorderBrush="{StaticResource MainBorderColor}"
+                Background="{DynamicResource MainButtonBackgroundColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
                 BorderThickness="1,0,1,0"
                 Classes="hover"
                 Command="{CompiledBinding MinimizeCommand}"
@@ -156,11 +152,15 @@
                 <Viewbox Height="12" Width="12">
                     <Path
                         Data="{StaticResource MinimizeGeometry}"
-                        Fill="{StaticResource MainIconColor}"
+                        Fill="{DynamicResource MainIconColor}"
                         Stretch="Fill" />
                 </Viewbox>
             </Button>
-            <uc:EditableTitlebar Background="{StaticResource SecondaryBackgroundColor}" x:Name="EditableTitlebar" />
+            <uc:EditableTitlebar
+                Background="{DynamicResource SecondaryBackgroundColor}"
+                BorderBrush="{DynamicResource MainBorderColor}"
+                BorderThickness="0,0,0,1"
+                x:Name="EditableTitlebar" />
         </DockPanel>
     </Border>
 </UserControl>

src/PicView.Avalonia/PicViewTheme/Accents/AccentColors.axaml

@@ -0,0 +1,9 @@
+<ResourceDictionary
+    x:ClassModifier="internal"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Color x:Key="AccentColor">#FFDB5B3D</Color>
+    <Color x:Key="SecondaryAccentColor">#e0755a</Color>
+    <Color x:Key="LogoAccentColor">#FFf8af3c</Color>
+</ResourceDictionary>

src/PicView.Avalonia/PicViewTheme/Accents/Base.axaml → src/PicView.Avalonia/PicViewTheme/Accents/MainColors.axaml

@@ -36,6 +36,7 @@
 
             <Color x:Key="WindowBackgroundColor">#66000000</Color>
             <Color x:Key="WindowBorderColor">#FF3A3A3A</Color>
+
             <ImageBrush
                 DestinationRect="0,0,100,100"
                 Opacity=".6"
@@ -61,13 +62,16 @@
 
             <Color x:Key="MainBackgroundColor">White</Color>
             <Color x:Key="SecondaryBackgroundColor">White</Color>
-            <Color x:Key="TertiaryBackgroundColor">#CC3d3d3d</Color>
-            <Color x:Key="FadedBackgroundColor">#FF333333</Color>
-            <Color x:Key="BackgroundHoverColor">#D5FFFFFF</Color>
+            <Color x:Key="TertiaryBackgroundColor">#eee</Color>
+
+            <Color x:Key="FadedBackgroundColor">#E9EEEEEE</Color>
+
+            <Color x:Key="BackgroundHoverColor">#A2EEEEEE</Color>
+
             <Color x:Key="AltBackgroundHoverColor">#22FFFFFF</Color>
-            <Color x:Key="AltBackgroundColor">#A7222222</Color>
+            <Color x:Key="AltBackgroundColor">#A7FFFFFF</Color>
 
-            <Color x:Key="MainButtonBackgroundColor">#81FFFFFF</Color>
+            <Color x:Key="MainButtonBackgroundColor">White</Color>
 
             <Color x:Key="MainBorderColor">#78B5B5B5</Color>
             <Color x:Key="SecondaryBorderColor">#95B5B5B5</Color>
@@ -75,22 +79,17 @@
 
             <Color x:Key="ButtonForegroundPointerOver">#FFF</Color>
 
-            <Color x:Key="BackgroundAlpha">#442e2e2e</Color>
+            <Color x:Key="BackgroundAlpha">#32FFFFFF</Color>
 
             <Color x:Key="MenuBackgroundColor">#D1EEEEEE</Color>
 
             <Color x:Key="ContextMenuBackgroundColor">#D1EEEEEE</Color>
             <Color x:Key="ContextMenuTextColor">#474139</Color>
 
-            <Color x:Key="WindowBackgroundColor">#66FFFFFF</Color>
-            <ImageBrush
-                DestinationRect="0,0,100,100"
-                Opacity=".6"
-                Source="/PicViewTheme/Resources/noisy-texture-200x200-o4-d23-c-ffffff-t1.png"
-                SourceRect="0,0,200,200"
-                Stretch="Fill"
-                TileMode="FlipXY"
-                x:Key="NoisyTexture" />
+            <Color x:Key="WindowBackgroundColor">#78B5B5B5</Color>
+            <Color x:Key="WindowBorderColor">#66FFFFFF</Color>
+
+            <Color x:Key="NoisyTexture">#fff</Color>
 
             <DropShadowEffect
                 BlurRadius="5"

src/PicView.Avalonia/PicViewTheme/Classes.axaml

@@ -0,0 +1,68 @@
+<Styles
+    xmlns="https://github.com/avaloniaui"
+    xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style Selector="TextBlock.txt">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="{DynamicResource MainTextColor}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="FontFamily" Value="/Assets/Fonts/Roboto-Medium.ttf#Roboto" />
+        <Setter Property="TextTrimming" Value="CharacterEllipsis" />
+        <Setter Property="TextWrapping" Value="Wrap" />
+    </Style>
+
+    <Style Selector="TextBlock.hover">
+        <Style Selector="^:pointerover">
+            <Setter Property="Foreground" Value="{DynamicResource AccentColor}" />
+        </Style>
+    </Style>
+
+    <Style Selector="Button.hover, customControls|CopyButton:hover">
+        <Style Selector="^:pointerover">
+            <Setter Property="Background" Value="{DynamicResource AccentColor}" />
+        </Style>
+    </Style>
+
+    <Style Selector="Button.ButtonBorder, ToggleButton.ButtonBorder, SplitButton.ButtonBorder">
+        <Setter Property="Height" Value="40" />
+        <Setter Property="Width" Value="147" />
+        <Setter Property="CornerRadius" Value="4" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MainBorderColor}" />
+        <Setter Property="Effect" Value="{DynamicResource MenuShadowButtonBorder}" />
+        <Setter Property="Background" Value="{DynamicResource MainButtonBackgroundColor}" />
+    </Style>
+
+    <Style Selector="Button.BorderStyle, ToggleButton.BorderStyle">
+        <Setter Property="Width" Value="37" />
+        <Setter Property="Height" Value="35" />
+        <Setter Property="Margin" Value="7,0,0,0" />
+        <Setter Property="Background" Value="{DynamicResource BackgroundAlpha}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MainBorderColor}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="CornerRadius" Value="2" />
+    </Style>
+
+    <Style Selector="Button.mainBtn, ToggleButton.mainBtn">
+        <Setter Property="Width" Value="NaN" />
+        <Setter Property="Height" Value="35" />
+        <Setter Property="Padding" Value="10" />
+        <Setter Property="Background" Value="{DynamicResource SecondaryBackgroundColor}" />
+    </Style>
+
+    <Style Selector="TextBox.TStyle">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="{DynamicResource MainTextColorFaded}" />
+        <Setter Property="FontFamily" Value="/Assets/Fonts/Roboto-Medium.ttf#Roboto" />
+        <Setter Property="Background" Value="{DynamicResource TertiaryBackgroundColor}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MainBorderColor}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="CornerRadius" Value="2" />
+        <Setter Property="CaretBrush" Value="{DynamicResource MainTextColor}" />
+        <Setter Property="Margin" Value="5,0,0,0" />
+        <Setter Property="Padding" Value="5,9,0,7" />
+        <Setter Property="Width" Value="180" />
+    </Style>
+</Styles>

src/PicView.Avalonia/PicViewTheme/Controls/Button.axaml

@@ -25,10 +25,10 @@
                 <Animation Duration=".35" IterationCount="1">
                     <KeyFrame>
                         <Setter Property="Background">
-                            <SolidColorBrush Color="{StaticResource SecondaryBackgroundColor}" />
+                            <SolidColorBrush Color="{DynamicResource SecondaryBackgroundColor}" />
                         </Setter>
                         <Setter Property="BorderBrush">
-                            <SolidColorBrush Color="{StaticResource MainBorderColor}" />
+                            <SolidColorBrush Color="{DynamicResource MainBorderColor}" />
                         </Setter>
                     </KeyFrame>
                     <KeyFrame Cue="1">
@@ -49,48 +49,48 @@
                 <Animation Duration=".35" IterationCount="1">
                     <KeyFrame>
                         <Setter Property="Background">
-                            <SolidColorBrush Color="{StaticResource SecondaryBackgroundColor}" />
+                            <SolidColorBrush Color="{DynamicResource SecondaryBackgroundColor}" />
                         </Setter>
                         <Setter Property="BorderBrush">
-                            <SolidColorBrush Color="{StaticResource MainBorderColor}" />
+                            <SolidColorBrush Color="{DynamicResource MainBorderColor}" />
                         </Setter>
                     </KeyFrame>
                     <KeyFrame Cue="1">
                         <Setter Property="Background">
-                            <SolidColorBrush Color="{StaticResource BackgroundHoverColor}" />
+                            <SolidColorBrush Color="{DynamicResource BackgroundHoverColor}" />
                         </Setter>
                         <Setter Property="BorderBrush">
-                            <SolidColorBrush Color="{StaticResource SecondaryBorderColor}" />
+                            <SolidColorBrush Color="{DynamicResource SecondaryBorderColor}" />
                         </Setter>
                     </KeyFrame>
                 </Animation>
             </Style.Animations>
-            <Setter Property="Background" Value="{StaticResource BackgroundHoverColor}" />
-            <Setter Property="BorderBrush" Value="{StaticResource SecondaryBorderColor}" />
+            <Setter Property="Background" Value="{DynamicResource BackgroundHoverColor}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderColor}" />
         </Style>
         <Style Selector="^.noBorderHover:pointerover /template/ ContentPresenter#PART_ContentPresenter">
             <Style.Animations>
                 <Animation Duration=".35" IterationCount="1">
                     <KeyFrame>
                         <Setter Property="Background">
-                            <SolidColorBrush Color="{StaticResource SecondaryBackgroundColor}" />
+                            <SolidColorBrush Color="{DynamicResource MainButtonBackgroundColor}" />
                         </Setter>
                     </KeyFrame>
                     <KeyFrame Cue="1">
                         <Setter Property="Background">
-                            <SolidColorBrush Color="{StaticResource BackgroundHoverColor}" />
+                            <SolidColorBrush Color="{DynamicResource BackgroundHoverColor}" />
                         </Setter>
                     </KeyFrame>
                 </Animation>
             </Style.Animations>
-            <Setter Property="Background" Value="{StaticResource BackgroundHoverColor}" />
+            <Setter Property="Background" Value="{DynamicResource BackgroundHoverColor}" />
         </Style>
         <Style Selector="^.foregroundHover:pointerover /template/ ContentPresenter#PART_ContentPresenter">
             <Style.Animations>
                 <Animation Duration=".25" IterationCount="1">
                     <KeyFrame>
                         <Setter Property="Foreground">
-                            <SolidColorBrush Color="{StaticResource MainTextColor}" />
+                            <SolidColorBrush Color="{DynamicResource MainTextColor}" />
                         </Setter>
                     </KeyFrame>
                     <KeyFrame Cue="1">
@@ -106,11 +106,11 @@
             <Setter Property="Background" Value="{DynamicResource SecondaryAccentColor}" />
         </Style>
         <Style Selector="^.altHover:pressed  /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{StaticResource AltBackgroundHoverColor}" />
-            <Setter Property="BorderBrush" Value="{StaticResource SecondaryBorderColor}" />
+            <Setter Property="Background" Value="{DynamicResource AltBackgroundHoverColor}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderColor}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+            <Setter Property="Opacity" Value="{StaticResource ThemeDisabledOpacity}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/PicView.Avalonia/PicViewTheme/Controls/ComboBox.axaml

@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme TargetType="ComboBox" x:Key="{x:Type ComboBox}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{StaticResource MainTextColor}" />
+        <Setter Property="Foreground" Value="{DynamicResource MainTextColor}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="4" />
@@ -46,7 +46,7 @@
                                     Width="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}" />
                                 <Path
                                     Data="F1 M512,512z M0,0z M98,190.06L237.78,353.18A24,24,0,0,0,274.22,353.18L414,190.06C427.34,174.49,416.28,150.44,395.78,150.44L116.18,150.44C95.6799999999999,150.44,84.6199999999999,174.49,97.9999999999999,190.06z"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="17"
                                     HorizontalAlignment="Right"
                                     Margin="0,0,5,0"
@@ -65,8 +65,8 @@
                             Name="PART_Popup"
                             PlacementTarget="{TemplateBinding}">
                             <Border
-                                Background="{StaticResource SecondaryBackgroundColor}"
-                                BorderBrush="{StaticResource MainBorderColor}"
+                                Background="{DynamicResource SecondaryBackgroundColor}"
+                                BorderBrush="{DynamicResource MainBorderColor}"
                                 BorderThickness="1,0,1,1">
                                 <ScrollViewer
                                     HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
@@ -84,7 +84,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:pointerover /template/ Border#border">
-            <Setter Property="BorderBrush" Value="{StaticResource SecondaryBorderColor}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderColor}" />
         </Style>
         <Style Selector="^:disabled /template/ Border#border">
             <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />

src/PicView.Avalonia/PicViewTheme/Controls/ListBoxItem.axaml

@@ -10,8 +10,8 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <ContentPresenter
-                    Background="{StaticResource SecondaryBackgroundColor}"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    Background="{DynamicResource SecondaryBackgroundColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="1"
                     Content="{TemplateBinding Content}"
                     ContentTemplate="{TemplateBinding ContentTemplate}"

src/PicView.Avalonia/PicViewTheme/Controls/Menu.axaml

@@ -7,12 +7,11 @@
     <conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
 
     <ControlTheme TargetType="ContextMenu" x:Key="{x:Type ContextMenu}">
-        <Setter Property="Foreground" Value="{StaticResource ContextMenuTextColor}" />
-        <Setter Property="Background" Value="{StaticResource ContextMenuBackgroundColor}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MainBorderColor}" />
+        <Setter Property="Foreground" Value="{DynamicResource ContextMenuTextColor}" />
+        <Setter Property="Background" Value="{DynamicResource ContextMenuBackgroundColor}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MainBorderColor}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Padding" Value="6,4" />
-        <Setter Property="TextBlock.FontSize" Value="{DynamicResource FontSizeNormal}" />
         <Setter Property="TextBlock.FontFamily" Value="/Assets/Fonts/Roboto-Medium.ttf#Roboto" />
         <Setter Property="TextBlock.FontWeight" Value="Normal" />
         <Setter Property="Template">
@@ -84,7 +83,7 @@
                             x:Name="PART_InputGestureText" />
                         <Path
                             Data="F1M0.002,31.062L0,0 27.01,15.534z"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Grid.Column="4"
                             Height="8"
                             Margin="6,0,4,0"
@@ -93,14 +92,15 @@
                             VerticalAlignment="Center"
                             Width="8" />
                         <Popup
+                            Grid.Column="0"
                             IsLightDismissEnabled="False"
                             IsOpen="{TemplateBinding IsSubMenuOpen,
                                                      Mode=TwoWay}"
                             Name="PART_Popup"
                             Placement="RightEdgeAlignedTop">
                             <Border
-                                Background="{StaticResource ContextMenuBackgroundColor}"
-                                BorderBrush="{StaticResource MainBorderColor}"
+                                Background="{DynamicResource ContextMenuBackgroundColor}"
+                                BorderBrush="{DynamicResource MainBorderColor}"
                                 BorderThickness="1"
                                 CornerRadius="8">
                                 <ScrollViewer>
@@ -135,7 +135,7 @@
                 <Template>
                     <Path
                         Data="F1M10,1.2L4.7,9.1 4.5,9.1 0,5.2 1.3,3.5 4.3,6.1 8.3,0 10,1.2z"
-                        Fill="{StaticResource MainIconColor}"
+                        Fill="{DynamicResource MainIconColor}"
                         VerticalAlignment="Center" />
                 </Template>
             </Setter>
@@ -144,7 +144,7 @@
             <Setter Property="Content">
                 <Template>
                     <Ellipse
-                        Fill="{StaticResource MainIconColor}"
+                        Fill="{DynamicResource MainIconColor}"
                         Height="8"
                         Margin="4"
                         Width="8" />
@@ -176,7 +176,7 @@
 
     <ControlTheme TargetType="Separator" x:Key="{x:Type Separator}">
         <Setter Property="Focusable" Value="False" />
-        <Setter Property="Background" Value="{StaticResource MainBorderColor}" />
+        <Setter Property="Background" Value="{DynamicResource MainBorderColor}" />
         <Setter Property="Opacity" Value=".8" />
         <Setter Property="Margin" Value="2" />
         <Setter Property="Height" Value="1" />

src/PicView.Avalonia/PicViewTheme/Controls/MenuFlyoutPresenter.axaml

@@ -6,8 +6,8 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Border
-                    Background="{StaticResource ContextMenuBackgroundColor}"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    Background="{DynamicResource ContextMenuBackgroundColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="1"
                     CornerRadius="8"
                     Name="LayoutRoot">

src/PicView.Avalonia/PicViewTheme/Controls/Scrollbar.axaml

@@ -9,7 +9,7 @@
             <Setter Property="Height" Value="18" />
             <Setter Property="Template">
                 <ControlTemplate>
-                    <Border Background="{StaticResource SecondaryBackgroundColor}" UseLayoutRounding="False">
+                    <Border Background="{DynamicResource SecondaryBackgroundColor}" UseLayoutRounding="False">
                         <Grid ColumnDefinitions="Auto,*,Auto">
                             <RepeatButton
                                 Background="Transparent"
@@ -24,7 +24,7 @@
                                 Width="16">
                                 <Path
                                     Data="M321.94 98L158.82 237.78a24 24 0 000 36.44L321.94 414c15.57 13.34 39.62 2.28 39.62-18.22v-279.6c0-20.5-24.05-31.56-39.62-18.18z"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="12"
                                     HorizontalAlignment="Center"
                                     Stretch="Fill"
@@ -69,7 +69,7 @@
                                 Width="16">
                                 <Path
                                     Data="M190.06 414l163.12-139.78a24 24 0 000-36.44L190.06 98c-15.57-13.34-39.62-2.28-39.62 18.22v279.6c0 20.5 24.05 31.56 39.62 18.18z"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="12"
                                     HorizontalAlignment="Center"
                                     Stretch="Fill"
@@ -86,7 +86,7 @@
             <Setter Property="Width" Value="30" />
             <Setter Property="Template">
                 <ControlTemplate>
-                    <Border Background="{StaticResource SecondaryBackgroundColor}" UseLayoutRounding="False">
+                    <Border Background="{DynamicResource SecondaryBackgroundColor}" UseLayoutRounding="False">
                         <Grid RowDefinitions="Auto,*,Auto">
                             <RepeatButton
                                 Background="Transparent"
@@ -94,11 +94,11 @@
                                 Focusable="False"
                                 Grid.Row="0"
                                 HorizontalAlignment="Center"
-                                MinHeight="{DynamicResource ScrollBarThickness}"
+                                MinHeight="{StaticResource ScrollBarThickness}"
                                 Name="PART_LineUpButton">
                                 <Path
                                     Data="F1 M512,512z M0,0z M414,321.94L274.22,158.82A24,24,0,0,0,237.78,158.82L98,321.94C84.66,337.51,95.72,361.56,116.22,361.56L395.82,361.56C416.32,361.56,427.38,337.51,414,321.94z"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     HorizontalAlignment="Center"
                                     Stretch="Fill"
@@ -139,11 +139,11 @@
                                 Grid.Column="2"
                                 Grid.Row="2"
                                 HorizontalAlignment="Center"
-                                MinHeight="{DynamicResource ScrollBarThickness}"
+                                MinHeight="{StaticResource ScrollBarThickness}"
                                 Name="PART_LineDownButton">
                                 <Path
                                     Data="F1 M512,512z M0,0z M98,190.06L237.78,353.18A24,24,0,0,0,274.22,353.18L414,190.06C427.34,174.49,416.28,150.44,395.78,150.44L116.18,150.44C95.6799999999999,150.44,84.6199999999999,174.49,97.9999999999999,190.06z"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     HorizontalAlignment="Center"
                                     Stretch="Fill"
@@ -156,13 +156,13 @@
             </Setter>
         </Style>
         <Style Selector="^ /template/ Thumb#thumb">
-            <Setter Property="Background" Value="{StaticResource SecondaryBackgroundColor}" />
+            <Setter Property="Background" Value="{DynamicResource SecondaryBackgroundColor}" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate>
                         <Border
                             Background="{TemplateBinding Background}"
-                            BorderBrush="{StaticResource MainBorderColor}"
+                            BorderBrush="{DynamicResource MainBorderColor}"
                             BorderThickness="1" />
                     </ControlTemplate>
                 </Setter.Value>
@@ -175,7 +175,7 @@
             <Setter Property="Background" Value="{DynamicResource SecondaryAccentColor}" />
         </Style>
         <Style Selector="^:horizontal /template/ Thumb#thumb">
-            <Setter Property="MinWidth" Value="{DynamicResource ScrollBarThickness}" />
+            <Setter Property="MinWidth" Value="{StaticResource ScrollBarThickness}" />
             <Setter Property="Height" Value="16" />
         </Style>
         <Style Selector="^:vertical /template/ Thumb#thumb">
@@ -195,7 +195,7 @@
         </Style>
 
         <Style Selector="^ /template/ RepeatButton &gt; Path">
-            <Setter Property="Fill" Value="{StaticResource MainIconColor}" />
+            <Setter Property="Fill" Value="{DynamicResource MainIconColor}" />
         </Style>
 
         <Style Selector="^ /template/ RepeatButton:pointerover &gt; Path">

src/PicView.Avalonia/PicViewTheme/Controls/Slider.axaml

@@ -1,8 +1,8 @@
 <ResourceDictionary
+    x:ClassModifier="internal"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:ClassModifier="internal">
-    <ControlTheme x:Key="SliderDecreaseTheme" TargetType="RepeatButton">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme TargetType="RepeatButton" x:Key="SliderDecreaseTheme">
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Height" Value="12" />
         <Setter Property="Template">
@@ -11,7 +11,7 @@
             </ControlTemplate>
         </Setter>
     </ControlTheme>
-    <ControlTheme x:Key="SliderIncreaseTheme" TargetType="RepeatButton">
+    <ControlTheme TargetType="RepeatButton" x:Key="SliderIncreaseTheme">
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Height" Value="12" />
         <Setter Property="Template">
@@ -21,7 +21,7 @@
         </Setter>
     </ControlTheme>
 
-    <ControlTheme x:Key="{x:Type Slider}" TargetType="Slider">
+    <ControlTheme TargetType="Slider" x:Key="{x:Type Slider}">
         <Style Selector="^:horizontal">
             <Setter Property="MinWidth" Value="40" />
             <Setter Property="MinHeight" Value="20" />
@@ -34,9 +34,9 @@
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Track
-                            Name="PART_Track"
                             Grid.Row="1"
                             IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                            Name="PART_Track"
                             Orientation="Horizontal">
                             <Track.DecreaseButton>
                                 <RepeatButton Name="PART_DecreaseButton" Theme="{StaticResource SliderDecreaseTheme}" />
@@ -44,13 +44,13 @@
                             <Track.IncreaseButton>
                                 <RepeatButton Name="PART_IncreaseButton" Theme="{StaticResource SliderIncreaseTheme}" />
                             </Track.IncreaseButton>
-                            <Thumb Width="22" Height="22">
+                            <Thumb Height="22" Width="22">
                                 <Thumb.Template>
                                     <ControlTemplate>
                                         <Rectangle
+                                            Fill="{DynamicResource MainButtonBackgroundColor}"
                                             Name="thumb"
-                                            Fill="{StaticResource MainButtonBackgroundColor}"
-                                            Stroke="{StaticResource MainBorderColor}"
+                                            Stroke="{DynamicResource MainBorderColor}"
                                             StrokeThickness="1.5" />
                                     </ControlTemplate>
                                 </Thumb.Template>

src/PicView.Avalonia/PicViewTheme/Controls/SplitButton.axaml

@@ -50,43 +50,19 @@
             </ControlTemplate>
         </Setter>
 
-        <Style Selector="^:pointerover /template/ ContentPresenter">
-            <Style.Animations>
-                <Animation Duration=".35" IterationCount="1">
-                    <KeyFrame>
-                        <Setter Property="Background">
-                            <SolidColorBrush Color="{StaticResource SecondaryBackgroundColor}" />
-                        </Setter>
-                    </KeyFrame>
-                    <KeyFrame Cue="1">
-                        <Setter Property="Background">
-                            <SolidColorBrush Color="{StaticResource BackgroundHoverColor}" />
-                        </Setter>
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-            <Setter Property="Background" Value="{StaticResource BackgroundHoverColor}" />
-        </Style>
-
         <Style Selector="^:pressed /template/ ContentPresenter">
             <Setter Property="Background" Value="{DynamicResource SecondaryAccentColor}" />
         </Style>
 
         <Style Selector="^[Tag=flyout-open] /template/ ContentPresenter">
-            <Setter Property="Background" Value="{StaticResource BackgroundHoverColor}" />
+            <Setter Property="Background" Value="{DynamicResource BackgroundHoverColor}" />
         </Style>
 
         <Style Selector="^[Tag=checked]">
             <Style Selector="^ /template/ ContentPresenter">
-                <Setter Property="Background" Value="{StaticResource BackgroundHoverColor}" />
+                <Setter Property="Background" Value="{DynamicResource BackgroundHoverColor}" />
             </Style>
         </Style>
-
-        <Style Selector="^[Tag=checked-flyout-open] /template/ ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource ThemeBorderHighColor}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighColor}" />
-            <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
-        </Style>
     </ControlTheme>
 
     <ControlTheme TargetType="SplitButton" x:Key="{x:Type SplitButton}">
@@ -130,7 +106,7 @@
 
                     <Border
                         Background="Transparent"
-                        BorderBrush="{StaticResource MainBorderColor}"
+                        BorderBrush="{DynamicResource MainBorderColor}"
                         BorderThickness="1,0,0,0"
                         Grid.Column="1"
                         x:Name="SeparatorBorder" />
@@ -156,6 +132,7 @@
                         x:Name="PART_SecondaryButton">
                         <PathIcon
                             Data="{StaticResource ChevronUpGeometry}"
+                            Foreground="{DynamicResource MainIconColor}"
                             Height="12"
                             Width="12" />
                     </Button>
@@ -163,6 +140,56 @@
             </ControlTemplate>
         </Setter>
 
+        <Style Selector="^.altHover:pointerover /template/ Button#PART_PrimaryButton">
+            <Style.Animations>
+                <Animation Duration=".35" IterationCount="1">
+                    <KeyFrame>
+                        <Setter Property="Background">
+                            <SolidColorBrush Color="{DynamicResource SecondaryBackgroundColor}" />
+                        </Setter>
+                        <Setter Property="BorderBrush">
+                            <SolidColorBrush Color="{DynamicResource MainBorderColor}" />
+                        </Setter>
+                    </KeyFrame>
+                    <KeyFrame Cue="1">
+                        <Setter Property="Background">
+                            <SolidColorBrush Color="{DynamicResource BackgroundHoverColor}" />
+                        </Setter>
+                        <Setter Property="BorderBrush">
+                            <SolidColorBrush Color="{DynamicResource SecondaryBorderColor}" />
+                        </Setter>
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+            <Setter Property="Background" Value="{DynamicResource BackgroundHoverColor}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderColor}" />
+        </Style>
+
+        <Style Selector="^.altHover:pointerover /template/ Button#PART_SecondaryButton">
+            <Style.Animations>
+                <Animation Duration=".35" IterationCount="1">
+                    <KeyFrame>
+                        <Setter Property="Background">
+                            <SolidColorBrush Color="{DynamicResource SecondaryBackgroundColor}" />
+                        </Setter>
+                        <Setter Property="BorderBrush">
+                            <SolidColorBrush Color="{DynamicResource MainBorderColor}" />
+                        </Setter>
+                    </KeyFrame>
+                    <KeyFrame Cue="1">
+                        <Setter Property="Background">
+                            <SolidColorBrush Color="{DynamicResource BackgroundHoverColor}" />
+                        </Setter>
+                        <Setter Property="BorderBrush">
+                            <SolidColorBrush Color="{DynamicResource SecondaryBorderColor}" />
+                        </Setter>
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+            <Setter Property="Background" Value="{DynamicResource BackgroundHoverColor}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderColor}" />
+        </Style>
+
         <Style Selector="^:flyout-open /template/ Button">
             <Setter Property="Tag" Value="flyout-open" />
         </Style>

src/PicView.Avalonia/PicViewTheme/Controls/TabItem.axaml

@@ -4,14 +4,14 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme TargetType="TabItem" x:Key="{x:Type TabItem}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{StaticResource MainTextColorFaded}" />
+        <Setter Property="Foreground" Value="{DynamicResource MainTextColorFaded}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="Padding" Value="14,9" />
         <Setter Property="Template">
             <ControlTemplate>
                 <ContentPresenter
                     Background="{TemplateBinding Background}"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
                     Content="{TemplateBinding Header}"
                     ContentTemplate="{TemplateBinding HeaderTemplate}"

src/PicView.Avalonia/PicViewTheme/Controls/TextBox.axaml

@@ -4,13 +4,9 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ControlTheme TargetType="TextBox" x:Key="{x:Type TextBox}">
-        <Setter Property="CaretBrush" Value="{StaticResource MainTextColor}" />
-        <!-- <Setter Property="Background" Value="{TemplateBinding Background}" /> -->
-        <!-- <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" /> -->
-        <!-- <Setter Property="Foreground" Value="{TemplateBinding Foreground}" /> -->
-        <!-- <Setter Property="BorderThickness" Value="{TemplateBinding BorderThickness}" /> -->
+        <Setter Property="CaretBrush" Value="{DynamicResource MainTextColor}" />
         <Setter Property="SelectionBrush" Value="{DynamicResource AccentColor}" />
-        <Setter Property="SelectionForegroundBrush" Value="{StaticResource MainTextColor}" />
+        <Setter Property="SelectionForegroundBrush" Value="{DynamicResource MainTextColor}" />
         <Setter Property="Padding" Value="4" />
         <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
         <Setter Property="Template">
@@ -29,15 +25,11 @@
                         <DataValidationErrors>
 
                             <Grid ColumnDefinitions="Auto,*,Auto">
-                                <ContentPresenter
-                                    Content="{TemplateBinding InnerLeftContent}"
-                                    Grid.Column="0"
-                                    Grid.ColumnSpan="1" />
+                                <ContentPresenter Content="{TemplateBinding InnerLeftContent}" Grid.Column="0" />
                                 <ScrollViewer
                                     AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
                                     BringIntoViewOnFocusChange="{TemplateBinding (ScrollViewer.BringIntoViewOnFocusChange)}"
                                     Grid.Column="1"
-                                    Grid.ColumnSpan="1"
                                     HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                                     IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
                                     Name="PART_ScrollViewer"
@@ -76,10 +68,7 @@
                                         </Style>
                                     </ScrollViewer.Styles>
                                 </ScrollViewer>
-                                <ContentPresenter
-                                    Content="{TemplateBinding InnerRightContent}"
-                                    Grid.Column="2"
-                                    Grid.ColumnSpan="1" />
+                                <ContentPresenter Content="{TemplateBinding InnerRightContent}" Grid.Column="2" />
                             </Grid>
                         </DataValidationErrors>
                     </DockPanel>
@@ -88,19 +77,19 @@
         </Setter>
 
         <Style Selector="^:pointerover /template/ Border#border">
-            <Setter Property="BorderBrush" Value="{StaticResource SecondaryBorderColor}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderColor}" />
         </Style>
         <Style Selector="^:focus /template/ Border#border">
             <Setter Property="BorderBrush" Value="{DynamicResource AccentColor}" />
         </Style>
         <Style Selector="^:error /template/ Border#border">
-            <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}" />
+            <Setter Property="BorderBrush" Value="{StaticResource ErrorBrush}" />
         </Style>
         <Style Selector="^ /template/ DockPanel">
             <Setter Property="Cursor" Value="IBeam" />
         </Style>
         <Style Selector="^:disabled /template/ Border#border">
-            <Setter Property="Background" Value="{StaticResource BackgroundAlpha}" />
+            <Setter Property="Background" Value="{DynamicResource BackgroundAlpha}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/PicView.Avalonia/PicViewTheme/Controls/ToggleButton.axaml

@@ -1,40 +1,36 @@
 <ResourceDictionary
+    x:ClassModifier="internal"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:ClassModifier="internal">
-    <ControlTheme x:Key="{x:Type ToggleButton}" TargetType="ToggleButton">
-        <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
-        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme TargetType="ToggleButton" x:Key="{x:Type ToggleButton}">
         <Setter Property="Padding" Value="4" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Template">
             <ControlTemplate TargetType="{x:Type ToggleButton}">
                 <Border
-                    Name="border"
-                    Padding="{TemplateBinding Padding}"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}">
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    Name="border"
+                    Padding="{TemplateBinding Padding}">
                     <StackPanel Orientation="Horizontal">
                         <Decorator
-                            Margin="{TemplateBinding Padding}"
                             HorizontalAlignment="Center"
+                            Margin="{TemplateBinding Padding}"
                             VerticalAlignment="Center">
 
-                            <Canvas Width="20" Height="20">
+                            <Canvas Height="20" Width="20">
                                 <Border
-                                    x:Name="TickMark"
-                                    Width="16"
-                                    Height="16"
-                                    Margin="1,2.2,4,0"
-                                    Background="{StaticResource MainIconColor}"
+                                    Background="#eeebebeb"
                                     CornerRadius="9"
+                                    Height="16"
                                     IsVisible="False"
-                                    UseLayoutRounding="True">
+                                    Margin="1,2.2,4,0"
+                                    UseLayoutRounding="True"
+                                    Width="16"
+                                    x:Name="TickMark">
                                     <Path
                                         Data="M504 256c0 136.967-111.033 248-248 248S8 392.967 8 256 119.033 8 256 8s248 111.033 248 248zM227.314 387.314l184-184c6.248-6.248 6.248-16.379 0-22.627l-22.627-22.627c-6.248-6.249-16.379-6.249-22.628 0L216 308.118l-70.059-70.059c-6.248-6.248-16.379-6.248-22.628 0l-22.627 22.627c-6.248 6.248-6.248 16.379 0 22.627l104 104c6.249 6.249 16.379 6.249 22.628.001z"
                                         Fill="{DynamicResource AccentColor}"
@@ -42,24 +38,24 @@
                                 </Border>
 
                                 <Path
-                                    x:Name="CrossMark"
-                                    Width="11"
-                                    Height="11"
-                                    Margin="2,3.9,3,0"
                                     Data="M342.6 150.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L192 210.7 86.6 105.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3L146.7 256 41.4 361.4c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L192 301.3 297.4 406.6c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L237.3 256 342.6 150.6z"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
+                                    Height="11"
                                     IsVisible="True"
-                                    Stretch="Fill" />
+                                    Margin="2,3.9,3,0"
+                                    Stretch="Fill"
+                                    Width="11"
+                                    x:Name="CrossMark" />
                             </Canvas>
                         </Decorator>
                         <ContentPresenter
-                            Name="PART_ContentPresenter"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                             Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            Name="PART_ContentPresenter"
                             RecognizesAccessKey="True"
-                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                            TextElement.Foreground="{TemplateBinding Foreground}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
                     </StackPanel>
                 </Border>
             </ControlTemplate>
@@ -85,10 +81,10 @@
 
         <Style Selector="^.hover:pointerover /template/ Border#border">
             <Style.Animations>
-                <Animation IterationCount="1" Duration=".35">
+                <Animation Duration=".35" IterationCount="1">
                     <KeyFrame>
                         <Setter Property="Background">
-                            <SolidColorBrush Color="{StaticResource SecondaryBackgroundColor}" />
+                            <SolidColorBrush Color="{DynamicResource SecondaryBackgroundColor}" />
                         </Setter>
                     </KeyFrame>
                     <KeyFrame Cue="1">
@@ -102,24 +98,31 @@
         </Style>
         <Style Selector="^.altHover:pointerover /template/ Border#border">
             <Style.Animations>
-                <Animation IterationCount="1" Duration=".35">
+                <Animation Duration=".35" IterationCount="1">
                     <KeyFrame>
                         <Setter Property="Background">
-                            <SolidColorBrush Color="{StaticResource SecondaryBackgroundColor}" />
+                            <SolidColorBrush Color="{DynamicResource SecondaryBackgroundColor}" />
+                        </Setter>
+                        <Setter Property="BorderBrush">
+                            <SolidColorBrush Color="{DynamicResource MainBorderColor}" />
                         </Setter>
                     </KeyFrame>
                     <KeyFrame Cue="1">
                         <Setter Property="Background">
-                            <SolidColorBrush Color="{StaticResource BackgroundHoverColor}" />
+                            <SolidColorBrush Color="{DynamicResource BackgroundHoverColor}" />
+                        </Setter>
+                        <Setter Property="BorderBrush">
+                            <SolidColorBrush Color="{DynamicResource SecondaryBorderColor}" />
                         </Setter>
                     </KeyFrame>
                 </Animation>
             </Style.Animations>
-            <Setter Property="Background" Value="{StaticResource BackgroundHoverColor}" />
+            <Setter Property="Background" Value="{DynamicResource BackgroundHoverColor}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderColor}" />
         </Style>
         <Style Selector="^.noBorderHover:pointerover /template/ Border#border">
             <Style.Animations>
-                <Animation IterationCount="1" Duration=".35">
+                <Animation Duration=".35" IterationCount="1">
                     <KeyFrame>
                         <Setter Property="Background">
                             <SolidColorBrush Color="Transparent" />
@@ -127,12 +130,12 @@
                     </KeyFrame>
                     <KeyFrame Cue="1">
                         <Setter Property="Background">
-                            <SolidColorBrush Color="{StaticResource AltBackgroundHoverColor}" />
+                            <SolidColorBrush Color="{DynamicResource AltBackgroundHoverColor}" />
                         </Setter>
                     </KeyFrame>
                 </Animation>
             </Style.Animations>
-            <Setter Property="Background" Value="{StaticResource AltBackgroundHoverColor}" />
+            <Setter Property="Background" Value="{DynamicResource AltBackgroundHoverColor}" />
         </Style>
         <Style Selector="^.hover:pressed  /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Background" Value="{DynamicResource SecondaryAccentColor}" />

src/PicView.Avalonia/PicViewTheme/Controls/ToolTip.axaml

@@ -3,8 +3,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme TargetType="ToolTip" x:Key="{x:Type ToolTip}">
-        <Setter Property="Background" Value="{StaticResource SecondaryBackgroundColor}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MainBorderColor}" />
+        <Setter Property="Background" Value="{DynamicResource SecondaryBackgroundColor}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MainBorderColor}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="FontSize" Value="12" />
         <Setter Property="FontFamily" Value="/Assets/Fonts/Roboto-Regular.ttf#Roboto" />
@@ -12,13 +12,14 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <ContentPresenter
-                    Background="{StaticResource ContextMenuBackgroundColor}"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    Background="{DynamicResource ContextMenuBackgroundColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     Content="{TemplateBinding Content}"
                     ContentTemplate="{TemplateBinding ContentTemplate}"
                     CornerRadius="5"
-                    Foreground="{StaticResource ContextMenuTextColor}"
+                    Foreground="{DynamicResource ContextMenuTextColor}"
+                    IsHitTestVisible="False"
                     Name="PART_ContentPresenter"
                     Padding="8" />
             </ControlTemplate>

src/PicView.Avalonia/PicViewTheme/DarkColors.axaml

@@ -1,48 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <Color x:Key="MainTextColor">#FFf6f4f4</Color>
-    <Color x:Key="MainTextColorFaded">#d6d4d4</Color>
-
-    <Color x:Key="MainIconColor">#eeebebeb</Color>
-    <Color x:Key="SecondaryIconColor">#eeebebeb</Color>
-
-    <Color x:Key="MainBackgroundColor">#CC2b2b2b</Color>
-    <Color x:Key="SecondaryBackgroundColor">#CC252525</Color>
-    <Color x:Key="TertiaryBackgroundColor">#CC3d3d3d</Color>
-    <Color x:Key="FadedBackgroundColor">#FF333333</Color>
-    <Color x:Key="BackgroundHoverColor">#FF4B4B4B</Color>
-    <Color x:Key="AltBackgroundHoverColor">#22FFFFFF</Color>
-    <Color x:Key="AltBackgroundColor">#A7222222</Color>
-
-    <Color x:Key="MainButtonBackgroundColor">#FF2e2e2e</Color>
-
-    <Color x:Key="MainBorderColor">#FF3A3A3A</Color>
-    <Color x:Key="SecondaryBorderColor">#777</Color>
-    <Color x:Key="TertiaryBorderColor">#555</Color>
-
-    <Color x:Key="ButtonForegroundPointerOver">#FFF</Color>
-
-    <Color x:Key="BackgroundAlpha">#442e2e2e</Color>
-
-    <Color x:Key="MenuBackgroundColor">#292929</Color>
-
-    <Color x:Key="ContextMenuBackgroundColor">#EE2b2b2b</Color>
-    <Color x:Key="ContextMenuTextColor">#EDEBEB</Color>
-
-    <Color x:Key="WindowBackgroundColor">#66000000</Color>
-    <ImageBrush
-        DestinationRect="0,0,100,100"
-        Opacity=".6"
-        Source="/PicViewTheme/Resources/noisy-texture-200x200-o4-d31-c-161616-t0.png"
-        SourceRect="0,0,200,200"
-        Stretch="Fill"
-        TileMode="FlipXY"
-        x:Key="NoisyTexture" />
-
-    <DropShadowEffect
-        BlurRadius="5"
-        Color="#112e2e2e"
-        OffsetX="2"
-        OffsetY="2"
-        x:Key="MenuShadowButtonBorder" />
-</ResourceDictionary>

src/PicView.Avalonia/PicViewTheme/Index.axaml

@@ -0,0 +1,43 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source="/PicViewTheme/Accents/AccentColors.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Accents/MainColors.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Icons.axaml" />
+
+                <ResourceInclude Source="/PicViewTheme/Controls/AutoScrollViewer.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/Border.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/Button.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/ComboBox.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/ComboBoxItem.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/FlyoutPresenter.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/ListBox.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/ListBoxItem.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/Menu.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/MenuFlyoutPresenter.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/PathIcon.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/RadioButton.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/Scrollbar.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/Slider.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/SplitButton.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/TabItem.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/TextBlock.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/TextBox.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/ToggleButton.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/ToolTip.axaml" />
+                <ResourceInclude Source="/PicViewTheme/Controls/Window.axaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Styles.Resources>
+    <Style Selector="Window">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="ExtendClientAreaChromeHints" Value="NoChrome" />
+        <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="32" />
+        <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
+        <Setter Property="TransparencyLevelHint" Value="AcrylicBlur" />
+    </Style>
+
+    <StyleInclude Source="Classes.axaml" />
+
+</Styles>

src/PicView.Avalonia/PicViewTheme/Main.axaml

@@ -1,119 +0,0 @@
-<Styles
-    xmlns="https://github.com/avaloniaui"
-    xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Styles.Resources>
-        <ResourceDictionary>
-
-            <Color x:Key="AccentColor">#FFDB5B3D</Color>
-            <Color x:Key="SecondaryAccentColor">#e0755a</Color>
-            <Color x:Key="LogoAccentColor">#FFf8af3c</Color>
-
-
-            <ResourceDictionary.MergedDictionaries>
-
-                <!--  TODO: Figure out switching themes  -->
-                <ResourceInclude Source="/PicViewTheme/Accents/Base.axaml" />
-                <!-- <ResourceInclude Source="/PicViewTheme/LightColors.axaml" /> -->
-                <!--  TODO: Figure out switching themes  -->
-
-
-                <ResourceInclude Source="/PicViewTheme/Controls/AutoScrollViewer.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/Border.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/Button.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/ComboBox.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/ComboBoxItem.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/FlyoutPresenter.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/ListBox.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/ListBoxItem.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/Menu.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/MenuFlyoutPresenter.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/PathIcon.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/RadioButton.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/Scrollbar.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/Slider.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/SplitButton.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/TabItem.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/TextBlock.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/TextBox.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/ToggleButton.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/ToolTip.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Controls/Window.axaml" />
-                <ResourceInclude Source="/PicViewTheme/Icons.axaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-    <Style Selector="Window">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="ExtendClientAreaChromeHints" Value="NoChrome" />
-        <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="32" />
-        <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
-        <Setter Property="TransparencyLevelHint" Value="AcrylicBlur" />
-    </Style>
-    <Style Selector="TextBox, Label, Button">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="FontFamily" Value="/Assets/Fonts/Roboto-Medium.ttf#Roboto" />
-    </Style>
-    <Style Selector="TextBlock.txt">
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="Foreground" Value="{StaticResource MainTextColor}" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="FontFamily" Value="/Assets/Fonts/Roboto-Medium.ttf#Roboto" />
-        <Setter Property="TextTrimming" Value="CharacterEllipsis" />
-        <Setter Property="TextWrapping" Value="Wrap" />
-    </Style>
-
-    <Style Selector="TextBlock.hover">
-        <Style Selector="^:pointerover">
-            <Setter Property="Foreground" Value="{DynamicResource AccentColor}" />
-        </Style>
-    </Style>
-
-    <Style Selector="Button.hover, customControls|CopyButton:hover">
-        <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource AccentColor}" />
-        </Style>
-    </Style>
-
-    <Style Selector="Button.ButtonBorder, ToggleButton.ButtonBorder, SplitButton.ButtonBorder">
-        <Setter Property="Height" Value="40" />
-        <Setter Property="Width" Value="147" />
-        <Setter Property="CornerRadius" Value="4" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="BorderBrush" Value="{StaticResource MainBorderColor}" />
-        <Setter Property="Effect" Value="{StaticResource MenuShadowButtonBorder}" />
-        <Setter Property="Background" Value="{StaticResource MainButtonBackgroundColor}" />
-    </Style>
-
-    <Style Selector="Button.BorderStyle, ToggleButton.BorderStyle">
-        <Setter Property="Width" Value="37" />
-        <Setter Property="Height" Value="35" />
-        <Setter Property="Margin" Value="7,0,0,0" />
-        <Setter Property="Background" Value="{StaticResource BackgroundAlpha}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MainBorderColor}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CornerRadius" Value="2" />
-    </Style>
-
-    <Style Selector="Button.mainBtn, ToggleButton.mainBtn">
-        <Setter Property="Width" Value="NaN" />
-        <Setter Property="Height" Value="35" />
-        <Setter Property="Padding" Value="10" />
-        <Setter Property="Background" Value="{StaticResource SecondaryBackgroundColor}" />
-    </Style>
-
-    <Style Selector="TextBox.TStyle">
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="Foreground" Value="{StaticResource MainTextColorFaded}" />
-        <Setter Property="FontFamily" Value="/Assets/Fonts/Roboto-Medium.ttf#Roboto" />
-        <Setter Property="Background" Value="{StaticResource TertiaryBackgroundColor}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MainBorderColor}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CornerRadius" Value="2" />
-        <Setter Property="CaretBrush" Value="{StaticResource MainTextColor}" />
-        <Setter Property="Margin" Value="5,0,0,0" />
-        <Setter Property="Padding" Value="5,9,0,7" />
-        <Setter Property="Width" Value="180" />
-    </Style>
-</Styles>

src/PicView.Avalonia/PicViewTheme/ThemeManager.cs

@@ -5,7 +5,6 @@ using PicView.Core.Config;
 namespace PicView.Avalonia.PicViewTheme;
 public static class ThemeManager
 {
-    // TODO: Implement changing Dark/Light theme
     public static void ChangeTheme()
     {
         SetTheme(SettingsHelper.Settings.Theme.Dark);
@@ -17,9 +16,7 @@ public static class ThemeManager
         if (application is null)
             return;
         
-        // https://www.codeproject.com/Articles/5317972/Theming-and-Localization-Functionality-for-Multipl
         // StyleInclude breaks trimming and AOT
-        // Change colors with keys like https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Simple/Accents/Base.xaml
 
         // Add the new theme
         if (dark)

src/PicView.Avalonia/Views/AboutView.axaml

@@ -112,7 +112,7 @@
     </UserControl.Resources>
 
     <StackPanel Margin="0,10,0,10">
-        
+
         <Image Height="75" Margin="15,30,15,25">
             <Image.Source>
                 <DrawingImage>
@@ -130,34 +130,29 @@
                 </DrawingImage>
             </Image.Source>
         </Image>
-        
+
         <HyperlinkButton
-            Margin="0,0,0,2"
             HorizontalAlignment="Center"
+            Margin="0,0,0,2"
             NavigateUri="https://github.com/Ruben2776/PicView"
             ToolTip.Tip="https://github.com/Ruben2776/PicView">
             <StackPanel Orientation="Horizontal">
-                <TextBlock
-                    Classes="txt"
-                    Text="{CompiledBinding GithubRepo}" />
+                <TextBlock Classes="txt" Text="{CompiledBinding GithubRepo}" />
                 <Path
                     Data="M256,32C132.3,32,32,134.9,32,261.7c0,101.5,64.2,187.5,153.2,217.9a17.56,17.56,0,0,0,3.8.4c8.3,0,11.5-6.1,11.5-11.4,0-5.5-.2-19.9-.3-39.1a102.4,102.4,0,0,1-22.6,2.7c-43.1,0-52.9-33.5-52.9-33.5-10.2-26.5-24.9-33.6-24.9-33.6-19.5-13.7-.1-14.1,1.4-14.1h.1c22.5,2,34.3,23.8,34.3,23.8,11.2,19.6,26.2,25.1,39.6,25.1a63,63,0,0,0,25.6-6c2-14.8,7.8-24.9,14.2-30.7-49.7-5.8-102-25.5-102-113.5,0-25.1,8.7-45.6,23-61.6-2.3-5.8-10-29.2,2.2-60.8a18.64,18.64,0,0,1,5-.5c8.1,0,26.4,3.1,56.6,24.1a208.21,208.21,0,0,1,112.2,0c30.2-21,48.5-24.1,56.6-24.1a18.64,18.64,0,0,1,5,.5c12.2,31.6,4.5,55,2.2,60.8,14.3,16.1,23,36.6,23,61.6,0,88.2-52.4,107.6-102.3,113.3,8,7.1,15.2,21.1,15.2,42.5,0,30.7-.3,55.5-.3,63,0,5.4,3.1,11.5,11.4,11.5a19.35,19.35,0,0,0,4-.4C415.9,449.2,480,363.1,480,261.7,480,134.9,379.7,32,256,32Z"
-                    Fill="{StaticResource MainIconColor}"
                     Height="16"
                     Margin="5,0,0,0"
                     Stretch="Fill"
                     Width="16" />
             </StackPanel>
         </HyperlinkButton>
-        
+
         <HyperlinkButton
-            Margin="0,2,0,2"
             HorizontalAlignment="Center"
+            Margin="0,2,0,2"
             NavigateUri="https://picview.org"
             ToolTip.Tip="https://picview.org">
-            <TextBlock
-                Classes="txt"
-                Text="PicView.org" />
+            <TextBlock Classes="txt" Text="PicView.org" />
         </HyperlinkButton>
 
         <TextBlock
@@ -167,8 +162,8 @@
             Text="2017 - 2024 © Ruben Hyldgaard Negendahl" />
 
         <HyperlinkButton
-            Margin="0,2,0,2"
             HorizontalAlignment="Center"
+            Margin="0,2,0,2"
             NavigateUri="https://github.com/Ruben2776/PicView?tab=License-1-ov-file#readme"
             ToolTip.Tip="{CompiledBinding ViewLicenseFile}">
             <TextBlock Classes="txt" Text="GNU GPLv3" />
@@ -183,10 +178,10 @@
         </TextBlock>
 
         <Button
-            x:Name="UpdateButton"
             Classes="BorderStyle altHover mainBtn"
             HorizontalAlignment="Center"
-            Margin="0,10,0,15">
+            Margin="0,10,0,15"
+            x:Name="UpdateButton">
             <TextBlock Classes="txt" Text="{CompiledBinding CheckForUpdates}" />
         </Button>
 
@@ -207,43 +202,35 @@
             Text="{CompiledBinding Credits}" />
 
         <HyperlinkButton
-            Margin="0,1,0,1"
             HorizontalAlignment="Center"
+            Margin="0,1,0,1"
             NavigateUri="https://github.com/AvaloniaUI/Avalonia"
             ToolTip.Tip="https://github.com/AvaloniaUI/Avalonia">
-            <TextBlock
-                Classes="txt"
-                Text="Avalonia" />
+            <TextBlock Classes="txt" Text="Avalonia" />
         </HyperlinkButton>
 
         <HyperlinkButton
-            Margin="0,1,0,1"
             HorizontalAlignment="Center"
+            Margin="0,1,0,1"
             NavigateUri="https://github.com/dlemstra/Magick.NET"
             ToolTip.Tip="https://github.com/dlemstra/Magick.NET">
-            <TextBlock
-                Classes="txt"
-                Text="ImageMagick" />
+            <TextBlock Classes="txt" Text="ImageMagick" />
         </HyperlinkButton>
 
         <HyperlinkButton
-            Margin="0,1,0,1"
             HorizontalAlignment="Center"
+            Margin="0,1,0,1"
             NavigateUri="http://Ionicons.com/"
             ToolTip.Tip="http://Ionicons.com/">
-            <TextBlock
-                Classes="txt"
-                Text="Ioinicons" />
+            <TextBlock Classes="txt" Text="Ioinicons" />
         </HyperlinkButton>
 
         <HyperlinkButton
-            Margin="0,1,0,1"
             HorizontalAlignment="Center"
+            Margin="0,1,0,1"
             NavigateUri="https://fontawesome.com/"
             ToolTip.Tip="https://fontawesome.com/">
-            <TextBlock
-                Classes="txt"
-                Text="Font Awesome" />
+            <TextBlock Classes="txt" Text="Font Awesome" />
         </HyperlinkButton>
     </StackPanel>
 </UserControl>

src/PicView.Avalonia/Views/AppearanceView.axaml

@@ -27,8 +27,8 @@
                                    Mode=OneWay}" />
 
         <ComboBox
-            Background="{StaticResource SecondaryBackgroundColor}"
-            BorderBrush="{StaticResource MainBorderColor}"
+            Background="{DynamicResource SecondaryBackgroundColor}"
+            BorderBrush="{DynamicResource MainBorderColor}"
             BorderThickness="1"
             FontFamily="/Assets/Fonts/Roboto-Medium.ttf#Roboto"
             Margin="0,0,0,5"
@@ -134,7 +134,7 @@
         <TextBlock
             Classes="txt"
             FontFamily="/Assets/Fonts/Roboto-Bold.ttf#Roboto"
-            Foreground="{StaticResource MainTextColorFaded}"
+            Foreground="{DynamicResource MainTextColorFaded}"
             Margin="0,0,0,15"
             Text="{CompiledBinding GetFullGalleryItemHeight,
                                    Mode=OneWay}" />
@@ -151,7 +151,7 @@
         <TextBlock
             Classes="txt"
             FontFamily="/Assets/Fonts/Roboto-Bold.ttf#Roboto"
-            Foreground="{StaticResource MainTextColorFaded}"
+            Foreground="{DynamicResource MainTextColorFaded}"
             Margin="0,0,0,15"
             Text="{CompiledBinding GetBottomGalleryItemHeight,
                                    Mode=OneWay}" />
@@ -165,8 +165,8 @@
             Text="{CompiledBinding GalleryThumbnailStretch,
                                    Mode=OneWay}" />
         <ComboBox
-            Background="{StaticResource SecondaryBackgroundColor}"
-            BorderBrush="{StaticResource MainBorderColor}"
+            Background="{DynamicResource SecondaryBackgroundColor}"
+            BorderBrush="{DynamicResource MainBorderColor}"
             BorderThickness="1"
             FontFamily="/Assets/Fonts/Roboto-Medium.ttf#Roboto"
             Margin="0,0,0,10"
@@ -189,8 +189,8 @@
             MaxWidth="270"
             Text="{CompiledBinding BottomGalleryThumbnailStretch}" />
         <ComboBox
-            Background="{StaticResource SecondaryBackgroundColor}"
-            BorderBrush="{StaticResource MainBorderColor}"
+            Background="{DynamicResource SecondaryBackgroundColor}"
+            BorderBrush="{DynamicResource MainBorderColor}"
             BorderThickness="1"
             FontFamily="/Assets/Fonts/Roboto-Medium.ttf#Roboto"
             Margin="0,0,0,10"

src/PicView.Avalonia/Views/BottomBar.axaml.cs

@@ -2,7 +2,6 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Media;
-using Avalonia.Styling;
 using PicView.Avalonia.UI;
 
 namespace PicView.Avalonia.Views;
@@ -14,7 +13,7 @@ public partial class BottomBar : UserControl
         InitializeComponent();
         NextButton.PointerEntered += (s, e) =>
         {
-            if (!Application.Current.TryGetResource("ButtonForegroundPointerOver", ThemeVariant.Default, out var buttonForegroundPointerOver))
+            if (!Application.Current.TryGetResource("ButtonForegroundPointerOver", Application.Current.RequestedThemeVariant, out var buttonForegroundPointerOver))
             {
                 return;
             }
@@ -23,7 +22,7 @@ public partial class BottomBar : UserControl
         };
         NextButton.PointerExited += (s, e) =>
         {
-            if (!Application.Current.TryGetResource("MainIconColor", ThemeVariant.Default, out var mainIconColor))
+            if (!Application.Current.TryGetResource("MainIconColor", Application.Current.RequestedThemeVariant, out var mainIconColor))
             {
                 return;
             }
@@ -32,7 +31,7 @@ public partial class BottomBar : UserControl
         };
         PreviousButton.PointerEntered += (s, e) =>
         {
-            if (!Application.Current.TryGetResource("ButtonForegroundPointerOver", ThemeVariant.Default, out var buttonForegroundPointerOver))
+            if (!Application.Current.TryGetResource("ButtonForegroundPointerOver", Application.Current.RequestedThemeVariant, out var buttonForegroundPointerOver))
             {
                 return;
             }
@@ -41,7 +40,7 @@ public partial class BottomBar : UserControl
         };
         PreviousButton.PointerExited += (s, e) =>
         {
-            if (!Application.Current.TryGetResource("MainIconColor", ThemeVariant.Default, out var mainIconColor))
+            if (!Application.Current.TryGetResource("MainIconColor", Application.Current.RequestedThemeVariant, out var mainIconColor))
             {
                 return;
             }

src/PicView.Avalonia/Views/ExifView.axaml

@@ -33,9 +33,9 @@
                             Text="{CompiledBinding FileName}"
                             Width="100" />
                         <customControls:FuncTextBox
-                            Background="{StaticResource SecondaryBackgroundColor}"
+                            Background="{DynamicResource SecondaryBackgroundColor}"
                             Classes="hover TStyle"
-                            Foreground="{StaticResource MainTextColor}"
+                            Foreground="{DynamicResource MainTextColor}"
                             Text="{Binding FileInfo.Name, FallbackValue=''}" />
                         <customControls:CopyButton
                             Classes="altHover BorderStyle"
@@ -44,7 +44,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -58,9 +58,9 @@
                             Text="{CompiledBinding Folder}"
                             Width="100" />
                         <customControls:FuncTextBox
-                            Background="{StaticResource SecondaryBackgroundColor}"
+                            Background="{DynamicResource SecondaryBackgroundColor}"
                             Classes="hover TStyle"
-                            Foreground="{StaticResource MainTextColor}"
+                            Foreground="{DynamicResource MainTextColor}"
                             Text="{CompiledBinding FileInfo.DirectoryName,
                                                    FallbackValue=''}" />
                         <customControls:CopyButton
@@ -70,7 +70,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -84,9 +84,9 @@
                             Text="{CompiledBinding FullPath}"
                             Width="100" />
                         <customControls:FuncTextBox
-                            Background="{StaticResource SecondaryBackgroundColor}"
+                            Background="{DynamicResource SecondaryBackgroundColor}"
                             Classes="hover TStyle"
-                            Foreground="{StaticResource MainTextColor}"
+                            Foreground="{DynamicResource MainTextColor}"
                             Text="{CompiledBinding FileInfo.FullName,
                                                    FallbackValue=''}" />
                         <customControls:CopyButton
@@ -96,7 +96,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -121,7 +121,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -146,7 +146,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -171,7 +171,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -194,7 +194,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -211,9 +211,9 @@
                             Text="{CompiledBinding Width}"
                             Width="100" />
                         <customControls:FuncTextBox
-                            Background="{StaticResource SecondaryBackgroundColor}"
+                            Background="{DynamicResource SecondaryBackgroundColor}"
                             Classes="hover TStyle"
-                            Foreground="{StaticResource MainTextColor}"
+                            Foreground="{DynamicResource MainTextColor}"
                             Text="{CompiledBinding PixelWidth}"
                             ToolTip.Tip="{CompiledBinding SizeTooltip}"
                             x:Name="PixelWidthTextBox" />
@@ -223,7 +223,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -237,9 +237,9 @@
                             Text="{CompiledBinding Height}"
                             Width="100" />
                         <customControls:FuncTextBox
-                            Background="{StaticResource SecondaryBackgroundColor}"
+                            Background="{DynamicResource SecondaryBackgroundColor}"
                             Classes="hover TStyle"
-                            Foreground="{StaticResource MainTextColor}"
+                            Foreground="{DynamicResource MainTextColor}"
                             Text="{CompiledBinding PixelHeight}"
                             ToolTip.Tip="{CompiledBinding SizeTooltip}"
                             x:Name="PixelHeightTextBox" />
@@ -249,7 +249,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -272,7 +272,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -295,7 +295,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -318,7 +318,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -341,7 +341,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -364,7 +364,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -380,7 +380,7 @@
                         Text="{CompiledBinding ConvertTo}"
                         TextAlignment="Center" />
                     <ComboBox
-                        Background="{StaticResource SecondaryBackgroundColor}"
+                        Background="{DynamicResource SecondaryBackgroundColor}"
                         BorderBrush="{StaticResource MainBorderColor}"
                         BorderThickness="1"
                         FontFamily="/Assets/Fonts/Roboto-Medium.ttf#Roboto"
@@ -397,7 +397,7 @@
                         <ComboBoxItem Content=".jxl" />
                     </ComboBox>
                     <Button
-                        Background="{StaticResource SecondaryBackgroundColor}"
+                        Background="{DynamicResource SecondaryBackgroundColor}"
                         Classes="altHover BorderStyle"
                         Command="{CompiledBinding ConvertCommand}"
                         CommandParameter="{CompiledBinding Path=SelectedIndex,
@@ -420,7 +420,7 @@
                         Text="{CompiledBinding Resize}"
                         TextAlignment="Center" />
                     <ComboBox
-                        Background="{StaticResource SecondaryBackgroundColor}"
+                        Background="{DynamicResource SecondaryBackgroundColor}"
                         BorderBrush="{StaticResource MainBorderColor}"
                         BorderThickness="1"
                         FontFamily="/Assets/Fonts/Roboto-Medium.ttf#Roboto"
@@ -450,7 +450,7 @@
                         <ComboBoxItem Content="5%" />
                     </ComboBox>
                     <Button
-                        Background="{StaticResource SecondaryBackgroundColor}"
+                        Background="{DynamicResource SecondaryBackgroundColor}"
                         Classes="altHover BorderStyle"
                         Command="{CompiledBinding ResizeCommand}"
                         CommandParameter="{CompiledBinding Path=SelectedIndex,
@@ -479,7 +479,7 @@
                     Width="395" />
                 <Path
                     Data="M256 8C118.941 8 8 118.919 8 256c0 137.059 110.919 248 248 248 48.154 0 95.342-14.14 135.408-40.223 12.005-7.815 14.625-24.288 5.552-35.372l-10.177-12.433c-7.671-9.371-21.179-11.667-31.373-5.129C325.92 429.757 291.314 440 256 440c-101.458 0-184-82.542-184-184S154.542 72 256 72c100.139 0 184 57.619 184 160 0 38.786-21.093 79.742-58.17 83.693-17.349-.454-16.91-12.857-13.476-30.024l23.433-121.11C394.653 149.75 383.308 136 368.225 136h-44.981a13.518 13.518 0 0 0-13.432 11.993l-.01.092c-14.697-17.901-40.448-21.775-59.971-21.775-74.58 0-137.831 62.234-137.831 151.46 0 65.303 36.785 105.87 96 105.87 26.984 0 57.369-15.637 74.991-38.333 9.522 34.104 40.613 34.103 70.71 34.103C462.609 379.41 504 307.798 504 232 504 95.653 394.023 8 256 8zm-21.68 304.43c-22.249 0-36.07-15.623-36.07-40.771 0-44.993 30.779-72.729 58.63-72.729 22.292 0 35.601 15.241 35.601 40.77 0 45.061-33.875 72.73-58.161 72.73z"
-                    Fill="{StaticResource MainIconColor}"
+                    Fill="{DynamicResource MainIconColor}"
                     Stretch="Uniform" />
                 <Rectangle
                     Fill="{StaticResource MainBorderColor}"
@@ -508,7 +508,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -532,7 +532,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -558,7 +558,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -582,7 +582,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -609,7 +609,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -633,7 +633,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -654,7 +654,7 @@
                     Width="395" />
                 <Path
                     Data="M172.268 501.67C26.97 291.031 0 269.413 0 192 0 85.961 85.961 0 192 0s192 85.961 192 192c0 77.413-26.97 99.031-172.268 309.67-9.535 13.774-29.93 13.773-39.464 0zM192 272c44.183 0 80-35.817 80-80s-35.817-80-80-80-80 35.817-80 80 35.817 80 80 80z"
-                    Fill="{StaticResource MainIconColor}"
+                    Fill="{DynamicResource MainIconColor}"
                     Stretch="Uniform" />
                 <Rectangle
                     Fill="{StaticResource MainBorderColor}"
@@ -683,7 +683,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -707,7 +707,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -732,7 +732,7 @@
                         ToolTip.Tip="{CompiledBinding Copy}">
                         <Path
                             Data="{StaticResource CopyGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="16"
                             Stretch="Fill"
                             Width="16" />
@@ -745,7 +745,7 @@
                             Margin="30,0,15,0">
                             <Path
                                 Data="M473.16 221.48l-2.26-9.59H262.46v88.22H387c-12.93 61.4-72.93 93.72-121.94 93.72-35.66 0-73.25-15-98.13-39.11a140.08 140.08 0 01-41.8-98.88c0-37.16 16.7-74.33 41-98.78s61-38.13 97.49-38.13c41.79 0 71.74 22.19 82.94 32.31l62.69-62.36C390.86 72.72 340.34 32 261.6 32c-60.75 0-119 23.27-161.58 65.71C58 139.5 36.25 199.93 36.25 256s20.58 113.48 61.3 155.6c43.51 44.92 105.13 68.4 168.58 68.4 57.73 0 112.45-22.62 151.45-63.66 38.34-40.4 58.17-96.3 58.17-154.9 0-24.67-2.48-39.32-2.59-39.96z"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="20"
                                 Stretch="Fill"
                                 Width="20" />
@@ -753,7 +753,7 @@
                         <Button Classes="altHover BorderStyle" Command="{CompiledBinding OpenBingLinkCommand}">
                             <Path
                                 Data="M31.87 30.58H244.7v212.81H31.87zM266.89 30.58H479.7v212.81H266.89zM31.87 265.61H244.7v212.8H31.87zM266.89 265.61H479.7v212.8H266.89z"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="20"
                                 Stretch="Fill"
                                 Width="20" />
@@ -773,7 +773,7 @@
                     Width="395" />
                 <Path
                     Data="M384 121.941V128H256V0h6.059a24 24 0 0 1 16.97 7.029l97.941 97.941a24.002 24.002 0 0 1 7.03 16.971zM248 160c-13.2 0-24-10.8-24-24V0H24C10.745 0 0 10.745 0 24v464c0 13.255 10.745 24 24 24h336c13.255 0 24-10.745 24-24V160H248zm-135.455 16c26.51 0 48 21.49 48 48s-21.49 48-48 48-48-21.49-48-48 21.491-48 48-48zm208 240h-256l.485-48.485L104.545 328c4.686-4.686 11.799-4.201 16.485.485L160.545 368 264.06 264.485c4.686-4.686 12.284-4.686 16.971 0L320.545 304v112z"
-                    Fill="{StaticResource MainIconColor}"
+                    Fill="{DynamicResource MainIconColor}"
                     Stretch="Uniform" />
                 <Rectangle
                     Fill="{StaticResource MainBorderColor}"
@@ -802,7 +802,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -826,7 +826,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -853,7 +853,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -877,7 +877,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -901,7 +901,7 @@
                         <DrawingImage>
                             <DrawingImage.Drawing>
                                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                    <GeometryDrawing Brush="{StaticResource MainIconColor}" Geometry="F1 M512,512z M0,0z M48,32C21.5,32,0,53.5,0,80L0,432C0,458.5,21.5,480,48,480L464,480C490.5,480,512,458.5,512,432L512,80C512,53.5,490.5,32,464,32L48,32z M48,64L154,64C157.3,64,160,66.7,160,70L160,90C160,93.3,157.3,96,154,96L38,96C34.7,96,32,93.3,32,90L32,80C32,71.2,39.2,64,48,64z M474,160L38,160C34.7,160,32,157.3,32,154L32,118C32,114.7,34.7,112,38,112L176,112 206.2,66.7C207.3,65,209.2,64,211.2,64L464,64C472.8,64,480,71.2,480,80L480,154C480,157.3,477.3,160,474,160z M256,424C189.8,424 136,370.2 136,304 136,237.8 189.8,184 256,184 322.2,184 376,237.8 376,304 376,370.2 322.2,424 256,424z M256,216C207.5,216 168,255.5 168,304 168,352.5 207.5,392 256,392 304.5,392 344,352.5 344,304 344,255.5 304.5,216 256,216z M208,320C199.2,320 192,312.8 192,304 192,268.7 220.7,240 256,240 264.8,240 272,247.2 272,256 272,264.8 264.8,272 256,272 238.4,272 224,286.4 224,304 224,312.8 216.8,320 208,320z" />
+                                    <GeometryDrawing Brush="{DynamicResource MainIconColor}" Geometry="F1 M512,512z M0,0z M48,32C21.5,32,0,53.5,0,80L0,432C0,458.5,21.5,480,48,480L464,480C490.5,480,512,458.5,512,432L512,80C512,53.5,490.5,32,464,32L48,32z M48,64L154,64C157.3,64,160,66.7,160,70L160,90C160,93.3,157.3,96,154,96L38,96C34.7,96,32,93.3,32,90L32,80C32,71.2,39.2,64,48,64z M474,160L38,160C34.7,160,32,157.3,32,154L32,118C32,114.7,34.7,112,38,112L176,112 206.2,66.7C207.3,65,209.2,64,211.2,64L464,64C472.8,64,480,71.2,480,80L480,154C480,157.3,477.3,160,474,160z M256,424C189.8,424 136,370.2 136,304 136,237.8 189.8,184 256,184 322.2,184 376,237.8 376,304 376,370.2 322.2,424 256,424z M256,216C207.5,216 168,255.5 168,304 168,352.5 207.5,392 256,392 304.5,392 344,352.5 344,304 344,255.5 304.5,216 256,216z M208,320C199.2,320 192,312.8 192,304 192,268.7 220.7,240 256,240 264.8,240 272,247.2 272,256 272,264.8 264.8,272 256,272 238.4,272 224,286.4 224,304 224,312.8 216.8,320 208,320z" />
                                 </DrawingGroup>
                             </DrawingImage.Drawing>
                         </DrawingImage>
@@ -934,7 +934,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -958,7 +958,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />
@@ -985,7 +985,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1009,7 +1009,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1037,7 +1037,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1061,7 +1061,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1089,7 +1089,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1113,7 +1113,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1141,7 +1141,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1165,7 +1165,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1193,7 +1193,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1217,7 +1217,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1245,7 +1245,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1269,7 +1269,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1297,7 +1297,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1321,7 +1321,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1349,7 +1349,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1373,7 +1373,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1401,7 +1401,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1425,7 +1425,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1453,7 +1453,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1477,7 +1477,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1505,7 +1505,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1529,7 +1529,7 @@
                                 ToolTip.Tip="{CompiledBinding Copy}">
                                 <Path
                                     Data="{StaticResource CopyGeometry}"
-                                    Fill="{StaticResource MainIconColor}"
+                                    Fill="{DynamicResource MainIconColor}"
                                     Height="16"
                                     Stretch="Fill"
                                     Width="16" />
@@ -1556,7 +1556,7 @@
                             ToolTip.Tip="{CompiledBinding Copy}">
                             <Path
                                 Data="{StaticResource CopyGeometry}"
-                                Fill="{StaticResource MainIconColor}"
+                                Fill="{DynamicResource MainIconColor}"
                                 Height="16"
                                 Stretch="Fill"
                                 Width="16" />

src/PicView.Avalonia/Views/GalleryView.axaml

@@ -25,7 +25,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource ImageGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />
@@ -81,7 +81,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource ImageGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />
@@ -89,8 +89,8 @@
                     <FlyoutBase.AttachedFlyout>
                         <Flyout>
                             <Border
-                                Background="{StaticResource MainButtonBackgroundColor}"
-                                BorderBrush="{StaticResource MainBorderColor}"
+                                Background="{DynamicResource MainButtonBackgroundColor}"
+                                BorderBrush="{DynamicResource MainBorderColor}"
                                 BorderThickness="2"
                                 CornerRadius="4"
                                 Padding="10,3">
@@ -104,7 +104,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource CloseGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />
@@ -127,7 +127,7 @@
             ZIndex="99">
             <Path
                 Data="{StaticResource CloseGeometry}"
-                Fill="{StaticResource MainIconColor}"
+                Fill="{DynamicResource MainIconColor}"
                 Height="23"
                 Margin="7,0,0,11"
                 Stretch="Fill"
@@ -136,8 +136,8 @@
 
         <customControls:GalleryListBox
             AutoScrollToSelectedItem="False"
-            Background="{StaticResource BackgroundAlpha}"
-            BorderBrush="{StaticResource TertiaryBorderColor}"
+            Background="{DynamicResource BackgroundAlpha}"
+            BorderBrush="{DynamicResource TertiaryBorderColor}"
             BorderThickness="0,1,0,0"
             Focusable="False"
             Padding="0"

src/PicView.Avalonia/Views/GeneralSettingsView.axaml

@@ -27,8 +27,8 @@
                                    Mode=OneWay}" />
 
         <ComboBox
-            Background="{StaticResource SecondaryBackgroundColor}"
-            BorderBrush="{StaticResource MainBorderColor}"
+            Background="{DynamicResource SecondaryBackgroundColor}"
+            BorderBrush="{DynamicResource MainBorderColor}"
             BorderThickness="1"
             FontFamily="/Assets/Fonts/Roboto-Medium.ttf#Roboto"
             Margin="0,0,0,15"
@@ -135,8 +135,8 @@
             Margin="0,10,0,10"
             Text="{Binding MouseWheel}" />
         <ComboBox
-            Background="{StaticResource SecondaryBackgroundColor}"
-            BorderBrush="{StaticResource MainBorderColor}"
+            Background="{DynamicResource SecondaryBackgroundColor}"
+            BorderBrush="{DynamicResource MainBorderColor}"
             BorderThickness="1"
             FontFamily="/Assets/Fonts/Roboto-Medium.ttf#Roboto"
             Margin="0,6,0,10"
@@ -156,8 +156,8 @@
             Text="{CompiledBinding ScrollDirection,
                                    Mode=OneWay}" />
         <ComboBox
-            Background="{StaticResource SecondaryBackgroundColor}"
-            BorderBrush="{StaticResource MainBorderColor}"
+            Background="{DynamicResource SecondaryBackgroundColor}"
+            BorderBrush="{DynamicResource MainBorderColor}"
             BorderThickness="1"
             FontFamily="/Assets/Fonts/Roboto-Medium.ttf#Roboto"
             Margin="0,6,0,10"
@@ -177,8 +177,8 @@
             Text="{CompiledBinding ApplicationStartup,
                                    Mode=OneWay}" />
         <ComboBox
-            Background="{StaticResource SecondaryBackgroundColor}"
-            BorderBrush="{StaticResource MainBorderColor}"
+            Background="{DynamicResource SecondaryBackgroundColor}"
+            BorderBrush="{DynamicResource MainBorderColor}"
             BorderThickness="1"
             FontFamily="/Assets/Fonts/Roboto-Medium.ttf#Roboto"
             Margin="0,6,0,10"
@@ -211,7 +211,7 @@
         <TextBlock
             Classes="txt"
             FontFamily="/Assets/Fonts/Roboto-Bold.ttf#Roboto"
-            Foreground="{StaticResource MainTextColorFaded}"
+            Foreground="{DynamicResource MainTextColorFaded}"
             Margin="0,0,0,15">
             <Run Text="{CompiledBinding GetSlideshowSpeed, Mode=OneWay}" />
             <Run Text="{CompiledBinding SecAbbreviation, Mode=OneWay}" />
@@ -240,7 +240,7 @@
         <TextBlock
             Classes="txt"
             FontFamily="/Assets/Fonts/Roboto-Bold.ttf#Roboto"
-            Foreground="{StaticResource MainTextColorFaded}"
+            Foreground="{DynamicResource MainTextColorFaded}"
             Margin="0,0,0,15"
             Text="{CompiledBinding GetZoomSpeed,
                                    Mode=OneWay}" />
@@ -268,7 +268,7 @@
         <TextBlock
             Classes="txt"
             FontFamily="/Assets/Fonts/Roboto-Bold.ttf#Roboto"
-            Foreground="{StaticResource MainTextColorFaded}"
+            Foreground="{DynamicResource MainTextColorFaded}"
             Margin="0,0,0,15">
             <Run Text="{CompiledBinding GetNavSpeed, Mode=OneWay}" />
             <Run Text="{CompiledBinding SecAbbreviation, Mode=OneWay}" />

src/PicView.Avalonia/Views/UC/Buttons/AltClose.axaml

@@ -11,7 +11,7 @@
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Button
-        Background="{StaticResource AltBackgroundColor}"
+        Background="{DynamicResource AltBackgroundColor}"
         BorderThickness="1,0,0,1"
         Classes="ButtonBorder noBorderHover"
         Command="{CompiledBinding ExitCommand}"
@@ -27,7 +27,7 @@
         x:Name="XButton">
         <Path
             Data="{StaticResource CloseGeometry}"
-            Fill="{StaticResource MainIconColor}"
+            Fill="{DynamicResource MainIconColor}"
             Height="12"
             Margin="0,0,0,3"
             Stretch="Fill"

src/PicView.Avalonia/Views/UC/Buttons/AltMinimize.axaml

@@ -11,8 +11,8 @@
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Button
-        Background="{StaticResource AltBackgroundColor}"
-        BorderBrush="{StaticResource MainBorderColor}"
+        Background="{DynamicResource AltBackgroundColor}"
+        BorderBrush="{DynamicResource MainBorderColor}"
         BorderThickness="1,0,0,0"
         Classes="ButtonBorder noBorderHover"
         Command="{CompiledBinding MinimizeCommand}"
@@ -28,7 +28,7 @@
         <Viewbox Height="15" Width="15">
             <Path
                 Data="{StaticResource MinimizeGeometry}"
-                Fill="{StaticResource MainIconColor}"
+                Fill="{DynamicResource MainIconColor}"
                 Margin="7.5,0,0,7"
                 Stretch="Fill" />
         </Viewbox>

src/PicView.Avalonia/Views/UC/Buttons/AltRestore.axaml

@@ -11,8 +11,8 @@
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Button
-        Background="{StaticResource AltBackgroundColor}"
-        BorderBrush="{StaticResource MainBorderColor}"
+        Background="{DynamicResource AltBackgroundColor}"
+        BorderBrush="{DynamicResource MainBorderColor}"
         BorderThickness="1,0,0,1"
         Classes="ButtonBorder noBorderHover"
         Command="{CompiledBinding ToggleFullscreenCommand}"
@@ -28,7 +28,7 @@
         <Panel>
             <Path
                 Data="{StaticResource FullscreenGeometry}"
-                Fill="{StaticResource MainIconColor}"
+                Fill="{DynamicResource MainIconColor}"
                 Height="12"
                 IsVisible="{CompiledBinding !IsFullscreen}"
                 Margin="0,0,0,3"
@@ -36,7 +36,7 @@
                 Width="12" />
             <Path
                 Data="{StaticResource RestoreGeometry}"
-                Fill="{StaticResource MainIconColor}"
+                Fill="{DynamicResource MainIconColor}"
                 Height="12"
                 IsVisible="{CompiledBinding IsFullscreen}"
                 Margin="0,0,0,3"

src/PicView.Avalonia/Views/UC/Buttons/ClickArrowLeft.axaml

@@ -13,8 +13,8 @@
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Button
-        Background="{StaticResource AltBackgroundColor}"
-        BorderBrush="{StaticResource MainBorderColor}"
+        Background="{DynamicResource AltBackgroundColor}"
+        BorderBrush="{DynamicResource MainBorderColor}"
         BorderThickness="0,1,1,1"
         Classes="hover"
         Command="{CompiledBinding PreviousArrowButtonCommand}"
@@ -24,7 +24,7 @@
         Width="50"
         x:Name="PolyButton">
         <Polygon
-            Fill="{StaticResource MainIconColor}"
+            Fill="{DynamicResource MainIconColor}"
             Height="40"
             Margin="0,5,5,0"
             Points="352,128.4 319.7,96 160,256 160,256 160,256 319.7,416 352,383.6 224.7,256"

src/PicView.Avalonia/Views/UC/Buttons/ClickArrowRight.axaml

@@ -13,8 +13,8 @@
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Button
-        Background="{StaticResource AltBackgroundColor}"
-        BorderBrush="{StaticResource MainBorderColor}"
+        Background="{DynamicResource AltBackgroundColor}"
+        BorderBrush="{DynamicResource MainBorderColor}"
         BorderThickness="1,1,0,1"
         Classes="hover"
         Command="{CompiledBinding NextArrowButtonCommand}"

src/PicView.Avalonia/Views/UC/Buttons/GalleryShortcut.axaml

@@ -15,8 +15,8 @@
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Button
-        Background="{StaticResource AltBackgroundColor}"
-        BorderBrush="{StaticResource MainBorderColor}"
+        Background="{DynamicResource AltBackgroundColor}"
+        BorderBrush="{DynamicResource MainBorderColor}"
         BorderThickness="1,0,0,0"
         Classes="hover"
         Command="{CompiledBinding ToggleGalleryCommand}"
@@ -37,7 +37,7 @@
                     Canvas.Left="0.233"
                     Canvas.Top="0"
                     Data="F1M27.242,10.47L5.429,0.05C5.173,-0.072,4.868,0.035,4.748,0.287L0,10.223 2.587,10.223 6.073,2.922 24.983,11.956 19.071,24.335 15.741,22.744 15.741,29.289 17.786,30.267C18.042,30.39,18.346,30.28,18.467,30.027L27.484,11.149C27.605,10.897,27.497,10.593,27.242,10.47"
-                    Fill="{StaticResource MainIconColor}"
+                    Fill="{DynamicResource MainIconColor}"
                     Height="26.318"
                     Stretch="Fill"
                     Width="23.901" />
@@ -46,7 +46,7 @@
                     Canvas.Right="13"
                     Canvas.Top="7.03"
                     Data="F1M23.29,16.034L21.76,16.034C20.866,13.747 19.768,10.543 18.102,10.97 16.146,11.47 15.168,16.034 15.168,16.034 15.168,16.034 14.172,10.883 11.414,8.124 8.654,5.367 5.983,16.034 5.983,16.034L2.333,16.034 2.333,2.314 23.29,2.314z M24.688,0L0.511,0C0.228,0,0,0.229,0,0.509L0,21.429C0,21.71,0.228,21.94,0.511,21.94L24.688,21.94C24.97,21.94,25.198,21.71,25.198,21.429L25.198,0.509C25.198,0.229,24.97,0,24.688,0"
-                    Fill="{StaticResource MainIconColor}"
+                    Fill="{DynamicResource MainIconColor}"
                     Height="19.288"
                     Stretch="Fill"
                     Width="22.152" />
@@ -54,7 +54,7 @@
                     Canvas.Bottom="12"
                     Canvas.Right="14"
                     Data="F1M1.711,3.42C2.655,3.42 3.422,2.655 3.422,1.71 3.422,0.766 2.655,0 1.711,0 0.765,0 0,0.766 0,1.71 0,2.655 0.765,3.42 1.711,3.42"
-                    Fill="{StaticResource MainIconColor}"
+                    Fill="{DynamicResource MainIconColor}"
                     Height="7"
                     Width="7" />
             </Canvas>

src/PicView.Avalonia/Views/UC/Buttons/StarOutlineButtons.axaml

@@ -1,14 +1,14 @@
 <UserControl
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d"
     x:Class="PicView.Avalonia.Views.UC.Buttons.StarOutlineButtons"
+    x:DataType="viewModels:MainViewModel"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    x:DataType="viewModels:MainViewModel"
-    mc:Ignorable="d">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.DataContext>
         <viewModels:MainViewModel />
     </Design.DataContext>
@@ -17,7 +17,7 @@
         <DrawingImage x:Key="StarFilledDrawingImage">
             <DrawingImage.Drawing>
                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                    <GeometryDrawing Brush="{StaticResource MainIconColor}" Geometry="F1 M512,512z M0,0z M394,480A16,16,0,0,1,384.61,477L256,383.76 127.39,477A16,16,0,0,1,102.84,458.92L153,310.35 23,221.2A16,16,0,0,1,32,192L192.38,192 240.78,43.05A16,16,0,0,1,271.22,43.05L319.62,192.05 480,192.05A16,16,0,0,1,489.05,221.25L359,310.35 409.13,458.88A16,16,0,0,1,394,480z" />
+                    <GeometryDrawing Brush="{DynamicResource MainIconColor}" Geometry="F1 M512,512z M0,0z M394,480A16,16,0,0,1,384.61,477L256,383.76 127.39,477A16,16,0,0,1,102.84,458.92L153,310.35 23,221.2A16,16,0,0,1,32,192L192.38,192 240.78,43.05A16,16,0,0,1,271.22,43.05L319.62,192.05 480,192.05A16,16,0,0,1,489.05,221.25L359,310.35 409.13,458.88A16,16,0,0,1,394,480z" />
                 </DrawingGroup>
             </DrawingImage.Drawing>
         </DrawingImage>
@@ -28,7 +28,7 @@
                     <GeometryDrawing Geometry="F1 M512,512z M0,0z M480,208L308,208 256,48 204,208 32,208 172,304 118,464 256,364 394,464 340,304z">
                         <GeometryDrawing.Pen>
                             <Pen
-                                Brush="{StaticResource MainIconColor}"
+                                Brush="{DynamicResource MainIconColor}"
                                 LineCap="Flat"
                                 LineJoin="Round"
                                 Thickness="32" />
@@ -40,84 +40,84 @@
     </UserControl.Resources>
 
     <StackPanel Orientation="Horizontal">
-        <Canvas Width="30" Height="28">
+        <Canvas Height="28" Width="30">
             <Button
+                Background="Transparent"
                 Canvas.Left="3"
                 Canvas.Top="5"
-                Background="Transparent"
                 Click="OneStarCLick"
                 Command="{Binding SetExifRating1Command}"
                 PointerEntered="Star1_OnPointerEntered"
                 PointerExited="Stars_OnPointerExited">
                 <Image
-                    x:Name="Star1"
-                    Width="20"
                     Height="20"
-                    Source="{StaticResource StarOutlineDrawingImage}" />
+                    Source="{StaticResource StarOutlineDrawingImage}"
+                    Width="20"
+                    x:Name="Star1" />
             </Button>
         </Canvas>
-        <Canvas Width="30" Height="28">
+        <Canvas Height="28" Width="30">
             <Button
+                Background="Transparent"
                 Canvas.Left="3"
                 Canvas.Top="5"
-                Background="Transparent"
                 Click="TwoStarCLick"
                 Command="{Binding SetExifRating2Command}"
                 PointerEntered="Star2_OnPointerEntered"
                 PointerExited="Stars_OnPointerExited">
                 <Image
-                    x:Name="Star2"
-                    Width="20"
                     Height="20"
-                    Source="{StaticResource StarOutlineDrawingImage}" />
+                    Source="{StaticResource StarOutlineDrawingImage}"
+                    Width="20"
+                    x:Name="Star2" />
             </Button>
         </Canvas>
-        <Canvas Width="30" Height="28">
+        <Canvas Height="28" Width="30">
             <Button
+                Background="Transparent"
                 Canvas.Left="3"
                 Canvas.Top="5"
-                Background="Transparent"
                 Click="ThreeStarCLick"
                 Command="{Binding SetExifRating3Command}"
                 PointerEntered="Star3_OnPointerEntered"
                 PointerExited="Stars_OnPointerExited">
                 <Image
-                    x:Name="Star3"
-                    Width="20"
                     Height="20"
-                    Source="{StaticResource StarOutlineDrawingImage}" />
+                    Source="{StaticResource StarOutlineDrawingImage}"
+                    Width="20"
+                    x:Name="Star3" />
             </Button>
         </Canvas>
-        <Canvas Width="30" Height="28">
+        <Canvas Height="28" Width="30">
             <Button
+                Background="Transparent"
                 Canvas.Left="3"
                 Canvas.Top="5"
-                Background="Transparent"
                 Click="FourStarCLick"
                 Command="{Binding SetExifRating4Command}"
                 PointerEntered="Star4_OnPointerEntered"
                 PointerExited="Stars_OnPointerExited">
                 <Image
-                    x:Name="Star4"
-                    Width="20"
                     Height="20"
-                    Source="{StaticResource StarOutlineDrawingImage}" />
+                    Source="{StaticResource StarOutlineDrawingImage}"
+                    Width="20"
+                    x:Name="Star4" />
             </Button>
         </Canvas>
-        <Canvas Width="30" Height="28">
+        <Canvas Height="28" Width="30">
             <Button
+                Background="Transparent"
                 Canvas.Left="3"
                 Canvas.Top="5"
-                Background="Transparent"
                 Click="FiveStarCLick"
                 Command="{Binding SetExifRating5Command}"
                 PointerEntered="Star5_OnPointerEntered"
                 PointerExited="Stars_OnPointerExited">
                 <Image
-                    x:Name="Star5"
-                    Width="20"
                     Height="20"
-                    Source="{StaticResource StarOutlineDrawingImage}" />
+                    Source="{StaticResource StarOutlineDrawingImage}"
+                    Width="20"
+                    x:Name="Star5" />
             </Button>
         </Canvas>
     </StackPanel>

src/PicView.Avalonia/Views/UC/EditableTitlebar.axaml

@@ -18,6 +18,7 @@
             FontFamily="avares://PicView.Avalonia/Assets/Fonts/Roboto-Medium.ttf#Roboto"
             FontSize="13"
             FontWeight="Medium"
+            Foreground="{DynamicResource MainTextColor}"
             Height="{CompiledBinding TitlebarHeight,
                                      Mode=OneWay}"
             IsTabStop="False"
@@ -38,6 +39,7 @@
                 FontFamily="avares://PicView.Avalonia/Assets/Fonts/Roboto-Medium.ttf#Roboto"
                 FontSize="13"
                 FontWeight="Medium"
+                Foreground="{DynamicResource MainTextColor}"
                 Height="{CompiledBinding TitlebarHeight,
                                          Mode=OneWay}"
                 IsTabStop="False"

src/PicView.Avalonia/Views/UC/GalleryItem.axaml

@@ -57,7 +57,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource PrintGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />
@@ -73,7 +73,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource OpenWithGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />
@@ -88,7 +88,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource ShowInFolderGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />
@@ -104,7 +104,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource PanoramaGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />
@@ -120,7 +120,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource PanoramaGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />
@@ -136,7 +136,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource CopyGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />
@@ -146,7 +146,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource CopyGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />
@@ -162,7 +162,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource CopyGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />
@@ -177,7 +177,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource CopyGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />
@@ -188,7 +188,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource CutGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />
@@ -203,7 +203,7 @@
                     <MenuItem.Icon>
                         <Path
                             Data="{StaticResource RecycleGeometry}"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="12"
                             Stretch="Fill"
                             Width="12" />

src/PicView.Avalonia/Views/UC/Menus/ImageMenu.axaml

@@ -13,18 +13,21 @@
         <viewModels:MainViewModel />
     </Design.DataContext>
     <StackPanel>
+        <StackPanel.Resources>
+            <SolidColorBrush Color="{DynamicResource MainIconColor}" x:Key="Brush0" />
+        </StackPanel.Resources>
 
         <Border
-            Background="{StaticResource MenuBackgroundColor}"
-            BorderBrush="{StaticResource MainBorderColor}"
+            Background="{DynamicResource MenuBackgroundColor}"
+            BorderBrush="{DynamicResource MainBorderColor}"
             BorderThickness="1"
             CornerRadius="8"
-            Effect="{StaticResource MenuShadowButtonBorder}">
+            Effect="{DynamicResource MenuShadowButtonBorder}">
             <Canvas Height="193" Width="315">
 
                 <Border
-                    Background="{StaticResource SecondaryBackgroundColor}"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    Background="{DynamicResource SecondaryBackgroundColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,0,1"
                     CornerRadius="8,8,0,0"
                     Height="47"
@@ -32,7 +35,7 @@
 
                 <Button
                     Background="Transparent"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
                     Classes="hover"
                     Command="{CompiledBinding RotateLeftCommand}"
@@ -43,7 +46,7 @@
                     Width="45">
                     <Path
                         Data="M255.545 8c-66.269.119-126.438 26.233-170.86 68.685L48.971 40.971C33.851 25.851 8 36.559 8 57.941V192c0 13.255 10.745 24 24 24h134.059c21.382 0 32.09-25.851 16.971-40.971l-41.75-41.75c30.864-28.899 70.801-44.907 113.23-45.273 92.398-.798 170.283 73.977 169.484 169.442C423.236 348.009 349.816 424 256 424c-41.127 0-79.997-14.678-110.63-41.556-4.743-4.161-11.906-3.908-16.368.553L89.34 422.659c-4.872 4.872-4.631 12.815.482 17.433C133.798 479.813 192.074 504 256 504c136.966 0 247.999-111.033 248-247.998C504.001 119.193 392.354 7.755 255.545 8z"
-                        Fill="{StaticResource MainIconColor}"
+                        Fill="{DynamicResource MainIconColor}"
                         Height="15"
                         Stretch="Fill"
                         Width="15">
@@ -57,7 +60,7 @@
 
                 <Button
                     Background="Transparent"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
                     Canvas.Left="45"
                     Classes="hover"
@@ -68,7 +71,7 @@
                     Width="45">
                     <Path
                         Data="M255.545 8c-66.269.119-126.438 26.233-170.86 68.685L48.971 40.971C33.851 25.851 8 36.559 8 57.941V192c0 13.255 10.745 24 24 24h134.059c21.382 0 32.09-25.851 16.971-40.971l-41.75-41.75c30.864-28.899 70.801-44.907 113.23-45.273 92.398-.798 170.283 73.977 169.484 169.442C423.236 348.009 349.816 424 256 424c-41.127 0-79.997-14.678-110.63-41.556-4.743-4.161-11.906-3.908-16.368.553L89.34 422.659c-4.872 4.872-4.631 12.815.482 17.433C133.798 479.813 192.074 504 256 504c136.966 0 247.999-111.033 248-247.998C504.001 119.193 392.354 7.755 255.545 8z"
-                        Fill="{StaticResource MainIconColor}"
+                        Fill="{DynamicResource MainIconColor}"
                         Height="15"
                         Stretch="Fill"
                         Width="15" />
@@ -76,7 +79,7 @@
 
                 <Button
                     Background="Transparent"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
                     Canvas.Left="90"
                     Classes="hover"
@@ -87,7 +90,7 @@
                     Width="45">
                     <Path
                         Data="M192,96v64h248c4.4,0,8,3.6,8,8v240c0,4.4-3.6,8-8,8H136c-4.4,0-8-3.6-8-8v-48c0-4.4,3.6-8,8-8h248V224H192v64L64,192  L192,96z"
-                        Fill="{StaticResource MainIconColor}"
+                        Fill="{DynamicResource MainIconColor}"
                         Height="13"
                         Stretch="Fill"
                         Width="13">
@@ -99,7 +102,7 @@
 
                 <Button
                     Background="Transparent"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
                     Canvas.Left="135"
                     Classes="hover"
@@ -110,7 +113,7 @@
                     <Image Height="17" Width="17">
                         <DrawingImage>
                             <DrawingGroup>
-                                <GeometryDrawing Brush="{StaticResource MainIconColor}" Geometry="F1 M142.9 142.9C205.1 80.7 305.6 80.4 368.2 141.9L327 183C320.1 189.9 318.1 200.2 321.8 209.2C325.5 218.2 334.3 224 344 224L463.5 224C463.5 224 463.5 224 463.5 224L472 224C485.3 224 496 213.3 496 200L496 72C496 62.3 490.2 53.5 481.2 49.8C472.2 46.1 461.9 48.1 455 55L413.4 96.6C325.8 10.1 184.7 10.4 97.6 97.6C73.2 122 55.6 150.7 44.8 181.4C38.9 198.1 47.7 216.3 64.3 222.2C80.9 228.1 99.2 219.3 105.1 202.7C112.8 180.9 125.3 160.4 142.9 142.9L142.9 142.9ZM16 312L16 319.6L16 320.3L16 440C16 449.7 21.8 458.5 30.8 462.2C39.8 465.9 50.1 463.9 57 457L98.6 415.4C186.2 501.9 327.3 501.6 414.4 414.4C438.8 390 456.5 361.3 467.3 330.7C473.2 314 464.4 295.8 447.8 289.9C431.2 284 412.9 292.8 407 309.4C399.3 331.2 386.8 351.7 369.2 369.2C307 431.4 206.5 431.7 143.9 370.2L185 329C191.9 322.1 193.9 311.8 190.2 302.8C186.5 293.8 177.7 288 168 288L48.4 288L47.7 288L40 288C26.7 288 16 298.7 16 312Z" />
+                                <GeometryDrawing Brush="{DynamicResource MainIconColor}" Geometry="F1 M142.9 142.9C205.1 80.7 305.6 80.4 368.2 141.9L327 183C320.1 189.9 318.1 200.2 321.8 209.2C325.5 218.2 334.3 224 344 224L463.5 224C463.5 224 463.5 224 463.5 224L472 224C485.3 224 496 213.3 496 200L496 72C496 62.3 490.2 53.5 481.2 49.8C472.2 46.1 461.9 48.1 455 55L413.4 96.6C325.8 10.1 184.7 10.4 97.6 97.6C73.2 122 55.6 150.7 44.8 181.4C38.9 198.1 47.7 216.3 64.3 222.2C80.9 228.1 99.2 219.3 105.1 202.7C112.8 180.9 125.3 160.4 142.9 142.9L142.9 142.9ZM16 312L16 319.6L16 320.3L16 440C16 449.7 21.8 458.5 30.8 462.2C39.8 465.9 50.1 463.9 57 457L98.6 415.4C186.2 501.9 327.3 501.6 414.4 414.4C438.8 390 456.5 361.3 467.3 330.7C473.2 314 464.4 295.8 447.8 289.9C431.2 284 412.9 292.8 407 309.4C399.3 331.2 386.8 351.7 369.2 369.2C307 431.4 206.5 431.7 143.9 370.2L185 329C191.9 322.1 193.9 311.8 190.2 302.8C186.5 293.8 177.7 288 168 288L48.4 288L47.7 288L40 288C26.7 288 16 298.7 16 312Z" />
                             </DrawingGroup>
                         </DrawingImage>
                     </Image>
@@ -118,7 +121,7 @@
 
                 <Button
                     Background="Transparent"
-                    BorderBrush="{StaticResource MainBorderColor}"
+                    BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
                     Canvas.Left="180"
                     Classes="noBorderHover"
@@ -133,7 +136,7 @@
                                     <GeometryDrawing Geometry="F1 M112 111L112 401C112 418.44 129 429.52 143 421.16L390.9 272.79C403.02 265.54 403.02 246.46 390.9 239.21L143 90.84C129 82.48 112 93.56 112 111Z">
                                         <GeometryDrawing.Pen>
                                             <Pen
-                                                Brush="{StaticResource MainIconColor}"
+                                                Brush="{DynamicResource MainIconColor}"
                                                 LineJoin="Miter"
                                                 Thickness="32" />
                                         </GeometryDrawing.Pen>
@@ -141,7 +144,7 @@
                                     <GeometryDrawing Geometry="F1 M400 80L400 432">
                                         <GeometryDrawing.Pen>
                                             <Pen
-                                                Brush="{StaticResource MainIconColor}"
+                                                Brush="{DynamicResource MainIconColor}"
                                                 LineCap="Round"
                                                 LineJoin="Miter"
                                                 Thickness="32" />
@@ -151,10 +154,10 @@
                             </DrawingImage>
                         </Image>
                         <AutoCompleteBox
-                            Background="{StaticResource BackgroundAlpha}"
-                            BorderBrush="{StaticResource MainBorderColor}"
+                            Background="{DynamicResource BackgroundAlpha}"
+                            BorderBrush="{DynamicResource MainBorderColor}"
                             FontFamily="/Assets/Fonts/Roboto-Regular.ttf#Roboto"
-                            Foreground="{StaticResource MainIconColor}"
+                            Foreground="{DynamicResource MainIconColor}"
                             Height="26"
                             IsEnabled="True"
                             IsTabStop="False"
@@ -180,7 +183,7 @@
                     Width="45">
                     <Path
                         Data="M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z"
-                        Fill="{StaticResource MainIconColor}"
+                        Fill="{DynamicResource MainIconColor}"
                         Height="10"
                         Stretch="Fill"
                         Width="10" />
@@ -203,7 +206,7 @@
                                     <DrawingImage>
                                         <DrawingImage.Drawing>
                                             <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                                <GeometryDrawing Brush="{StaticResource MainIconColor}" Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
+                                                <GeometryDrawing Brush="{StaticResource Brush0}" Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
                                             </DrawingGroup>
                                         </DrawingImage.Drawing>
                                     </DrawingImage>
@@ -218,7 +221,7 @@
                                     <DrawingImage>
                                         <DrawingImage.Drawing>
                                             <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                                <GeometryDrawing Brush="{StaticResource MainIconColor}" Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
+                                                <GeometryDrawing Brush="{StaticResource Brush0}" Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
                                             </DrawingGroup>
                                         </DrawingImage.Drawing>
                                     </DrawingImage>
@@ -244,7 +247,7 @@
                     <StackPanel Orientation="Horizontal">
                         <Path
                             Data="M488 352h-40V109.25l59.31-59.31c6.25-6.25 6.25-16.38 0-22.63L484.69 4.69c-6.25-6.25-16.38-6.25-22.63 0L402.75 64H192v96h114.75L160 306.75V24c0-13.26-10.75-24-24-24H88C74.75 0 64 10.74 64 24v40H24C10.75 64 0 74.74 0 88v48c0 13.25 10.75 24 24 24h40v264c0 13.25 10.75 24 24 24h232v-96H205.25L352 205.25V488c0 13.25 10.75 24 24 24h48c13.25 0 24-10.75 24-24v-40h40c13.25 0 24-10.75 24-24v-48c0-13.26-10.75-24-24-24z"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="17"
                             Margin="9,0,9,0"
                             Stretch="Fill"
@@ -264,14 +267,13 @@
                     Classes="ButtonBorder altHover"
                     Command="{CompiledBinding StartSlideShowTask}"
                     CommandParameter="0"
-                    ToolTip.Placement="Top"
                     ToolTip.Tip="{CompiledBinding Slideshow,
                                                   Mode=OneWay}"
                     x:Name="SlideShowButton">
                     <StackPanel Orientation="Horizontal">
                         <Path
                             Data="M20 16v16l10-8-10-8zm18-10h-28c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm0 32h-28v-28h28v28z"
-                            Fill="{StaticResource MainIconColor}"
+                            Fill="{DynamicResource MainIconColor}"
                             Height="20"
                             Margin="3,0,12,0"
                             Stretch="Fill"
@@ -410,8 +412,8 @@
                             <DrawingImage>
                                 <DrawingImage.Drawing>
                                     <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                        <GeometryDrawing Brush="{StaticResource MainIconColor}" Geometry="F1 M512,512z M0,0z M80,132L80,460A20,20,0,0,0,100,480L492,480A20,20,0,0,0,512,460L512,132A20,20,0,0,0,492,112L100,112A20,20,0,0,0,80,132z M373.14,173.33A46,46,0,1,1,326.86,219.33A46.19,46.19,0,0,1,373.14,173.33z M111.73,449.33L111.73,353.85 234.49,243.65 328.27,337 215.27,449.33z M480,449.33L259,449.33 403.58,305.33 480,370.59z" />
-                                        <GeometryDrawing Brush="{StaticResource MainIconColor}" Geometry="F1 M512,512z M0,0z M20,32A20,20,0,0,0,0,52L0,396A20,20,0,0,0,20,416L48,416 48,100A20,20,0,0,1,68,80L448,80 448,52A20,20,0,0,0,428,32z" />
+                                        <GeometryDrawing Brush="{StaticResource Brush0}" Geometry="F1 M512,512z M0,0z M80,132L80,460A20,20,0,0,0,100,480L492,480A20,20,0,0,0,512,460L512,132A20,20,0,0,0,492,112L100,112A20,20,0,0,0,80,132z M373.14,173.33A46,46,0,1,1,326.86,219.33A46.19,46.19,0,0,1,373.14,173.33z M111.73,449.33L111.73,353.85 234.49,243.65 328.27,337 215.27,449.33z M480,449.33L259,449.33 403.58,305.33 480,370.59z" />
+                                        <GeometryDrawing Brush="{StaticResource Brush0}" Geometry="F1 M512,512z M0,0z M20,32A20,20,0,0,0,0,52L0,396A20,20,0,0,0,20,416L48,416 48,100A20,20,0,0,1,68,80L448,80 448,52A20,20,0,0,0,428,32z" />
                                     </DrawingGroup>
                                 </DrawingImage.Drawing>
                             </DrawingImage>
@@ -427,17 +429,17 @@
             </Canvas>
         </Border>
         <Rectangle
-            Fill="{StaticResource MenuBackgroundColor}"
+            Fill="{DynamicResource MenuBackgroundColor}"
             Height="4"
             HorizontalAlignment="Left"
             Margin="55,-2,0,0"
             Width="26"
             ZIndex="1" />
         <Polygon
-            Fill="{StaticResource MenuBackgroundColor}"
+            Fill="{DynamicResource MenuBackgroundColor}"
             Margin="54,-3.5,0,0"
             Points="0,0 15,30, 30,0"
-            Stroke="{StaticResource MainBorderColor}"
+            Stroke="{DynamicResource MainBorderColor}"
             StrokeThickness="1" />
     </StackPanel>
 </customControls:AnimatedMenu>

src/PicView.Avalonia/Views/UC/TitleTextBox.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    Background="{StaticResource SecondaryBackgroundColor}"
+    Background="{DynamicResource SecondaryBackgroundColor}"
     MaxWidth="{CompiledBinding TitleMaxWidth,
                                Mode=OneWay}"
     d:DesignHeight="450"
@@ -29,7 +29,8 @@
                                    Mode=OneWay}"
             TextAlignment="Center"
             TextTrimming="CharacterEllipsis"
-            ToolTip.Tip="{Binding TitleTooltip, Mode=OneWay}"
+            ToolTip.Tip="{CompiledBinding TitleTooltip,
+                                          Mode=OneWay}"
             VerticalAlignment="Center" />
         <TextBox
             FontFamily="avares://PicView.Avalonia/Assets/Fonts/Roboto-Medium.ttf#Roboto"

src/PicView.Avalonia/Views/UC/ToolTipMessage.axaml

@@ -20,8 +20,8 @@
         </Transitions>
     </UserControl.Transitions>
     <Border
-        Background="{StaticResource SecondaryBackgroundColor}"
-        BorderBrush="{StaticResource MainBorderColor}"
+        Background="{DynamicResource SecondaryBackgroundColor}"
+        BorderBrush="{DynamicResource MainBorderColor}"
         BorderThickness="1"
         CornerRadius="6">