diff --git a/ColorSelector/ColorSelector.cs b/ColorSelector/ColorSelector.cs
index 018b814..d49a2b9 100644
--- a/ColorSelector/ColorSelector.cs
+++ b/ColorSelector/ColorSelector.cs
@@ -333,12 +333,12 @@ public ColorSelector()
 
         private void CustomColorsLimitDecrement(object? obj)
         {
-            CustomColorsLimit = Math.Clamp(CustomColorsLimit - 1, 1, CustomColorsLimit_MAX);
+            CustomColorsLimit = Math.Clamp(CustomColorsLimit - 1, 1, (CustomColorsLimited) ? CustomColorsLimit_MAX : CustomColorsLimit_SAFETY_MAX);
         }
 
         private void CustomColorsLimitIncrement(object? obj)
         {
-            CustomColorsLimit = Math.Clamp(CustomColorsLimit + 1, 1, CustomColorsLimit_MAX);
+            CustomColorsLimit = Math.Clamp(CustomColorsLimit + 1, 1, (CustomColorsLimited) ? CustomColorsLimit_MAX : CustomColorsLimit_SAFETY_MAX);
         }
 
         private void ColorColumnsDecrement(object? obj)
@@ -485,10 +485,11 @@ public override void OnApplyTemplate()
         public const double DisplayScale_MIN = .5;
         public const double DisplayScale_MAX = 2.0;
 
-        public const int CustomColorsLimit_DEFAULT = 10;
+        public const int CustomColorsLimit_DEFAULT = 20;
         public const int CustomColorsLimit_MAX = 1000;
+        public const int CustomColorsLimit_SAFETY_MAX = 16383; // Memory/performance safety hard-limit
 
-        public const int ColorColumns_DEFAULT = 5;
+        public const int ColorColumns_DEFAULT = 10;
         public const int ColorColumns_MAX = 100;
 
         public void ToggleMenu(object? obj)
@@ -516,6 +517,37 @@ private void DeleteCustomColors(object? obj)
             CustomColors.Clear();
         }
 
+        /// <summary>
+        /// Returns the int.CompareTo() result for checking the count of a collection of colors. 
+        /// If CustomColorsLimited is set to true, CustomColorsLimit is the comparison value;
+        /// Else, CustomColorsLimit_SAFETY_MAX is the comparison value.
+        /// </summary>
+        /// <returns></returns>
+        private int CustomColorsLimitReached(IEnumerable<Color>? colorCollection = null)
+        {
+            var colleciton = (colorCollection == null) ? CustomColors : colorCollection;
+            if (CustomColorsLimited)
+                return colleciton.Count().CompareTo(CustomColorsLimit);
+            else
+                return colleciton.Count().CompareTo(CustomColorsLimit_SAFETY_MAX);
+        }
+
+        private int CustomColorsLimitReached()
+        {
+            if (CustomColorsLimited)
+                return CustomColors.Count.CompareTo(CustomColorsLimit);
+            else
+                return CustomColors.Count.CompareTo(CustomColorsLimit_SAFETY_MAX);
+        }
+
+        private int GetCustomColorsLimit()
+        {
+            if (CustomColorsLimited)
+                return CustomColorsLimit;
+            else
+                return CustomColorsLimit_SAFETY_MAX;
+        }
+
         /// <summary>
         /// Saves custom colors up to a certain limit; once limit is reached,
         /// colors are replaced in FILO (First In, Last Out) order;
@@ -523,7 +555,7 @@ private void DeleteCustomColors(object? obj)
         /// <param name="obj"></param>
         private void SaveCustomColor(object? obj)
         {
-            if (CustomColorsLimited && CustomColors.Count >= CustomColorsLimit)
+            if (CustomColorsLimitReached() >= 0)
                 CustomColors.RemoveAt(CustomColors.Count - 1);
 
             CustomColors.Insert(0, GetColorFromRawColor());
@@ -2334,10 +2366,14 @@ private void ImportFromFile(ImportType importType, string filePath = "")
                     switch (importType)
                     {
                         case ImportType.CustomColors:
-                            CustomColors = new ObservableCollection<Color>(collection);
+                            CustomColors.Clear();
+                            for (int i = 0; i < collection.Count() && i < GetCustomColorsLimit(); ++i)
+                                CustomColors.Add(collection.ElementAt(i));
                             break;
                         case ImportType.PresetColors:
-                            PresetColors = new ObservableCollection<Color>(collection);
+                            PresetColors.Clear();
+                            for (int i = 0; i < collection.Count() && i < CustomColorsLimit_SAFETY_MAX; ++i)
+                                PresetColors.Add(collection.ElementAt(i));
                             break;
                         default:
                             break;
@@ -5817,10 +5853,13 @@ private static void CustomColorsLimitedChanged(DependencyObject d, DependencyPro
 
         private static void UpdateCustomColors(ColorSelector selector)
         {
-            selector.CustomColorsLimitReadout = (selector.CustomColorsLimited) ? selector.CustomColorsLimit.ToString() : "Unlimited";
-            if (selector.CustomColorsLimited && selector.CustomColors.Count >= selector.CustomColorsLimit)
+            selector.CustomColorsLimitReadout = (selector.CustomColorsLimited) ? selector.CustomColorsLimit.ToString() : "Unlimited*";
+            if (selector.CustomColorsLimitReached() >= 1)
             {
-                selector.CustomColors = new(selector.CustomColors.Take(selector.CustomColorsLimit));
+                var items = new List<Color>(selector.CustomColors.Take(selector.CustomColorsLimit));
+                selector.CustomColors.Clear();
+                foreach (var item in items)
+                    selector.CustomColors.Add(item);
             }
         }
 
diff --git a/ColorSelector/Themes/Generic.xaml b/ColorSelector/Themes/Generic.xaml
index 73f74d6..76e4bbc 100644
--- a/ColorSelector/Themes/Generic.xaml
+++ b/ColorSelector/Themes/Generic.xaml
@@ -83,8 +83,8 @@
                   PresentationOptions:Freeze="True"
                   TileMode="FlipX"
                   AlignmentX="Center"
-                  ViewportUnits="RelativeToBoundingBox"
-                  Viewport="0,0,.15,.15">
+                  ViewportUnits="Absolute"
+                  Viewport="0,0,10,10">
         <DrawingBrush.Transform>
             <RotateTransform Angle="45"
                              PresentationOptions:Freeze="True" />
@@ -93,7 +93,7 @@
             <DrawingGroup PresentationOptions:Freeze="True">
                 <GeometryDrawing PresentationOptions:Freeze="True">
                     <GeometryDrawing.Pen>
-                        <Pen Brush="#88333333"
+                        <Pen Brush="#44ffffff"
                              Thickness="1"
                              PresentationOptions:Freeze="True" />
                     </GeometryDrawing.Pen>
@@ -104,7 +104,7 @@
                 </GeometryDrawing>
                 <GeometryDrawing PresentationOptions:Freeze="True">
                     <GeometryDrawing.Pen>
-                        <Pen Brush="#88B8860B"
+                        <Pen Brush="#4400ACFF"
                              Thickness="1"
                              PresentationOptions:Freeze="True" />
                     </GeometryDrawing.Pen>
@@ -1469,7 +1469,7 @@
         <Setter Property="VerticalContentAlignment"
                 Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="Background"
-                Value="Transparent" />
+                Value="{x:Null}" />
         <Setter Property="BorderBrush"
                 Value="Transparent" />
         <Setter Property="Cursor"
@@ -1493,7 +1493,7 @@
                             BorderThickness="{TemplateBinding BorderThickness}"
                             Padding="{TemplateBinding Padding}"
                             SnapsToDevicePixels="true">
-                        <Grid>
+                        <Grid Background="{StaticResource checkeredBrush}">
                             <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
@@ -2164,13 +2164,12 @@
                                             </Style.Triggers>
                                         </Style>
                                     </StackPanel.Resources>
-                                    <ListBox x:Name="PART_presetColorsSelector"
+                                    <Grid Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=PresetColorsVisible, Mode=OneWay, Converter={StaticResource b2v}}">
+                                        <ListBox x:Name="PART_presetColorsSelector"
                                          ItemsSource="{Binding Path=PresetColors, Mode=OneWay}"
                                          ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                          Padding="0"
-                                         BorderThickness="0"
                                          KeyboardNavigation.TabNavigation="Continue"
-                                         Margin="4,8"
                                          HorizontalAlignment="Stretch"
                                          HorizontalContentAlignment="Stretch"
                                          VerticalAlignment="Stretch"
@@ -2179,8 +2178,38 @@
                                          IsTabStop="False"
                                          ItemTemplate="{StaticResource ColorListItemDataTemplateAnimated}"
                                          ItemContainerStyle="{StaticResource ColorSelectorListItemStyle}"
-                                         ItemsPanel="{StaticResource ColorListItemPanelTemplate}"
-                                         Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=PresetColorsVisible, Mode=OneWay, Converter={StaticResource b2v}}"/>
+                                         ItemsPanel="{StaticResource ColorListItemPanelTemplate}">
+                                            <ListBox.Style>
+                                                <Style TargetType="{x:Type ListBox}">
+                                                    <Setter Property="BorderBrush" Value="Transparent"/>
+                                                    <Setter Property="BorderThickness" Value="0"/>
+                                                    <Setter Property="Margin" Value="4,8,4,4"/>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=PresetColors.Count, Mode=OneWay}" Value="0">
+                                                            <Setter Property="BorderBrush" Value="{StaticResource warningBrush}"/>
+                                                            <Setter Property="BorderThickness" Value="4"/>
+                                                            <Setter Property="Margin" Value="8,12,8,8"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </ListBox.Style>
+                                        </ListBox>
+                                        <TextBlock Text="Drag and drop file" Foreground="#44ffffff" IsHitTestVisible="False" TextWrapping="Wrap" Margin="16">
+                                            <TextBlock.Style>
+                                                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource monospacedBoldText}">
+                                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=PresetColors.Count, Mode=OneWay}" Value="0">
+                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=ApplicationOrientation, Mode=OneWay}" Value="true">
+                                                            <Setter Property="Width" Value="48"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </TextBlock.Style>
+                                        </TextBlock>
+                                    </Grid>
 
                                     <Grid Margin="8,8,8,8" 
                                           Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=Display2dVisible, Mode=OneWay, Converter={StaticResource b2v}}">
@@ -2620,10 +2649,11 @@
                                                 IsTabStop="True"
                                                 Height="32"
                                                 Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=CustomColorsVisible, Mode=OneWay, Converter={StaticResource b2v}}">
-                                            <TextBlock Text="Add +" TextWrapping="Wrap"
-                                                   TextAlignment="Center"
-                                                           Padding="8,0"
-                                                   Style="{StaticResource buttonText}" />
+                                            <TextBlock Text="Add +" 
+                                                       TextWrapping="Wrap"
+                                                       TextAlignment="Center"
+                                                       Padding="8,0"
+                                                       Style="{StaticResource buttonText}" />
                                         </Button>
 
                                         <Button Background="{StaticResource redColorBrush}" 
@@ -2633,29 +2663,61 @@
                                                 Grid.Column="1" 
                                                 ToolTip="Delete Saved Colors"
                                                 x:Name="PART_deleteCustomColorsButtonBase">
-                                            <TextBlock Text="🗑" FontWeight="Normal" />
+                                            <TextBlock Style="{StaticResource buttonText}" Padding="8,0">
+                                                <Run Text="🗑 " FontWeight="Normal"/><Run Text="All"/>
+                                            </TextBlock>
                                         </Button>
                                     </WrapPanel>
 
 
-                                    <ListBox ItemsSource="{Binding Path=CustomColors, Mode=OneWay}"
+                                    <Grid Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=CustomColorsVisible, Mode=OneWay, Converter={StaticResource b2v}}">
+                                        <ListBox ItemsSource="{Binding Path=CustomColors, Mode=OneWay}"
                                          x:Name="PART_customColorsSelector"
                                          ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                          Padding="0"
-                                         BorderThickness="0"
                                          IsTabStop="False"
+                                         Background="Transparent"
                                          KeyboardNavigation.TabNavigation="Continue"
-                                         Margin="4,8"
                                          HorizontalAlignment="Stretch"
                                          HorizontalContentAlignment="Stretch"
                                          VerticalAlignment="Stretch"
                                          VerticalContentAlignment="Stretch"
-                                         Background="Transparent"
                                          ItemTemplate="{StaticResource ColorListItemDataTemplateAnimated}"
                                          ItemContainerStyle="{StaticResource ColorSelectorListItemStyle}"
-                                         ItemsPanel="{StaticResource ColorListItemPanelTemplate}" 
-                                         Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=CustomColorsVisible, Mode=OneWay, Converter={StaticResource b2v}}">
-                                    </ListBox>
+                                         ItemsPanel="{StaticResource ColorListItemPanelTemplate}">
+                                            <ListBox.Style>
+                                                <Style TargetType="{x:Type ListBox}">
+                                                    <Setter Property="BorderBrush" Value="Transparent"/>
+                                                    <Setter Property="BorderThickness" Value="0"/>
+                                                    <Setter Property="MinHeight" Value="0"/>
+                                                    <Setter Property="MinWidth" Value="0"/>
+                                                    <Setter Property="Margin" Value="4,8"/>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=CustomColors.Count, Mode=OneWay}" Value="0">
+                                                            <Setter Property="BorderBrush" Value="{StaticResource warningBrush}"/>
+                                                            <Setter Property="BorderThickness" Value="4"/>
+                                                            <Setter Property="Margin" Value="8,12,8,8"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </ListBox.Style>
+                                        </ListBox>
+                                        <TextBlock Text="Drag and drop file" Foreground="#44ffffff" IsHitTestVisible="False" Margin="16" TextWrapping="Wrap">
+                                            <TextBlock.Style>
+                                                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource monospacedBoldText}">
+                                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=CustomColors.Count, Mode=OneWay}" Value="0">
+                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=ApplicationOrientation, Mode=OneWay}" Value="true">
+                                                            <Setter Property="Width" Value="48"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </TextBlock.Style>
+                                        </TextBlock>
+                                    </Grid>
                                 </StackPanel>
                             </ScrollViewer>
 
@@ -3059,13 +3121,13 @@
                                                         </Button>
                                                         
                                                     </WrapPanel>
-                                                    <UniformGrid Grid.Row="1" Rows="1" Columns="2" Grid.ColumnSpan="2">
+                                                    <UniformGrid Margin="0,0,0,8" Grid.Row="1" Rows="1" Columns="2" Grid.ColumnSpan="2">
 
-                                                        <Button Style="{StaticResource ButtonStyle1}" ToolTip="Decrease Interface Scale (Ctrl+ -)" Background="{StaticResource redColorBrush}" MinWidth="32"
+                                                        <Button Style="{StaticResource MenuButtonStyle1}" ToolTip="Decrease Interface Scale (Ctrl+ -)" Background="{StaticResource redColorBrush}" MinWidth="32" Margin="8,0,4,0"
                                                                     x:Name="PART_decreaseAppScaleButtonBase">
                                                             <TextBlock Text="-" Style="{StaticResource buttonTextIcon}" TextBlock.LineHeight="24" TextBlock.LineStackingStrategy="BlockLineHeight"/>
                                                         </Button>
-                                                        <Button Style="{StaticResource ButtonStyle1}"  ToolTip="Increase Interface Scale (Ctrl+ +)" Background="{StaticResource greenColorBrush}" MinWidth="32"
+                                                        <Button Style="{StaticResource MenuButtonStyle1}"  ToolTip="Increase Interface Scale (Ctrl+ +)" Background="{StaticResource greenColorBrush}" MinWidth="32" Margin="4,0,8,0"
                                                                     x:Name="PART_increaseAppScaleButtonBase">
                                                             <TextBlock Text="+" Style="{StaticResource buttonTextIcon}" TextBlock.LineHeight="24"  TextBlock.LineStackingStrategy="BlockLineHeight"/>
                                                         </Button>
@@ -3106,7 +3168,18 @@
                                                 <WrapPanel Grid.ColumnSpan="2">
                                                     <StackPanel>
                                                         <TextBlock Text="Custom Colors Limit:"/>
-                                                        <TextBlock Opacity=".8" Style="{StaticResource menuSubSectionLabel}" Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=CustomColorsLimitReadout, Mode=OneWay}"/>
+                                                        <TextBlock Background="#00000000" Opacity=".8" Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=CustomColorsLimitReadout, Mode=OneWay}">
+                                                            <TextBlock.Style>
+                                                                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource menuSubSectionLabel}">
+                                                                    <Style.Triggers>
+                                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=CustomColorsLimited, Mode=OneWay}" Value="false">
+                                                                            <Setter Property="ToolTip" Value="Practically unlimited, with an app-safety limit of 16,383 colors."/>
+                                                                            <Setter Property="Cursor" Value="Help"/>
+                                                                        </DataTrigger>
+                                                                    </Style.Triggers>
+                                                                </Style>
+                                                            </TextBlock.Style>
+                                                        </TextBlock>
                                                     </StackPanel>
                                                     <StackPanel>
                                                         
@@ -3126,9 +3199,11 @@
                                                             <StackPanel.Style>
                                                                 <Style TargetType="{x:Type StackPanel}">
                                                                     <Setter Property="IsEnabled" Value="False"/>
+                                                                    <Setter Property="Visibility" Value="Collapsed"/>
                                                                     <Style.Triggers>
                                                                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ColorSelector}}, Path=CustomColorsLimited, Mode=OneWay}" Value="true">
                                                                             <Setter Property="IsEnabled" Value="True"/>
+                                                                            <Setter Property="Visibility" Value="Visible"/>
                                                                         </DataTrigger>
                                                                     </Style.Triggers>
                                                                 </Style>