WIP Windows 10

Dependencies finally installed
Removal of useless code
Big cleanup in XAML styles (override colors the correct way)

ModernKeePass/Views/UserControls/BreadCrumbUserControl.xaml

@@ -16,11 +16,7 @@
         </ItemsControl.ItemsPanel>
         <ItemsControl.Resources>
             <DataTemplate x:Name="FirstItemTemplate">
-                <HyperlinkButton 
-                    FontWeight="Light" FontSize="12" Padding="0"
-                    Foreground="{StaticResource MainColor}" 
-                    Content="{Binding Title}" 
-                    Style="{StaticResource MainColorHyperlinkButton}">
+                <HyperlinkButton FontWeight="Light" FontSize="12" Padding="0" Content="{Binding Title}">
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="Click">
                             <core:NavigateToPageAction Parameter="{Binding Id}" TargetPage="ModernKeePass.Views.GroupDetailPage" />
@@ -33,7 +29,7 @@
                     <Viewbox MaxHeight="10" Margin="0,2,0,0">
                         <SymbolIcon Symbol="Forward" />
                     </Viewbox>
-                    <HyperlinkButton Foreground="{StaticResource MainColor}" Content="{Binding Title}" Style="{StaticResource MainColorHyperlinkButton}" FontWeight="Light" FontSize="12" Padding="0">
+                    <HyperlinkButton Content="{Binding Title}" FontWeight="Light" FontSize="12" Padding="0">
                         <interactivity:Interaction.Behaviors>
                             <core:EventTriggerBehavior EventName="Click">
                                 <core:NavigateToPageAction Parameter="{Binding Id}" TargetPage="ModernKeePass.Views.GroupDetailPage" />

ModernKeePass/Views/UserControls/ColorPickerUserControl.xaml

@@ -9,8 +9,6 @@
               ItemsSource="{Binding Colors, ElementName=UserControl}" 
               SelectionChanged="Selector_OnSelectionChanged" 
               Loaded="ComboBox_Loaded" 
-              ItemContainerStyle="{StaticResource MainColorComboBoxItem}" 
-              Style="{StaticResource MainColorComboBox}" 
               IsEnabled="{Binding IsEnabled, ElementName=UserControl}">
         <ComboBox.ItemTemplate>
             <DataTemplate>

ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml

@@ -21,7 +21,7 @@
         IsSynchronizedWithCurrentItem="False"
         RequestedTheme="Dark"
         Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-        Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
+        Foreground="{ThemeResource TextColorLightBrush}"
         ItemContainerStyle="{StaticResource ListViewLeftIndicatorItemExpanded}">
         <ListView.Resources>
             <DataTemplate x:Name="IsSpecial">
@@ -77,6 +77,7 @@
                             Visibility="{Binding IsButtonVisible, ElementName=UserControl}" 
                             Style="{StaticResource NoBorderButtonStyle}" 
                             Background="Transparent" 
+                            Foreground="{ThemeResource TextColorLightBrush}"
                             BorderThickness="0" 
                             Width="{StaticResource ExpandedMenuSize}" 
                             HorizontalContentAlignment="Left" 
@@ -90,7 +91,14 @@
                             <TextBlock Text="{Binding ButtonLabel, ElementName=UserControl}" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="30,0,20,0" />
                         </StackPanel>
                     </Button>
-                    <Button Padding="0" Height="{StaticResource MenuSize}" Margin="0" Style="{StaticResource NoBorderButtonStyle}" Background="Transparent" BorderThickness="0" Width="{StaticResource ExpandedMenuSize}" HorizontalContentAlignment="Left">
+                    <Button Padding="0" Margin="0" 
+                            Height="{StaticResource MenuSize}" 
+                            Style="{StaticResource NoBorderButtonStyle}" 
+                            Foreground="{ThemeResource TextColorLightBrush}"
+                            Background="Transparent" 
+                            BorderThickness="0" 
+                            Width="{StaticResource ExpandedMenuSize}" 
+                            HorizontalContentAlignment="Left">
                         <StackPanel Orientation="Horizontal" Margin="17,0,5,0">
                             <SymbolIcon Symbol="Home">
                                 <ToolTipService.ToolTip>
@@ -105,7 +113,15 @@
                             </core:EventTriggerBehavior>
                         </interactivity:Interaction.Behaviors>
                     </Button>
-                    <Button Padding="0" Height="{StaticResource MenuSize}" Margin="0" Style="{StaticResource NoBorderButtonStyle}" Background="Transparent" BorderThickness="0" Width="{StaticResource ExpandedMenuSize}" HorizontalContentAlignment="Left">
+                    <Button 
+                        Padding="0" Margin="0" 
+                        Height="{StaticResource MenuSize}" 
+                        Style="{StaticResource NoBorderButtonStyle}" 
+                        Foreground="{ThemeResource TextColorLightBrush}"
+                        Background="Transparent" 
+                        BorderThickness="0" 
+                        Width="{StaticResource ExpandedMenuSize}" 
+                        HorizontalContentAlignment="Left">
                         <StackPanel Orientation="Horizontal" Margin="17,0,5,0">
                             <SymbolIcon Symbol="Setting">
                                 <ToolTipService.ToolTip>

ModernKeePass/Views/UserControls/OpenDatabaseUserControl.xaml

@@ -24,7 +24,7 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <CheckBox Grid.Row="0" Grid.Column="0" IsChecked="{Binding HasPassword, Mode=TwoWay}" />
-        <PasswordBox Grid.Row="0" Grid.Column="1" x:Uid="CompositeKeyPassword" Password="{Binding Password, Mode=TwoWay}" Height="30" IsPasswordRevealButtonEnabled="True" KeyDown="PasswordBox_KeyDown" BorderBrush="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" SelectionHighlightColor="{StaticResource MainColor}" >
+        <PasswordBox Grid.Row="0" Grid.Column="1" x:Uid="CompositeKeyPassword" Password="{Binding Password, Mode=TwoWay}" Height="30" IsPasswordRevealButtonEnabled="True" KeyDown="PasswordBox_KeyDown" BorderBrush="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" >
             <interactivity:Interaction.Behaviors>
                 <core:EventTriggerBehavior EventName="GotFocus">
                     <core:ChangePropertyAction TargetObject="{Binding}" PropertyName="HasPassword" Value="True" />
@@ -35,13 +35,11 @@
         <HyperlinkButton Grid.Row="1" Grid.Column="1" Margin="-15,0,0,0" 
                          Content="{Binding KeyFileText}" 
                          IsEnabled="{Binding HasKeyFile}" 
-                         Click="KeyFileButton_Click" 
-                         Style="{StaticResource MainColorHyperlinkButton}" />
+                         Click="KeyFileButton_Click" />
         <Button Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2"
                 Content="{Binding OpenButtonLabel}"
                 Command="{Binding OpenDatabaseCommand}"
-                CommandParameter="{Binding DatabaseFilePath, ElementName=UserControl}"
-                Style="{StaticResource MainColorButton}" />
+                CommandParameter="{Binding DatabaseFilePath, ElementName=UserControl}" />
         <TextBlock Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" Height="Auto" FontSize="14" FontWeight="Light" 
                    Text="{Binding Status}" 
                    Foreground="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" 

ModernKeePass/Views/UserControls/SetCredentialsUserControl.xaml

@@ -27,14 +27,14 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <CheckBox Grid.Row="0" Grid.Column="0" IsChecked="{Binding HasPassword, Mode=TwoWay}" />
-        <PasswordBox Grid.Row="0" Grid.Column="1" x:Uid="CompositeKeyPassword" Password="{Binding Password, Mode=TwoWay}" Height="30" IsPasswordRevealButtonEnabled="True" BorderBrush="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" SelectionHighlightColor="{StaticResource MainColor}" >
+        <PasswordBox Grid.Row="0" Grid.Column="1" x:Uid="CompositeKeyPassword" Password="{Binding Password, Mode=TwoWay}" Height="30" IsPasswordRevealButtonEnabled="True" BorderBrush="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}">
             <interactivity:Interaction.Behaviors>
                 <core:EventTriggerBehavior EventName="GotFocus">
                     <core:ChangePropertyAction TargetObject="{Binding}" PropertyName="HasPassword" Value="True" />
                 </core:EventTriggerBehavior>
             </interactivity:Interaction.Behaviors>
         </PasswordBox>
-        <PasswordBox Grid.Row="1" Grid.Column="1" x:Uid="CompositeKeyPassword" Password="{Binding ConfirmPassword, Mode=TwoWay}" Height="30" IsPasswordRevealButtonEnabled="True" BorderBrush="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" SelectionHighlightColor="{StaticResource MainColor}" />
+        <PasswordBox Grid.Row="1" Grid.Column="1" x:Uid="CompositeKeyPassword" Password="{Binding ConfirmPassword, Mode=TwoWay}" Height="30" IsPasswordRevealButtonEnabled="True" BorderBrush="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" />
         <ProgressBar Grid.Row="1" Grid.Column="1" 
                      Maximum="128" VerticalAlignment="Bottom" 
                      Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}"
@@ -43,11 +43,9 @@
         <HyperlinkButton Grid.Row="2" Grid.Column="1" Margin="-15,0,0,0" 
                          Content="{Binding KeyFileText}" 
                          IsEnabled="{Binding HasKeyFile}" 
-                         Click="KeyFileButton_Click" 
-                         Style="{StaticResource MainColorHyperlinkButton}" />
+                         Click="KeyFileButton_Click"  />
         <HyperlinkButton Grid.Row="2" Grid.Column="1" HorizontalAlignment="Right" 
                          IsEnabled="{Binding HasKeyFile}" 
-                         Style="{StaticResource MainColorHyperlinkButton}" 
                          Click="CreateKeyFileButton_Click">
             <SymbolIcon Symbol="Add">
                 <ToolTipService.ToolTip>
@@ -57,8 +55,7 @@
         </HyperlinkButton>
         <Button Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" 
                 Command="{Binding GenerateCredentialsCommand}"
-                Content="{Binding ButtonLabel, ElementName=UserControl}" 
-                Style="{StaticResource MainColorButton}" />
+                Content="{Binding ButtonLabel, ElementName=UserControl}" />
         <TextBlock Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="4" Height="Auto" FontSize="14" FontWeight="Light" 
                    Text="{Binding Status}" 
                    Foreground="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" 

ModernKeePass/Views/UserControls/SymbolPickerUserControl.xaml

@@ -9,9 +9,7 @@
         x:Name="ComboBox" 
         ItemsSource="{Binding Symbols, ElementName=UserControl}" 
         SelectedItem="{Binding SelectedSymbol, ElementName=UserControl, Mode=TwoWay}" 
-        Loaded="ComboBox_OnLoaded" 
-        ItemContainerStyle="{StaticResource MainColorComboBoxItem}" 
-        Style="{StaticResource MainColorComboBox}">
+        Loaded="ComboBox_OnLoaded">
         <ComboBox.ItemTemplate>
             <DataTemplate>
                 <Border>

ModernKeePass/Views/UserControls/TopMenuUserControl.xaml

@@ -8,7 +8,6 @@
     <UserControl.Resources>
         <Style BasedOn="{StaticResource NoBorderButtonStyle}" TargetType="Button" x:Key="MenuButtonStyle" >
             <Setter Property="Padding" Value="25,0,25,0" />
-            <Setter Property="Background" Value="{ThemeResource ToggleButtonBackgroundThemeBrush}" />
             <Setter Property="Height" Value="{StaticResource MenuSize}" />
         </Style>
         <Style BasedOn="{StaticResource NoBorderToggleButtonStyle}" TargetType="ToggleButton" x:Key="MenuToggleButtonStyle" >
@@ -64,10 +63,9 @@
                                 FontSize="15" 
                                 SuggestionsRequested="SearchBox_OnSuggestionsRequested" 
                                 ResultSuggestionChosen="SearchBox_OnResultSuggestionChosen" 
-                                SearchHistoryEnabled="False"
-                                Style="{StaticResource MainColorSearchBox}">
+                                SearchHistoryEnabled="False">
                             </SearchBox>
-                            <Button x:Name="MoveButton" x:Uid="MoveButton" Style="{StaticResource MainColorButton}" />
+                            <Button x:Name="MoveButton" x:Uid="MoveButton" />
                         </StackPanel>
                     </Flyout>
                 </Button.Flyout>