From 2fc367a8e41f1c93debf5d7d63776f1f82804afc Mon Sep 17 00:00:00 2001
From: Megalon <megalongaming@gmail.com>
Date: Tue, 25 Feb 2020 17:02:02 -0800
Subject: [PATCH 1/4] Remove UpperHighlight from ModsList

---
 ModAssistant/Styles/ListViewItem.xaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ModAssistant/Styles/ListViewItem.xaml b/ModAssistant/Styles/ListViewItem.xaml
index 3a3d3ce..46ff017 100644
--- a/ModAssistant/Styles/ListViewItem.xaml
+++ b/ModAssistant/Styles/ListViewItem.xaml
@@ -15,9 +15,9 @@
 							        BorderThickness="1">
                             <Grid>
                                 <Rectangle
-									        Name="UpperHighlight"
+									        Name="BorderBox"
 									        Visibility="Collapsed"
-									        Fill="#75FFFFFF" />
+									        Fill="Transparent" />
                                 <GridViewRowPresenter
 									        Grid.RowSpan="2"
 									        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -28,11 +28,9 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Background" Value="{DynamicResource ModListItemHighlighted}"/>
-                            <Setter TargetName="UpperHighlight" Property="Visibility" Value="Visible"/>
                         </Trigger>
                         <Trigger Property="ListBoxItem.IsSelected" Value="True">
                             <Setter Property="Background" Value="{DynamicResource ModListItemSelected}"/>
-                            <Setter TargetName="UpperHighlight" Property="Visibility" Value="Hidden"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>

From b3abd002a31ae194e45bf1a7d146a75e279825c0 Mon Sep 17 00:00:00 2001
From: Megalon <megalongaming@gmail.com>
Date: Tue, 25 Feb 2020 17:05:43 -0800
Subject: [PATCH 2/4] Fix themes that relied on UpperHighlight tint

---
 ModAssistant/Themes/Dark.xaml            | 2 +-
 ModAssistant/Themes/Light Pink.xaml      | 2 +-
 ModAssistant/Themes/Light.xaml           | 2 +-
 ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ModAssistant/Themes/Dark.xaml b/ModAssistant/Themes/Dark.xaml
index 23434e3..bd96a45 100644
--- a/ModAssistant/Themes/Dark.xaml
+++ b/ModAssistant/Themes/Dark.xaml
@@ -37,7 +37,7 @@
     <SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}" />
     <SolidColorBrush x:Key="ModListBackground" Color="#10FFFFFF" />
     <SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
-    <SolidColorBrush x:Key="ModListItemHighlighted" Color="Transparent" />
+    <SolidColorBrush x:Key="ModListItemHighlighted" Color="#858585" />
     <SolidColorBrush x:Key="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}" />
 
     <!-- Combo Box (Version select) -->
diff --git a/ModAssistant/Themes/Light Pink.xaml b/ModAssistant/Themes/Light Pink.xaml
index 5b7dfb2..5aa72c5 100644
--- a/ModAssistant/Themes/Light Pink.xaml	
+++ b/ModAssistant/Themes/Light Pink.xaml	
@@ -27,7 +27,7 @@
     <SolidColorBrush x:Key="ModColumnBorderBrush" Color="Gray"/>
     <SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="#FFFF86FF"/>
     <SolidColorBrush x:Key="ModListBackground" Color="#FFFCDCFF" />
-    <SolidColorBrush x:Key="ModListItemHighlighted" Color="#FFF8B6FF"/>
+    <SolidColorBrush x:Key="ModListItemHighlighted" Color="#FFFBD7FF"/>
     <SolidColorBrush x:Key="ModListItemSelected" Color="#FFFF88F4"/>
 
     <!-- Combo Box (Version select) -->
diff --git a/ModAssistant/Themes/Light.xaml b/ModAssistant/Themes/Light.xaml
index 8cbbcd7..ddf04cc 100644
--- a/ModAssistant/Themes/Light.xaml
+++ b/ModAssistant/Themes/Light.xaml
@@ -36,7 +36,7 @@
     <SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}" />
     <SolidColorBrush x:Key="ModListBackground" Color="#09000000" />
     <SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
-    <SolidColorBrush x:Key="ModListItemHighlighted" Color="#BBBBBB" />
+    <SolidColorBrush x:Key="ModListItemHighlighted" Color="#DADADA" />
     <SolidColorBrush x:Key="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}" />
 
     <!-- Combo Box (Version select) -->
diff --git a/ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml b/ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml
index 5f27e91..c5a387b 100644
--- a/ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml	
+++ b/ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml	
@@ -52,7 +52,7 @@
     <SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}"/>
     <SolidColorBrush x:Key="ModListBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
     <SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
-    <SolidColorBrush x:Key="ModListItemHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}"/>
+    <SolidColorBrush x:Key="ModListItemHighlighted" Color="#A0C29F"/>
     <SolidColorBrush x:Key="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}"/>
 
     <!-- Combo Box (Version select) -->

From 65fddf3e7093fe8474fd6d2c1822861f353d1230 Mon Sep 17 00:00:00 2001
From: Jack Baron <jackmbaron@gmail.com>
Date: Wed, 26 Feb 2020 03:42:45 +0000
Subject: [PATCH 3/4] allow theming of modlistitem hover/active outline

---
 ModAssistant/Styles/ListViewItem.xaml    | 2 ++
 ModAssistant/Themes/Dark.xaml            | 6 ++++--
 ModAssistant/Themes/Light Pink.xaml      | 2 ++
 ModAssistant/Themes/Light.xaml           | 2 ++
 ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml | 2 ++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ModAssistant/Styles/ListViewItem.xaml b/ModAssistant/Styles/ListViewItem.xaml
index 46ff017..afb0c9c 100644
--- a/ModAssistant/Styles/ListViewItem.xaml
+++ b/ModAssistant/Styles/ListViewItem.xaml
@@ -28,9 +28,11 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Background" Value="{DynamicResource ModListItemHighlighted}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource ModListItemHighlightedOutline}"/>
                         </Trigger>
                         <Trigger Property="ListBoxItem.IsSelected" Value="True">
                             <Setter Property="Background" Value="{DynamicResource ModListItemSelected}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource ModListItemSelectedOutline}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/ModAssistant/Themes/Dark.xaml b/ModAssistant/Themes/Dark.xaml
index bd96a45..79a1376 100644
--- a/ModAssistant/Themes/Dark.xaml
+++ b/ModAssistant/Themes/Dark.xaml
@@ -37,8 +37,10 @@
     <SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}" />
     <SolidColorBrush x:Key="ModListBackground" Color="#10FFFFFF" />
     <SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
-    <SolidColorBrush x:Key="ModListItemHighlighted" Color="#858585" />
-    <SolidColorBrush x:Key="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}" />
+    <SolidColorBrush x:Key="ModListItemHighlighted" Color="#70404040" />
+    <SolidColorBrush x:Key="ModListItemHighlightedOutline" Color="#40FFFFFF" />
+    <SolidColorBrush x:Key="ModListItemSelected" Color="#FF353535" />
+    <SolidColorBrush x:Key="ModListItemSelectedOutline" Color="#40FFFFFF" />
 
     <!-- Combo Box (Version select) -->
     <SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
diff --git a/ModAssistant/Themes/Light Pink.xaml b/ModAssistant/Themes/Light Pink.xaml
index 5aa72c5..0b1bb16 100644
--- a/ModAssistant/Themes/Light Pink.xaml	
+++ b/ModAssistant/Themes/Light Pink.xaml	
@@ -28,7 +28,9 @@
     <SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="#FFFF86FF"/>
     <SolidColorBrush x:Key="ModListBackground" Color="#FFFCDCFF" />
     <SolidColorBrush x:Key="ModListItemHighlighted" Color="#FFFBD7FF"/>
+    <SolidColorBrush x:Key="ModListItemHighlightedOutline" Color="" />
     <SolidColorBrush x:Key="ModListItemSelected" Color="#FFFF88F4"/>
+    <SolidColorBrush x:Key="ModListItemSelectedOutline" Color="" />
 
     <!-- Combo Box (Version select) -->
     <SolidColorBrush x:Key="ComboBoxBackground" Color="#FFE09EE0"/>
diff --git a/ModAssistant/Themes/Light.xaml b/ModAssistant/Themes/Light.xaml
index ddf04cc..5907216 100644
--- a/ModAssistant/Themes/Light.xaml
+++ b/ModAssistant/Themes/Light.xaml
@@ -37,7 +37,9 @@
     <SolidColorBrush x:Key="ModListBackground" Color="#09000000" />
     <SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
     <SolidColorBrush x:Key="ModListItemHighlighted" Color="#DADADA" />
+    <SolidColorBrush x:Key="ModListItemHighlightedOutline" Color="#60000000" />
     <SolidColorBrush x:Key="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}" />
+    <SolidColorBrush x:Key="ModListItemSelectedOutline" Color="#70000000" />
 
     <!-- Combo Box (Version select) -->
     <SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
diff --git a/ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml b/ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml
index c5a387b..5263ffe 100644
--- a/ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml	
+++ b/ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml	
@@ -53,7 +53,9 @@
     <SolidColorBrush x:Key="ModListBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
     <SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
     <SolidColorBrush x:Key="ModListItemHighlighted" Color="#A0C29F"/>
+    <SolidColorBrush x:Key="ModListItemHighlightedOutline" Color="" />
     <SolidColorBrush x:Key="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}"/>
+    <SolidColorBrush x:Key="ModListItemSelectedOutline" Color="" />
 
     <!-- Combo Box (Version select) -->
     <SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}"/>

From d51be2d4d61ac126b9732f3838d83f65f73fa6d4 Mon Sep 17 00:00:00 2001
From: Assistant <assistant.moetron@gmail.com>
Date: Wed, 26 Feb 2020 00:40:47 -0700
Subject: [PATCH 4/4] Updated themes

---
 ModAssistant/Themes/Light Pink.xaml      | 4 ++--
 ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ModAssistant/Themes/Light Pink.xaml b/ModAssistant/Themes/Light Pink.xaml
index 0b1bb16..e2f0dae 100644
--- a/ModAssistant/Themes/Light Pink.xaml	
+++ b/ModAssistant/Themes/Light Pink.xaml	
@@ -28,9 +28,9 @@
     <SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="#FFFF86FF"/>
     <SolidColorBrush x:Key="ModListBackground" Color="#FFFCDCFF" />
     <SolidColorBrush x:Key="ModListItemHighlighted" Color="#FFFBD7FF"/>
-    <SolidColorBrush x:Key="ModListItemHighlightedOutline" Color="" />
+    <SolidColorBrush x:Key="ModListItemHighlightedOutline" Color="#FFCF61C4" />
     <SolidColorBrush x:Key="ModListItemSelected" Color="#FFFF88F4"/>
-    <SolidColorBrush x:Key="ModListItemSelectedOutline" Color="" />
+    <SolidColorBrush x:Key="ModListItemSelectedOutline" Color="#FFFF88F4" />
 
     <!-- Combo Box (Version select) -->
     <SolidColorBrush x:Key="ComboBoxBackground" Color="#FFE09EE0"/>
diff --git a/ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml b/ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml
index 5263ffe..e4d27e2 100644
--- a/ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml	
+++ b/ModAssistant/Themes/Ugly Kulu-Ya-Ku.xaml	
@@ -53,9 +53,9 @@
     <SolidColorBrush x:Key="ModListBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
     <SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
     <SolidColorBrush x:Key="ModListItemHighlighted" Color="#A0C29F"/>
-    <SolidColorBrush x:Key="ModListItemHighlightedOutline" Color="" />
+    <SolidColorBrush x:Key="ModListItemHighlightedOutline" Color="{DynamicResource ResourceKey=StandardBorder}" />
     <SolidColorBrush x:Key="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}"/>
-    <SolidColorBrush x:Key="ModListItemSelectedOutline" Color="" />
+    <SolidColorBrush x:Key="ModListItemSelectedOutline" Color="{DynamicResource ResourceKey=StandardBorder}" />
 
     <!-- Combo Box (Version select) -->
     <SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}"/>