From 9cc719b461c6aa4bad26b6c9ccc37e4df6909e67 Mon Sep 17 00:00:00 2001
From: CWO333 <github@cwo333.com>
Date: Wed, 22 Oct 2025 13:22:13 -0500
Subject: [PATCH 1/5] Restrict the Color Picker's Height and add vertical
 scrollbar if the user's Screen Resolution is too small.

---
 Celeste_Launcher_Gui/Pages/OverviewPage.xaml.cs        | 4 ++++
 Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/Celeste_Launcher_Gui/Pages/OverviewPage.xaml.cs b/Celeste_Launcher_Gui/Pages/OverviewPage.xaml.cs
index b630c5c..d8bab5b 100644
--- a/Celeste_Launcher_Gui/Pages/OverviewPage.xaml.cs
+++ b/Celeste_Launcher_Gui/Pages/OverviewPage.xaml.cs
@@ -273,6 +273,10 @@ private void OpenPlayerColors(object sender, RoutedEventArgs e)
         {
             var colorWindow = new SetPlayerColorWindow();
             colorWindow.Owner = Window.GetWindow(this);
+            if (System.Windows.SystemParameters.PrimaryScreenHeight < 1000)
+            {
+                colorWindow.Height = System.Windows.SystemParameters.PrimaryScreenHeight - 100;
+            }
             colorWindow.ShowDialog();
         }
         #endregion
diff --git a/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml b/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
index bb039fc..546610e 100644
--- a/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
+++ b/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
@@ -10,6 +10,7 @@
         Title="{x:Static p:Resources.ColorPickerWindowTitle}" 
         WindowStyle="none" ResizeMode="NoResize" UseLayoutRounding="True" Background="Transparent" AllowsTransparency="True"
         Width="850" Height="950">
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
     <Grid>
         <Grid.Background>
             <ImageBrush ImageSource="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/ColorPickerDialogue-BackgroundV4.png"/>
@@ -283,4 +284,5 @@
                  Click="CloseWindow"/>
         </StackPanel>
     </Grid>
+    </ScrollViewer>
 </Window>

From 8c91a0bdd650ee3da37a0ce6a9ee829f875d3855 Mon Sep 17 00:00:00 2001
From: CWO333 <github@cwo333.com>
Date: Fri, 24 Oct 2025 16:45:18 -0500
Subject: [PATCH 2/5] Resize Window instead of adding Scrollbar. Solution
 provided by Sonicflare

---
 Celeste_Launcher_Gui/Pages/OverviewPage.xaml.cs        | 4 ----
 Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml | 9 ++++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Celeste_Launcher_Gui/Pages/OverviewPage.xaml.cs b/Celeste_Launcher_Gui/Pages/OverviewPage.xaml.cs
index d8bab5b..b630c5c 100644
--- a/Celeste_Launcher_Gui/Pages/OverviewPage.xaml.cs
+++ b/Celeste_Launcher_Gui/Pages/OverviewPage.xaml.cs
@@ -273,10 +273,6 @@ private void OpenPlayerColors(object sender, RoutedEventArgs e)
         {
             var colorWindow = new SetPlayerColorWindow();
             colorWindow.Owner = Window.GetWindow(this);
-            if (System.Windows.SystemParameters.PrimaryScreenHeight < 1000)
-            {
-                colorWindow.Height = System.Windows.SystemParameters.PrimaryScreenHeight - 100;
-            }
             colorWindow.ShowDialog();
         }
         #endregion
diff --git a/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml b/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
index 546610e..eead3fa 100644
--- a/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
+++ b/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
@@ -9,15 +9,15 @@
         WindowStartupLocation="CenterOwner"
         Title="{x:Static p:Resources.ColorPickerWindowTitle}" 
         WindowStyle="none" ResizeMode="NoResize" UseLayoutRounding="True" Background="Transparent" AllowsTransparency="True"
-        Width="850" Height="950">
-    <ScrollViewer VerticalScrollBarVisibility="Auto">
+        Width="850" Height="950" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}">
     <Grid>
         <Grid.Background>
             <ImageBrush ImageSource="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/ColorPickerDialogue-BackgroundV4.png"/>
         </Grid.Background>
         <Border BorderThickness="22" BorderBrush="Transparent" MouseDown="BorderMoved">
             <Grid>
-                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,0,0,10">
+                <Viewbox StretchDirection="DownOnly">
+                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,0,0,0">
                     <DockPanel Margin="0,39,0,0">
 
                         <DockPanel Margin="0,0,0,0" Width="340">
@@ -274,7 +274,7 @@
 
                     <Button Style="{StaticResource TinyButton}" Content="{x:Static p:Resources.ColorPickerSaveBtn}" Click="ConfirmBtnClick" Margin="0,12,0,0"/>
                 </StackPanel>
-
+            </Viewbox>
             </Grid>
         </Border>
         <StackPanel Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,4,30,0">
@@ -284,5 +284,4 @@
                  Click="CloseWindow"/>
         </StackPanel>
     </Grid>
-    </ScrollViewer>
 </Window>

From 3eab3944ffb8c608c137f934d5b06d24e04e93fc Mon Sep 17 00:00:00 2001
From: CWO333 <github@cwo333.com>
Date: Fri, 24 Oct 2025 16:52:10 -0500
Subject: [PATCH 3/5] small tweak to undo an unintended change

---
 Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml b/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
index eead3fa..1554053 100644
--- a/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
+++ b/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
@@ -17,7 +17,7 @@
         <Border BorderThickness="22" BorderBrush="Transparent" MouseDown="BorderMoved">
             <Grid>
                 <Viewbox StretchDirection="DownOnly">
-                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,0,0,0">
+                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,0,0,10">
                     <DockPanel Margin="0,39,0,0">
 
                         <DockPanel Margin="0,0,0,0" Width="340">

From b5a5afde069fed7f083698ea9f44c8d78071da2b Mon Sep 17 00:00:00 2001
From: CWO333 <github@cwo333.com>
Date: Sat, 25 Oct 2025 16:29:54 -0500
Subject: [PATCH 4/5] Fixed indentation of xaml Keep aspect ratio when resizing
 window

---
 .../Windows/SetPlayerColorWindow.xaml         | 604 ++++++++++--------
 .../Windows/SetPlayerColorWindow.xaml.cs      |   2 +
 2 files changed, 344 insertions(+), 262 deletions(-)

diff --git a/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml b/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
index 1554053..2b27335 100644
--- a/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
+++ b/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
@@ -7,281 +7,361 @@
         xmlns:p="clr-namespace:Celeste_Launcher_Gui.Properties"
         mc:Ignorable="d"
         WindowStartupLocation="CenterOwner"
-        Title="{x:Static p:Resources.ColorPickerWindowTitle}" 
-        WindowStyle="none" ResizeMode="NoResize" UseLayoutRounding="True" Background="Transparent" AllowsTransparency="True"
-        Width="850" Height="950" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}">
+        Title="{x:Static p:Resources.ColorPickerWindowTitle}"
+        WindowStyle="none"
+        ResizeMode="NoResize"
+        UseLayoutRounding="True"
+        Background="Transparent"
+        AllowsTransparency="True"
+        Width="850"
+        Height="950"
+        MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}">
     <Grid>
         <Grid.Background>
             <ImageBrush ImageSource="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/ColorPickerDialogue-BackgroundV4.png"/>
         </Grid.Background>
-        <Border BorderThickness="22" BorderBrush="Transparent" MouseDown="BorderMoved">
+        <Border BorderThickness="22"
+                BorderBrush="Transparent"
+                MouseDown="BorderMoved">
             <Grid>
                 <Viewbox StretchDirection="DownOnly">
-                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,0,0,10">
-                    <DockPanel Margin="0,39,0,0">
-
-                        <DockPanel Margin="0,0,0,0" Width="340">
-                            <TextBlock
-                                Foreground="White"
-                                FontFamily="{StaticResource Ashley-Crawford-CG}"
-                                FontSize="22"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                TextWrapping="WrapWithOverflow"
-                                Text="{x:Static p:Resources.ColorPickerTitleColor}" />
-                        </DockPanel>
+                    <StackPanel HorizontalAlignment="Center"
+                            VerticalAlignment="Top"
+                            Margin="0,0,0,10">
+                        <DockPanel Margin="0,39,0,0">
+
+                            <DockPanel Margin="0,0,0,0"
+                                    Width="340">
+                                <TextBlock
+                                    Foreground="White"
+                                    FontFamily="{StaticResource Ashley-Crawford-CG}"
+                                    FontSize="22"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Center"
+                                    TextWrapping="WrapWithOverflow"
+                                    Text="{x:Static p:Resources.ColorPickerTitleColor}"/>
+                            </DockPanel>
+
+                            <DockPanel Margin="0,0,0,0"
+                                    Width="339"
+                                    HorizontalAlignment="Right">
+                                <TextBlock
+                                    Foreground="White"
+                                    FontFamily="{StaticResource Ashley-Crawford-CG}"
+                                    FontSize="22"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    TextWrapping="WrapWithOverflow"
+                                    Text="{x:Static p:Resources.ColorPickerTitlePicker}"/>
+                            </DockPanel>
 
-                        <DockPanel Margin="0,0,0,0" Width="339" HorizontalAlignment="Right">
-                            <TextBlock
-                                 Foreground="White"
-                                 FontFamily="{StaticResource Ashley-Crawford-CG}"
-                                 FontSize="22"
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Center"
-                                 TextWrapping="WrapWithOverflow"
-                                 Text="{x:Static p:Resources.ColorPickerTitlePicker}" />
                         </DockPanel>
-
-                    </DockPanel>
-                    <TextBlock
-                        Foreground="White"
-                        FontFamily="{StaticResource Ashley-Crawford-CG}"
-                        FontSize="22"
-                        Width="300"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Margin="40,12,0,0"
-                        TextWrapping="WrapWithOverflow"
-                        Text="{x:Static p:Resources.ColorPickerPlayerColorTitle}" />
-                    <Grid HorizontalAlignment="Center">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-
-                        <local:ColorComboBoxSelection
-                            Grid.Column="0"
-                            LabelContent="{x:Static p:Resources.ColorPickerPlayer1}"
-                            x:Name="Player1ColorPicker"
-                            ColorChanged="ColorPicker_ColorChanged" />
-
-                        <local:ColorComboBoxSelection
-                            Grid.Column="1"
-                            LabelContent="{x:Static p:Resources.ColorPickerPlayer2}"
-                            x:Name="Player2ColorPicker"
-                            ColorChanged="ColorPicker_ColorChanged" />
-
-                        <Image
-                            Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P1.png"
-                            Grid.Column="0"
-                            HorizontalAlignment="Left"
-                            Margin="-35,0,0,0"
-                            Panel.ZIndex="1"/>
-
-                        <Image
-                            Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P2.png"
-                            Grid.Column="1"
-                            HorizontalAlignment="Right"
-                            Margin="0,0,-35,0"
-                            Panel.ZIndex="1"/>
-                    </Grid>
-                    <Grid HorizontalAlignment="Center">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-
-                        <local:ColorComboBoxSelection
-                            Grid.Column="0"
-                            LabelContent="{x:Static p:Resources.ColorPickerPlayer3}"
-                            x:Name="Player3ColorPicker"
-                            ColorChanged="ColorPicker_ColorChanged" />
-
-                        <local:ColorComboBoxSelection
-                            Grid.Column="1"
-                            LabelContent="{x:Static p:Resources.ColorPickerPlayer4}"
-                            x:Name="Player4ColorPicker"
-                            ColorChanged="ColorPicker_ColorChanged" />
-
-                        <Image
-                            Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P3.png"
-                            Grid.Column="0"
-                            HorizontalAlignment="Left"
-                            Margin="-35,0,0,0"
-                            Panel.ZIndex="1" />
-
-                        <Image
-                            Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P4.png"
-                            Grid.Column="1"
-                            HorizontalAlignment="Right"
-                            Margin="0,0,-35,0"
-                            Panel.ZIndex="1" />
-                    </Grid>
-                    <Grid HorizontalAlignment="Center">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-
-                        <local:ColorComboBoxSelection
-                            Grid.Column="0"
-                            LabelContent="{x:Static p:Resources.ColorPickerPlayer5}"
-                            x:Name="Player5ColorPicker"
-                            ColorChanged="ColorPicker_ColorChanged" />
-
-                        <local:ColorComboBoxSelection
-                            Grid.Column="1"
-                            LabelContent="{x:Static p:Resources.ColorPickerPlayer6}"
-                            x:Name="Player6ColorPicker"
-                            ColorChanged="ColorPicker_ColorChanged" />
-
-                        <Image
-                            Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P5.png"
-                            Grid.Column="0"
-                            HorizontalAlignment="Left"
-                            Margin="-35,0,0,0"
-                            Panel.ZIndex="1" />
-
-                        <Image
-                            Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P6.png"
-                            Grid.Column="1"
-                            HorizontalAlignment="Right"
-                            Margin="0,0,-35,0"
-                            Panel.ZIndex="1" />
-                    </Grid>
-                    <Grid HorizontalAlignment="Center">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-
-                        <local:ColorComboBoxSelection
-                            Grid.Column="0"
-                            LabelContent="{x:Static p:Resources.ColorPickerPlayer7}"
-                            x:Name="Player7ColorPicker"
-                            ColorChanged="ColorPicker_ColorChanged" />
-
-                        <local:ColorComboBoxSelection
-                            Grid.Column="1"
-                            LabelContent="{x:Static p:Resources.ColorPickerPlayer8}"
-                            x:Name="Player8ColorPicker"
-                            ColorChanged="ColorPicker_ColorChanged" />
-
-                        <Image
-                            Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P7.png"
-                            Grid.Column="0"
-                            HorizontalAlignment="Left"
-                            Margin="-35,0,0,0"
-                            Panel.ZIndex="1" />
-
-                        <Image
-                            Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P8.png"
-                            Grid.Column="1"
-                            HorizontalAlignment="Right"
-                            Margin="0,0,-35,0"
-                            Panel.ZIndex="1" />
-                    </Grid>
-                    <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Separator.png" Stretch="None" />
-                    <TextBlock
-                        Foreground="White"
-                        FontFamily="{StaticResource Ashley-Crawford-CG}"
-                        FontSize="22"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Margin="40,0,0,0"
-                        TextWrapping="WrapWithOverflow"
-                        Text="{x:Static p:Resources.ColorPickerFriendOrFoeTitle}" />
-
-
-                    <Grid HorizontalAlignment="Center">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-
-                        <local:ColorComboBoxSelection
-                            Grid.Column="0"
-                            LabelContent="{x:Static p:Resources.ColorPickerSelf}"
-                            x:Name="FriendorfoeselfColorPicker"
-                            ColorChanged="ColorPicker_ColorChanged" />
-
-                        <local:ColorComboBoxSelection
-                            Grid.Column="1"
-                            LabelContent="{x:Static p:Resources.ColorPickerAlly}"
-                            x:Name="FriendorfoeallyColorPicker"
-                            ColorChanged="ColorPicker_ColorChanged" />
-
-                        <Image
-                            Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/Self.png"
-                            Grid.Column="0"
-                            HorizontalAlignment="Left"
-                            Margin="-35,0,0,0"
-                            Panel.ZIndex="1" />
-
-                        <Image
-                            Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/Ally.png"
-                            Grid.Column="1"
-                            HorizontalAlignment="Right"
-                            Margin="0,0,-35,0"
-                            Panel.ZIndex="1" />
-                    </Grid>
-
-                    <Grid HorizontalAlignment="Center">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-
-                        <local:ColorComboBoxSelection
-                            Grid.Column="0"
-                            LabelContent="{x:Static p:Resources.ColorPickerFoe}"
-                            x:Name="FriendorfoeenemyColorPicker"
+                        <TextBlock
+                            Foreground="White"
+                            FontFamily="{StaticResource Ashley-Crawford-CG}"
+                            FontSize="22"
+                            Width="300"
                             HorizontalAlignment="Left"
-                            ColorChanged="ColorPicker_ColorChanged" />
-
-                        <local:ColorComboBoxSelection
-                            Grid.Column="1"
-                            HorizontalAlignment="Left"
-                            Visibility="Hidden" />
-
-                        <Image
-                            Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/Enemy.png"
-                            Grid.Column="0"
+                            VerticalAlignment="Center"
+                            Margin="40,12,0,0"
+                            TextWrapping="WrapWithOverflow"
+                            Text="{x:Static p:Resources.ColorPickerPlayerColorTitle}"/>
+                        <Grid HorizontalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+
+                            <local:ColorComboBoxSelection
+                                Grid.Column="0"
+                                LabelContent="{x:Static p:Resources.ColorPickerPlayer1}"
+                                x:Name="Player1ColorPicker"
+                                ColorChanged="ColorPicker_ColorChanged"/>
+
+                            <local:ColorComboBoxSelection
+                                Grid.Column="1"
+                                LabelContent="{x:Static p:Resources.ColorPickerPlayer2}"
+                                x:Name="Player2ColorPicker"
+                                ColorChanged="ColorPicker_ColorChanged"/>
+
+                            <Image
+                                Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P1.png"
+                                Grid.Column="0"
+                                HorizontalAlignment="Left"
+                                Margin="-35,0,0,0"
+                                Panel.ZIndex="1"/>
+
+                            <Image
+                                Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P2.png"
+                                Grid.Column="1"
+                                HorizontalAlignment="Right"
+                                Margin="0,0,-35,0"
+                                Panel.ZIndex="1"/>
+                        </Grid>
+                        <Grid HorizontalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+
+                            <local:ColorComboBoxSelection
+                                Grid.Column="0"
+                                LabelContent="{x:Static p:Resources.ColorPickerPlayer3}"
+                                x:Name="Player3ColorPicker"
+                                ColorChanged="ColorPicker_ColorChanged"/>
+
+                            <local:ColorComboBoxSelection
+                                Grid.Column="1"
+                                LabelContent="{x:Static p:Resources.ColorPickerPlayer4}"
+                                x:Name="Player4ColorPicker"
+                                ColorChanged="ColorPicker_ColorChanged"/>
+
+                            <Image
+                                Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P3.png"
+                                Grid.Column="0"
+                                HorizontalAlignment="Left"
+                                Margin="-35,0,0,0"
+                                Panel.ZIndex="1"/>
+
+                            <Image
+                                Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P4.png"
+                                Grid.Column="1"
+                                HorizontalAlignment="Right"
+                                Margin="0,0,-35,0"
+                                Panel.ZIndex="1"/>
+                        </Grid>
+                        <Grid HorizontalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+
+                            <local:ColorComboBoxSelection
+                                Grid.Column="0"
+                                LabelContent="{x:Static p:Resources.ColorPickerPlayer5}"
+                                x:Name="Player5ColorPicker"
+                                ColorChanged="ColorPicker_ColorChanged"/>
+
+                            <local:ColorComboBoxSelection
+                                Grid.Column="1"
+                                LabelContent="{x:Static p:Resources.ColorPickerPlayer6}"
+                                x:Name="Player6ColorPicker"
+                                ColorChanged="ColorPicker_ColorChanged"/>
+
+                            <Image
+                                Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P5.png"
+                                Grid.Column="0"
+                                HorizontalAlignment="Left"
+                                Margin="-35,0,0,0"
+                                Panel.ZIndex="1"/>
+
+                            <Image
+                                Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P6.png"
+                                Grid.Column="1"
+                                HorizontalAlignment="Right"
+                                Margin="0,0,-35,0"
+                                Panel.ZIndex="1"/>
+                        </Grid>
+                        <Grid HorizontalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+
+                            <local:ColorComboBoxSelection
+                                Grid.Column="0"
+                                LabelContent="{x:Static p:Resources.ColorPickerPlayer7}"
+                                x:Name="Player7ColorPicker"
+                                ColorChanged="ColorPicker_ColorChanged"/>
+
+                            <local:ColorComboBoxSelection
+                                Grid.Column="1"
+                                LabelContent="{x:Static p:Resources.ColorPickerPlayer8}"
+                                x:Name="Player8ColorPicker"
+                                ColorChanged="ColorPicker_ColorChanged"/>
+
+                            <Image
+                                Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P7.png"
+                                Grid.Column="0"
+                                HorizontalAlignment="Left"
+                                Margin="-35,0,0,0"
+                                Panel.ZIndex="1"/>
+
+                            <Image
+                                Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P8.png"
+                                Grid.Column="1"
+                                HorizontalAlignment="Right"
+                                Margin="0,0,-35,0"
+                                Panel.ZIndex="1"/>
+                        </Grid>
+                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Separator.png"
+                                Stretch="None"/>
+                        <TextBlock
+                            Foreground="White"
+                            FontFamily="{StaticResource Ashley-Crawford-CG}"
+                            FontSize="22"
                             HorizontalAlignment="Left"
-                            Margin="-35,0,0,0"
-                            Panel.ZIndex="1" />
-                    </Grid>
-
-                    <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Separator.png" Stretch="None" />
-
-                    <Grid Width="778" Height="177" Margin="0,0,0,0">
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Base.png" Stretch="None"/>
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Labels.png" Stretch="None"/>
-
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P1C2.png" x:Name="ColorP1Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="26,70,0,0"/>
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P2C2.png" x:Name="ColorP2Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="98,70,0,0"/>
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P3C2.png" x:Name="ColorP3Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="173,70,0,0"/>
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P4C2.png" x:Name="ColorP4Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="241,70,0,0"/>
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P5C2.png" x:Name="ColorP5Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="315,70,0,0"/>
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P6C2.png" x:Name="ColorP6Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="384,70,0,0"/>
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P7C2.png" x:Name="ColorP7Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="447,70,0,0"/>
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P8C2.png" x:Name="ColorP8Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="512,70,0,0"/>
-
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/AllyC2.png" x:Name="ColorAPreview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="649,33,0,0"/>
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/SelfC2.png" x:Name="ColorSPreview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="605,78,0,0"/>
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/FoeC2.png" x:Name="ColorFPreview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="687,87,0,0"/>
-                    </Grid>
-
-                    <Button Style="{StaticResource TinyButton}" Content="{x:Static p:Resources.ColorPickerSaveBtn}" Click="ConfirmBtnClick" Margin="0,12,0,0"/>
-                </StackPanel>
-            </Viewbox>
+                            VerticalAlignment="Center"
+                            Margin="40,0,0,0"
+                            TextWrapping="WrapWithOverflow"
+                            Text="{x:Static p:Resources.ColorPickerFriendOrFoeTitle}"/>
+
+
+                        <Grid HorizontalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+
+                            <local:ColorComboBoxSelection
+                                Grid.Column="0"
+                                LabelContent="{x:Static p:Resources.ColorPickerSelf}"
+                                x:Name="FriendorfoeselfColorPicker"
+                                ColorChanged="ColorPicker_ColorChanged"/>
+
+                            <local:ColorComboBoxSelection
+                                Grid.Column="1"
+                                LabelContent="{x:Static p:Resources.ColorPickerAlly}"
+                                x:Name="FriendorfoeallyColorPicker"
+                                ColorChanged="ColorPicker_ColorChanged"/>
+
+                            <Image
+                                Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/Self.png"
+                                Grid.Column="0"
+                                HorizontalAlignment="Left"
+                                Margin="-35,0,0,0"
+                                Panel.ZIndex="1"/>
+
+                            <Image
+                                Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/Ally.png"
+                                Grid.Column="1"
+                                HorizontalAlignment="Right"
+                                Margin="0,0,-35,0"
+                                Panel.ZIndex="1"/>
+                        </Grid>
+
+                        <Grid HorizontalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+
+                            <local:ColorComboBoxSelection
+                                Grid.Column="0"
+                                LabelContent="{x:Static p:Resources.ColorPickerFoe}"
+                                x:Name="FriendorfoeenemyColorPicker"
+                                HorizontalAlignment="Left"
+                                ColorChanged="ColorPicker_ColorChanged"/>
+
+                            <local:ColorComboBoxSelection
+                                Grid.Column="1"
+                                HorizontalAlignment="Left"
+                                Visibility="Hidden"/>
+
+                            <Image
+                                Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/Enemy.png"
+                                Grid.Column="0"
+                                HorizontalAlignment="Left"
+                                Margin="-35,0,0,0"
+                                Panel.ZIndex="1"/>
+                        </Grid>
+
+                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Separator.png"
+                                Stretch="None"/>
+
+                        <Grid Width="778"
+                                Height="177"
+                                Margin="0,0,0,0">
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Base.png"
+                                    Stretch="None"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Labels.png"
+                                    Stretch="None"/>
+
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P1C2.png"
+                                    x:Name="ColorP1Preview"
+                                    Stretch="None"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Margin="26,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P2C2.png"
+                                    x:Name="ColorP2Preview"
+                                    Stretch="None"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Margin="98,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P3C2.png"
+                                    x:Name="ColorP3Preview"
+                                    Stretch="None"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Margin="173,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P4C2.png"
+                                    x:Name="ColorP4Preview"
+                                    Stretch="None"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Margin="241,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P5C2.png"
+                                    x:Name="ColorP5Preview"
+                                    Stretch="None"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Margin="315,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P6C2.png"
+                                    x:Name="ColorP6Preview"
+                                    Stretch="None"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Margin="384,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P7C2.png"
+                                    x:Name="ColorP7Preview"
+                                    Stretch="None"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Margin="447,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P8C2.png"
+                                    x:Name="ColorP8Preview"
+                                    Stretch="None"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Margin="512,70,0,0"/>
+
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/AllyC2.png"
+                                    x:Name="ColorAPreview"
+                                    Stretch="None"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Margin="649,33,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/SelfC2.png"
+                                    x:Name="ColorSPreview"
+                                    Stretch="None"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Margin="605,78,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/FoeC2.png"
+                                    x:Name="ColorFPreview"
+                                    Stretch="None"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Margin="687,87,0,0"/>
+                        </Grid>
+
+                        <Button Style="{StaticResource TinyButton}"
+                                Content="{x:Static p:Resources.ColorPickerSaveBtn}"
+                                Click="ConfirmBtnClick"
+                                Margin="0,12,0,0"/>
+                    </StackPanel>
+                </Viewbox>
             </Grid>
         </Border>
-        <StackPanel Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,4,30,0">
+        <StackPanel Orientation="Horizontal"
+                VerticalAlignment="Top"
+                HorizontalAlignment="Right"
+                Margin="0,4,30,0">
             <local:WindowControl
-                 DefaultIcon="pack://application:,,,/Celeste Launcher;component/Resources/Icons/WCCloseNormal.png"
-                 HoverIcon="pack://application:,,,/Celeste Launcher;component/Resources/Icons/WCCloseHover.png"
-                 Click="CloseWindow"/>
+                DefaultIcon="pack://application:,,,/Celeste Launcher;component/Resources/Icons/WCCloseNormal.png"
+                HoverIcon="pack://application:,,,/Celeste Launcher;component/Resources/Icons/WCCloseHover.png"
+                Click="CloseWindow"/>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml.cs b/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml.cs
index abce556..f545629 100644
--- a/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml.cs
+++ b/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml.cs
@@ -31,6 +31,8 @@ public SetPlayerColorWindow()
                 Close();
             }
 
+            MaxWidth = MaxHeight * 0.9;
+
             if (!File.Exists(GetPathToPlayerColors()))
             {
                 File.WriteAllText(GetPathToPlayerColors(), GetDefaultXml());

From e6d1f2c7208ad913f22396ab748ad15c61296b43 Mon Sep 17 00:00:00 2001
From: CWO333 <github@cwo333.com>
Date: Sat, 25 Oct 2025 16:36:40 -0500
Subject: [PATCH 5/5] Fix indentation of xaml

---
 .../Windows/SetPlayerColorWindow.xaml         | 186 +++++-------------
 1 file changed, 53 insertions(+), 133 deletions(-)

diff --git a/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml b/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
index 2b27335..a6f0161 100644
--- a/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
+++ b/Celeste_Launcher_Gui/Windows/SetPlayerColorWindow.xaml
@@ -7,31 +7,20 @@
         xmlns:p="clr-namespace:Celeste_Launcher_Gui.Properties"
         mc:Ignorable="d"
         WindowStartupLocation="CenterOwner"
-        Title="{x:Static p:Resources.ColorPickerWindowTitle}"
-        WindowStyle="none"
-        ResizeMode="NoResize"
-        UseLayoutRounding="True"
-        Background="Transparent"
-        AllowsTransparency="True"
-        Width="850"
-        Height="950"
-        MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}">
+        Title="{x:Static p:Resources.ColorPickerWindowTitle}" 
+        WindowStyle="none" ResizeMode="NoResize" UseLayoutRounding="True" Background="Transparent" AllowsTransparency="True"
+        Width="850" Height="950" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}">
     <Grid>
         <Grid.Background>
             <ImageBrush ImageSource="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/ColorPickerDialogue-BackgroundV4.png"/>
         </Grid.Background>
-        <Border BorderThickness="22"
-                BorderBrush="Transparent"
-                MouseDown="BorderMoved">
+        <Border BorderThickness="22" BorderBrush="Transparent" MouseDown="BorderMoved">
             <Grid>
                 <Viewbox StretchDirection="DownOnly">
-                    <StackPanel HorizontalAlignment="Center"
-                            VerticalAlignment="Top"
-                            Margin="0,0,0,10">
+                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,0,0,10">
                         <DockPanel Margin="0,39,0,0">
 
-                            <DockPanel Margin="0,0,0,0"
-                                    Width="340">
+                            <DockPanel Margin="0,0,0,0" Width="340">
                                 <TextBlock
                                     Foreground="White"
                                     FontFamily="{StaticResource Ashley-Crawford-CG}"
@@ -39,12 +28,10 @@
                                     HorizontalAlignment="Right"
                                     VerticalAlignment="Center"
                                     TextWrapping="WrapWithOverflow"
-                                    Text="{x:Static p:Resources.ColorPickerTitleColor}"/>
+                                    Text="{x:Static p:Resources.ColorPickerTitleColor}" />
                             </DockPanel>
 
-                            <DockPanel Margin="0,0,0,0"
-                                    Width="339"
-                                    HorizontalAlignment="Right">
+                            <DockPanel Margin="0,0,0,0" Width="339" HorizontalAlignment="Right">
                                 <TextBlock
                                     Foreground="White"
                                     FontFamily="{StaticResource Ashley-Crawford-CG}"
@@ -52,7 +39,7 @@
                                     HorizontalAlignment="Left"
                                     VerticalAlignment="Center"
                                     TextWrapping="WrapWithOverflow"
-                                    Text="{x:Static p:Resources.ColorPickerTitlePicker}"/>
+                                    Text="{x:Static p:Resources.ColorPickerTitlePicker}" />
                             </DockPanel>
 
                         </DockPanel>
@@ -65,7 +52,7 @@
                             VerticalAlignment="Center"
                             Margin="40,12,0,0"
                             TextWrapping="WrapWithOverflow"
-                            Text="{x:Static p:Resources.ColorPickerPlayerColorTitle}"/>
+                            Text="{x:Static p:Resources.ColorPickerPlayerColorTitle}" />
                         <Grid HorizontalAlignment="Center">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
@@ -76,13 +63,13 @@
                                 Grid.Column="0"
                                 LabelContent="{x:Static p:Resources.ColorPickerPlayer1}"
                                 x:Name="Player1ColorPicker"
-                                ColorChanged="ColorPicker_ColorChanged"/>
+                                ColorChanged="ColorPicker_ColorChanged" />
 
                             <local:ColorComboBoxSelection
                                 Grid.Column="1"
                                 LabelContent="{x:Static p:Resources.ColorPickerPlayer2}"
                                 x:Name="Player2ColorPicker"
-                                ColorChanged="ColorPicker_ColorChanged"/>
+                                ColorChanged="ColorPicker_ColorChanged" />
 
                             <Image
                                 Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P1.png"
@@ -108,27 +95,27 @@
                                 Grid.Column="0"
                                 LabelContent="{x:Static p:Resources.ColorPickerPlayer3}"
                                 x:Name="Player3ColorPicker"
-                                ColorChanged="ColorPicker_ColorChanged"/>
+                                ColorChanged="ColorPicker_ColorChanged" />
 
                             <local:ColorComboBoxSelection
                                 Grid.Column="1"
                                 LabelContent="{x:Static p:Resources.ColorPickerPlayer4}"
                                 x:Name="Player4ColorPicker"
-                                ColorChanged="ColorPicker_ColorChanged"/>
+                                ColorChanged="ColorPicker_ColorChanged" />
 
                             <Image
                                 Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P3.png"
                                 Grid.Column="0"
                                 HorizontalAlignment="Left"
                                 Margin="-35,0,0,0"
-                                Panel.ZIndex="1"/>
+                                Panel.ZIndex="1" />
 
                             <Image
                                 Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P4.png"
                                 Grid.Column="1"
                                 HorizontalAlignment="Right"
                                 Margin="0,0,-35,0"
-                                Panel.ZIndex="1"/>
+                                Panel.ZIndex="1" />
                         </Grid>
                         <Grid HorizontalAlignment="Center">
                             <Grid.ColumnDefinitions>
@@ -140,27 +127,27 @@
                                 Grid.Column="0"
                                 LabelContent="{x:Static p:Resources.ColorPickerPlayer5}"
                                 x:Name="Player5ColorPicker"
-                                ColorChanged="ColorPicker_ColorChanged"/>
+                                ColorChanged="ColorPicker_ColorChanged" />
 
                             <local:ColorComboBoxSelection
                                 Grid.Column="1"
                                 LabelContent="{x:Static p:Resources.ColorPickerPlayer6}"
                                 x:Name="Player6ColorPicker"
-                                ColorChanged="ColorPicker_ColorChanged"/>
+                                ColorChanged="ColorPicker_ColorChanged" />
 
                             <Image
                                 Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P5.png"
                                 Grid.Column="0"
                                 HorizontalAlignment="Left"
                                 Margin="-35,0,0,0"
-                                Panel.ZIndex="1"/>
+                                Panel.ZIndex="1" />
 
                             <Image
                                 Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P6.png"
                                 Grid.Column="1"
                                 HorizontalAlignment="Right"
                                 Margin="0,0,-35,0"
-                                Panel.ZIndex="1"/>
+                                Panel.ZIndex="1" />
                         </Grid>
                         <Grid HorizontalAlignment="Center">
                             <Grid.ColumnDefinitions>
@@ -172,30 +159,29 @@
                                 Grid.Column="0"
                                 LabelContent="{x:Static p:Resources.ColorPickerPlayer7}"
                                 x:Name="Player7ColorPicker"
-                                ColorChanged="ColorPicker_ColorChanged"/>
+                                ColorChanged="ColorPicker_ColorChanged" />
 
                             <local:ColorComboBoxSelection
                                 Grid.Column="1"
                                 LabelContent="{x:Static p:Resources.ColorPickerPlayer8}"
                                 x:Name="Player8ColorPicker"
-                                ColorChanged="ColorPicker_ColorChanged"/>
+                                ColorChanged="ColorPicker_ColorChanged" />
 
                             <Image
                                 Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P7.png"
                                 Grid.Column="0"
                                 HorizontalAlignment="Left"
                                 Margin="-35,0,0,0"
-                                Panel.ZIndex="1"/>
+                                Panel.ZIndex="1" />
 
                             <Image
                                 Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/P8.png"
                                 Grid.Column="1"
                                 HorizontalAlignment="Right"
                                 Margin="0,0,-35,0"
-                                Panel.ZIndex="1"/>
+                                Panel.ZIndex="1" />
                         </Grid>
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Separator.png"
-                                Stretch="None"/>
+                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Separator.png" Stretch="None" />
                         <TextBlock
                             Foreground="White"
                             FontFamily="{StaticResource Ashley-Crawford-CG}"
@@ -204,7 +190,7 @@
                             VerticalAlignment="Center"
                             Margin="40,0,0,0"
                             TextWrapping="WrapWithOverflow"
-                            Text="{x:Static p:Resources.ColorPickerFriendOrFoeTitle}"/>
+                            Text="{x:Static p:Resources.ColorPickerFriendOrFoeTitle}" />
 
 
                         <Grid HorizontalAlignment="Center">
@@ -217,27 +203,27 @@
                                 Grid.Column="0"
                                 LabelContent="{x:Static p:Resources.ColorPickerSelf}"
                                 x:Name="FriendorfoeselfColorPicker"
-                                ColorChanged="ColorPicker_ColorChanged"/>
+                                ColorChanged="ColorPicker_ColorChanged" />
 
                             <local:ColorComboBoxSelection
                                 Grid.Column="1"
                                 LabelContent="{x:Static p:Resources.ColorPickerAlly}"
                                 x:Name="FriendorfoeallyColorPicker"
-                                ColorChanged="ColorPicker_ColorChanged"/>
+                                ColorChanged="ColorPicker_ColorChanged" />
 
                             <Image
                                 Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/Self.png"
                                 Grid.Column="0"
                                 HorizontalAlignment="Left"
                                 Margin="-35,0,0,0"
-                                Panel.ZIndex="1"/>
+                                Panel.ZIndex="1" />
 
                             <Image
                                 Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/Ally.png"
                                 Grid.Column="1"
                                 HorizontalAlignment="Right"
                                 Margin="0,0,-35,0"
-                                Panel.ZIndex="1"/>
+                                Panel.ZIndex="1" />
                         </Grid>
 
                         <Grid HorizontalAlignment="Center">
@@ -251,117 +237,51 @@
                                 LabelContent="{x:Static p:Resources.ColorPickerFoe}"
                                 x:Name="FriendorfoeenemyColorPicker"
                                 HorizontalAlignment="Left"
-                                ColorChanged="ColorPicker_ColorChanged"/>
+                                ColorChanged="ColorPicker_ColorChanged" />
 
                             <local:ColorComboBoxSelection
                                 Grid.Column="1"
                                 HorizontalAlignment="Left"
-                                Visibility="Hidden"/>
+                                Visibility="Hidden" />
 
                             <Image
                                 Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Indicators/Enemy.png"
                                 Grid.Column="0"
                                 HorizontalAlignment="Left"
                                 Margin="-35,0,0,0"
-                                Panel.ZIndex="1"/>
+                                Panel.ZIndex="1" />
                         </Grid>
 
-                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Separator.png"
-                                Stretch="None"/>
+                        <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Separator.png" Stretch="None" />
 
-                        <Grid Width="778"
-                                Height="177"
-                                Margin="0,0,0,0">
-                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Base.png"
-                                    Stretch="None"/>
-                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Labels.png"
-                                    Stretch="None"/>
+                        <Grid Width="778" Height="177" Margin="0,0,0,0">
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Base.png" Stretch="None"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Labels.png" Stretch="None"/>
 
-                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P1C2.png"
-                                    x:Name="ColorP1Preview"
-                                    Stretch="None"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Margin="26,70,0,0"/>
-                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P2C2.png"
-                                    x:Name="ColorP2Preview"
-                                    Stretch="None"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Margin="98,70,0,0"/>
-                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P3C2.png"
-                                    x:Name="ColorP3Preview"
-                                    Stretch="None"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Margin="173,70,0,0"/>
-                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P4C2.png"
-                                    x:Name="ColorP4Preview"
-                                    Stretch="None"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Margin="241,70,0,0"/>
-                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P5C2.png"
-                                    x:Name="ColorP5Preview"
-                                    Stretch="None"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Margin="315,70,0,0"/>
-                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P6C2.png"
-                                    x:Name="ColorP6Preview"
-                                    Stretch="None"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Margin="384,70,0,0"/>
-                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P7C2.png"
-                                    x:Name="ColorP7Preview"
-                                    Stretch="None"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Margin="447,70,0,0"/>
-                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P8C2.png"
-                                    x:Name="ColorP8Preview"
-                                    Stretch="None"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Margin="512,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P1C2.png" x:Name="ColorP1Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="26,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P2C2.png" x:Name="ColorP2Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="98,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P3C2.png" x:Name="ColorP3Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="173,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P4C2.png" x:Name="ColorP4Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="241,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P5C2.png" x:Name="ColorP5Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="315,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P6C2.png" x:Name="ColorP6Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="384,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P7C2.png" x:Name="ColorP7Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="447,70,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/P8C2.png" x:Name="ColorP8Preview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="512,70,0,0"/>
 
-                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/AllyC2.png"
-                                    x:Name="ColorAPreview"
-                                    Stretch="None"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Margin="649,33,0,0"/>
-                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/SelfC2.png"
-                                    x:Name="ColorSPreview"
-                                    Stretch="None"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Margin="605,78,0,0"/>
-                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/FoeC2.png"
-                                    x:Name="ColorFPreview"
-                                    Stretch="None"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Margin="687,87,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/AllyC2.png" x:Name="ColorAPreview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="649,33,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/SelfC2.png" x:Name="ColorSPreview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="605,78,0,0"/>
+                            <Image Source="pack://application:,,,/Celeste Launcher;component/Resources/ColorPicker/Preview/FoeC2.png" x:Name="ColorFPreview" Stretch="None" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="687,87,0,0"/>
                         </Grid>
 
-                        <Button Style="{StaticResource TinyButton}"
-                                Content="{x:Static p:Resources.ColorPickerSaveBtn}"
-                                Click="ConfirmBtnClick"
-                                Margin="0,12,0,0"/>
+                        <Button Style="{StaticResource TinyButton}" Content="{x:Static p:Resources.ColorPickerSaveBtn}" Click="ConfirmBtnClick" Margin="0,12,0,0"/>
                     </StackPanel>
                 </Viewbox>
             </Grid>
         </Border>
-        <StackPanel Orientation="Horizontal"
-                VerticalAlignment="Top"
-                HorizontalAlignment="Right"
-                Margin="0,4,30,0">
+        <StackPanel Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,4,30,0">
             <local:WindowControl
-                DefaultIcon="pack://application:,,,/Celeste Launcher;component/Resources/Icons/WCCloseNormal.png"
-                HoverIcon="pack://application:,,,/Celeste Launcher;component/Resources/Icons/WCCloseHover.png"
-                Click="CloseWindow"/>
+                 DefaultIcon="pack://application:,,,/Celeste Launcher;component/Resources/Icons/WCCloseNormal.png"
+                 HoverIcon="pack://application:,,,/Celeste Launcher;component/Resources/Icons/WCCloseHover.png"
+                 Click="CloseWindow"/>
         </StackPanel>
     </Grid>
 </Window>