From 7b2df973dab9f615d01085c3706740b6a31c6d9d Mon Sep 17 00:00:00 2001
From: copiousfish <copiousfish@hotmail.com>
Date: Sun, 18 Sep 2022 21:30:16 -0700
Subject: [PATCH 1/8] fixed up the project a bit. changed the layout to use
 grids

---
 AutoSynthesis/AutoSynthesis.csproj           |    8 +-
 AutoSynthesis/MainWindow.xaml                | 2134 +++++++++++++-----
 AutoSynthesis/MainWindow.xaml.cs             |   65 +-
 AutoSynthesis/Resources/Icon/Icon - Copy.png |  Bin 3817 -> 0 bytes
 AutoSynthesis/Windows/Settings.xaml          |  149 +-
 AutoSynthesis/packages.config                |    2 +-
 6 files changed, 1748 insertions(+), 610 deletions(-)
 delete mode 100644 AutoSynthesis/Resources/Icon/Icon - Copy.png

diff --git a/AutoSynthesis/AutoSynthesis.csproj b/AutoSynthesis/AutoSynthesis.csproj
index 9eba1bf..29865a8 100644
--- a/AutoSynthesis/AutoSynthesis.csproj
+++ b/AutoSynthesis/AutoSynthesis.csproj
@@ -177,6 +177,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
@@ -206,10 +207,9 @@
     <Resource Include="Resources\Icon\Icon.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\Icon\Icon - Copy.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Icon.ico" />
+    <None Include="Icon.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Images\Buttons\Minimize to Tray Hover.png" />
diff --git a/AutoSynthesis/MainWindow.xaml b/AutoSynthesis/MainWindow.xaml
index f476796..18ff18c 100644
--- a/AutoSynthesis/MainWindow.xaml
+++ b/AutoSynthesis/MainWindow.xaml
@@ -1,170 +1,197 @@
 <Window
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:AutoSynthesis"
-        xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2" x:Class="AutoSynthesis.MainWindow"
-        mc:Ignorable="d"
-        Title="AutoSynthesis" 
-        SizeToContent="WidthAndHeight" 
-        ResizeMode="CanMinimize" 
-        HorizontalAlignment="Center" 
-        VerticalAlignment="Center" 
-        Icon="Resources/Icon/Icon.png" Closing="Window_Closing" Deactivated="Window_Deactivated">
+    x:Class="AutoSynthesis.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:AutoSynthesis"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Name="window"
+    Title="AutoSynthesis"
+    HorizontalAlignment="Center"
+    VerticalAlignment="Center"
+    Closing="Window_Closing"
+    Deactivated="Window_Deactivated"
+    Icon="Resources/Icon/Icon.png"
+    ResizeMode="CanMinimize"
+    SizeToContent="WidthAndHeight"
+    mc:Ignorable="d">
     <Window.Resources>
         <Style x:Key="FocusVisual">
             <Setter Property="Control.Template">
                 <Setter.Value>
                     <ControlTemplate>
-                        <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+                        <Rectangle
+                            Margin="2"
+                            SnapsToDevicePixels="true"
+                            Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                            StrokeDashArray="1 2"
+                            StrokeThickness="1" />
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
         </Style>
 
         <!--
-        Default Background For Buttons: 121212
-        Default Border for Buttons: DCEDFF
-        Default Text Color: DCEDFF
-        Default Highlighted Background: 292929
-        Click: 5c5863
+            Default Background For Buttons: 121212
+            Default Border for Buttons: DCEDFF
+            Default Text Color: DCEDFF
+            Default Highlighted Background: 292929
+            Click: 5c5863
         -->
 
         <!--
-        Base Color: #201834
-        Highlighted: #2f2842
-        Pressed: #231e30
+            Base Color: #201834
+            Highlighted: #2f2842
+            Pressed: #231e30
         -->
 
-        <!--#region ComboBox Style -->
-        <SolidColorBrush x:Key="ComboBox.Static.Background" Color="#201834"/>
-        <SolidColorBrush x:Key="ComboBox.Static.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="ComboBox.Static.Editable.Background" Color="#FFFFFFFF"/>
-        <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="Black"/>
-        <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="Transparent"/>
-        <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="Transparent"/>
-
-        <SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="#FF000000"/>
-        <SolidColorBrush x:Key="ComboBox.MouseOver.Background" Color="#2f2842"/>
-        <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="#FF7EB4EA"/>
-        <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="#FFFFFFFF"/>
-        <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="#FF7EB4EA"/>
-        <LinearGradientBrush x:Key="ComboBox.MouseOver.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
-            <GradientStop Color="#FFEBF4FC" Offset="0.0"/>
-            <GradientStop Color="#FFDCECFC" Offset="1.0"/>
+        <!--#region ComboBox Style-->
+        <SolidColorBrush x:Key="ComboBox.Static.Background" Color="#201834" />
+        <SolidColorBrush x:Key="ComboBox.Static.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="ComboBox.Static.Editable.Background" Color="#FFFFFFFF" />
+        <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="Black" />
+        <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="Transparent" />
+        <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="Transparent" />
+
+        <SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="#FF000000" />
+        <SolidColorBrush x:Key="ComboBox.MouseOver.Background" Color="#2f2842" />
+        <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="#FF7EB4EA" />
+        <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="#FFFFFFFF" />
+        <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="#FF7EB4EA" />
+        <LinearGradientBrush x:Key="ComboBox.MouseOver.Editable.Button.Background" StartPoint="0,0" EndPoint="0,1">
+            <GradientStop Offset="0.0" Color="#FFEBF4FC" />
+            <GradientStop Offset="1.0" Color="#FFDCECFC" />
         </LinearGradientBrush>
-        <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="#FF7EB4EA"/>
-
-        <SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="#FF000000"/>
-        <SolidColorBrush x:Key="ComboBox.Pressed.Background" Color="#231e30"/>
-        <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="#FF569DE5"/>
-        <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="#FFFFFFFF"/>
-        <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="#FF569DE5"/>
-        <LinearGradientBrush x:Key="ComboBox.Pressed.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
-            <GradientStop Color="#FFDAEBFC" Offset="0.0"/>
-            <GradientStop Color="#FFC4E0FC" Offset="1.0"/>
+        <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="#FF7EB4EA" />
+
+        <SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="#FF000000" />
+        <SolidColorBrush x:Key="ComboBox.Pressed.Background" Color="#231e30" />
+        <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="#FF569DE5" />
+        <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="#FFFFFFFF" />
+        <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="#FF569DE5" />
+        <LinearGradientBrush x:Key="ComboBox.Pressed.Editable.Button.Background" StartPoint="0,0" EndPoint="0,1">
+            <GradientStop Offset="0.0" Color="#FFDAEBFC" />
+            <GradientStop Offset="1.0" Color="#FFC4E0FC" />
         </LinearGradientBrush>
-        <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="#FF569DE5"/>
+        <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="#FF569DE5" />
 
-        <SolidColorBrush x:Key="ComboBox.Disabled.Glyph" Color="#FFBFBFBF"/>
-        <SolidColorBrush x:Key="ComboBox.Disabled.Background" Color="#FFF0F0F0"/>
-        <SolidColorBrush x:Key="ComboBox.Disabled.Border" Color="#FFD9D9D9"/>
-        <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Background" Color="#FFFFFFFF"/>
-        <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Border" Color="#FFBFBFBF"/>
-        <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Background" Color="Transparent"/>
-        <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Border" Color="Transparent"/>
+        <SolidColorBrush x:Key="ComboBox.Disabled.Glyph" Color="#FFBFBFBF" />
+        <SolidColorBrush x:Key="ComboBox.Disabled.Background" Color="#FFF0F0F0" />
+        <SolidColorBrush x:Key="ComboBox.Disabled.Border" Color="#FFD9D9D9" />
+        <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Background" Color="#FFFFFFFF" />
+        <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Border" Color="#FFBFBFBF" />
+        <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Background" Color="Transparent" />
+        <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Border" Color="Transparent" />
 
-        <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="#FF606060"/>
+        <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="#FF606060" />
         <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
-            <Setter Property="OverridesDefaultStyle" Value="true"/>
-            <Setter Property="IsTabStop" Value="false"/>
-            <Setter Property="Focusable" Value="false"/>
-            <Setter Property="ClickMode" Value="Press"/>
-            <Setter Property="Foreground" Value="Red"/>
+            <Setter Property="OverridesDefaultStyle" Value="true" />
+            <Setter Property="IsTabStop" Value="false" />
+            <Setter Property="Focusable" Value="false" />
+            <Setter Property="ClickMode" Value="Press" />
+            <Setter Property="Foreground" Value="Red" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ToggleButton}">
-                        <Border x:Name="templateRoot" BorderBrush="{StaticResource ComboBox.Static.Border}" BorderThickness="{TemplateBinding BorderThickness}" Background="{StaticResource ComboBox.Static.Background}" SnapsToDevicePixels="true">
-                            <Border x:Name="splitBorder" BorderBrush="Transparent" BorderThickness="1" HorizontalAlignment="Right" Margin="0" SnapsToDevicePixels="true" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                                <Path x:Name="arrow" Data="F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z" Fill="{StaticResource ComboBox.Static.Glyph}" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center"/>
+                        <Border
+                            x:Name="templateRoot"
+                            Background="{StaticResource ComboBox.Static.Background}"
+                            BorderBrush="{StaticResource ComboBox.Static.Border}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="true">
+                            <Border
+                                x:Name="splitBorder"
+                                Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"
+                                Margin="0"
+                                HorizontalAlignment="Right"
+                                BorderBrush="Transparent"
+                                BorderThickness="1"
+                                SnapsToDevicePixels="true">
+                                <Path
+                                    x:Name="arrow"
+                                    Margin="0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Data="F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z"
+                                    Fill="{StaticResource ComboBox.Static.Glyph}" />
                             </Border>
                         </Border>
                         <ControlTemplate.Triggers>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
-                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
-                                    <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                    <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                    <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true" />
+                                    <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="false" />
+                                    <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="false" />
+                                    <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="true" />
                                 </MultiDataTrigger.Conditions>
-                                <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Static.Editable.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Static.Editable.Border}"/>
-                                <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Static.Editable.Button.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Static.Editable.Button.Border}"/>
+                                <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.Static.Editable.Background}" />
+                                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.Static.Editable.Border}" />
+                                <Setter TargetName="splitBorder" Property="Background" Value="{StaticResource ComboBox.Static.Editable.Button.Background}" />
+                                <Setter TargetName="splitBorder" Property="BorderBrush" Value="{StaticResource ComboBox.Static.Editable.Button.Border}" />
                             </MultiDataTrigger>
                             <Trigger Property="IsMouseOver" Value="true">
-                                <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.MouseOver.Glyph}"/>
+                                <Setter TargetName="arrow" Property="Fill" Value="{StaticResource ComboBox.MouseOver.Glyph}" />
                             </Trigger>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
-                                    <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false"/>
+                                    <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true" />
+                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false" />
                                 </MultiDataTrigger.Conditions>
-                                <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Border}"/>
+                                <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.MouseOver.Background}" />
+                                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.MouseOver.Border}" />
                             </MultiDataTrigger>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
-                                    <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                    <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true" />
+                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true" />
                                 </MultiDataTrigger.Conditions>
-                                <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Editable.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Editable.Border}"/>
-                                <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Border}"/>
+                                <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.MouseOver.Editable.Background}" />
+                                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.MouseOver.Editable.Border}" />
+                                <Setter TargetName="splitBorder" Property="Background" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Background}" />
+                                <Setter TargetName="splitBorder" Property="BorderBrush" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Border}" />
                             </MultiDataTrigger>
                             <Trigger Property="IsPressed" Value="true">
-                                <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.Pressed.Glyph}"/>
+                                <Setter TargetName="arrow" Property="Fill" Value="{StaticResource ComboBox.Pressed.Glyph}" />
                             </Trigger>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
-                                    <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false"/>
+                                    <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true" />
+                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false" />
                                 </MultiDataTrigger.Conditions>
-                                <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Border}"/>
+                                <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.Pressed.Background}" />
+                                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.Pressed.Border}" />
                             </MultiDataTrigger>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
-                                    <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                    <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true" />
+                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true" />
                                 </MultiDataTrigger.Conditions>
-                                <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Editable.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Editable.Border}"/>
-                                <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Pressed.Editable.Button.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Pressed.Editable.Button.Border}"/>
+                                <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.Pressed.Editable.Background}" />
+                                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.Pressed.Editable.Border}" />
+                                <Setter TargetName="splitBorder" Property="Background" Value="{StaticResource ComboBox.Pressed.Editable.Button.Background}" />
+                                <Setter TargetName="splitBorder" Property="BorderBrush" Value="{StaticResource ComboBox.Pressed.Editable.Button.Border}" />
                             </MultiDataTrigger>
                             <Trigger Property="IsEnabled" Value="false">
-                                <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.Disabled.Glyph}"/>
+                                <Setter TargetName="arrow" Property="Fill" Value="{StaticResource ComboBox.Disabled.Glyph}" />
                             </Trigger>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
-                                    <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false"/>
+                                    <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false" />
+                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false" />
                                 </MultiDataTrigger.Conditions>
-                                <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Border}"/>
+                                <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.Disabled.Background}" />
+                                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.Disabled.Border}" />
                             </MultiDataTrigger>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
-                                    <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                    <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false" />
+                                    <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true" />
                                 </MultiDataTrigger.Conditions>
-                                <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Editable.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Editable.Border}"/>
-                                <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Disabled.Editable.Button.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Disabled.Editable.Button.Border}"/>
+                                <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.Disabled.Editable.Background}" />
+                                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.Disabled.Editable.Border}" />
+                                <Setter TargetName="splitBorder" Property="Background" Value="{StaticResource ComboBox.Disabled.Editable.Button.Background}" />
+                                <Setter TargetName="splitBorder" Property="BorderBrush" Value="{StaticResource ComboBox.Disabled.Editable.Button.Border}" />
                             </MultiDataTrigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -174,59 +201,109 @@
         <ControlTemplate x:Key="ComboBoxTemplate" TargetType="{x:Type ComboBox}">
             <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
-                <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="1" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1,1,1.4,0.8" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-                    <Themes:SystemDropShadowChrome x:Name="shadow" Color="Transparent" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}">
-                        <Border x:Name="dropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+                <Popup
+                    x:Name="PART_Popup"
+                    Grid.ColumnSpan="1"
+                    Margin="1,1,1.4,0.8"
+                    AllowsTransparency="true"
+                    IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                    Placement="Bottom"
+                    PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                    <Themes:SystemDropShadowChrome
+                        x:Name="shadow"
+                        MinWidth="{Binding ActualWidth, ElementName=templateRoot}"
+                        MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                        Color="Transparent">
+                        <Border
+                            x:Name="dropDownBorder"
+                            Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                            BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                            BorderThickness="1">
                             <ScrollViewer x:Name="DropDownScrollViewer">
                                 <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
-                                    <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
-                                        <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                                    <Canvas
+                                        x:Name="canvas"
+                                        Width="0"
+                                        Height="0"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top">
+                                        <Rectangle
+                                            x:Name="opaqueRect"
+                                            Width="{Binding ActualWidth, ElementName=dropDownBorder}"
+                                            Height="{Binding ActualHeight, ElementName=dropDownBorder}"
+                                            Fill="{Binding Background, ElementName=dropDownBorder}" />
                                     </Canvas>
-                                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                    <ItemsPresenter
+                                        x:Name="ItemsPresenter"
+                                        KeyboardNavigation.DirectionalNavigation="Contained"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                                 </Grid>
                             </ScrollViewer>
                         </Border>
                     </Themes:SystemDropShadowChrome>
                 </Popup>
-                <ToggleButton x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="1" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}" Margin="0,0,0.4,-0.2"/>
-                <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" Margin="6,3,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                <ToggleButton
+                    x:Name="toggleButton"
+                    Grid.ColumnSpan="1"
+                    Margin="0,0,0.4,-0.2"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                    Style="{StaticResource ComboBoxToggleButton}" />
+                <ContentPresenter
+                    x:Name="contentPresenter"
+                    Margin="6,3,0,0"
+                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                    Content="{TemplateBinding SelectionBoxItem}"
+                    ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
+                    ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                    ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                    IsHitTestVisible="false"
+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
             </Grid>
             <ControlTemplate.Triggers>
-                <Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
-                    <Setter Property="Margin" TargetName="shadow" Value="0,0,5,5"/>
-                    <Setter Property="Color" TargetName="shadow" Value="#71000000"/>
+                <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                    <Setter TargetName="shadow" Property="Margin" Value="0,0,5,5" />
+                    <Setter TargetName="shadow" Property="Color" Value="#71000000" />
                 </Trigger>
                 <Trigger Property="HasItems" Value="false">
-                    <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
+                    <Setter TargetName="dropDownBorder" Property="Height" Value="95" />
                 </Trigger>
                 <MultiTrigger>
                     <MultiTrigger.Conditions>
-                        <Condition Property="IsGrouping" Value="true"/>
-                        <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                        <Condition Property="IsGrouping" Value="true" />
+                        <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
                     </MultiTrigger.Conditions>
-                    <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                    <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
                 </MultiTrigger>
-                <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
-                    <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
-                    <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+                <Trigger SourceName="DropDownScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false">
+                    <Setter TargetName="opaqueRect" Property="Canvas.Top" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}" />
+                    <Setter TargetName="opaqueRect" Property="Canvas.Left" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}" />
                 </Trigger>
             </ControlTemplate.Triggers>
         </ControlTemplate>
-        <SolidColorBrush x:Key="TextBox.Static.Background" Color="#FFFFFFFF"/>
+        <SolidColorBrush x:Key="TextBox.Static.Background" Color="#FFFFFFFF" />
         <Style x:Key="ComboBoxEditableTextBox" TargetType="{x:Type TextBox}">
-            <Setter Property="OverridesDefaultStyle" Value="true"/>
-            <Setter Property="AllowDrop" Value="true"/>
-            <Setter Property="MinWidth" Value="0"/>
-            <Setter Property="MinHeight" Value="0"/>
-            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-            <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-            <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+            <Setter Property="OverridesDefaultStyle" Value="true" />
+            <Setter Property="AllowDrop" Value="true" />
+            <Setter Property="MinWidth" Value="0" />
+            <Setter Property="MinHeight" Value="0" />
+            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+            <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+            <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type TextBox}">
-                        <ScrollViewer x:Name="PART_ContentHost" Background="Transparent" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                        <ScrollViewer
+                            x:Name="PART_ContentHost"
+                            Background="Transparent"
+                            Focusable="false"
+                            HorizontalScrollBarVisibility="Hidden"
+                            VerticalScrollBarVisibility="Hidden" />
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
@@ -234,227 +311,293 @@
         <ControlTemplate x:Key="ComboBoxEditableTemplate" TargetType="{x:Type ComboBox}">
             <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="0" MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" />
                 </Grid.ColumnDefinitions>
-                <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-                    <Themes:SystemDropShadowChrome x:Name="shadow" Color="Transparent" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}">
-                        <Border x:Name="dropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+                <Popup
+                    x:Name="PART_Popup"
+                    Grid.ColumnSpan="2"
+                    AllowsTransparency="true"
+                    IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                    Placement="Bottom"
+                    PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                    <Themes:SystemDropShadowChrome
+                        x:Name="shadow"
+                        MinWidth="{Binding ActualWidth, ElementName=templateRoot}"
+                        MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                        Color="Transparent">
+                        <Border
+                            x:Name="dropDownBorder"
+                            Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                            BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                            BorderThickness="1">
                             <ScrollViewer x:Name="DropDownScrollViewer">
                                 <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
-                                    <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
-                                        <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                                    <Canvas
+                                        x:Name="canvas"
+                                        Width="0"
+                                        Height="0"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top">
+                                        <Rectangle
+                                            x:Name="opaqueRect"
+                                            Width="{Binding ActualWidth, ElementName=dropDownBorder}"
+                                            Height="{Binding ActualHeight, ElementName=dropDownBorder}"
+                                            Fill="{Binding Background, ElementName=dropDownBorder}" />
                                     </Canvas>
-                                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                    <ItemsPresenter
+                                        x:Name="ItemsPresenter"
+                                        KeyboardNavigation.DirectionalNavigation="Contained"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                                 </Grid>
                             </ScrollViewer>
                         </Border>
                     </Themes:SystemDropShadowChrome>
                 </Popup>
-                <ToggleButton x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/>
-                <Border x:Name="border" Background="{StaticResource TextBox.Static.Background}" Margin="{TemplateBinding BorderThickness}">
-                    <TextBox x:Name="PART_EditableTextBox" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                <ToggleButton
+                    x:Name="toggleButton"
+                    Grid.ColumnSpan="2"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                    Style="{StaticResource ComboBoxToggleButton}" />
+                <Border
+                    x:Name="border"
+                    Margin="{TemplateBinding BorderThickness}"
+                    Background="{StaticResource TextBox.Static.Background}">
+                    <TextBox
+                        x:Name="PART_EditableTextBox"
+                        Margin="{TemplateBinding Padding}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                        Style="{StaticResource ComboBoxEditableTextBox}" />
                 </Border>
             </Grid>
             <ControlTemplate.Triggers>
                 <Trigger Property="IsEnabled" Value="false">
-                    <Setter Property="Opacity" TargetName="border" Value="0.56"/>
+                    <Setter TargetName="border" Property="Opacity" Value="0.56" />
                 </Trigger>
                 <Trigger Property="IsKeyboardFocusWithin" Value="true">
-                    <Setter Property="Foreground" Value="Black"/>
+                    <Setter Property="Foreground" Value="Black" />
                 </Trigger>
-                <Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
-                    <Setter Property="Margin" TargetName="shadow" Value="0,0,5,5"/>
-                    <Setter Property="Color" TargetName="shadow" Value="#71000000"/>
+                <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                    <Setter TargetName="shadow" Property="Margin" Value="0,0,5,5" />
+                    <Setter TargetName="shadow" Property="Color" Value="#71000000" />
                 </Trigger>
                 <Trigger Property="HasItems" Value="false">
-                    <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
+                    <Setter TargetName="dropDownBorder" Property="Height" Value="95" />
                 </Trigger>
                 <MultiTrigger>
                     <MultiTrigger.Conditions>
-                        <Condition Property="IsGrouping" Value="true"/>
-                        <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                        <Condition Property="IsGrouping" Value="true" />
+                        <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
                     </MultiTrigger.Conditions>
-                    <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                    <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
                 </MultiTrigger>
-                <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
-                    <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
-                    <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+                <Trigger SourceName="DropDownScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false">
+                    <Setter TargetName="opaqueRect" Property="Canvas.Top" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}" />
+                    <Setter TargetName="opaqueRect" Property="Canvas.Left" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}" />
                 </Trigger>
             </ControlTemplate.Triggers>
         </ControlTemplate>
         <Style x:Key="ComboBoxNewStyle" TargetType="{x:Type ComboBox}">
-            <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-            <Setter Property="Background" Value="{StaticResource ComboBox.Static.Background}"/>
-            <Setter Property="BorderBrush" Value="{StaticResource ComboBox.Static.Border}"/>
-            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-            <Setter Property="Padding" Value="6,3,5,3"/>
-            <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
-            <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-            <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-            <Setter Property="Template" Value="{StaticResource ComboBoxTemplate}"/>
+            <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
+            <Setter Property="Background" Value="{StaticResource ComboBox.Static.Background}" />
+            <Setter Property="BorderBrush" Value="{StaticResource ComboBox.Static.Border}" />
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+            <Setter Property="Padding" Value="6,3,5,3" />
+            <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+            <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+            <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+            <Setter Property="Template" Value="{StaticResource ComboBoxTemplate}" />
             <Style.Triggers>
                 <Trigger Property="IsEditable" Value="true">
-                    <Setter Property="IsTabStop" Value="false"/>
-                    <Setter Property="Padding" Value="2"/>
-                    <Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}"/>
+                    <Setter Property="IsTabStop" Value="false" />
+                    <Setter Property="Padding" Value="2" />
+                    <Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
 
 
-        <SolidColorBrush x:Key="ComboBoxItem.Itemsview.Background" Color="#121212"/>
-        <SolidColorBrush x:Key="ComboBoxItem.Itemsview.Border" Color="Transparent"/>
-        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewHover.Background" Color="#292929"/>
-        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewHover.Border" Color="Transparent"/>
-        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewSelected.Background" Color="#3d334d"/>
-        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewSelected.Border" Color="Transparent"/>
-        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewSelectedHover.Background" Color="#3d334d"/>
-        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewSelectedHover.Border" Color="Transparent"/>
-        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewSelectedNoFocus.Background" Color="#3d334d"/>
-        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewSelectedNoFocus.Border" Color="Transparent"/>
-        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewFocus.Border" Color="Transparent"/>
-        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewHoverFocus.Background" Color="#5c5863"/>
-        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewHoverFocus.Border" Color="Transparent"/>
+        <SolidColorBrush x:Key="ComboBoxItem.Itemsview.Background" Color="#121212" />
+        <SolidColorBrush x:Key="ComboBoxItem.Itemsview.Border" Color="Transparent" />
+        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewHover.Background" Color="#292929" />
+        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewHover.Border" Color="Transparent" />
+        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewSelected.Background" Color="#3d334d" />
+        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewSelected.Border" Color="Transparent" />
+        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewSelectedHover.Background" Color="#3d334d" />
+        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewSelectedHover.Border" Color="Transparent" />
+        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewSelectedNoFocus.Background" Color="#3d334d" />
+        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewSelectedNoFocus.Border" Color="Transparent" />
+        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewFocus.Border" Color="Transparent" />
+        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewHoverFocus.Background" Color="#5c5863" />
+        <SolidColorBrush x:Key="ComboBoxItem.ItemsviewHoverFocus.Border" Color="Transparent" />
         <Style x:Key="ComboBoxItemStyle1" TargetType="{x:Type ComboBoxItem}">
-            <Setter Property="SnapsToDevicePixels" Value="True"/>
-            <Setter Property="Padding" Value="4,1"/>
-            <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-            <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-            <Setter Property="Background" Value="{StaticResource ComboBoxItem.Itemsview.Background}"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+            <Setter Property="SnapsToDevicePixels" Value="True" />
+            <Setter Property="Padding" Value="4,1" />
+            <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+            <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+            <Setter Property="Background" Value="{StaticResource ComboBoxItem.Itemsview.Background}" />
+            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-                        <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <Border
+                            x:Name="Bd"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="true">
+                            <ContentPresenter
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                                <Setter TargetName="Bd" Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
                             </Trigger>
                             <MultiTrigger>
                                 <MultiTrigger.Conditions>
-                                    <Condition Property="IsSelected" Value="False"/>
-                                    <Condition Property="IsMouseOver" Value="False"/>
-                                    <Condition Property="IsKeyboardFocused" Value="False"/>
+                                    <Condition Property="IsSelected" Value="False" />
+                                    <Condition Property="IsMouseOver" Value="False" />
+                                    <Condition Property="IsKeyboardFocused" Value="False" />
                                 </MultiTrigger.Conditions>
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource ComboBoxItem.Itemsview.Border}"/>
-                                <Setter Property="Background" TargetName="Bd" Value="{StaticResource ComboBoxItem.Itemsview.Background}"/>
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource ComboBoxItem.Itemsview.Border}" />
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource ComboBoxItem.Itemsview.Background}" />
                             </MultiTrigger>
                             <MultiTrigger>
                                 <MultiTrigger.Conditions>
-                                    <Condition Property="IsSelected" Value="False"/>
-                                    <Condition Property="IsMouseOver" Value="True"/>
-                                    <Condition Property="IsKeyboardFocused" Value="False"/>
+                                    <Condition Property="IsSelected" Value="False" />
+                                    <Condition Property="IsMouseOver" Value="True" />
+                                    <Condition Property="IsKeyboardFocused" Value="False" />
                                 </MultiTrigger.Conditions>
-                                <Setter Property="Background" TargetName="Bd" Value="{StaticResource ComboBoxItem.ItemsviewHover.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource ComboBoxItem.ItemsviewHover.Border}"/>
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource ComboBoxItem.ItemsviewHover.Background}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource ComboBoxItem.ItemsviewHover.Border}" />
                             </MultiTrigger>
                             <MultiTrigger>
                                 <MultiTrigger.Conditions>
-                                    <Condition Property="IsSelected" Value="True"/>
-                                    <Condition Property="IsMouseOver" Value="False"/>
-                                    <Condition Property="IsKeyboardFocused" Value="True"/>
+                                    <Condition Property="IsSelected" Value="True" />
+                                    <Condition Property="IsMouseOver" Value="False" />
+                                    <Condition Property="IsKeyboardFocused" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter Property="Background" TargetName="Bd" Value="{StaticResource ComboBoxItem.ItemsviewSelected.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource ComboBoxItem.ItemsviewSelected.Border}"/>
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource ComboBoxItem.ItemsviewSelected.Background}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource ComboBoxItem.ItemsviewSelected.Border}" />
                             </MultiTrigger>
                             <MultiTrigger>
                                 <MultiTrigger.Conditions>
-                                    <Condition Property="IsSelected" Value="True"/>
-                                    <Condition Property="IsMouseOver" Value="True"/>
+                                    <Condition Property="IsSelected" Value="True" />
+                                    <Condition Property="IsMouseOver" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter Property="Background" TargetName="Bd" Value="{StaticResource ComboBoxItem.ItemsviewSelectedHover.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource ComboBoxItem.ItemsviewSelectedHover.Border}"/>
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource ComboBoxItem.ItemsviewSelectedHover.Background}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource ComboBoxItem.ItemsviewSelectedHover.Border}" />
                             </MultiTrigger>
                             <MultiTrigger>
                                 <MultiTrigger.Conditions>
-                                    <Condition Property="IsSelected" Value="True"/>
-                                    <Condition Property="IsMouseOver" Value="False"/>
-                                    <Condition Property="IsKeyboardFocused" Value="False"/>
+                                    <Condition Property="IsSelected" Value="True" />
+                                    <Condition Property="IsMouseOver" Value="False" />
+                                    <Condition Property="IsKeyboardFocused" Value="False" />
                                 </MultiTrigger.Conditions>
-                                <Setter Property="Background" TargetName="Bd" Value="{StaticResource ComboBoxItem.ItemsviewSelectedNoFocus.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource ComboBoxItem.ItemsviewSelectedNoFocus.Border}"/>
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource ComboBoxItem.ItemsviewSelectedNoFocus.Background}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource ComboBoxItem.ItemsviewSelectedNoFocus.Border}" />
                             </MultiTrigger>
                             <MultiTrigger>
                                 <MultiTrigger.Conditions>
-                                    <Condition Property="IsSelected" Value="False"/>
-                                    <Condition Property="IsMouseOver" Value="False"/>
-                                    <Condition Property="IsKeyboardFocused" Value="True"/>
+                                    <Condition Property="IsSelected" Value="False" />
+                                    <Condition Property="IsMouseOver" Value="False" />
+                                    <Condition Property="IsKeyboardFocused" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource ComboBoxItem.Itemsview.Border}"/>
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource ComboBoxItem.Itemsview.Border}" />
                             </MultiTrigger>
                             <MultiTrigger>
                                 <MultiTrigger.Conditions>
-                                    <Condition Property="IsSelected" Value="False"/>
-                                    <Condition Property="IsMouseOver" Value="True"/>
-                                    <Condition Property="IsKeyboardFocused" Value="True"/>
+                                    <Condition Property="IsSelected" Value="False" />
+                                    <Condition Property="IsMouseOver" Value="True" />
+                                    <Condition Property="IsKeyboardFocused" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter Property="Background" TargetName="Bd" Value="{StaticResource ComboBoxItem.ItemsviewHoverFocus.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource ComboBoxItem.ItemsviewHoverFocus.Border}"/>
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource ComboBoxItem.ItemsviewHoverFocus.Background}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource ComboBoxItem.ItemsviewHoverFocus.Border}" />
                             </MultiTrigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
         </Style>
-        <!--#endregion -->
+        <!--#endregion-->
 
         <!--#region Button Style-->
 
-        <!-- Required states: Base, ActiveCrafting, Processing -->
-
-        <!-- Crafting -->
-        <SolidColorBrush x:Key="Button.Crafting.Static.Background" Color="#4f0c1d"/>
-        <SolidColorBrush x:Key="Button.Crafting.Static.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Crafting.MouseOver.Background" Color="#991436"/>
-        <SolidColorBrush x:Key="Button.Crafting.MouseOver.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Crafting.Focused.Border" Color="#a2cefc"/>
-        <SolidColorBrush x:Key="Button.Crafting.Pressed.Background" Color="#380815"/>
-        <SolidColorBrush x:Key="Button.Crafting.Pressed.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Crafting.Disabled.Background" Color="#FFF4F4F4"/>
-        <SolidColorBrush x:Key="Button.Crafting.Disabled.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Crafting.Disabled.Foreground" Color="#FF838383"/>
-        <Style x:Key="ButtonStyleCrafting" TargetType="{x:Type Button}" x:Name="ButtonStyleCrafting">
-            <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-            <Setter Property="Background" Value="{StaticResource Button.Crafting.Static.Background}"/>
-            <Setter Property="BorderBrush" Value="{StaticResource Button.Crafting.Static.Border}"/>
-            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="Padding" Value="1"/>
+        <!--  Required states: Base, ActiveCrafting, Processing  -->
+
+        <!--  Crafting  -->
+        <SolidColorBrush x:Key="Button.Crafting.Static.Background" Color="#4f0c1d" />
+        <SolidColorBrush x:Key="Button.Crafting.Static.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Crafting.MouseOver.Background" Color="#991436" />
+        <SolidColorBrush x:Key="Button.Crafting.MouseOver.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Crafting.Focused.Border" Color="#a2cefc" />
+        <SolidColorBrush x:Key="Button.Crafting.Pressed.Background" Color="#380815" />
+        <SolidColorBrush x:Key="Button.Crafting.Pressed.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Crafting.Disabled.Background" Color="#FFF4F4F4" />
+        <SolidColorBrush x:Key="Button.Crafting.Disabled.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Crafting.Disabled.Foreground" Color="#FF838383" />
+        <Style
+            x:Key="ButtonStyleCrafting"
+            x:Name="ButtonStyleCrafting"
+            TargetType="{x:Type Button}">
+            <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
+            <Setter Property="Background" Value="{StaticResource Button.Crafting.Static.Background}" />
+            <Setter Property="BorderBrush" Value="{StaticResource Button.Crafting.Static.Border}" />
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Padding" Value="1" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
-                        <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                            <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <Border
+                            x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="true">
+                            <ContentPresenter
+                                x:Name="contentPresenter"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Focusable="False"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsDefaulted" Value="true">
-                                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                                <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
                             </Trigger>
                             <Trigger Property="IsFocused" Value="true">
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Crafting.Focused.Border}"/>
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.Crafting.Focused.Border}" />
                             </Trigger>
                             <Trigger Property="IsMouseOver" Value="true">
-                                <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Crafting.MouseOver.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Crafting.MouseOver.Border}"/>
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Button.Crafting.MouseOver.Background}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.Crafting.MouseOver.Border}" />
                             </Trigger>
                             <Trigger Property="IsPressed" Value="true">
-                                <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Crafting.Pressed.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Crafting.Pressed.Border}"/>
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Button.Crafting.Pressed.Background}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.Crafting.Pressed.Border}" />
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="false">
-                                <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Crafting.Disabled.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Crafting.Disabled.Border}"/>
-                                <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Crafting.Disabled.Foreground}"/>
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Button.Crafting.Disabled.Background}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.Crafting.Disabled.Border}" />
+                                <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{StaticResource Button.Crafting.Disabled.Foreground}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -462,51 +605,66 @@
             </Setter>
         </Style>
 
-        <!-- Processing -->
-        <SolidColorBrush x:Key="Button.Processing.Static.Background" Color="#4f4f4f"/>
-        <SolidColorBrush x:Key="Button.Processing.Static.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Processing.MouseOver.Background" Color="#666666"/>
-        <SolidColorBrush x:Key="Button.Processing.MouseOver.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Processing.Pressed.Background" Color="#4d4d4d"/>
-        <SolidColorBrush x:Key="Button.Processing.Pressed.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Processing.Disabled.Background" Color="#FFF4F4F4"/>
-        <SolidColorBrush x:Key="Button.Processing.Disabled.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Processing.Disabled.Foreground" Color="#FF838383"/>
-        <Style x:Key="ButtonStyleProcessing" TargetType="{x:Type Button}" x:Name="ButtonStyleProcessing">
-            <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-            <Setter Property="Background" Value="{StaticResource Button.Processing.Static.Background}"/>
-            <Setter Property="BorderBrush" Value="{StaticResource Button.Processing.Static.Border}"/>
-            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="Padding" Value="1"/>
+        <!--  Processing  -->
+        <SolidColorBrush x:Key="Button.Processing.Static.Background" Color="#4f4f4f" />
+        <SolidColorBrush x:Key="Button.Processing.Static.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Processing.MouseOver.Background" Color="#666666" />
+        <SolidColorBrush x:Key="Button.Processing.MouseOver.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Processing.Pressed.Background" Color="#4d4d4d" />
+        <SolidColorBrush x:Key="Button.Processing.Pressed.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Processing.Disabled.Background" Color="#FFF4F4F4" />
+        <SolidColorBrush x:Key="Button.Processing.Disabled.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Processing.Disabled.Foreground" Color="#FF838383" />
+        <Style
+            x:Key="ButtonStyleProcessing"
+            x:Name="ButtonStyleProcessing"
+            TargetType="{x:Type Button}">
+            <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
+            <Setter Property="Background" Value="{StaticResource Button.Processing.Static.Background}" />
+            <Setter Property="BorderBrush" Value="{StaticResource Button.Processing.Static.Border}" />
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Padding" Value="1" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
-                        <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                            <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <Border
+                            x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="true">
+                            <ContentPresenter
+                                x:Name="contentPresenter"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Focusable="False"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsDefaulted" Value="true">
-                                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                                <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
                             </Trigger>
                             <Trigger Property="IsFocused" Value="true">
-                                <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Processing.MouseOver.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Processing.MouseOver.Border}"/>
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Button.Processing.MouseOver.Background}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.Processing.MouseOver.Border}" />
                             </Trigger>
                             <Trigger Property="IsMouseOver" Value="true">
-                                <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Processing.MouseOver.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Processing.MouseOver.Border}"/>
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Button.Processing.MouseOver.Background}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.Processing.MouseOver.Border}" />
                             </Trigger>
                             <Trigger Property="IsPressed" Value="true">
-                                <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Processing.Pressed.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Processing.Pressed.Border}"/>
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Button.Processing.Pressed.Background}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.Processing.Pressed.Border}" />
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="false">
-                                <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Processing.Disabled.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Processing.Disabled.Border}"/>
-                                <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Processing.Disabled.Foreground}"/>
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Button.Processing.Disabled.Background}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.Processing.Disabled.Border}" />
+                                <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{StaticResource Button.Processing.Disabled.Foreground}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -515,51 +673,66 @@
         </Style>
 
 
-        <!-- Idle -->
-        <SolidColorBrush x:Key="Button.Static.Background" Color="#201834"/>
-        <SolidColorBrush x:Key="Button.Static.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#2f2842"/>
-        <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Focus.Border" Color="#a2cefc"/>
-        <SolidColorBrush x:Key="Button.Pressed.Background" Color="#231e30"/>
-        <SolidColorBrush x:Key="Button.Pressed.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
-        <SolidColorBrush x:Key="Button.Disabled.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
-        <Style x:Key="ButtonStyleIdle" TargetType="{x:Type Button}" x:Name="ButtonStyleIdle">
-            <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-            <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
-            <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
-            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="Padding" Value="1"/>
+        <!--  Idle  -->
+        <SolidColorBrush x:Key="Button.Static.Background" Color="#201834" />
+        <SolidColorBrush x:Key="Button.Static.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#2f2842" />
+        <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Focus.Border" Color="#a2cefc" />
+        <SolidColorBrush x:Key="Button.Pressed.Background" Color="#231e30" />
+        <SolidColorBrush x:Key="Button.Pressed.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4" />
+        <SolidColorBrush x:Key="Button.Disabled.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383" />
+        <Style
+            x:Key="ButtonStyleIdle"
+            x:Name="ButtonStyleIdle"
+            TargetType="{x:Type Button}">
+            <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
+            <Setter Property="Background" Value="{StaticResource Button.Static.Background}" />
+            <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}" />
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Padding" Value="1" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
-                        <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                            <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <Border
+                            x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="true">
+                            <ContentPresenter
+                                x:Name="contentPresenter"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Focusable="False"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsDefaulted" Value="true">
-                                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                                <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
                             </Trigger>
                             <Trigger Property="IsFocused" Value="true">
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Focus.Border}"/>
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.Focus.Border}" />
                             </Trigger>
                             <Trigger Property="IsMouseOver" Value="true">
-                                <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Button.MouseOver.Background}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.MouseOver.Border}" />
                             </Trigger>
                             <Trigger Property="IsPressed" Value="true">
-                                <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Button.Pressed.Background}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.Pressed.Border}" />
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="false">
-                                <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
-                                <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Button.Disabled.Background}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.Disabled.Border}" />
+                                <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{StaticResource Button.Disabled.Foreground}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -570,220 +743,1123 @@
         <!--#endregion-->
     </Window.Resources>
     <Window.Background>
-        <ImageBrush ImageSource="Resources/Images/Background/Background 3.png"/>
+        <ImageBrush ImageSource="Resources/Images/Background/Background 3.png" />
     </Window.Background>
 
-    <Grid x:Name="MainWindowGrid" Margin="0" KeyboardNavigation.TabNavigation="Continue" Width="575" HorizontalAlignment="Center" VerticalAlignment="Center" Height="395">
+    <Grid
+        x:Name="MainWindowGrid"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        Grid.IsSharedSizeScope="True"
+        KeyboardNavigation.TabNavigation="Continue">
         <Grid.Background>
-            <ImageBrush ImageSource="Resources/Images/Background/Background 3.png"/>
+            <ImageBrush ImageSource="Resources/Images/Background/Background 3.png" />
         </Grid.Background>
         <Grid.RowDefinitions>
-            <RowDefinition Height="70"/>
-            <RowDefinition x:Name="RowContainers" Height="235"/>
-            <RowDefinition Height="90"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="320"/>
-            <ColumnDefinition Width="255"/>
+            <ColumnDefinition Width="Auto" SharedSizeGroup="A" />
+            <ColumnDefinition Width="Auto" SharedSizeGroup="A" />
         </Grid.ColumnDefinitions>
 
-        <!-- TITLE -->
-        <Label x:Name="LabelTitle" Content="AutoSynthesis" Margin="195,10,0,0" VerticalAlignment="Top" Height="55" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" VerticalContentAlignment="Center" FontSize="36" FontWeight="Bold" Foreground="#FFDCEDFF" HorizontalContentAlignment="Center" Width="250" HorizontalAlignment="Left" Grid.ColumnSpan="2">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-
-        <!-- MACRO 1 -->
-        <Label x:Name="LabelMacros" Content="Macros" HorizontalAlignment="Left" Margin="10,0,0,0" VerticalAlignment="Top" Height="25" Width="75" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" VerticalContentAlignment="Center" FontSize="20" FontWeight="Bold" Grid.Row="1" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <Label x:Name="LabelMacrosTime" Content="Macro Time (sec)" Margin="200,0,0,0.3" VerticalAlignment="Top" Height="25" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" VerticalContentAlignment="Bottom" HorizontalContentAlignment="Right" Grid.Row="1" HorizontalAlignment="Left" Width="110" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <Label x:Name="LabelMacro1" Content="Macro 1" HorizontalAlignment="Left" Margin="10,25,0,0" VerticalAlignment="Top" Height="25" Width="75" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" VerticalContentAlignment="Center" FontSize="17" Grid.Row="1" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <TextBox x:Name="TXBMacro1Key" HorizontalAlignment="Left" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Height="25" Margin="105,25,0,0" VerticalAlignment="Top" Width="170" IsReadOnly="True" PreviewKeyDown="HotkeyKeyDown" PreviewKeyUp="HotkeyKeyUp" GotFocus="HotkeyTextboxGainFocus" LostFocus="HotkeyTextboxLoseFocus" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" MaxLines="1" Grid.Row="1" Opacity="0.9" Background="#FFDCEDFF" TextChanged="InputTextChange" FontSize="16" MouseDoubleClick="HotkeyInputDoubleClick"/>
-        <TextBox x:Name="TXBMacro1Timer" HorizontalAlignment="Left" Height="25" Margin="280,25,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="30" IsReadOnly="True" KeyDown="SetTimeValue" GotFocus="TimeGetFocus" LostFocus="TimeLostFocus" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" HorizontalContentAlignment="Center" VerticalContentAlignment="Bottom" FontSize="16" Grid.Row="1" Opacity="0.9" Background="#FFDCEDFF" Text="0"/>
-
-        <!-- MACRO 2 -->
-        <Label x:Name="LabelMacro2" Content="Macro 2" HorizontalAlignment="Left" Margin="10,55,0,0" VerticalAlignment="Top" Height="25" Width="75" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" VerticalContentAlignment="Center" FontSize="17" Grid.Row="1" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <CheckBox x:Name="CHBMacro2" Content="" HorizontalAlignment="Left" Margin="85,55,0,0" VerticalAlignment="Top" Height="25" Width="20" Checked="CHBMacro2_Checked" Unchecked="CHBMacro2_Checked" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" VerticalContentAlignment="Center" BorderThickness="1" ClipToBounds="True" HorizontalContentAlignment="Center" Grid.Row="1" Opacity="0.9" Background="#FFDCEDFF" GotFocus="CheckFocusGain" LostFocus="CheckFocusLoss"/>
-        <TextBox x:Name="TXBMacro2Key" MouseDoubleClick="HotkeyInputDoubleClick" TextChanged="InputTextChange" HorizontalAlignment="Left" Height="25" Margin="105,55,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="170" IsReadOnly="True" PreviewKeyDown="HotkeyKeyDown" PreviewKeyUp="HotkeyKeyUp" GotFocus="HotkeyTextboxGainFocus" LostFocus="HotkeyTextboxLoseFocus" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="16" Grid.Row="1" Opacity="0.9" Background="#FFDCEDFF" IsEnabled="False"/>
-        <TextBox x:Name="TXBMacro2Timer" HorizontalAlignment="Left" Height="25" Margin="280,55,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="30" IsReadOnly="True" KeyDown="SetTimeValue" GotFocus="TimeGetFocus" LostFocus="TimeLostFocus" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" HorizontalContentAlignment="Center" VerticalContentAlignment="Bottom" FontSize="16" Grid.Row="1" Opacity="0.9" Background="#FFDCEDFF" IsEnabled="False" Text="0"/>
-
-        <!-- MACRO 3 -->
-        <Label x:Name="LabelMacro3" Content="Macro 3" HorizontalAlignment="Left" Margin="10,85,0,0" VerticalAlignment="Top" Height="25" Width="75" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" VerticalContentAlignment="Center" FontSize="17" Grid.Row="1" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <CheckBox x:Name="CHBMacro3" GotFocus="CheckFocusGain" LostFocus="CheckFocusLoss" Content="" HorizontalAlignment="Left" Margin="85,85,0,0" VerticalAlignment="Top" Height="25" Width="20" Checked="CHBMacro3_Checked" Unchecked="CHBMacro3_Checked" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Grid.Row="1" Opacity="0.9" Background="#FFDCEDFF"/>
-        <TextBox x:Name="TXBMacro3Key" MouseDoubleClick="HotkeyInputDoubleClick" TextChanged="InputTextChange" HorizontalAlignment="Left" Height="25" Margin="105,85,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="170" IsReadOnly="True" PreviewKeyDown="HotkeyKeyDown" PreviewKeyUp="HotkeyKeyUp" GotFocus="HotkeyTextboxGainFocus" LostFocus="HotkeyTextboxLoseFocus" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="16" Grid.Row="1" Opacity="0.9" Background="#FFDCEDFF" IsEnabled="False"/>
-        <TextBox x:Name="TXBMacro3Timer" HorizontalAlignment="Left" Height="25" Margin="280,85,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="30" IsReadOnly="True" KeyDown="SetTimeValue" GotFocus="TimeGetFocus" LostFocus="TimeLostFocus" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" HorizontalContentAlignment="Center" VerticalContentAlignment="Bottom" FontSize="16" Grid.Row="1" Opacity="0.9" Background="#FFDCEDFF" IsEnabled="False" Text="0"/>
-
-        <!-- Food -->
-        <Label x:Name="LabelConsumables" Content="Consumables" HorizontalAlignment="Left" Margin="10,120,0,0" VerticalAlignment="Top" Height="25" Width="129" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" VerticalContentAlignment="Center" FontSize="20" FontWeight="Bold" Grid.Row="1" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <Label x:Name="LabelFoodTime" Content="Time Remaining (min)" Margin="167,119.6,0,0" VerticalAlignment="Top" Height="25" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" VerticalContentAlignment="Bottom" HorizontalContentAlignment="Right" Grid.Row="1" HorizontalAlignment="Left" Width="143" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <Label x:Name="LabelFood" Content="Food" HorizontalAlignment="Left" Margin="10,145,0,0" VerticalAlignment="Top" Height="25" Width="75" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" VerticalContentAlignment="Center" FontSize="17" Grid.Row="1" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <CheckBox x:Name="CHBFood" GotFocus="CheckFocusGain" LostFocus="CheckFocusLoss" Content="" HorizontalAlignment="Left" Margin="85,145,0,0" VerticalAlignment="Top" Height="25" Width="20" Checked="CHBFood_Checked" Unchecked="CHBFood_Checked" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" Grid.Row="1" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Opacity="0.9" Background="#FFDCEDFF"/>
-        <TextBox x:Name="TXBFoodKey" MouseDoubleClick="HotkeyInputDoubleClick" TextChanged="InputTextChange" HorizontalAlignment="Left" Height="25" Margin="105,145,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="170" IsReadOnly="True" PreviewKeyDown="HotkeyKeyDown" PreviewKeyUp="HotkeyKeyUp" GotFocus="HotkeyTextboxGainFocus" LostFocus="HotkeyTextboxLoseFocus" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="16" Grid.Row="1" Opacity="0.9" Background="#FFDCEDFF" IsEnabled="False"/>
-        <TextBox x:Name="TXBFoodTimer" HorizontalAlignment="Left" Height="26" Margin="280,145,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="30" IsReadOnly="True" KeyDown="SetTimeValue" GotFocus="TimeGetFocus" LostFocus="TimeLostFocus" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="16" Grid.Row="1" Opacity="0.9" Background="#FFDCEDFF" IsEnabled="False" Text="0"/>
-
-        <!-- Syrup -->
-        <Label x:Name="LabelSyrup" Content="Syrup" HorizontalAlignment="Left" Margin="10,175,0,0" VerticalAlignment="Top" Height="25" Width="75" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" VerticalContentAlignment="Center" FontSize="17" Grid.Row="1" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <CheckBox x:Name="CHBSyrup" GotFocus="CheckFocusGain" LostFocus="CheckFocusLoss" Content="" HorizontalAlignment="Left" Margin="85,175,0,0" VerticalAlignment="Top" Height="25" Width="20" Checked="CHBSyrup_Checked" Unchecked="CHBSyrup_Checked" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" Grid.Row="1" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Opacity="0.9" Background="#FFDCEDFF"/>
-        <TextBox x:Name="TXBSyrupKey" MouseDoubleClick="HotkeyInputDoubleClick" TextChanged="InputTextChange" HorizontalAlignment="Left" Height="25" Margin="105,175,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="170" IsReadOnly="True" PreviewKeyDown="HotkeyKeyDown" PreviewKeyUp="HotkeyKeyUp" GotFocus="HotkeyTextboxGainFocus" LostFocus="HotkeyTextboxLoseFocus" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="16" Grid.Row="1" Opacity="0.9" Background="#FFDCEDFF" IsEnabled="False"/>
-        <TextBox x:Name="TXBSyrupTimer" HorizontalAlignment="Left" Height="25" Margin="280,175,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="30" IsReadOnly="True" KeyDown="SetTimeValue" GotFocus="TimeGetFocus" LostFocus="TimeLostFocus" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="16" Grid.Row="1" Opacity="0.9" Background="#FFDCEDFF" IsEnabled="False" Text="0"/>
-
-        <!-- Food Duration -->
-        <Label x:Name="LabelFoodTimer" Content="Food Duration" HorizontalAlignment="Left" Margin="10,205,0,0" VerticalAlignment="Top" Height="25" Width="129" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" VerticalContentAlignment="Center" FontSize="17" Grid.Row="1" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <RadioButton x:Name="RDFood30" GotFocus="CheckRadioGain" LostFocus="CheckRadioLoss"  Content="30 Min" HorizontalAlignment="Left" Margin="135,205,0,0" VerticalAlignment="Top" Width="55" GroupName="RDFoodTimer" IsChecked="True" Checked="RDFood30_Checked" Height="25" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="1" VerticalContentAlignment="Center" Padding="0,1,0,0" Foreground="#FFDCEDFF" FontSize="13" Background="#FFDCEDFF">
-            <RadioButton.Effect>
-                <DropShadowEffect ShadowDepth="1" BlurRadius="1"/>
-            </RadioButton.Effect>
-        </RadioButton>
-        <RadioButton x:Name="RDFood40" GotFocus="CheckRadioGain" LostFocus="CheckRadioLoss" Content="40 Min" HorizontalAlignment="Left" Margin="195,205,0,0" VerticalAlignment="Top" Width="55" GroupName="RDFoodTimer" Checked="RDFood40_Checked" Height="25" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="1" VerticalContentAlignment="Center" Padding="0,1,0,0" Foreground="#FFDCEDFF" FontSize="13" Background="#FFDCEDFF">
-            <RadioButton.Effect>
-                <DropShadowEffect ShadowDepth="1" BlurRadius="1"/>
-            </RadioButton.Effect>
-        </RadioButton>
-        <RadioButton x:Name="RDFood45" GotFocus="CheckRadioGain" LostFocus="CheckRadioLoss" Content="45 Min" HorizontalAlignment="Left" Margin="255,205,0,0" VerticalAlignment="Top" Width="55" GroupName="RDFoodTimer" Checked="RDFood45_Checked" Height="25" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="1" VerticalContentAlignment="Center" Padding="0,1,0,0" Foreground="#FFDCEDFF" FontSize="13" Background="#FFDCEDFF">
-            <RadioButton.Effect>
-                <DropShadowEffect ShadowDepth="1" BlurRadius="1"/>
-            </RadioButton.Effect>
-        </RadioButton>
-
-        <!-- Confirm -->
-        <Label x:Name="LabelSelectConfirm" Content="Confirm" HorizontalAlignment="Left" Margin="0,25,0,0" VerticalAlignment="Top" Height="25" Width="75" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" VerticalContentAlignment="Center" FontSize="17" Grid.Row="1" Grid.Column="1" Padding="0" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <TextBox x:Name="TXBConfirmKey" MouseDoubleClick="HotkeyInputDoubleClick" TextChanged="InputTextChange" HorizontalAlignment="Left" Height="25" Margin="75,25,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="169" IsReadOnly="True" PreviewKeyDown="HotkeyKeyDown" PreviewKeyUp="HotkeyKeyUp" GotFocus="HotkeyTextboxGainFocus" LostFocus="HotkeyTextboxLoseFocus" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Grid.Row="1" Grid.Column="1" FontSize="16" Opacity="0.9" Background="#FFDCEDFF"/>
-
-        <!-- Cancel -->
-        <Label x:Name="LabelCancel" Content="Cancel" HorizontalAlignment="Left" Margin="0,55,0,0" VerticalAlignment="Top" Height="25" Width="75" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" VerticalContentAlignment="Center" FontSize="17" Grid.Row="1" Grid.Column="1" Padding="0" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <TextBox x:Name="TXBCancelKey" MouseDoubleClick="HotkeyInputDoubleClick" TextChanged="InputTextChange" HorizontalAlignment="Left" Height="25" Margin="75,55,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="169" IsReadOnly="True" PreviewKeyDown="HotkeyKeyDown" PreviewKeyUp="HotkeyKeyUp" GotFocus="HotkeyTextboxGainFocus" LostFocus="HotkeyTextboxLoseFocus" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Grid.Row="1" Grid.Column="1" FontSize="16" Opacity="0.9" Background="#FFDCEDFF" IsEnabled="False"/>
-
-        <!-- Settings -->
-        <Label x:Name="LabelSettings" Content="Settings" HorizontalAlignment="Left" Margin="0" VerticalAlignment="Top" Height="25" Width="95" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0,0,0,1" VerticalContentAlignment="Center" FontSize="20" FontWeight="Bold" Grid.Column="1" Foreground="#FFDCEDFF" Grid.Row="1">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <Label x:Name="LabelCraftCount" Content="Craft Count" HorizontalAlignment="Left" Margin="0,85,0,0" VerticalAlignment="Top" Height="25" Width="98" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" VerticalContentAlignment="Center" FontSize="17" Grid.Row="1" Grid.Column="1" Padding="0" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <CheckBox x:Name="CHBCraftCount" GotFocus="CheckFocusGain" LostFocus="CheckFocusLoss" Content="" HorizontalAlignment="Left" Margin="105,85,0,0" VerticalAlignment="Top" Height="25" Width="20" Checked="CHBCraftCount_Checked" Unchecked="CHBCraftCount_Checked" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" Grid.Row="1" Grid.Column="1" VerticalContentAlignment="Center" Opacity="0.9" Background="#FFDCEDFF"/>
-        <TextBox x:Name="TXBCraftCount" HorizontalAlignment="Left" Height="25" Margin="130,85,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="59" IsReadOnly="True" KeyDown="SetTimeValue" GotFocus="TimeGetFocus" LostFocus="TimeLostFocus" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Grid.Row="1" Grid.Column="1" FontSize="16" Opacity="0.9" Background="#FFDCEDFF" IsEnabled="False" Text="0"/>
-        <Label x:Name="LabelCollectableCraft" Content="Collectable Craft" HorizontalAlignment="Left" Margin="0,115,0,0" VerticalAlignment="Top" Height="25" Width="137" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" VerticalContentAlignment="Center" FontSize="17" Grid.Row="1" Grid.Column="1" Padding="0" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <CheckBox x:Name="CHBCollectableCraft" GotFocus="CheckFocusGain" LostFocus="CheckFocusLoss" Content="" HorizontalAlignment="Left" Margin="145,115,0,0" VerticalAlignment="Top" Height="25" Width="20" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="1" Grid.Column="1" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Opacity="0.9" Background="#FFDCEDFF"/>
-
-        <!-- Profile Systems -->
-        <Label x:Name="LabelProfiles" Content="Profiles" HorizontalAlignment="Left" Margin="0,150,0,0" VerticalAlignment="Top" Height="25" Width="95" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Padding="0" VerticalContentAlignment="Center" FontSize="20" FontWeight="Bold" Grid.Row="1" Grid.Column="1" Foreground="#FFDCEDFF">
-            <Label.Effect>
-                <DropShadowEffect ShadowDepth="1"/>
-            </Label.Effect>
-        </Label>
-        <ComboBox x:Name="CMBProfileList" HorizontalAlignment="Left" Margin="0,175,0,0" VerticalAlignment="Top" Width="246" Height="25" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="1" Grid.Column="1" Opacity="0.85" BorderBrush="Black" Foreground="#FFBFDDFD" Background="#FFFF4D4D" Style="{DynamicResource ComboBoxNewStyle}" VerticalContentAlignment="Center" Padding="0" ItemContainerStyle="{DynamicResource ComboBoxItemStyle1}" FontSize="14"/>
-        <Button x:Name="BTNSave" Content="Save" HorizontalAlignment="Left" Margin="0,205,0,0" VerticalAlignment="Top" Width="68" Click="BTNSave_Click" Height="25" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="1" Grid.Column="1" Opacity="0.85" Style="{DynamicResource ButtonStyleIdle}" Foreground="#FFDCEDFF" FontSize="14" />
-        <Button x:Name="BTNLoad" Content="Load" HorizontalAlignment="Left" Margin="74,205,0,0" VerticalAlignment="Top" Width="68" Click="BTNLoad_Click" Height="25" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="1" Grid.Column="1" Opacity="0.85" Style="{DynamicResource ButtonStyleIdle}" Foreground="#FFDCEDFF" FontSize="14" />
-        <Button x:Name="BTNDelete" Content="Delete" HorizontalAlignment="Left" Margin="148,205,0,0" VerticalAlignment="Top" Width="68" Click="BTNDelete_Click" Height="25" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="1" Grid.Column="1" Opacity="0.85" Style="{DynamicResource ButtonStyleIdle}" Foreground="#FFDCEDFF" FontSize="14" />
-
-
-        <!-- Help -->
-        <Label x:Name="LBLHelp" Content="" Grid.Column="1" Margin="221,205,0,0" VerticalAlignment="Top" Height="25" HorizontalAlignment="Left" Width="25" MouseEnter="LBLHelp_MouseEnter" MouseLeave="LBLHelp_MouseLeave" MouseDown="LBLHelp_MouseDown" MouseUp="LBLHelp_MouseUp" Grid.Row="1" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen">
-            <Label.Background>
-                <ImageBrush ImageSource="Resources/Images/Background/InfoUnhighlighted.png">
-                    <ImageBrush.RelativeTransform>
+        <Grid
+            Name="TitleGrid"
+            Grid.Row="0"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Image
+                Name="TitleIcon"
+                Grid.Column="0"
+                Source="Resources/Icon/Icon.png"
+                Stretch="None">
+                <Image.LayoutTransform>
+                    <TransformGroup>
+                        <ScaleTransform ScaleX=".67" ScaleY=".67" />
+                        <SkewTransform />
+                        <RotateTransform />
+                        <TranslateTransform />
+                    </TransformGroup>
+                </Image.LayoutTransform>
+            </Image>
+            <Label
+                x:Name="LabelTitle"
+                Grid.Column="1"
+                Padding="10,10,10,10"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Top"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Content="AutoSynthesis"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="36"
+                FontWeight="Bold"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+        </Grid>
+
+        <Grid
+            Name="TopRightMenuGrid"
+            Grid.Row="0"
+            Grid.Column="1"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Image
+                x:Name="Minimize_Label"
+                Grid.Column="0"
+                MouseDown="MinimizeLabelMouseDown"
+                MouseEnter="MinimizeLabelMouseEnter"
+                MouseLeave="MinimizeLabelMouseExit"
+                MouseUp="MinimizeLabelMouseUp"
+                Opacity="0.5"
+                Source="Resources/Images/Buttons/Minimize to Tray.png"
+                Stretch="None"
+                ToolTip="Minimize To Tray">
+                <Image.LayoutTransform>
+                    <TransformGroup>
+                        <ScaleTransform ScaleX="0.4" ScaleY="0.4" />
+                        <SkewTransform />
+                        <RotateTransform />
+                        <TranslateTransform />
+                    </TransformGroup>
+                </Image.LayoutTransform>
+            </Image>
+            <Image
+                x:Name="AlwaysOnTop_Label"
+                Grid.Column="1"
+                MouseDown="AlwaysOnTopLabelMouseDown"
+                MouseEnter="AlwaysOnTopLabelMouseEnter"
+                MouseLeave="AlwaysOnTopLabelMouseExit"
+                MouseUp="AlwaysOnTopLabelMouseUp"
+                Opacity="0.5"
+                Source="Resources/Images/Buttons/AlwaysOnTopOff.png"
+                Stretch="None"
+                ToolTip="Always On Top">
+                <Image.LayoutTransform>
+                    <TransformGroup>
+                        <ScaleTransform ScaleX="0.4" ScaleY="0.4" />
+                        <SkewTransform />
+                        <RotateTransform />
+                        <TranslateTransform />
+                    </TransformGroup>
+                </Image.LayoutTransform>
+            </Image>
+            <Image
+                x:Name="SettingsButton"
+                Grid.Column="2"
+                MouseEnter="SettingsEnter"
+                MouseLeave="SettingsExit"
+                MouseUp="OpenSettings"
+                Opacity="0.5"
+                Source="Resources/Images/Buttons/settings.png"
+                Stretch="None"
+                ToolTip="Settings">
+                <Image.LayoutTransform>
+                    <TransformGroup>
+                        <ScaleTransform ScaleX="0.0375" ScaleY="0.0375" />
+                        <SkewTransform />
+                        <RotateTransform />
+                        <TranslateTransform />
+                    </TransformGroup>
+                </Image.LayoutTransform>
+            </Image>
+        </Grid>
+
+        <Grid
+            Name="LeftGrid"
+            Grid.Row="1"
+            Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <!--  Macros Title Bar  -->
+            <Label
+                x:Name="LabelMacros"
+                Grid.Row="0"
+                Grid.Column="0"
+                Grid.ColumnSpan="2"
+                Padding="5,5,5,5"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                VerticalContentAlignment="Center"
+                Content="Macros"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="20"
+                FontWeight="Bold"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+            <Label
+                x:Name="LabelMacrosTime"
+                Grid.Row="0"
+                Grid.Column="2"
+                Grid.ColumnSpan="2"
+                Padding="5,5,5,5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Content="Macro Time (sec)"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+
+            <!--  Macros 1  -->
+            <Label
+                x:Name="LabelMacro1"
+                Grid.Row="1"
+                Content="Macro 1"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="17"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+            <TextBox
+                x:Name="TXBMacro1Key"
+                Grid.Row="1"
+                Grid.Column="2"
+                Margin="2,2,2,2"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                FontFamily="/Autoynthesis;component/Resources/Fonts/#Sen"
+                FontSize="16"
+                GotFocus="HotkeyTextboxGainFocus"
+                IsReadOnly="True"
+                LostFocus="HotkeyTextboxLoseFocus"
+                MouseDoubleClick="HotkeyInputDoubleClick"
+                Opacity="0.9"
+                PreviewKeyDown="HotkeyKeyDown"
+                PreviewKeyUp="HotkeyKeyUp"
+                Text="1"
+                TextChanged="InputTextChange" />
+            <TextBox
+                x:Name="TXBMacro1Timer"
+                Grid.Row="1"
+                Grid.Column="3"
+                Width="30"
+                Margin="2,2,2,2"
+                Padding="2,2,2,2"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="16"
+                GotFocus="TimeGetFocus"
+                IsReadOnly="True"
+                KeyDown="SetTimeValue"
+                LostFocus="TimeLostFocus"
+                Opacity="0.9"
+                Text="99" />
+
+            <!--  MACRO 2  -->
+            <Label
+                x:Name="LabelMacro2"
+                Grid.Row="2"
+                Content="Macro 2"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="17"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+            <CheckBox
+                x:Name="CHBMacro2"
+                Grid.Row="2"
+                Grid.Column="1"
+                Margin="5,5,5,5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Background="#FFDCEDFF"
+                Checked="CHBMacro2_Checked"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                GotFocus="CheckFocusGain"
+                LostFocus="CheckFocusLoss"
+                Opacity="0.9"
+                Unchecked="CHBMacro2_Checked" />
+            <TextBox
+                x:Name="TXBMacro2Key"
+                Grid.Row="2"
+                Grid.Column="2"
+                Margin="2,2,2,2"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="16"
+                GotFocus="HotkeyTextboxGainFocus"
+                IsEnabled="False"
+                IsReadOnly="True"
+                LostFocus="HotkeyTextboxLoseFocus"
+                MouseDoubleClick="HotkeyInputDoubleClick"
+                Opacity="0.9"
+                PreviewKeyDown="HotkeyKeyDown"
+                PreviewKeyUp="HotkeyKeyUp"
+                Text="2"
+                TextChanged="InputTextChange"
+                TextWrapping="Wrap" />
+            <TextBox
+                x:Name="TXBMacro2Timer"
+                Grid.Row="2"
+                Grid.Column="3"
+                Width="30"
+                Margin="2,2,2,2"
+                Padding="2,2,2,2"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="16"
+                GotFocus="TimeGetFocus"
+                IsEnabled="False"
+                IsReadOnly="True"
+                KeyDown="SetTimeValue"
+                LostFocus="TimeLostFocus"
+                Opacity="0.9"
+                Text="0"
+                TextWrapping="Wrap" />
+
+            <!--  MACRO 3  -->
+            <Label
+                x:Name="LabelMacro3"
+                Grid.Row="3"
+                Content="Macro 3"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="17"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+            <CheckBox
+                x:Name="CHBMacro3"
+                Grid.Row="3"
+                Grid.Column="1"
+                Margin="5,5,5,5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Background="#FFDCEDFF"
+                Checked="CHBMacro3_Checked"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                GotFocus="CheckFocusGain"
+                LostFocus="CheckFocusLoss"
+                Opacity="0.9"
+                Unchecked="CHBMacro3_Checked" />
+            <TextBox
+                x:Name="TXBMacro3Key"
+                Grid.Row="3"
+                Grid.Column="2"
+                Margin="2,2,2,2"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="16"
+                GotFocus="HotkeyTextboxGainFocus"
+                IsEnabled="False"
+                IsReadOnly="True"
+                LostFocus="HotkeyTextboxLoseFocus"
+                MouseDoubleClick="HotkeyInputDoubleClick"
+                Opacity="0.9"
+                PreviewKeyDown="HotkeyKeyDown"
+                PreviewKeyUp="HotkeyKeyUp"
+                Text="3"
+                TextChanged="InputTextChange"
+                TextWrapping="Wrap" />
+            <TextBox
+                x:Name="TXBMacro3Timer"
+                Grid.Row="3"
+                Grid.Column="3"
+                Width="30"
+                Margin="2,2,2,2"
+                Padding="2,2,2,2"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="16"
+                GotFocus="TimeGetFocus"
+                IsEnabled="False"
+                IsReadOnly="True"
+                KeyDown="SetTimeValue"
+                LostFocus="TimeLostFocus"
+                Opacity="0.9"
+                Text="0"
+                TextWrapping="Wrap" />
+
+            <!--  Food  -->
+            <Label
+                x:Name="LabelConsumables"
+                Grid.Row="4"
+                Grid.Column="0"
+                Grid.ColumnSpan="2"
+                Padding="5,5,5,5"
+                HorizontalAlignment="Left"
+                Content="Consumables"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="20"
+                FontWeight="Bold"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+            <Label
+                x:Name="LabelFoodTime"
+                Grid.Row="4"
+                Grid.Column="2"
+                Grid.ColumnSpan="2"
+                Padding="5,5,5,5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Content="Time Remaining (min)"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+            <Label
+                x:Name="LabelFood"
+                Grid.Row="5"
+                Content="Food"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="17"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+            <CheckBox
+                x:Name="CHBFood"
+                Grid.Row="5"
+                Grid.Column="1"
+                Margin="5,5,5,5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Background="#FFDCEDFF"
+                Checked="CHBFood_Checked"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                GotFocus="CheckFocusGain"
+                LostFocus="CheckFocusLoss"
+                Opacity="0.9"
+                Unchecked="CHBFood_Checked" />
+            <TextBox
+                x:Name="TXBFoodKey"
+                Grid.Row="5"
+                Grid.Column="2"
+                Margin="2,2,2,2"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="16"
+                GotFocus="HotkeyTextboxGainFocus"
+                IsEnabled="False"
+                IsReadOnly="True"
+                LostFocus="HotkeyTextboxLoseFocus"
+                MouseDoubleClick="HotkeyInputDoubleClick"
+                Opacity="0.9"
+                PreviewKeyDown="HotkeyKeyDown"
+                PreviewKeyUp="HotkeyKeyUp"
+                Text="F"
+                TextChanged="InputTextChange"
+                TextWrapping="Wrap" />
+            <TextBox
+                x:Name="TXBFoodTimer"
+                Grid.Row="5"
+                Grid.Column="3"
+                Width="30"
+                Margin="2,2,2,2"
+                Padding="2,2,2,2"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="16"
+                GotFocus="TimeGetFocus"
+                IsEnabled="False"
+                IsReadOnly="True"
+                KeyDown="SetTimeValue"
+                LostFocus="TimeLostFocus"
+                Opacity="0.9"
+                Text="0"
+                TextWrapping="Wrap" />
+
+            <!--  Syrup  -->
+            <Label
+                x:Name="LabelSyrup"
+                Grid.Row="7"
+                Grid.Column="0"
+                Content="Syrup"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="17"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+            <CheckBox
+                x:Name="CHBSyrup"
+                Grid.Row="7"
+                Grid.Column="1"
+                Margin="5,5,5,5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                Checked="CHBSyrup_Checked"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                GotFocus="CheckFocusGain"
+                LostFocus="CheckFocusLoss"
+                Opacity="0.9"
+                Unchecked="CHBSyrup_Checked" />
+            <TextBox
+                x:Name="TXBSyrupKey"
+                Grid.Row="7"
+                Grid.Column="2"
+                Margin="2,2,2,2"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="16"
+                GotFocus="HotkeyTextboxGainFocus"
+                IsEnabled="False"
+                IsReadOnly="True"
+                LostFocus="HotkeyTextboxLoseFocus"
+                MouseDoubleClick="HotkeyInputDoubleClick"
+                Opacity="0.9"
+                PreviewKeyDown="HotkeyKeyDown"
+                PreviewKeyUp="HotkeyKeyUp"
+                Text="S"
+                TextChanged="InputTextChange"
+                TextWrapping="Wrap" />
+            <TextBox
+                x:Name="TXBSyrupTimer"
+                Grid.Row="7"
+                Grid.Column="3"
+                Width="30"
+                Margin="2,2,2,2"
+                Padding="2,2,2,2"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="16"
+                GotFocus="TimeGetFocus"
+                IsEnabled="False"
+                IsReadOnly="True"
+                KeyDown="SetTimeValue"
+                LostFocus="TimeLostFocus"
+                Opacity="0.9"
+                Text="0"
+                TextWrapping="Wrap" />
+        </Grid>
+
+        <Grid
+            Name="FoodTimerGrid"
+            Grid.Row="2"
+            Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <!--  Food Duration  -->
+            <Label
+                x:Name="LabelFoodTimer"
+                Grid.Row="0"
+                Grid.Column="0"
+                Padding="5,5,5,5"
+                HorizontalAlignment="Left"
+                VerticalContentAlignment="Center"
+                Content="Food Duration"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="17"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+            <RadioButton
+                x:Name="RDFood30"
+                Grid.Row="0"
+                Grid.Column="1"
+                Margin="5,5,5,5"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                Checked="RDFood30_Checked"
+                Content="30 Min"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="13"
+                Foreground="#FFDCEDFF"
+                GotFocus="CheckRadioGain"
+                GroupName="RDFoodTimer"
+                IsChecked="True"
+                LostFocus="CheckRadioLoss">
+                <RadioButton.Effect>
+                    <DropShadowEffect BlurRadius="1" ShadowDepth="1" />
+                </RadioButton.Effect>
+            </RadioButton>
+            <RadioButton
+                x:Name="RDFood40"
+                Grid.Row="0"
+                Grid.Column="2"
+                Margin="5,5,5,5"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                Checked="RDFood40_Checked"
+                Content="40 Min"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="13"
+                Foreground="#FFDCEDFF"
+                GotFocus="CheckRadioGain"
+                GroupName="RDFoodTimer"
+                LostFocus="CheckRadioLoss">
+                <RadioButton.Effect>
+                    <DropShadowEffect BlurRadius="1" ShadowDepth="1" />
+                </RadioButton.Effect>
+            </RadioButton>
+            <RadioButton
+                x:Name="RDFood45"
+                Grid.Row="0"
+                Grid.Column="3"
+                Margin="5,5,5,5"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                Checked="RDFood45_Checked"
+                Content="45 Min"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="13"
+                Foreground="#FFDCEDFF"
+                GotFocus="CheckRadioGain"
+                GroupName="RDFoodTimer"
+                LostFocus="CheckRadioLoss">
+                <RadioButton.Effect>
+                    <DropShadowEffect BlurRadius="1" ShadowDepth="1" />
+                </RadioButton.Effect>
+            </RadioButton>
+
+        </Grid>
+
+        <Grid
+            Name="RightGrid"
+            Grid.Row="1"
+            Grid.RowSpan="2"
+            Grid.Column="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <!--  Settings  -->
+            <Label
+                x:Name="LabelSettings"
+                Grid.Row="0"
+                Grid.Column="0"
+                Padding="5,5,5,5"
+                VerticalContentAlignment="Center"
+                Content="Settings"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="20"
+                FontWeight="Bold"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+            <!--  Confirm  -->
+            <Label
+                x:Name="LabelSelectConfirm"
+                Grid.Row="1"
+                Grid.Column="0"
+                Content="Confirm"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="17"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+            <TextBox
+                x:Name="TXBConfirmKey"
+                Grid.Row="1"
+                Grid.Column="1"
+                Margin="2,2,2,2"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="16"
+                GotFocus="HotkeyTextboxGainFocus"
+                IsReadOnly="True"
+                LostFocus="HotkeyTextboxLoseFocus"
+                MouseDoubleClick="HotkeyInputDoubleClick"
+                Opacity="0.9"
+                PreviewKeyDown="HotkeyKeyDown"
+                PreviewKeyUp="HotkeyKeyUp"
+                TextChanged="InputTextChange"
+                TextWrapping="Wrap" />
+
+            <!--  Cancel  -->
+            <Label
+                x:Name="LabelCancel"
+                Grid.Row="2"
+                Grid.Column="0"
+                Content="Cancel"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="17"
+                Foreground="#FFDCEDFF">
+                <Label.Effect>
+                    <DropShadowEffect ShadowDepth="1" />
+                </Label.Effect>
+            </Label>
+            <TextBox
+                x:Name="TXBCancelKey"
+                Grid.Row="2"
+                Grid.Column="1"
+                Margin="2,2,2,2"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Background="#FFDCEDFF"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="16"
+                GotFocus="HotkeyTextboxGainFocus"
+                IsEnabled="False"
+                IsReadOnly="True"
+                LostFocus="HotkeyTextboxLoseFocus"
+                MouseDoubleClick="HotkeyInputDoubleClick"
+                Opacity="0.9"
+                PreviewKeyDown="HotkeyKeyDown"
+                PreviewKeyUp="HotkeyKeyUp"
+                TextChanged="InputTextChange"
+                TextWrapping="Wrap" />
+
+            <Grid
+                Name="CraftCountGrid"
+                Grid.Row="3"
+                Grid.Column="0"
+                Grid.ColumnSpan="3">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Label
+                    x:Name="LabelCraftCount"
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Content="Craft Count"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="17"
+                    Foreground="#FFDCEDFF">
+                    <Label.Effect>
+                        <DropShadowEffect ShadowDepth="1" />
+                    </Label.Effect>
+                </Label>
+                <CheckBox
+                    x:Name="CHBCraftCount"
+                    Grid.Row="4"
+                    Grid.Column="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Background="#FFDCEDFF"
+                    Checked="CHBCraftCount_Checked"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    GotFocus="CheckFocusGain"
+                    LostFocus="CheckFocusLoss"
+                    Opacity="0.9"
+                    Unchecked="CHBCraftCount_Checked" />
+                <TextBox
+                    x:Name="TXBCraftCount"
+                    Grid.Row="0"
+                    Grid.Column="2"
+                    Width="30"
+                    Margin="2,2,2,2"
+                    Padding="2,2,2,2"
+                    HorizontalContentAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    Background="#FFDCEDFF"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="16"
+                    GotFocus="TimeGetFocus"
+                    IsEnabled="False"
+                    IsReadOnly="True"
+                    KeyDown="SetTimeValue"
+                    LostFocus="TimeLostFocus"
+                    Opacity="0.9"
+                    Text="0"
+                    TextWrapping="Wrap" />
+            </Grid>
+
+            <Grid
+                Name="CollectableCraftGrid"
+                Grid.Row="4"
+                Grid.Column="0"
+                Grid.ColumnSpan="2">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Label
+                    x:Name="LabelCollectableCraft"
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Padding="5,5,5,5"
+                    Content="Collectable Craft"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="17"
+                    Foreground="#FFDCEDFF">
+                    <Label.Effect>
+                        <DropShadowEffect ShadowDepth="1" />
+                    </Label.Effect>
+                </Label>
+                <CheckBox
+                    x:Name="CHBCollectableCraft"
+                    Grid.Row="0"
+                    Grid.Column="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Background="#FFDCEDFF"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    GotFocus="CheckFocusGain"
+                    LostFocus="CheckFocusLoss"
+                    Opacity="0.9" />
+            </Grid>
+
+            <Grid
+                Name="ProfilesGrid"
+                Grid.Row="6"
+                Grid.Column="0"
+                Grid.ColumnSpan="2">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <!--  Profile Systems  -->
+                <Label
+                    x:Name="LabelProfiles"
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="4"
+                    Content="Profiles"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="20"
+                    FontWeight="Bold"
+                    Foreground="#FFDCEDFF">
+                    <Label.Effect>
+                        <DropShadowEffect ShadowDepth="1" />
+                    </Label.Effect>
+                </Label>
+                <ComboBox
+                    x:Name="CMBProfileList"
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="4"
+                    Margin="2,2,2,2"
+                    Background="#FFFF4D4D"
+                    BorderBrush="Black"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="14"
+                    Foreground="#FFBFDDFD"
+                    ItemContainerStyle="{DynamicResource ComboBoxItemStyle1}"
+                    Opacity="0.85"
+                    Style="{DynamicResource ComboBoxNewStyle}" />
+                <Button
+                    x:Name="BTNSave"
+                    Grid.Row="2"
+                    Grid.Column="0"
+                    Margin="2,2,2,2"
+                    Click="BTNSave_Click"
+                    Content="Save"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="14"
+                    Foreground="#FFDCEDFF"
+                    Opacity="0.85"
+                    Style="{DynamicResource ButtonStyleIdle}" />
+                <Button
+                    x:Name="BTNLoad"
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="2,2,2,2"
+                    Click="BTNLoad_Click"
+                    Content="Load"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="14"
+                    Foreground="#FFDCEDFF"
+                    Opacity="0.85"
+                    Style="{DynamicResource ButtonStyleIdle}" />
+                <Button
+                    x:Name="BTNDelete"
+                    Grid.Row="2"
+                    Grid.Column="2"
+                    Margin="2,2,2,2"
+                    Click="BTNDelete_Click"
+                    Content="Delete"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="14"
+                    Foreground="#FFDCEDFF"
+                    Opacity="0.85"
+                    Style="{DynamicResource ButtonStyleIdle}" />
+
+                <!--  Help  -->
+                <Image
+                    Grid.Row="2"
+                    Grid.Column="3"
+                    Margin="2,2,2,2"
+                    MouseDown="LBLHelp_MouseDown"
+                    MouseEnter="LBLHelp_MouseEnter"
+                    MouseLeave="LBLHelp_MouseLeave"
+                    MouseUp="LBLHelp_MouseUp"
+                    Source="Resources/Images/Background/InfoUnhighlighted.png">
+                    <Image.LayoutTransform>
                         <TransformGroup>
-                            <ScaleTransform CenterY="0.5" CenterX="0.5" ScaleX="0.9" ScaleY="0.9"/>
-                            <SkewTransform CenterY="0.5" CenterX="0.5"/>
-                            <RotateTransform CenterY="0.5" CenterX="0.5"/>
-                            <TranslateTransform/>
+                            <ScaleTransform ScaleX="0.5" ScaleY="0.5" />
+                            <SkewTransform />
+                            <RotateTransform />
+                            <TranslateTransform />
                         </TransformGroup>
-                    </ImageBrush.RelativeTransform>
-                </ImageBrush>
-            </Label.Background>
-        </Label>
-
-        <!-- Buttons -->
-        <Button x:Name="BTNCraft" Content="Start" HorizontalAlignment="Left" Margin="10,10,0,0" Width="100" Click="BTNCraftInitiate" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="2" Height="70" VerticalAlignment="Top" Style="{DynamicResource ButtonStyleIdle}" FontSize="18" Padding="0" Foreground="#FFDCEDFF"/>
-
-        <!-- Status -->
-        <ProgressBar x:Name="PGBOverall" HorizontalAlignment="Left" Height="20" Margin="115,10,0,0" VerticalAlignment="Top" Width="195" Maximum="1000" Background="#FF2B2B2B" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="2" BorderBrush="{x:Null}" Foreground="#FFA60732"/>
-        <ProgressBar x:Name="PGBCraft" HorizontalAlignment="Left" Height="20" Margin="115,35,0,0" VerticalAlignment="Top" Width="195" Maximum="1000" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="2" Background="#FF2B2B2B" Foreground="#FF00B1FF" BorderBrush="{x:Null}"/>
-        <ProgressBar x:Name="PGBMacro" HorizontalAlignment="Left" Margin="115,60,0,0" Width="195" Maximum="1000" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Height="20" VerticalAlignment="Top" Grid.Row="2" Background="#FF2B2B2B" Foreground="#FF7400FF" BorderBrush="{x:Null}"/>
-        <Label x:Name="LBLBackdrop" Content="" HorizontalAlignment="Left" Margin="0,10.4,0,0" VerticalAlignment="Top" Background="Black" Height="69" Width="246" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="2" Grid.Column="1" Padding="2,0" VerticalContentAlignment="Center" Foreground="#FFDCEDFF" Opacity="0.75"/>
-        <Label x:Name="LBLUpdate" Content="" HorizontalAlignment="Left" Margin="0,10,0,0" VerticalAlignment="Top" Background="Black" Height="20" Width="246" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="2" Grid.Column="1" Padding="2,0" VerticalContentAlignment="Center" Foreground="#FFDCEDFF" Opacity="0.75"/>
-        <Label x:Name="LBLCraftNumber" Content="Crafted: 99/99" Margin="0,10,10,0" VerticalAlignment="Top" Background="#7FFFFFFF" Height="20" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="2" Padding="0,1,5,0" VerticalContentAlignment="Center" Foreground="Black" HorizontalContentAlignment="Right" HorizontalAlignment="Right" Width="90" BorderThickness="1" Visibility="Hidden"/>
-        <Label x:Name="LBLUpdateFooter" Content="" HorizontalAlignment="Left" Margin="0,35,0,0" VerticalAlignment="Top" Background="Black" Height="20" Width="246" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="2" Grid.Column="1" Padding="2,0" Foreground="#FFDCEDFF" Opacity="0.75" VerticalContentAlignment="Center"/>
-
-        <Label x:Name="LBLTimerMacro" Content="Macro 3: 0:00" Margin="0,60,10,0" Grid.Row="2" VerticalAlignment="Top" Height="20" Padding="0,1,5,0" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" BorderThickness="1" HorizontalAlignment="Right" Width="90" Background="#7FFFFFFF" Visibility="Hidden"/>
-        <Label x:Name="LBLTimerCraft" Content="Craft 999: 0:00" Margin="0,35,10,0" Grid.Row="2" VerticalAlignment="Top" Height="20" Padding="0,1,5,0" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" BorderThickness="1" HorizontalAlignment="Right" Width="90" Background="#7FFFFFFF" Visibility="Hidden"/>
-        <Label x:Name="LBLFoodSyrupTimer" Content="" HorizontalAlignment="Left" Margin="0,60,0,0" VerticalAlignment="Top" Background="Black" Height="20" Width="246" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" Grid.Row="2" Grid.Column="1" Padding="2,0" VerticalContentAlignment="Center" Foreground="#FFDCEDFF" Opacity="0.75"/>
-        <Label Content="" HorizontalAlignment="Left" Margin="140,12,0,0" VerticalAlignment="Top" Height="55" Width="55">
-            <Label.Background>
-                <ImageBrush ImageSource="Resources/Icon/Icon.png"/>
-            </Label.Background>
-        </Label>
-        <Label x:Name="Minimize_Label" Content="" Grid.Column="1" HorizontalAlignment="Left" Margin="221,2,0,0" VerticalAlignment="Top" Width="15" Height="15" Opacity="0.5" MouseEnter="MinimizeLabelMouseEnter" MouseLeave="MinimizeLabelMouseExit" MouseDown="MinimizeLabelMouseDown" MouseUp="MinimizeLabelMouseUp" ToolTip="Minimize To Tray">
-            <Label.Background>
-                <ImageBrush ImageSource="Resources/Images/Buttons/Minimize to Tray.png"/>
-            </Label.Background>
-        </Label>
-        <Label x:Name="AlwaysOnTop_Label" Content="" Grid.Column="1" HorizontalAlignment="Left" Margin="238,2,0,0" VerticalAlignment="Top" Width="15" Height="15" Opacity="0.5" MouseEnter="AlwaysOnTopLabelMouseEnter" MouseLeave="AlwaysOnTopLabelMouseExit" MouseDown="AlwaysOnTopLabelMouseDown" MouseUp="AlwaysOnTopLabelMouseUp" ToolTip="Always On Top">
-            <Label.Background>
-                <ImageBrush ImageSource="Resources/Images/Buttons/AlwaysOnTopOff.png"/>
-            </Label.Background>
-        </Label>
-        <Label x:Name="SettingsButton" Content="" Grid.Column="1" HorizontalAlignment="Left" Margin="204,2,0,0" VerticalAlignment="Top" Width="15" Height="15" Opacity="0.5" MouseEnter="SettingsEnter" MouseLeave="SettingsExit" ToolTip="Settings" MouseUp="OpenSettings">
-            <Label.Background>
-                <ImageBrush ImageSource="Resources/Images/Buttons/settings.png"/>
-            </Label.Background>
-        </Label>
+                    </Image.LayoutTransform>
+                </Image>
+
+            </Grid>
+        </Grid>
+
+        <Grid
+            Name="CraftingGrid"
+            Grid.Row="4"
+            Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <Label
+                x:Name="LBLBackdrop"
+                Grid.Row="0"
+                Grid.RowSpan="3"
+                Grid.Column="0"
+                Grid.ColumnSpan="2"
+                Background="Black"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                Foreground="#FFDCEDFF"
+                Opacity="0.75" />
+
+            <!--  Buttons  -->
+            <Button
+                x:Name="BTNCraft"
+                Grid.Row="0"
+                Grid.RowSpan="3"
+                Grid.Column="0"
+                MinWidth="100"
+                Margin="2,2,2,2"
+                Padding="5,5,5,5"
+                Click="BTNCraftInitiate"
+                Content="Start"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                FontSize="18"
+                Foreground="#FFDCEDFF"
+                Style="{DynamicResource ButtonStyleIdle}" />
+
+            <!--  Status  -->
+            <ProgressBar
+                x:Name="PGBOverall"
+                Grid.Row="0"
+                Grid.Column="1"
+                Grid.ColumnSpan="2"
+                Margin="2,2,2,2"
+                Background="#FF2B2B2B"
+                BorderBrush="{x:Null}"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                Foreground="#FFA60732"
+                Maximum="1000" />
+            <Label
+                x:Name="LBLCraftNumber"
+                Grid.Row="0"
+                Grid.Column="2"
+                Width="Auto"
+                Margin="2,2,2,2"
+                HorizontalAlignment="Stretch"
+                HorizontalContentAlignment="Right"
+                Background="#7FFFFFFF"
+                Content="Crafted: 99/99"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                Foreground="Black"
+                Visibility="Hidden" />
+            <ProgressBar
+                x:Name="PGBCraft"
+                Grid.Row="1"
+                Grid.Column="1"
+                Grid.ColumnSpan="2"
+                Margin="2,2,2,2"
+                Background="#FF2B2B2B"
+                BorderBrush="{x:Null}"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                Foreground="#FF00B1FF"
+                Maximum="1000" />
+            <Label
+                x:Name="LBLTimerCraft"
+                Grid.Row="1"
+                Grid.Column="2"
+                Margin="2,2,2,2"
+                HorizontalAlignment="Stretch"
+                HorizontalContentAlignment="Right"
+                Background="#7FFFFFFF"
+                BorderThickness="1"
+                Content="Craft 999: 0:00"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                Visibility="Hidden" />
+            <ProgressBar
+                x:Name="PGBMacro"
+                Grid.Row="2"
+                Grid.Column="1"
+                Grid.ColumnSpan="2"
+                Margin="2,2,2,2"
+                Background="#FF2B2B2B"
+                BorderBrush="{x:Null}"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                Foreground="#FF7400FF"
+                Maximum="1000" />
+            <Label
+                x:Name="LBLTimerMacro"
+                Grid.Row="2"
+                Grid.Column="2"
+                Width="Auto"
+                Margin="2,2,2,2"
+                HorizontalAlignment="Stretch"
+                HorizontalContentAlignment="Right"
+                Background="#7FFFFFFF"
+                BorderThickness="1"
+                Content="Macro 3: 0:00"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                Visibility="Hidden" />
+
+        </Grid>
+
+        <Grid
+            Name="UpdateGrid"
+            Grid.Row="4"
+            Grid.Column="1">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Label
+                x:Name="LBLUpdate"
+                Grid.Row="0"
+                Grid.Column="0"
+                Background="Black"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                Foreground="#FFDCEDFF"
+                Opacity="0.75" />
+            <Label
+                x:Name="LBLUpdateFooter"
+                Grid.Row="1"
+                Grid.Column="0"
+                Background="Black"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                Foreground="#FFDCEDFF"
+                Opacity="0.75" />
+            <Label
+                x:Name="LBLFoodSyrupTimer"
+                Grid.Row="2"
+                Grid.Column="0"
+                Background="Black"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                Foreground="#FFDCEDFF"
+                Opacity="0.75" />
+        </Grid>
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/AutoSynthesis/MainWindow.xaml.cs b/AutoSynthesis/MainWindow.xaml.cs
index 0ec8e43..c2f1462 100644
--- a/AutoSynthesis/MainWindow.xaml.cs
+++ b/AutoSynthesis/MainWindow.xaml.cs
@@ -113,7 +113,7 @@ public MainWindow()
         private void SetupSystemTray()
         {
             Notify = new System.Windows.Forms.NotifyIcon();
-            Notify.Icon = new System.Drawing.Icon("Icon.ico"); 
+            Notify.Icon = new System.Drawing.Icon("Icon.ico");
             Notify.Visible = true;
             Notify.Click +=
                 delegate (object sender, EventArgs args)
@@ -1040,34 +1040,29 @@ private void CheckRadioLoss(object sender, RoutedEventArgs e)
         #endregion
 
         #region Help Window
-        private ScaleTransform helpScale = new ScaleTransform(0.9, 0.9, 0.5, 0.5);
         private string URL = "https://github.com/Saad888/AutoSynthesis/blob/master/README.md";
         private void LBLHelp_MouseEnter(object sender, MouseEventArgs e)
         {
-            var lbl = (Label)sender;
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), "Resources/Images/Background/InfoHighlighted.png")));
-            lbl.Background.RelativeTransform = helpScale;
+            var image = (Image)sender;
+            image.Source = new BitmapImage(new Uri("Resources/Images/Background/InfoHighlighted.png", UriKind.Relative));
         }
 
         private void LBLHelp_MouseLeave(object sender, MouseEventArgs e)
         {
-            var lbl = (Label)sender;
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), "Resources/Images/Background/InfoUnhighlighted.png")));
-            lbl.Background.RelativeTransform = helpScale;
+            var image = (Image)sender;
+            image.Source = new BitmapImage(new Uri("Resources/Images/Background/InfoUnhighlighted.png", UriKind.Relative));
         }
 
         private void LBLHelp_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            var lbl = (Label)sender;
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), "Resources/Images/Background/InfoPressed.png")));
-            lbl.Background.RelativeTransform = helpScale;
+            var image = (Image)sender;
+            image.Source = new BitmapImage(new Uri("Resources/Images/Background/InfoPressed.png", UriKind.Relative));
         }
 
         private void LBLHelp_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            var lbl = (Label)sender;
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), "Resources/Images/Background/InfoHighlighted.png")));
-            lbl.Background.RelativeTransform = helpScale;
+            var image = (Image)sender;
+            image.Source = new BitmapImage(new Uri("Resources/Images/Background/InfoHighlighted.png", UriKind.Relative));
             System.Diagnostics.Process.Start(URL);
         }
         #endregion
@@ -1075,26 +1070,26 @@ private void LBLHelp_MouseUp(object sender, MouseButtonEventArgs e)
         #region Minimize To Tray
         private void MinimizeLabelMouseEnter(object sender, MouseEventArgs e)
         {
-            var lbl = (Label)sender;
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), "Resources/Images/Buttons/Minimize to Tray Hover.png")));
+            var image = (Image)sender;
+            image.Source = new BitmapImage(new Uri("Resources/Images/Buttons/Minimize to Tray Hover.png", UriKind.Relative));
         }
 
         private void MinimizeLabelMouseExit(object sender, MouseEventArgs e)
         {
-            var lbl = (Label)sender;
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), "Resources/Images/Buttons/Minimize to Tray.png")));
+            var image = (Image)sender;
+            image.Source = new BitmapImage(new Uri("Resources/Images/Buttons/Minimize to Tray.png", UriKind.Relative));
         }
 
         private void MinimizeLabelMouseDown(object sender, MouseButtonEventArgs e)
         {
-            var lbl = (Label)sender;
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), "Resources/Images/Buttons/Minimize to Tray Pressed.png")));
+            var image = (Image)sender;
+            image.Source = new BitmapImage(new Uri("Resources/Images/Buttons/Minimize to Tray Pressed.png", UriKind.Relative));
         }
 
         private void MinimizeLabelMouseUp(object sender, MouseButtonEventArgs e)
         {
-            var lbl = (Label)sender;
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), "Resources/Images/Buttons/Minimize to Tray Hover.png")));
+            var image = (Image)sender;
+            image.Source = new BitmapImage(new Uri("Resources/Images/Buttons/Minimize to Tray Hover.png", UriKind.Relative));
             Hide();
             if (NotifyFlagged)
             {
@@ -1127,31 +1122,31 @@ private void Window_Deactivated(object sender, EventArgs e)
         }
         private void AlwaysOnTopLabelMouseDown(object sender, MouseButtonEventArgs e)
         {
-            var lbl = (Label)sender;
+            var image = (Image)sender;
             var resourceUrl = AlwaysOnTopEnabled ? "Resources/Images/Buttons/AlwaysOnTopPressedOn.png" : "Resources/Images/Buttons/AlwaysOnTopPressedOff.png";
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), resourceUrl)));
+            image.Source = new BitmapImage(new Uri(resourceUrl, UriKind.Relative));
         }
 
         private void AlwaysOnTopLabelMouseEnter(object sender, MouseEventArgs e)
         {
-            var lbl = (Label)sender;
+            var image = (Image)sender;
             var resourceUrl = AlwaysOnTopEnabled ? "Resources/Images/Buttons/AlwaysOnTopHoverOn.png" : "Resources/Images/Buttons/AlwaysOnTopHoverOff.png";
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), resourceUrl)));
+            image.Source = new BitmapImage(new Uri(resourceUrl, UriKind.Relative));
         }
 
         private void AlwaysOnTopLabelMouseExit(object sender, MouseEventArgs e)
         {
-            var lbl = (Label)sender;
+            var image = (Image)sender;
             var resourceUrl = AlwaysOnTopEnabled ? "Resources/Images/Buttons/AlwaysOnTopOn.png" : "Resources/Images/Buttons/AlwaysOnTopOff.png";
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), resourceUrl)));
+            image.Source = new BitmapImage(new Uri(resourceUrl, UriKind.Relative));
         }
 
         private void AlwaysOnTopLabelMouseUp(object sender, MouseButtonEventArgs e)
         {
             FlipAlwaysOnTop();
-            var lbl = (Label)sender;
+            var image = (Image)sender;
             var resourceUrl = AlwaysOnTopEnabled ? "Resources/Images/Buttons/AlwaysOnTopHoverOn.png" : "Resources/Images/Buttons/AlwaysOnTopHoverOff.png";
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), resourceUrl)));
+            image.Source = new BitmapImage(new Uri(resourceUrl, UriKind.Relative));
         }
 
         private void FlipAlwaysOnTop()
@@ -1216,16 +1211,16 @@ private void CheckForUpdates()
         #region Settings
         private void SettingsEnter(object sender, MouseEventArgs e)
         {
-            var lbl = (Label)sender;
+            var image = (Image)sender;
             var resourceUrl = "Resources/Images/Buttons/settings-hover.png";
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), resourceUrl)));
+            image.Source = new BitmapImage(new Uri(resourceUrl, UriKind.Relative));
         }
 
         private void SettingsExit(object sender, MouseEventArgs e)
         {
-            var lbl = (Label)sender;
+            var image = (Image)sender;
             var resourceUrl = "Resources/Images/Buttons/settings.png";
-            lbl.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), resourceUrl)));
+            image.Source = new BitmapImage(new Uri(resourceUrl, UriKind.Relative));
         }
 
         private void OpenSettings(object sender, MouseButtonEventArgs e)
@@ -1276,7 +1271,7 @@ private void ReadSettingsFile()
                 StartCraftingDelay = 0;
             }
             var resourceUrl = AlwaysOnTopEnabled ? "Resources/Images/Buttons/AlwaysOnTopOn.png" : "Resources/Images/Buttons/AlwaysOnTopOff.png";
-            AlwaysOnTop_Label.Background = new ImageBrush(new BitmapImage(new Uri(BaseUriHelper.GetBaseUri(this), resourceUrl)));
+            AlwaysOnTop_Label.Source = new BitmapImage(new Uri(resourceUrl, UriKind.Relative));
         }
         #endregion
     }
diff --git a/AutoSynthesis/Resources/Icon/Icon - Copy.png b/AutoSynthesis/Resources/Icon/Icon - Copy.png
deleted file mode 100644
index 222ec801317a8b5531ed5f5ad2728d0b22ccdc08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3817
zcmV<F4i@o=P)<h;3K|Lk000e1NJLTq002+`001%w1^@s6%Pm~|00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D4t_~QK~!i%?OS<p
zTy-7)z1{3?b~n4}=4f-ZB|%CFJ?KFj3Z9^#QWQK8fr`S6e|XF|IG$7;(NPBmQO9u@
z9S`Ixfr?rvy^}U+nl>Rvljdx)Id?ak?0uhpJ}*gaLz{C`TF3A9)6Ks3_PyWl^ZVZK
ztt5mXR6zQ~J3n9T5(gqcc;fFQuqZ;Z48ZcTva%bBi;MFTiG*Te`&B8DBqf8vV4$|P
zw%2O4p2a2`5R!K;f{>`yTeg;Mf9Ba|AG@}=I6t{~i*;Fq6N<&-v6`9_P2c$X*Zyp?
zS}U<>2%sjWTzI`Z?zr==$DaJfFF%u=ot-9<S2u;6P+D4=2!}$^pFjE2S6}$sU;l(n
zb%2liQ!PqhT|r^t*0Nh~yH2H2D<aXDh+f6u_`{K?P^nc)jYgwAxNo015{Zmpp7e)l
z0R8+z!Sl#&j{n_Tw(ZtOAOGI>@5;`}RVo#VD_#TP=Y&$Jgr=!vZBr=Zxm+MB>`TU@
zk!POz)thhZ-o00^*IN{l6r0#Rf5EkriA2;sI%*Gx!$Z9C_M+u09{R#V58s))bg7<$
zyFkDujQWb=RH0Bx8jV`Y$S^2!a&o2YoE)J^PnU_E6#i|{X+<m&^0}Q3yGE@EGr&yj
zUWiEHXf*!Hu3eSCe)_4Gc*SkNc2ic?%?5)p6J#+8lQktGveIZYq#2CHi>&c`C-Fo=
z#9*qKCX;5v#!aS8H*YaqQ(P?Rboz0dnxF~hB(xwlU85EXX?$7>m3Sg9thN#H```Vh
z`tN`F^K-mh0k9ER3zz`fw+_fFyXBUZJ9qB9rm(O`eI<pKL@b_kd))Dch6aCm`D>oi
zHEXl(`~3Ym%a-Ly3b>%f6ray0>Q9{vJpGHG9~d4UdX)syDJ}tW04$+U11n+9ANk!M
zp1XJ3wr$x+3t+@o4uSAxvhUNVRpLxbi|@r3Ul_ap!5syrtZda{E_56`ScZp1`O7bv
zUwr<r|Hh`>la|SMMr6LTBH2(_RP?}ipZL)iOK)6bgk{6;EbhwARp{<WVrGUO<{XVj
z;|WDD9F`IZ5I8xj6bVm9{qcFdqVb*j@Nb`ay1KXL?7y)2O_DY#i3w1$ydF=9%jwL`
z%gfI;W@aihnhTxul_2oZA{2=raZW0tvDi3yizLx#MAp8y-`q2Byz1yFY&s5foKN8S
zLUl7*hKGzG&6r<MutcxZOI&eMcqP$D*Fqu})5Ro`3E^@$M19>U-|q5VjefuX1U8=p
zMlMDmM-nA4DBWOxzgDl$$kghz8D5`P1Ok2$i^XJ<Rv;I<qS#y{@%w$EyQ?$4`_)~Y
zo$c+^zAB&-2wh48SvLlN2*}d)o6YL6u~E@;_H1Zqa4_m|yQOeg{;s4}tL3Ejf0f8c
zI4lMS2E@L-Zw((lc%Tm2UX9Hx4IMz@QUp?{g?<2KWhi0p?e%uFov}AJHrQKFH@j>$
z8~1C{lxZrIOoBv8|6?phqfueCSVZmdYS%x?%VD~{T5P8F^>a6mnT|l3GJ9$+zz(pZ
z(Fe003i$mlb8nBoqrE+dZR(7S44qc1m5}XUae-#O5{*TL&1z-T4V3SCxfSt%rh61<
z1E^TCOh+JvB(eynx()+opcfbbTp%*m)zOYDBC1|uG8y!S423%V>L(F3E;MggoNj6i
zzP{^~_O6bOcd+>wz;`DwnXSx7AcZ8-Cz41q?*T>uE8t{6K~AK=dpc5{OyrD`3g&z@
z3Zpr5Jp@kCP+#wR{nb}G+S|@FVHeGo=F2%>(2$r7fm4Nq@+2g44DhjL?(gqYqZTz5
zEni_kk<Wr3yRHI(u_Tc{27^H{VzVJob|<Qj9UXn+weq$;b8j<_V9=-m1_8RX3uGa)
zob-`yAee~9wIepGuDIlV%b<yB4GQ@8+K}bka3VjvU@ZKA&1?+74T;eao9OH9O*Wyn
z-n-}D=EDc}opHIGjW~*C%bbrcix&7US*V&!k|=k3F&L9hughIsTAD*Gl-|Q04qeNb
zV@!BFZlO|*_YEoWII5RWNPr+Y!ovL|nj0H^hxYFqeEY3E9cR0{&fvRDQy4Jn0Smx6
zj<3WNNtK=P0u1Y!$a$7+*tEGQCpR}usT?2ldm%m~{U@rc{LRp+?3`RJHPP*I$&q!S
zuP@or))qcld%^+Y`VSr0*VWzG*@m%G>n2T>(U!q;+9qtO2;}N8(CCAKVA1*w8%tKM
zEY_<gR{e4b2f>=vF*YWws9P%z9kka}RgLE5<r&6CM+MWacTSyjRvtMt1k!ryPMz$+
zaqZDagv60Ff_{%F8w-hZ(e_f3N*iNatQ7d{SHJd+2k!ga=dac2*&Vw)Lh?cg1gMlm
zXGeRewYh1mrn+iy)NT(H7A@DqohY0RhtKcxx#1fb{1{Q`+xjNndEbN?27TQ{&GllE
zN&?w{C<Z?L;EqRjJpAaR>vUS(IfuPyGI9P$Bq9d-`$W~zO2?jmzR_*7SQs@)41*l=
zDjrFKNEH1V!2&@Jf&fi*&Ld4_laCjtFAO5OMdcPcx6laqzF5Hd69^2>F^6cVt8*j$
zI1Ta`1oi`O0Ivh(6W9&B1u(j{05nySO8?EX%~?|2C6%Xzd{D^%GCs$}e!=D<VKFo`
z5Iykr-Y)n$CcXy&63Ft4!GL6)2D$)h9!cY3&*<Z3l2jAOsG-R#DA1;<NMI5p{O?p#
z{{jQagj{-cb#^#_4s2qdjv7ewWwKB0B3VSrpOZ-?fsE*S)WlgOB_$@dxW*G%{981D
zL?9Z8G7+{Tf9u8=&H(gt3%>_E3rQt`8X)(kjhn7P3bTaek-XNI0U$BqVrD$v@F02A
zw#y=^B9Q0FQl_Q7@8h5N<oe7dnd*2vc1}Ys1s3nT(>2+WpARVPN21ywX>$J(7~gRj
zBozcQJz&CDa`*Oowr#uZw(EEslsCUI#dp2r`ZM4ccDqgVBkdR(9FVI9nZ$X#cy)u(
zpjdVNYCfjNbcKGHW4bJoib{mHK}%L$fBhZb{?7OAUz(Sf?GFUcX~%yhi5fI4Mr>Bm
zgZlGyb5o$DsnKH}83`<3u|loaXUuCc`LITMx<)|j(@vhK>G8PTOpMtCUX;h#rpiJH
z<SJ`{l?4R_AAI7+KiRSFrVZD7d_K95pDKR8U-b8xlc#D=c=x~c=1|D*_ul^D53BF^
z=tm7%**U6MJR!ZC^qFP+8<Hq2D9~q_Olilfs)lfVRvJu>7oEiU5=b*K0wp)DS#$eO
ze){B>x8AaC1IUv?;mEjYohK;LStTS7?SI>T{Mb>;Lk~V^{MO@-7nH7DYfLH>X~9rf
zqA#5Kz1a#=8AN@lw6rvD>C&Yc^>uYlq&Dmjou44j@8mPcTnVI^@wu6Noldv@;T=2f
z`~DAp_(<uRH8(olUPS=4=+sftw>ceSD6uMBRTW39Pwd>8zx~tqF7*XN%8}7AL35|S
zT&Pg%k$WmPY`AIV&6_u`KoHZ6jEty)!QkYx-@M4Y%C+faF3y(68Wjq~s*io_&JXSQ
z(vDAV-m>-PgphQj4u^mijUP2dqNq{3Iy+;(fA*Q~yYIQj_{gJ=6?lDq93ML8C*_Db
z{)haT_f*F3s}QrFFQ1vo$k2-%lSw4wF|XA!Y#!(z=s8kxr0!3D{Nq6^CaV%wAt@tq
zE*i)PSG;!J`n!Mp<j=mjX5IQVZl7N@>Tt?WgkDN`Yp|uI+1vO|z3ZVzzEY5`)vKs=
zY-%$4vPZ}E6Kh!q;Bq>J$K#O+W-3G?<=X=!bcSh@|1cKJ=MUgeNt2bGz3iHj;?;&s
z)9Ry@6&A0@!v+JJ2MbsE37HFl3>Y_*TzB1FTW+~^QzRN!%H{|EGo8@18tUskXS+KC
zWw+jz3xB1AX^DQbIoaLW8EJ1j6KHR3^|iIOc-qdidOF(MynW{0klkjDyWMUHCa8$T
zqVi*F$TKH2b9$jm-~xEOJ^|MvhAkGU;?O}e2xKkHr}k48T;@vPs=U1XEt|KNtx{{#
zXO(u)2cAZ{QeRu^$tx^0hC^X>LtUNg@PYmPl}8SmYio|1vA+*Q_M?^^0ER%OrR8+<
zNM~D{%Q8F^3Iqa5EQH*WlAnZ_C6QEEUVqeXk5(K$*yi(kTd|4NO3KQ-xe{2MUs$w}
z52PcA%$mTq)>dy_?TJyF#p3PjGrNu+KGcb*+zw(|67e`YC7c*RAH{}152ErgCOn4Y
z-1xp{cxaGLR;|&bYjk?O#QPkx64<rV>4;VyIoyi#vD=(d0#i|m%qU8wf=<#3G8!7{
zP8|sb14r<g&)2;Mut&$g*{9n(fjz)K0Pg=+C={${X>K~T>xJhVt12sOPWVg^k6km%
zMcih}0tjV61oBy!nO+>OQlVs>%1#M;bZl^vunK@0(F3rt$rd|1#B2soOZY3J2H-I8
zPhhXt>#eV;I@S$eCWrj<uQT0i3S~3f{v2e^1ajs5s5TfqX9c&5?RKgQ$su9v*R=zz
z7Dxo6&{VD9XMTr2(c)7OG;8^(C`5HD{Adg$Ui^9&0bGTA^Bltere147GMCk0<?(@{
z<trZk)Mq|-m%(7rVkFZJ1}B%`{1eqjE1PPnkG+6R)I2`fG@nV(2lJN%4}A84FW$E-
zFW-dxamMo?)<~A&Vdv|+UVaTe@Fi^Gz221lc5W^NasnF>{XVtCWZJCJX!IEV^xwx`
zXl%skaCC!6`Zk&)HEKQtGHR>_?#W!T<o#N$76i^beh`>M9qxd}^7$4nAhrL}iR&C?
zE(Egv%?CCEHvrVgnOp#gVo}cy3ES-SgZw-n;kEcnf}4Q#Ko&5YEP}3p?t<=v_kX#7
zDNCg1LLiT&7Vx(u96U90HUu(&u)V~){3LH7gXi@#foy<1$k|+<*W*oc5;u7VE@d*W
f7SjJ^QiS*qaqaGQIz&7b00000NkvXXu0mjf>t|yX

diff --git a/AutoSynthesis/Windows/Settings.xaml b/AutoSynthesis/Windows/Settings.xaml
index de8e234..5210596 100644
--- a/AutoSynthesis/Windows/Settings.xaml
+++ b/AutoSynthesis/Windows/Settings.xaml
@@ -1,61 +1,90 @@
-<Window x:Class="AutoSynthesis.Windows.Settings"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:AutoSynthesis.Windows"
-        mc:Ignorable="d"
-        Title="Settings" SizeToContent="WidthAndHeight" ResizeMode="NoResize" ShowInTaskbar="False" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" Loaded="Window_Loaded" Background="#FF221632" Icon="/AutoSynthesis;component/Resources/Icon/Icon.png" Width="388" Height="102">
+<Window
+    x:Class="AutoSynthesis.Windows.Settings"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:AutoSynthesis.Windows"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="Settings"
+    Width="388"
+    Height="102"
+    Background="#FF221632"
+    Icon="/AutoSynthesis;component/Resources/Icon/Icon.png"
+    Loaded="Window_Loaded"
+    ResizeMode="NoResize"
+    ShowInTaskbar="False"
+    SizeToContent="WidthAndHeight"
+    WindowStartupLocation="CenterOwner"
+    WindowStyle="ToolWindow"
+    mc:Ignorable="d">
     <Window.Resources>
         <Style x:Key="FocusVisual">
             <Setter Property="Control.Template">
                 <Setter.Value>
                     <ControlTemplate>
-                        <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+                        <Rectangle
+                            Margin="2"
+                            SnapsToDevicePixels="true"
+                            Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                            StrokeDashArray="1 2"
+                            StrokeThickness="1" />
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
         </Style>
-        <SolidColorBrush x:Key="Button.Static.Background" Color="#201834"/>
-        <SolidColorBrush x:Key="Button.Static.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#2f2842"/>
-        <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Pressed.Background" Color="#231e30"/>
-        <SolidColorBrush x:Key="Button.Pressed.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
-        <SolidColorBrush x:Key="Button.Disabled.Border" Color="#DCEDFF"/>
-        <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
+        <SolidColorBrush x:Key="Button.Static.Background" Color="#201834" />
+        <SolidColorBrush x:Key="Button.Static.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#2f2842" />
+        <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Pressed.Background" Color="#231e30" />
+        <SolidColorBrush x:Key="Button.Pressed.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4" />
+        <SolidColorBrush x:Key="Button.Disabled.Border" Color="#DCEDFF" />
+        <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383" />
         <Style x:Key="ButtonStyle1" TargetType="{x:Type Button}">
-            <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-            <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
-            <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
-            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="Padding" Value="1"/>
+            <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
+            <Setter Property="Background" Value="{StaticResource Button.Static.Background}" />
+            <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}" />
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Padding" Value="1" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
-                        <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                            <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" OpacityMask="#FFFFF8F8"/>
+                        <Border
+                            x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="true">
+                            <ContentPresenter
+                                x:Name="contentPresenter"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Focusable="False"
+                                OpacityMask="#FFFFF8F8"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsDefaulted" Value="true">
-                                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                                <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
                             </Trigger>
                             <Trigger Property="IsMouseOver" Value="true">
-                                <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Button.MouseOver.Background}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.MouseOver.Border}" />
                             </Trigger>
                             <Trigger Property="IsPressed" Value="true">
-                                <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Button.Pressed.Background}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.Pressed.Border}" />
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="false">
-                                <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
-                                <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Button.Disabled.Background}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource Button.Disabled.Border}" />
+                                <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{StaticResource Button.Disabled.Foreground}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -63,13 +92,51 @@
             </Setter>
         </Style>
     </Window.Resources>
-    <Grid Margin="10,10,4,12" Height="52">
+    <Grid Margin="10,10,4,12">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+        </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition/>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
-        <Label Content="Set the delay before starting a craft" HorizontalAlignment="Left" VerticalAlignment="Top" Height="26" Width="358" Margin="0" Foreground="#FFDCEDFF" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" VerticalContentAlignment="Center" Padding="5,0,0,3" FontSize="16"/>
-        <TextBox x:Name="TXBDelay" HorizontalAlignment="Left" Height="23" Margin="5,0,0,5" TextWrapping="Wrap" VerticalAlignment="Bottom" Width="281" Background="#FFDCEDFF" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="14" PreviewTextInput="NumberValidationTextBox"/>
-        <Button x:Name="BTNConfirm" Content="Save" HorizontalAlignment="Right" Margin="0,0,5,5" VerticalAlignment="Bottom" Width="72" Click="BTNConfirm_Click" Height="23" Style="{DynamicResource ButtonStyle1}" Foreground="#FFDCEDFF" FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" FontSize="14"/>
+        <Label
+            Grid.Row="0"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            HorizontalAlignment="Left"
+            Content="Set the delay before starting a craft"
+            FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+            FontSize="16"
+            Foreground="#FFDCEDFF" />
+        <TextBox
+            x:Name="TXBDelay"
+            Grid.Row="0"
+            Grid.Column="1"
+            Width="30"
+            Margin="2,2,2,2"
+            HorizontalContentAlignment="Center"
+            VerticalContentAlignment="Center"
+            Background="#FFDCEDFF"
+            FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+            FontSize="14"
+            PreviewTextInput="NumberValidationTextBox"
+            Text="0"
+            TextWrapping="Wrap" />
+        <Button
+            x:Name="BTNConfirm"
+            Grid.Row="1"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="2,2,2,2"
+            HorizontalAlignment="Center"
+            Click="BTNConfirm_Click"
+            Content="Save"
+            FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+            FontSize="14"
+            Foreground="#FFDCEDFF"
+            Style="{DynamicResource ButtonStyle1}" />
 
     </Grid>
 </Window>
diff --git a/AutoSynthesis/packages.config b/AutoSynthesis/packages.config
index 35fb4af..4cad16f 100644
--- a/AutoSynthesis/packages.config
+++ b/AutoSynthesis/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<packages>
+<packages xmlns="urn:packages">
   <package id="InputSimulatorPlus" version="1.0.7" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
 </packages>
\ No newline at end of file

From 3d511466f256ae516bb4c564e2b838f0106079c7 Mon Sep 17 00:00:00 2001
From: copiousfish <copiousfish@hotmail.com>
Date: Mon, 19 Sep 2022 01:32:15 -0700
Subject: [PATCH 2/8] total craft timer complete

---
 .../Classes/Backend/CraftingEngine.cs         | 155 ++++++++++----
 .../Classes/Backend/KeyInputEngine.cs         |   6 +-
 .../Classes/Backend/UICommunicator.cs         | 191 +++++++++++-------
 AutoSynthesis/DataTypes/Crafting/Hotkey.cs    |   8 +-
 AutoSynthesis/DataTypes/SettingsContainer.cs  |   2 +-
 AutoSynthesis/MainWindow.xaml                 |  62 +++---
 AutoSynthesis/MainWindow.xaml.cs              |   4 +-
 AutoSynthesis/Windows/Settings.xaml           |   5 +-
 8 files changed, 283 insertions(+), 150 deletions(-)

diff --git a/AutoSynthesis/Classes/Backend/CraftingEngine.cs b/AutoSynthesis/Classes/Backend/CraftingEngine.cs
index 8b36755..6465be9 100644
--- a/AutoSynthesis/Classes/Backend/CraftingEngine.cs
+++ b/AutoSynthesis/Classes/Backend/CraftingEngine.cs
@@ -27,7 +27,7 @@ static class CraftingEngine
         private const int STANDARD_ANIMATION_DELAY = 2000;
         private const int STANDARD_TICK_TIME = 50;
         private static int CraftCount = 0;
-        private static int TotalCount = 0;
+        private static int CompletedCount = 0;
         #endregion
 
         #region System Methods
@@ -76,7 +76,7 @@ public static void CancelCrafting()
             if (!CraftingActive)
                 return;
 
-            if(!CraftPrimedToCancel)
+            if (!CraftPrimedToCancel)
             {
                 CraftPrimedToCancel = true;
                 UICommunicator.UpdateStatus("Finishing this craft...", true);
@@ -107,19 +107,22 @@ private static void RunCraftingEngine(CancellationToken token)
                 UICommunicator.ErrorMessageHandler = ErrorMessageHandler;
                 UICommunicator.UpdateStatus("Setting up for Crafting...");
                 UICommunicator.StartTimedProgressBarUpdates();
-                UICommunicator.UpdateCompletedUIInfo(0, Settings.CraftCount);
+
+                RunTotalProgressBar();
 
 
                 CraftCount = 1;
-                TotalCount = 0;
+                CompletedCount = 0;
                 if (HotkeySet[HKType.Food] != null)
                 {
-                    NextFoodUse = CalculateNextConsumableUse(Settings.StartingFoodTime);
+                    NextFoodUse = CalculateNextConsumableUse(Settings.StartingFoodTime, DateTime.Now);
                     UICommunicator.UpdateFood(NextFoodUse);
+
+                    RunFoodProgressBar(Settings.StartingFoodTime);
                 }
                 if (HotkeySet[HKType.Syrup] != null)
                 {
-                    NextSyrupUse = CalculateNextConsumableUse(Settings.StartingSyrupTime);
+                    NextSyrupUse = CalculateNextConsumableUse(Settings.StartingSyrupTime, DateTime.Now);
                     UICommunicator.UpdateSyrup(NextSyrupUse);
                 }
 
@@ -133,7 +136,7 @@ private static void RunCraftingEngine(CancellationToken token)
 
                     // Add requested delay
                     Break(Settings.StartingDelay);
-                    
+
                     // Begin Craft Timer:
                     RunCraftProgressBar();
 
@@ -145,10 +148,7 @@ private static void RunCraftingEngine(CancellationToken token)
 
                     // Initiate Macro 3
                     SendMacroInput(HotkeySet[HKType.Macro3], 3);
-
-                    // Update UI Message
-                    TotalCount = CraftCount;
-                    UICommunicator.UpdateCompletedUIInfo(TotalCount, Settings.CraftCount);
+                    CompletedCount = CraftCount;
 
                     // Collectable Menu Option
                     SendCollectableConfirmationInput();
@@ -165,11 +165,11 @@ private static void RunCraftingEngine(CancellationToken token)
 
                     CraftCount += 1;
                 }
-            } 
+            }
             catch (Exception e) when (!(e is CraftCancelRequest))
             {
                 ErrorMessageHandler(e);
-            } 
+            }
             finally
             {
                 EndCraftingProcess();
@@ -177,12 +177,12 @@ private static void RunCraftingEngine(CancellationToken token)
         }
 
         private static void EndCraftingProcess()
-        { 
+        {
             // ALL CLEANUP
             UICommunicator.EndAllProgress();
             UICommunicator.UpdateStatus("Crafting Finished!");
             var craftCompleted = "Completed ";
-            craftCompleted += Settings.CraftCount > 0 ? $"{TotalCount}/{Settings.CraftCount}" : $"{TotalCount}";
+            craftCompleted += Settings.CraftCount > 0 ? $"{CompletedCount}/{Settings.CraftCount}" : $"{CompletedCount}";
             UICommunicator.UpdateStatus2(craftCompleted);
             CraftingActive = false;
 
@@ -211,7 +211,7 @@ private static void SendMacroInput(Hotkey hotkey, int macroNumber)
                 return;
             Logger.Write("Sending Macro " + macroNumber);
             // UI message: MACRO NUMBER macroNumber
-            UICommunicator.UpdateMacroUIInfo(macroNumber, hotkey.TimerInMiliseconds, VerifyFinalMacro(macroNumber));
+            UICommunicator.UpdateMacroUIInfo(macroNumber, hotkey.TimerInMilliseconds, VerifyFinalMacro(macroNumber));
             SendInput(hotkey);
         }
 
@@ -236,13 +236,12 @@ private static void SendCollectableConfirmationInput()
 
             UICommunicator.UpdateStatus("Accepting Collectable Craft...");
             Break(STANDARD_MENU_DELAY);
-            SendInput(HotkeySet[HKType.Confirm]);
-            SendInput(HotkeySet[HKType.Confirm]);
+            SendInput(HotkeySet[HKType.Confirm], 2);
         }
 
         private static bool CraftingComplete()
         {
-            return CraftPrimedToCancel || ((Settings.CraftCount != 0) && (TotalCount >= Settings.CraftCount));
+            return CraftPrimedToCancel || ((Settings.CraftCount != 0) && (CompletedCount >= Settings.CraftCount));
         }
 
         private static void SendFoodAndSyrupInput()
@@ -261,15 +260,14 @@ private static void SendFoodAndSyrupInput()
             Logger.Write("Refreshing Consumables");
 
             // enter a craft and leave it out
-            Break(500);
+            Break(Settings.StartingDelay);
 
             try
             {
                 ProcessManager.DisableInputs();
-                Break(50);
+                Break(100);
                 SendInput(HotkeySet[HKType.Confirm], 3);
                 SendInput(HotkeySet[HKType.Cancel]);
-                Break(50);
             }
             finally
             {
@@ -285,14 +283,13 @@ private static void SendFoodAndSyrupInput()
                 SendInput(HotkeySet[HKType.Confirm]);
                 SendInput(HotkeySet[HKType.Cancel]);
                 SendInput(HotkeySet[HKType.Confirm]);
-                Break(50);
             }
             finally
             {
                 ProcessManager.EnableInputs();
             }
 
-            Break(2000);
+            Break(STANDARD_MENU_DELAY);
 
             // use food and syrup as needed
             if (useFood)
@@ -300,15 +297,17 @@ private static void SendFoodAndSyrupInput()
                 UICommunicator.UpdateStatus("Using Food...");
                 Logger.Write("Using Food");
                 SendInput(HotkeySet[HKType.Food]);
-                NextFoodUse = CalculateNextConsumableUse(Settings.FoodDuration);
+                NextFoodUse = CalculateNextConsumableUse(Settings.FoodDuration, DateTime.Now);
                 UICommunicator.UpdateFood(NextFoodUse);
+
+                RunFoodProgressBar(Settings.FoodDuration);
             }
             if (useSyrup)
             {
                 UICommunicator.UpdateStatus("Using Syrup...");
                 Logger.Write("Using Syrup");
                 SendInput(HotkeySet[HKType.Syrup]);
-                NextSyrupUse = CalculateNextConsumableUse(STANDARD_SYRUP_TIME);
+                NextSyrupUse = CalculateNextConsumableUse(STANDARD_SYRUP_TIME, DateTime.Now);
                 UICommunicator.UpdateSyrup(NextSyrupUse);
             }
         }
@@ -317,15 +316,14 @@ private static void PrepareNextCraftInput()
         {
             if (CraftingComplete())
                 return;
-            
+
             UICommunicator.UpdateStatus("Preparing Next Craft...");
             Logger.Write("Resetting Craft Cycle");
             try
             {
                 ProcessManager.DisableInputs();
-                Break(50);
+                Break(100);
                 SendInput(HotkeySet[HKType.Confirm], 3);
-                Break(50);
             }
             finally
             {
@@ -334,36 +332,114 @@ private static void PrepareNextCraftInput()
 
 
         }
-
-        private static DateTime CalculateNextConsumableUse(int timeRemainingInMinutes)
+        private static DateTime CalculateNextConsumableUse(int timeRemainingInMinutes, DateTime start)
         {
             var timeMargin = CalculateFoodSyrupMargin();
-            return DateTime.Now.AddMinutes(timeRemainingInMinutes - timeMargin);
+            return start.AddMinutes(timeRemainingInMinutes - timeMargin);
         }
 
         private static double CalculateFoodSyrupMargin()
         {
-            double totalTime = HotkeySet[HKType.Macro1].TimerInMiliseconds;
+            double totalTime = HotkeySet[HKType.Macro1].TimerInMilliseconds;
             if (HotkeySet[HKType.Macro2] != null)
-                totalTime += HotkeySet[HKType.Macro2].TimerInMiliseconds;
+                totalTime += HotkeySet[HKType.Macro2].TimerInMilliseconds;
             if (HotkeySet[HKType.Macro3] != null)
-                totalTime += HotkeySet[HKType.Macro3].TimerInMiliseconds;
+                totalTime += HotkeySet[HKType.Macro3].TimerInMilliseconds;
             return totalTime / (1000 * 60) + 0.25;
         }
 
         #endregion
 
         #region UI Methods
+        private static void RunTotalProgressBar()
+        {
+            DateTime start = DateTime.Now;
+            DateTime simulated = start;
+            DateTime simulatedNextFood = NextFoodUse;
+            DateTime simulatedNextSyrup = NextSyrupUse;
+            for (int i = 0; i < Settings.CraftCount; i++)
+            {
+                simulated = simulated.AddMilliseconds(Settings.StartingDelay);
+
+                simulated = simulated.AddMilliseconds(HotkeySet[HKType.Macro1].TimerInMilliseconds);
+                if (HotkeySet[HKType.Macro2] != null)
+                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Macro2].TimerInMilliseconds);
+                if (HotkeySet[HKType.Macro3] != null)
+                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Macro3].TimerInMilliseconds);
+
+                if (Settings.CollectableCraft)
+                {
+                    simulated = simulated.AddMilliseconds(STANDARD_MENU_DELAY);
+                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Confirm].TimerInMilliseconds * 2);
+                }
+
+                simulated = simulated.AddMilliseconds(STANDARD_MENU_DELAY);
+
+                bool useFood = (HotkeySet[HKType.Food] != null && DateTime.Compare(simulatedNextFood, start) <= 0);
+                bool useSyrup = (HotkeySet[HKType.Syrup] != null && DateTime.Compare(simulatedNextSyrup, start) <= 0);
+                if (useFood || useSyrup)
+                {
+                    simulated = simulated.AddMilliseconds(Settings.StartingDelay);
+                    simulated = simulated.AddMilliseconds(100);
+                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Confirm].TimerInMilliseconds * 3);
+                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Cancel].TimerInMilliseconds);
+                    simulated = simulated.AddMilliseconds(1500);
+                    simulated = simulated.AddMilliseconds(100);
+                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Confirm].TimerInMilliseconds);
+                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Cancel].TimerInMilliseconds);
+                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Confirm].TimerInMilliseconds);
+                    simulated = simulated.AddMilliseconds(STANDARD_MENU_DELAY);
+                    if (useFood)
+                    {
+                        simulated = simulated.AddMilliseconds(HotkeySet[HKType.Food].TimerInMilliseconds);
+                        simulatedNextFood = CalculateNextConsumableUse(Settings.FoodDuration, simulated);
+                    }
+                    if (useSyrup)
+                    {
+                        simulated = simulated.AddMilliseconds(HotkeySet[HKType.Syrup].TimerInMilliseconds);
+                        simulatedNextSyrup = CalculateNextConsumableUse(STANDARD_SYRUP_TIME, simulated);
+                    }
+                }
+
+                // Prepare next craft input
+                if (!CraftingComplete())
+                {
+                    simulated = simulated.AddMilliseconds(100);
+                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Confirm].TimerInMilliseconds * 3);
+                }
+
+                simulated = simulated.AddMilliseconds(STANDARD_ANIMATION_DELAY);
+            }
+
+            var totalDuration = (int)(simulated - start).TotalMilliseconds;
+            UICommunicator.BeginTotalTimer(totalDuration);
+        }
+
         private static void RunCraftProgressBar()
         {
-            int totalTime = HotkeySet[HKType.Macro1].TimerInMiliseconds;
+            int totalTime = HotkeySet[HKType.Macro1].TimerInMilliseconds;
             if (HotkeySet[HKType.Macro2] != null)
-                totalTime += HotkeySet[HKType.Macro2].TimerInMiliseconds;
+                totalTime += HotkeySet[HKType.Macro2].TimerInMilliseconds;
             if (HotkeySet[HKType.Macro3] != null)
-                totalTime += HotkeySet[HKType.Macro3].TimerInMiliseconds;
+                totalTime += HotkeySet[HKType.Macro3].TimerInMilliseconds;
 
             UICommunicator.BeginCraftTimer(totalTime);
         }
+
+        private static void RunFoodProgressBar(int time)
+        {
+            int totalTime = time * 60 * 1000;
+
+            totalTime -= HotkeySet[HKType.Macro1].TimerInMilliseconds;
+            if (HotkeySet[HKType.Macro2] != null)
+                totalTime -= HotkeySet[HKType.Macro2].TimerInMilliseconds;
+            if (HotkeySet[HKType.Macro3] != null)
+                totalTime -= HotkeySet[HKType.Macro3].TimerInMilliseconds;
+            totalTime -= 15000;
+
+            UICommunicator.BeginFoodTimer(totalTime);
+
+        }
         #endregion
 
         #region Timing Methods
@@ -378,8 +454,7 @@ private static void SendInput(Hotkey hotkey, int repeat = 1)
             {
                 UICommunicator.UpdateStatus2("Sending \"" + hotkey.ToString() + "\"");
                 KeyInputEngine.SendKeysToGame(hotkey.KeyCode, hotkey.ModKeyCodes);
-                SleepThread(hotkey.TimerInMiliseconds);
-
+                SleepThread(hotkey.TimerInMilliseconds);
             }
         }
 
diff --git a/AutoSynthesis/Classes/Backend/KeyInputEngine.cs b/AutoSynthesis/Classes/Backend/KeyInputEngine.cs
index 72baf64..99ea086 100644
--- a/AutoSynthesis/Classes/Backend/KeyInputEngine.cs
+++ b/AutoSynthesis/Classes/Backend/KeyInputEngine.cs
@@ -2,10 +2,6 @@
 using System.Runtime.InteropServices;
 using WindowsInput.Native;
 using System.Threading;
-//using WindowsInput;
-
-
-
 
 namespace AutoSynthesis 
 {
@@ -36,6 +32,8 @@ public static void SendKeysToGame(VirtualKeyCode key, VirtualKeyCode[] modKeys =
                 }
             }
 
+            Thread.Sleep(50);
+
             // send key command 
             SendMessage(ProcessManager.ProcessPtr(), WM_KEYDOWN, (int)key, 0);
             SendMessage(ProcessManager.ProcessPtr(), WM_KEYUP, (int)key, 0);
diff --git a/AutoSynthesis/Classes/Backend/UICommunicator.cs b/AutoSynthesis/Classes/Backend/UICommunicator.cs
index a01d664..5d3cf32 100644
--- a/AutoSynthesis/Classes/Backend/UICommunicator.cs
+++ b/AutoSynthesis/Classes/Backend/UICommunicator.cs
@@ -22,20 +22,27 @@ static class UICommunicator
         #region Properties and Consts
         public static Label UpdateLabel { get; set; }
         public static Label UpdateLabel2 { get; set; }
-        public static Label CraftsCompletedLabel { get; set; }
+        public static Label TotalTimerLabel { get; set; }
         public static Label FoodSyrupLabel { get; set; }
         public static Label CraftTimerLabel { get; set; }
         public static Label MacroTimerLabel { get; set; }
-        public static ProgressBar ProgressOverall { get; set; }
+        public static Label FoodTimerLabel { get; set; }
+        public static ProgressBar ProgressTotal { get; set; }
         public static ProgressBar ProgressCraft { get; set; }
         public static ProgressBar ProgressMacro { get; set; }
 
+        public static ProgressBar ProgressFood { get; set; }
+
         public static Action<Exception> ErrorMessageHandler { get; set; }
 
+        private static double ProgressTotalTimeDuration { get; set; }
         private static double ProgressCraftTimeDuration { get; set; }
+        private static DateTime ProgressTotalTime { get; set; }
         private static DateTime ProgressCraftTime { get; set; }
         private static double ProgressMacroTimeDuration { get; set; }
         private static DateTime ProgressMacroTime { get; set; }
+        private static double ProgressFoodTimeDuration { get; set; }
+        private static DateTime ProgressFoodTime { get; set; }
         private static DateTime NullDateTime { get; set; }
         private static int MacroNumber { get; set; }
         private static int CraftNumber { get; set; }
@@ -60,26 +67,39 @@ static class UICommunicator
         private static bool UpdateOverride { get; set; }
 
 
+        private static string PreviousTotalTimerText { get; set; }
         private static string PreviousCraftTimerText { get; set; }
         private static string PreviousMacroTimerText { get; set; }
+        private static string PreviousFoodTimerText { get; set; }
         private static string PreviousFoodSyrupTimerText { get; set; }
 
         #endregion
 
         #region Setup Methods
-        public static void ConnectUI(Label headerLabel, Label updateLabel, Label updateLabel2, Label craftLabel, 
-                                     Label macroLabel, Label foodSyrupLabel, ProgressBar progressOverall,
-                                     ProgressBar progressCraft, ProgressBar progressMacro)
+        public static void ConnectUI(Label totalLabel, Label updateLabel, Label updateLabel2, Label craftTimerLabel,
+                                     Label macroTimerLabel, Label foodSyrupLabel, Label foodTimerLabel, ProgressBar progressTotal,
+                                     ProgressBar progressCraft, ProgressBar progressMacro, ProgressBar progressFood)
         {
-            CraftsCompletedLabel = headerLabel;
+            TotalTimerLabel = totalLabel;
             UpdateLabel = updateLabel;
             UpdateLabel2 = updateLabel2;
             FoodSyrupLabel = foodSyrupLabel;
-            CraftTimerLabel = craftLabel;
-            MacroTimerLabel = macroLabel;
-            ProgressOverall = progressOverall;
+            CraftTimerLabel = craftTimerLabel;
+            MacroTimerLabel = macroTimerLabel;
+            FoodTimerLabel = foodTimerLabel;
+            ProgressTotal = progressTotal;
             ProgressCraft = progressCraft;
             ProgressMacro = progressMacro;
+            ProgressFood = progressFood;
+
+            TotalTimerLabel.Visibility = Visibility.Hidden;
+            CraftTimerLabel.Visibility = Visibility.Hidden;
+            MacroTimerLabel.Visibility = Visibility.Hidden;
+            FoodTimerLabel.Visibility = Visibility.Hidden;
+
+            updateLabel.Content = "";
+            updateLabel2.Content = "";
+            foodSyrupLabel.Content = "";
         }
 
         public static void ResetValues()
@@ -90,20 +110,24 @@ public static void ResetValues()
             FoodEnabled = false;
             SyrupEnabled = false;
             PreviousUpdate2Message = "";
+            ProgressTotalTime = new DateTime();
+            ProgressTotalTimeDuration = 0;
             ProgressCraftTime = new DateTime();
             ProgressCraftTimeDuration = 0;
             ProgressMacroTime = new DateTime();
             ProgressMacroTimeDuration = 0;
+            ProgressFoodTime = new DateTime();
+            ProgressFoodTimeDuration = 0;
             UpdateOverride = false;
             PreviousCraftTimerText = "";
             PreviousMacroTimerText = "";
             PreviousFoodSyrupTimerText = "";
 
-    }
-    #endregion
+        }
+        #endregion
 
-    #region Update Methods (Called by External Functions)
-    public static void UpdateCraftUIInfo(int craftCount, int max)
+        #region Update Methods (Called by External Functions)
+        public static void UpdateCraftUIInfo(int craftCount, int max)
         {
             // Updates visual display on craft status
             // Label
@@ -111,31 +135,6 @@ public static void UpdateCraftUIInfo(int craftCount, int max)
             MaxNumber = max;
         }
 
-        public static void UpdateCompletedUIInfo(int craftCount, int max)
-        {
-            CraftNumber = craftCount;
-            MaxNumber = max;
-            string uiText = $"Crafted: ";
-            string craftCounter = CraftNumber.ToString();
-            if (max != 0)
-                craftCounter += $"/{MaxNumber}";
-
-            if (craftCounter.Length > 5)
-            {
-                UpdateCraftNumberLabel(craftCounter);
-            } else
-            {
-                UpdateCraftNumberLabel(uiText + craftCounter);
-            }
-
-            // Progress Bar
-            if (max > 0)
-            {
-                double p = (double)CraftNumber / MaxNumber;
-                SmoothProgressUpdate(ProgressOverall, p);
-            }
-        }
-
         public static void UpdateMacroUIInfo(int macroNumber, int macroTimer, bool finalMacro = false)
         {
             MacroNumber = macroNumber;
@@ -148,12 +147,26 @@ public static void UpdateMacroUIInfo(int macroNumber, int macroTimer, bool final
                 ProgressMacroTime = ProgressCraftTime;
         }
 
+        public static void BeginTotalTimer(int totalTime)
+        {
+            ProgressTotalTimeDuration = totalTime;
+            ProgressTotalTime = DateTime.Now.AddMilliseconds(totalTime);
+        }
+
         public static void BeginCraftTimer(int totalTime)
         {
             ProgressCraftTimeDuration = totalTime;
             ProgressCraftTime = DateTime.Now.AddMilliseconds(totalTime);
         }
 
+        public static void BeginFoodTimer(int totalTime)
+        {
+            FoodEnabled = true;
+            ProgressFoodTimeDuration = totalTime;
+            ProgressFoodTime = DateTime.Now.AddMilliseconds(totalTime);
+            NextFood = DateTime.Now.AddMilliseconds(totalTime);
+        }
+
         public static void UpdateFood(DateTime nextFood)
         {
             FoodEnabled = true;
@@ -191,7 +204,8 @@ public static void UpdateStatus2(string text)
             {
                 PreviousUpdate2Count++;
                 text += "(" + PreviousUpdate2Count + ")";
-            } else
+            }
+            else
             {
                 PreviousUpdate2Count = 1;
             }
@@ -207,24 +221,13 @@ public static void EndAllProgress()
             UpdateOverrideReset();
             UpdateStatus2("");
             DropProgressToZero();
-            UpdateProgressBar(ProgressOverall, 0);
+            UpdateProgressBar(ProgressTotal, 0);
             UpdateProgressBar(ProgressCraft, 0);
             UpdateProgressBar(ProgressMacro, 0);
             FoodSyrupLabel.Dispatcher.Invoke(() => { FoodSyrupLabel.Content = ""; });
         }
         #endregion
 
-        #region Label Updates
-        private static void UpdateCraftNumberLabel(string uiText)
-        {
-            // Update label
-            Action action = () => { CraftsCompletedLabel.Content = uiText; };
-            DispatchActionLabel(CraftsCompletedLabel, action);
-            // Update progress bar
-        }
-
-        #endregion
-
         #region Progress Bar Updates
         public static void StartTimedProgressBarUpdates()
         {
@@ -235,10 +238,14 @@ public static void StartTimedProgressBarUpdates()
             {
                 try
                 {
-                    SetProgressbarLabelVisible();
+                    SetProgressBarLabelVisible();
 
                     while (!token.IsCancellationRequested)
                     {
+                        // Update Total Craft Timer
+                        UpdateTimerProgressBar(ProgressTotal, ProgressTotalTime, ProgressTotalTimeDuration);
+                        UpdateTotalTimerText();
+
                         // Update Craft Timer
                         UpdateTimerProgressBar(ProgressCraft, ProgressCraftTime, ProgressCraftTimeDuration);
                         UpdateCraftTimerText();
@@ -248,12 +255,15 @@ public static void StartTimedProgressBarUpdates()
                         UpdateMacroTimerText();
 
                         // Update Food Label
+                        UpdateTimerProgressBar(ProgressFood, ProgressFoodTime, ProgressFoodTimeDuration);
+                        UpdateFoodTimerText();
+
                         UpdateFoodSyrupLabel();
 
                         Thread.Sleep(TICK_TIME);
                     }
 
-                    SetProgressbarLabelVisible(false);
+                    SetProgressBarLabelVisible(false);
                 }
                 catch (Exception e)
                 {
@@ -263,10 +273,26 @@ public static void StartTimedProgressBarUpdates()
             Task.Run(action, token);
         }
 
+        private static void UpdateTotalTimerText()
+        {
+            var output = $"Total: ";
+            var timer = GetTimeRemainingString(ProgressTotalTime);
+            output += timer;
+
+            if (output != PreviousTotalTimerText)
+            {
+                TotalTimerLabel.Dispatcher.Invoke(() => { TotalTimerLabel.Content = output; });
+            }
+
+            PreviousTotalTimerText = output;
+        }
 
         private static void UpdateCraftTimerText()
         {
-            var output = "Craft " + CraftNumber + ": ";
+            var output = $"Craft {CraftNumber}";
+            if (MaxNumber > 0)
+                output += $"/{MaxNumber}";
+            output += ": ";
             var timer = GetTimeRemainingString(ProgressCraftTime);
             output += timer;
 
@@ -288,6 +314,18 @@ private static void UpdateMacroTimerText()
             PreviousMacroTimerText = output;
         }
 
+        private static void UpdateFoodTimerText()
+        {
+            var output = "Food: ";
+            var timer = GetTimeRemainingString(ProgressFoodTime);
+            output += timer;
+
+            if (output != PreviousFoodTimerText)
+                FoodTimerLabel.Dispatcher.Invoke(() => { FoodTimerLabel.Content = output; });
+
+            PreviousFoodTimerText = output;
+        }
+
         private static void UpdateFoodSyrupLabel()
         {
             var output = GetFoodSyrupLabelString();
@@ -338,19 +376,22 @@ private static string GetTimeRemainingString(DateTime target, bool longFormat =
             }
         }
 
-        private static void SetProgressbarLabelVisible(bool setToVisible = true)
+        private static void SetProgressBarLabelVisible(bool setToVisible = true)
         {
             var startingOpacity = setToVisible ? 0 : 100;
             var visibility = setToVisible ? Visibility.Visible : Visibility.Hidden;
             // Set the labels on and their opacity to 0
-            CraftsCompletedLabel.Dispatcher.Invoke(() => CraftsCompletedLabel.Opacity = startingOpacity);
-            MacroTimerLabel.Dispatcher.Invoke(() => MacroTimerLabel.Opacity = startingOpacity);
+            TotalTimerLabel.Dispatcher.Invoke(() => TotalTimerLabel.Opacity = startingOpacity);
             CraftTimerLabel.Dispatcher.Invoke(() => CraftTimerLabel.Opacity = startingOpacity);
+            MacroTimerLabel.Dispatcher.Invoke(() => MacroTimerLabel.Opacity = startingOpacity);
+            FoodTimerLabel.Dispatcher.Invoke(() => FoodTimerLabel.Opacity = startingOpacity);
             if (setToVisible)
             {
-                CraftsCompletedLabel.Dispatcher.Invoke(() => CraftsCompletedLabel.Visibility = visibility);
-                MacroTimerLabel.Dispatcher.Invoke(() => MacroTimerLabel.Visibility = visibility);
+                TotalTimerLabel.Dispatcher.Invoke(() => TotalTimerLabel.Visibility = visibility);
                 CraftTimerLabel.Dispatcher.Invoke(() => CraftTimerLabel.Visibility = visibility);
+                MacroTimerLabel.Dispatcher.Invoke(() => MacroTimerLabel.Visibility = visibility);
+                if (FoodEnabled)
+                    FoodTimerLabel.Dispatcher.Invoke(() => FoodTimerLabel.Visibility = visibility);
             }
 
             // Fade in Bars on Separate Thread
@@ -363,20 +404,26 @@ private static void SetProgressbarLabelVisible(bool setToVisible = true)
                     var prog = i * jump;
                     if (!setToVisible)
                         prog = 1 - prog;
-                    CraftsCompletedLabel.Dispatcher.Invoke(() => CraftsCompletedLabel.Opacity = prog);
-                    MacroTimerLabel.Dispatcher.Invoke(() => MacroTimerLabel.Opacity = prog);
+                    TotalTimerLabel.Dispatcher.Invoke(() => TotalTimerLabel.Opacity = prog);
                     CraftTimerLabel.Dispatcher.Invoke(() => CraftTimerLabel.Opacity = prog);
+                    MacroTimerLabel.Dispatcher.Invoke(() => MacroTimerLabel.Opacity = prog);
+                    if (FoodEnabled)
+                        FoodTimerLabel.Dispatcher.Invoke(() => FoodTimerLabel.Opacity = prog);
                     Thread.Sleep(TICK_TIME);
                 }
-                CraftsCompletedLabel.Dispatcher.Invoke(() => CraftsCompletedLabel.Opacity = 1);
-                MacroTimerLabel.Dispatcher.Invoke(() => MacroTimerLabel.Opacity = 1);
+                TotalTimerLabel.Dispatcher.Invoke(() => TotalTimerLabel.Opacity = 1);
                 CraftTimerLabel.Dispatcher.Invoke(() => CraftTimerLabel.Opacity = 1);
+                MacroTimerLabel.Dispatcher.Invoke(() => MacroTimerLabel.Opacity = 1);
+                if (FoodEnabled)
+                    FoodTimerLabel.Dispatcher.Invoke(() => FoodTimerLabel.Opacity = 1);
 
                 if (!setToVisible)
                 {
-                    CraftsCompletedLabel.Dispatcher.Invoke(() => CraftsCompletedLabel.Visibility = visibility);
-                    MacroTimerLabel.Dispatcher.Invoke(() => MacroTimerLabel.Visibility = visibility);
+                    TotalTimerLabel.Dispatcher.Invoke(() => TotalTimerLabel.Visibility = visibility);
                     CraftTimerLabel.Dispatcher.Invoke(() => CraftTimerLabel.Visibility = visibility);
+                    MacroTimerLabel.Dispatcher.Invoke(() => MacroTimerLabel.Visibility = visibility);
+                    if (FoodEnabled)
+                        FoodTimerLabel.Dispatcher.Invoke(() => FoodTimerLabel.Visibility = visibility);
                 }
             };
             Task.Run(action);
@@ -454,20 +501,24 @@ private static void UpdateProgressBar(ProgressBar prog, double p)
         private static void DropProgressToZero()
         {
             var tickCount = FADE_TIME / TICK_TIME;
-            var overallProgress = GetProgressBarValue(ProgressOverall);
-            var overallProgressStep = overallProgress / tickCount;
+            var totalProgress = GetProgressBarValue(ProgressTotal);
+            var totalProgressStep = totalProgress / tickCount;
             var craftProgress = GetProgressBarValue(ProgressCraft);
             var craftProgressStep = craftProgress / tickCount;
             var macroProgress = GetProgressBarValue(ProgressMacro);
             var macroProgressStep = macroProgress / tickCount;
+            var foodProgress = GetProgressBarValue(ProgressFood);
+            var foodProgressStep = foodProgress / tickCount;
             for (int i = 0; i < tickCount; i++)
             {
-                overallProgress -= overallProgressStep;
+                totalProgress -= totalProgressStep;
                 craftProgress -= craftProgressStep;
                 macroProgress -= macroProgressStep;
-                UpdateProgressBar(ProgressOverall, overallProgress);
+                foodProgress -= foodProgressStep;
+                UpdateProgressBar(ProgressTotal, totalProgress);
                 UpdateProgressBar(ProgressCraft, craftProgress);
                 UpdateProgressBar(ProgressMacro, macroProgress);
+                UpdateProgressBar(ProgressFood, foodProgress);
                 Thread.Sleep(TICK_TIME);
             }
         }
@@ -486,7 +537,7 @@ private static void DispatchActionLabel(Label label, Action action)
 
         private static double GetProgressBarValue(ProgressBar progress)
         {
-            Func<double> func = () => { return (progress.Value/progress.Maximum); };
+            Func<double> func = () => { return (progress.Value / progress.Maximum); };
             var value = progress.Dispatcher.Invoke(func);
             return value;
         }
diff --git a/AutoSynthesis/DataTypes/Crafting/Hotkey.cs b/AutoSynthesis/DataTypes/Crafting/Hotkey.cs
index 6dea96b..87318dc 100644
--- a/AutoSynthesis/DataTypes/Crafting/Hotkey.cs
+++ b/AutoSynthesis/DataTypes/Crafting/Hotkey.cs
@@ -11,9 +11,9 @@ class Hotkey
     {
         public VirtualKeyCode KeyCode { get; set; }
         public VirtualKeyCode[] ModKeyCodes { get; set; }
-        public int TimerInMiliseconds { get; set; }
+        public int TimerInMilliseconds { get; set; }
         public string Text { get; set; }
-        private const int DEFAULT_TIMER = 1;
+        private const int DEFAULT_TIMER = 50;
 
 
 
@@ -21,13 +21,13 @@ public Hotkey(VirtualKeyCode keyCode, int timer = DEFAULT_TIMER)
         {
             KeyCode = keyCode;
             ModKeyCodes = null;
-            TimerInMiliseconds = timer;
+            TimerInMilliseconds = timer;
         }
         public Hotkey(VirtualKeyCode keyCode, VirtualKeyCode[] modKeyCodes, string text, int timer = DEFAULT_TIMER)
         {
             KeyCode = keyCode;
             ModKeyCodes = modKeyCodes;
-            TimerInMiliseconds = timer;
+            TimerInMilliseconds = timer;
             Text = text;
         }
 
diff --git a/AutoSynthesis/DataTypes/SettingsContainer.cs b/AutoSynthesis/DataTypes/SettingsContainer.cs
index a3f7bd4..384e397 100644
--- a/AutoSynthesis/DataTypes/SettingsContainer.cs
+++ b/AutoSynthesis/DataTypes/SettingsContainer.cs
@@ -10,7 +10,7 @@ class SettingsContainer
     {
         // contains settings metadata
         public int CraftCount { get; set; } // Set to 0 if endless craft
-        public int FoodDuration { get; set; } // if 40 min food, true
+        public int FoodDuration { get; set; }
         public bool CollectableCraft { get; set; }
         public int StartingFoodTime { get; set; }
         public int StartingSyrupTime { get; set; }
diff --git a/AutoSynthesis/MainWindow.xaml b/AutoSynthesis/MainWindow.xaml
index 18ff18c..1814383 100644
--- a/AutoSynthesis/MainWindow.xaml
+++ b/AutoSynthesis/MainWindow.xaml
@@ -1130,7 +1130,7 @@
                 x:Name="LabelConsumables"
                 Grid.Row="4"
                 Grid.Column="0"
-                Grid.ColumnSpan="2"
+                Grid.ColumnSpan="4"
                 Padding="5,5,5,5"
                 HorizontalAlignment="Left"
                 Content="Consumables"
@@ -1704,6 +1704,8 @@
                 <RowDefinition />
                 <RowDefinition />
                 <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
@@ -1726,11 +1728,10 @@
             <Button
                 x:Name="BTNCraft"
                 Grid.Row="0"
-                Grid.RowSpan="3"
+                Grid.RowSpan="4"
                 Grid.Column="0"
-                MinWidth="100"
                 Margin="2,2,2,2"
-                Padding="5,5,5,5"
+                Padding="25,25,25,25"
                 Click="BTNCraftInitiate"
                 Content="Start"
                 FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
@@ -1740,7 +1741,7 @@
 
             <!--  Status  -->
             <ProgressBar
-                x:Name="PGBOverall"
+                x:Name="PGBTotal"
                 Grid.Row="0"
                 Grid.Column="1"
                 Grid.ColumnSpan="2"
@@ -1751,7 +1752,7 @@
                 Foreground="#FFA60732"
                 Maximum="1000" />
             <Label
-                x:Name="LBLCraftNumber"
+                x:Name="LBLTimerTotal"
                 Grid.Row="0"
                 Grid.Column="2"
                 Width="Auto"
@@ -1761,8 +1762,7 @@
                 Background="#7FFFFFFF"
                 Content="Crafted: 99/99"
                 FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
-                Foreground="Black"
-                Visibility="Hidden" />
+                Foreground="Black" />
             <ProgressBar
                 x:Name="PGBCraft"
                 Grid.Row="1"
@@ -1784,8 +1784,7 @@
                 Background="#7FFFFFFF"
                 BorderThickness="1"
                 Content="Craft 999: 0:00"
-                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
-                Visibility="Hidden" />
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" />
             <ProgressBar
                 x:Name="PGBMacro"
                 Grid.Row="2"
@@ -1808,8 +1807,30 @@
                 Background="#7FFFFFFF"
                 BorderThickness="1"
                 Content="Macro 3: 0:00"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" />
+            <ProgressBar
+                x:Name="PGBFood"
+                Grid.Row="3"
+                Grid.Column="1"
+                Grid.ColumnSpan="2"
+                Margin="2,2,2,2"
+                Background="#FF2B2B2B"
+                BorderBrush="{x:Null}"
                 FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
-                Visibility="Hidden" />
+                Foreground="#FF7400FF"
+                Maximum="1000" />
+            <Label
+                x:Name="LBLTimerFood"
+                Grid.Row="3"
+                Grid.Column="2"
+                Width="Auto"
+                Margin="2,2,2,2"
+                HorizontalAlignment="Stretch"
+                HorizontalContentAlignment="Right"
+                Background="#7FFFFFFF"
+                BorderThickness="1"
+                Content="Food: 0:00"
+                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen" />
 
         </Grid>
 
@@ -1826,7 +1847,9 @@
                 x:Name="LBLUpdate"
                 Grid.Row="0"
                 Grid.Column="0"
+                VerticalContentAlignment="Center"
                 Background="Black"
+                Content="Using Macro 1..."
                 FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
                 Foreground="#FFDCEDFF"
                 Opacity="0.75" />
@@ -1834,7 +1857,9 @@
                 x:Name="LBLUpdateFooter"
                 Grid.Row="1"
                 Grid.Column="0"
+                VerticalContentAlignment="Center"
                 Background="Black"
+                Content="Using &quot;NUM 0&quot;"
                 FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
                 Foreground="#FFDCEDFF"
                 Opacity="0.75" />
@@ -1842,24 +1867,11 @@
                 x:Name="LBLFoodSyrupTimer"
                 Grid.Row="2"
                 Grid.Column="0"
+                VerticalContentAlignment="Center"
                 Background="Black"
                 FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
                 Foreground="#FFDCEDFF"
                 Opacity="0.75" />
         </Grid>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/AutoSynthesis/MainWindow.xaml.cs b/AutoSynthesis/MainWindow.xaml.cs
index c2f1462..52be72e 100644
--- a/AutoSynthesis/MainWindow.xaml.cs
+++ b/AutoSynthesis/MainWindow.xaml.cs
@@ -99,8 +99,8 @@ public MainWindow()
             ReadSettingsFile();
 
             // Set up UICommunicator
-            UICommunicator.ConnectUI(LBLCraftNumber, LBLUpdate, LBLUpdateFooter, LBLTimerCraft, LBLTimerMacro, 
-                LBLFoodSyrupTimer, PGBOverall, PGBCraft, PGBMacro);
+            UICommunicator.ConnectUI(LBLTimerTotal, LBLUpdate, LBLUpdateFooter, LBLTimerCraft, LBLTimerMacro, LBLFoodSyrupTimer, LBLTimerFood,
+                 PGBTotal, PGBCraft, PGBMacro, PGBFood);
 
             // Set system state
             SystemState = SystemStates.IDLE;
diff --git a/AutoSynthesis/Windows/Settings.xaml b/AutoSynthesis/Windows/Settings.xaml
index 5210596..5c524b3 100644
--- a/AutoSynthesis/Windows/Settings.xaml
+++ b/AutoSynthesis/Windows/Settings.xaml
@@ -6,8 +6,6 @@
     xmlns:local="clr-namespace:AutoSynthesis.Windows"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="Settings"
-    Width="388"
-    Height="102"
     Background="#FF221632"
     Icon="/AutoSynthesis;component/Resources/Icon/Icon.png"
     Loaded="Window_Loaded"
@@ -92,7 +90,7 @@
             </Setter>
         </Style>
     </Window.Resources>
-    <Grid Margin="10,10,4,12">
+    <Grid Margin="10,10,10,10">
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition />
@@ -104,7 +102,6 @@
         <Label
             Grid.Row="0"
             Grid.Column="0"
-            Grid.ColumnSpan="2"
             HorizontalAlignment="Left"
             Content="Set the delay before starting a craft"
             FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"

From 167a4994bb58e459fad6eea3674603759ac52e89 Mon Sep 17 00:00:00 2001
From: copiousfish <copiousfish@hotmail.com>
Date: Mon, 19 Sep 2022 01:46:49 -0700
Subject: [PATCH 3/8] margin

---
 AutoSynthesis/MainWindow.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AutoSynthesis/MainWindow.xaml b/AutoSynthesis/MainWindow.xaml
index 1814383..931c4fc 100644
--- a/AutoSynthesis/MainWindow.xaml
+++ b/AutoSynthesis/MainWindow.xaml
@@ -1520,6 +1520,7 @@
                     x:Name="CHBCraftCount"
                     Grid.Row="4"
                     Grid.Column="1"
+                    Margin="5,5,5,5"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Background="#FFDCEDFF"

From 54774e7aaba6f71c326193cc69632e56299680f7 Mon Sep 17 00:00:00 2001
From: copiousfish <copiousfish@hotmail.com>
Date: Thu, 22 Sep 2022 22:55:36 -0700
Subject: [PATCH 4/8] Ending delay, true macro timers, food progress bar color,
 small fixes

---
 .../Classes/Backend/CraftingEngine.cs         | 59 +++++++++----------
 .../Classes/Backend/UICommunicator.cs         | 11 ++--
 AutoSynthesis/DataTypes/SettingsContainer.cs  |  4 +-
 AutoSynthesis/MainWindow.xaml                 |  6 +-
 AutoSynthesis/MainWindow.xaml.cs              | 15 +++--
 AutoSynthesis/Windows/Settings.xaml           | 29 ++++++++-
 AutoSynthesis/Windows/Settings.xaml.cs        | 18 ++++--
 7 files changed, 89 insertions(+), 53 deletions(-)

diff --git a/AutoSynthesis/Classes/Backend/CraftingEngine.cs b/AutoSynthesis/Classes/Backend/CraftingEngine.cs
index 6465be9..28367c6 100644
--- a/AutoSynthesis/Classes/Backend/CraftingEngine.cs
+++ b/AutoSynthesis/Classes/Backend/CraftingEngine.cs
@@ -108,9 +108,6 @@ private static void RunCraftingEngine(CancellationToken token)
                 UICommunicator.UpdateStatus("Setting up for Crafting...");
                 UICommunicator.StartTimedProgressBarUpdates();
 
-                RunTotalProgressBar();
-
-
                 CraftCount = 1;
                 CompletedCount = 0;
                 if (HotkeySet[HKType.Food] != null)
@@ -126,20 +123,21 @@ private static void RunCraftingEngine(CancellationToken token)
                     UICommunicator.UpdateSyrup(NextSyrupUse);
                 }
 
+                RunTotalProgressBar();
 
-                // If crafts remaining was 0, loop infinitley
+                // If crafts remaining was 0, loop infinitely
                 // If not, craft until quota is met
                 while (!CraftingComplete())
                 {
                     // UI MESSAGE: Set timer for overall craft
                     UICommunicator.UpdateCraftUIInfo(CraftCount, Settings.CraftCount);
 
-                    // Add requested delay
-                    Break(Settings.StartingDelay);
-
                     // Begin Craft Timer:
                     RunCraftProgressBar();
 
+                    // Add requested delay
+                    Break(Settings.StartingDelay);
+
                     // Initiate Macro 1
                     SendMacroInput(HotkeySet[HKType.Macro1], 1);
 
@@ -148,20 +146,20 @@ private static void RunCraftingEngine(CancellationToken token)
 
                     // Initiate Macro 3
                     SendMacroInput(HotkeySet[HKType.Macro3], 3);
-                    CompletedCount = CraftCount;
+
+                    // Finish and add requested end delay
+                    Break(STANDARD_MENU_DELAY+ Settings.EndingDelay);
 
                     // Collectable Menu Option
                     SendCollectableConfirmationInput();
 
-                    // Standard delay for menus
-                    Break(STANDARD_MENU_DELAY);
+                    CompletedCount = CraftCount;
 
                     // Use Food and Syrup
                     SendFoodAndSyrupInput();
 
                     // Prepare next craft if crafting is not finished
                     PrepareNextCraftInput();
-                    Break(STANDARD_ANIMATION_DELAY);
 
                     CraftCount += 1;
                 }
@@ -211,21 +209,10 @@ private static void SendMacroInput(Hotkey hotkey, int macroNumber)
                 return;
             Logger.Write("Sending Macro " + macroNumber);
             // UI message: MACRO NUMBER macroNumber
-            UICommunicator.UpdateMacroUIInfo(macroNumber, hotkey.TimerInMilliseconds, VerifyFinalMacro(macroNumber));
+            UICommunicator.UpdateMacroUIInfo(macroNumber, hotkey.TimerInMilliseconds);
             SendInput(hotkey);
         }
 
-        private static bool VerifyFinalMacro(int macroNumber)
-        {
-            switch (macroNumber)
-            {
-                case 1:
-                    return (HotkeySet[HKType.Macro2] == null && HotkeySet[HKType.Macro3] == null);
-                case 2:
-                    return (HotkeySet[HKType.Macro3] == null);
-            }
-            return true;
-        }
 
         private static void SendCollectableConfirmationInput()
         {
@@ -235,8 +222,8 @@ private static void SendCollectableConfirmationInput()
             Logger.Write("Accepting Collectable Craft");
 
             UICommunicator.UpdateStatus("Accepting Collectable Craft...");
-            Break(STANDARD_MENU_DELAY);
             SendInput(HotkeySet[HKType.Confirm], 2);
+            Break(STANDARD_MENU_DELAY);
         }
 
         private static bool CraftingComplete()
@@ -330,7 +317,7 @@ private static void PrepareNextCraftInput()
                 ProcessManager.EnableInputs();
             }
 
-
+            Break(STANDARD_ANIMATION_DELAY);
         }
         private static DateTime CalculateNextConsumableUse(int timeRemainingInMinutes, DateTime start)
         {
@@ -366,14 +353,16 @@ private static void RunTotalProgressBar()
                     simulated = simulated.AddMilliseconds(HotkeySet[HKType.Macro2].TimerInMilliseconds);
                 if (HotkeySet[HKType.Macro3] != null)
                     simulated = simulated.AddMilliseconds(HotkeySet[HKType.Macro3].TimerInMilliseconds);
+                
+                simulated = simulated.AddMilliseconds(STANDARD_MENU_DELAY);
+                simulated = simulated.AddMilliseconds(Settings.EndingDelay);
 
                 if (Settings.CollectableCraft)
                 {
-                    simulated = simulated.AddMilliseconds(STANDARD_MENU_DELAY);
                     simulated = simulated.AddMilliseconds(HotkeySet[HKType.Confirm].TimerInMilliseconds * 2);
+                    simulated = simulated.AddMilliseconds(STANDARD_MENU_DELAY);
                 }
 
-                simulated = simulated.AddMilliseconds(STANDARD_MENU_DELAY);
 
                 bool useFood = (HotkeySet[HKType.Food] != null && DateTime.Compare(simulatedNextFood, start) <= 0);
                 bool useSyrup = (HotkeySet[HKType.Syrup] != null && DateTime.Compare(simulatedNextSyrup, start) <= 0);
@@ -402,13 +391,15 @@ private static void RunTotalProgressBar()
                 }
 
                 // Prepare next craft input
-                if (!CraftingComplete())
+                if (i + 1 < Settings.CraftCount)
                 {
                     simulated = simulated.AddMilliseconds(100);
                     simulated = simulated.AddMilliseconds(HotkeySet[HKType.Confirm].TimerInMilliseconds * 3);
+                    simulated = simulated.AddMilliseconds(STANDARD_ANIMATION_DELAY);
                 }
 
-                simulated = simulated.AddMilliseconds(STANDARD_ANIMATION_DELAY);
+                // For each craft, add an artificial execution delay
+                simulated = simulated.AddMilliseconds(650);
             }
 
             var totalDuration = (int)(simulated - start).TotalMilliseconds;
@@ -417,12 +408,20 @@ private static void RunTotalProgressBar()
 
         private static void RunCraftProgressBar()
         {
-            int totalTime = HotkeySet[HKType.Macro1].TimerInMilliseconds;
+            int totalTime = Settings.StartingDelay;
+
+            totalTime += HotkeySet[HKType.Macro1].TimerInMilliseconds;
             if (HotkeySet[HKType.Macro2] != null)
                 totalTime += HotkeySet[HKType.Macro2].TimerInMilliseconds;
             if (HotkeySet[HKType.Macro3] != null)
                 totalTime += HotkeySet[HKType.Macro3].TimerInMilliseconds;
 
+            totalTime += Settings.EndingDelay;
+
+            totalTime += STANDARD_MENU_DELAY;
+            if (CraftCount + 1 < Settings.CraftCount)
+                totalTime += STANDARD_ANIMATION_DELAY;
+
             UICommunicator.BeginCraftTimer(totalTime);
         }
 
diff --git a/AutoSynthesis/Classes/Backend/UICommunicator.cs b/AutoSynthesis/Classes/Backend/UICommunicator.cs
index 5d3cf32..c93178d 100644
--- a/AutoSynthesis/Classes/Backend/UICommunicator.cs
+++ b/AutoSynthesis/Classes/Backend/UICommunicator.cs
@@ -135,16 +135,13 @@ public static void UpdateCraftUIInfo(int craftCount, int max)
             MaxNumber = max;
         }
 
-        public static void UpdateMacroUIInfo(int macroNumber, int macroTimer, bool finalMacro = false)
+        public static void UpdateMacroUIInfo(int macroNumber, int macroTimer)
         {
             MacroNumber = macroNumber;
             UpdateStatus($"Using Macro {MacroNumber}...");
 
             ProgressMacroTimeDuration = macroTimer;
-            if (!finalMacro)
-                ProgressMacroTime = DateTime.Now.AddMilliseconds(macroTimer);
-            else
-                ProgressMacroTime = ProgressCraftTime;
+            ProgressMacroTime = DateTime.Now.AddMilliseconds(macroTimer);
         }
 
         public static void BeginTotalTimer(int totalTime)
@@ -341,7 +338,7 @@ private static string GetFoodSyrupLabelString()
             {
                 var foodString = GetTimeRemainingString(NextFood, true);
                 var syrupString = GetTimeRemainingString(NextSyrup, true);
-                return "Next Food: " + foodString + "             Next Syrup: " + syrupString;
+                return "Next Food: " + foodString + ". Next Syrup: " + syrupString;
             }
             if (FoodEnabled)
             {
@@ -371,7 +368,7 @@ private static string GetTimeRemainingString(DateTime target, bool longFormat =
                 {
                     var minutes = difference.Hours * 60 + difference.Minutes;
                     var seconds = difference.Seconds;
-                    return longFormat ? minutes.ToString("00") + ":" + seconds.ToString("00") : minutes + ":" + seconds;
+                    return minutes.ToString() + ":" + seconds.ToString("00");
                 }
             }
         }
diff --git a/AutoSynthesis/DataTypes/SettingsContainer.cs b/AutoSynthesis/DataTypes/SettingsContainer.cs
index 384e397..ee6b63a 100644
--- a/AutoSynthesis/DataTypes/SettingsContainer.cs
+++ b/AutoSynthesis/DataTypes/SettingsContainer.cs
@@ -15,8 +15,9 @@ class SettingsContainer
         public int StartingFoodTime { get; set; }
         public int StartingSyrupTime { get; set; }
         public int StartingDelay { get; set; }
+        public int EndingDelay { get; set; }
 
-        public SettingsContainer(int craftCount, bool collectableCraft, int foodDuration, int startingFoodTime, int startingSyrupTime, int startingDelay)
+        public SettingsContainer(int craftCount, bool collectableCraft, int foodDuration, int startingFoodTime, int startingSyrupTime, int startingDelay, int endingDelay)
         {
             if (craftCount < 0)
             {
@@ -29,6 +30,7 @@ public SettingsContainer(int craftCount, bool collectableCraft, int foodDuration
             StartingFoodTime = startingFoodTime;
             StartingSyrupTime = startingSyrupTime;
             StartingDelay = startingDelay;
+            EndingDelay = endingDelay;
         }
     }
 }
diff --git a/AutoSynthesis/MainWindow.xaml b/AutoSynthesis/MainWindow.xaml
index 931c4fc..face954 100644
--- a/AutoSynthesis/MainWindow.xaml
+++ b/AutoSynthesis/MainWindow.xaml
@@ -748,6 +748,7 @@
 
     <Grid
         x:Name="MainWindowGrid"
+        Margin="10,10,10,10"
         HorizontalAlignment="Center"
         VerticalAlignment="Center"
         Grid.IsSharedSizeScope="True"
@@ -1582,6 +1583,7 @@
                     x:Name="CHBCollectableCraft"
                     Grid.Row="0"
                     Grid.Column="1"
+                    Margin="5,5,5,5"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Background="#FFDCEDFF"
@@ -1756,11 +1758,11 @@
                 x:Name="LBLTimerTotal"
                 Grid.Row="0"
                 Grid.Column="2"
-                Width="Auto"
                 Margin="2,2,2,2"
                 HorizontalAlignment="Stretch"
                 HorizontalContentAlignment="Right"
                 Background="#7FFFFFFF"
+                BorderThickness="1"
                 Content="Crafted: 99/99"
                 FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
                 Foreground="Black" />
@@ -1818,7 +1820,7 @@
                 Background="#FF2B2B2B"
                 BorderBrush="{x:Null}"
                 FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
-                Foreground="#FF7400FF"
+                Foreground="#FF0ECC1A"
                 Maximum="1000" />
             <Label
                 x:Name="LBLTimerFood"
diff --git a/AutoSynthesis/MainWindow.xaml.cs b/AutoSynthesis/MainWindow.xaml.cs
index 52be72e..0630764 100644
--- a/AutoSynthesis/MainWindow.xaml.cs
+++ b/AutoSynthesis/MainWindow.xaml.cs
@@ -76,6 +76,7 @@ private enum SystemStates
         private System.Windows.Forms.NotifyIcon Notify { get; set; }
         private bool NotifyFlagged { get; set; } = true;
         private int StartCraftingDelay { get; set; } = 0;
+        private int EndCraftingDelay { get; set; } = 0;
         #endregion
 
         #region Brush Colors
@@ -348,7 +349,8 @@ private void BTNCraftInitiate(object sender, RoutedEventArgs e)
                         FoodTimer,
                         TimerContainers[TXBFoodTimer].Timer,
                         TimerContainers[TXBSyrupTimer].Timer, 
-                        StartCraftingDelay * 1000
+                        StartCraftingDelay * 1000,
+                        EndCraftingDelay * 1000
                     );
                 }
                 catch (InvalidUserParametersException error)
@@ -1227,10 +1229,13 @@ private void OpenSettings(object sender, MouseButtonEventArgs e)
         {
             try
             {
-                var settingsDialogue = new Settings(StartCraftingDelay.ToString());
+                var settingsDialogue = new Settings(StartCraftingDelay.ToString(), EndCraftingDelay.ToString());
                 settingsDialogue.Owner = Application.Current.MainWindow;
                 if (settingsDialogue.ShowDialog() == true)
-                    StartCraftingDelay = Convert.ToInt32(settingsDialogue.Time);
+                {
+                    StartCraftingDelay = Convert.ToInt32(settingsDialogue.StartDelay);
+                    EndCraftingDelay = Convert.ToInt32(settingsDialogue.EndDelay);
+                }
                 WriteSaveSettings();
             }
             catch (Exception error)
@@ -1245,7 +1250,7 @@ private void WriteSaveSettings()
         {
             try
             {
-                var text = AlwaysOnTopEnabled.ToString() + "|" + StartCraftingDelay.ToString();
+                var text = AlwaysOnTopEnabled.ToString() + "|" + StartCraftingDelay.ToString() + "|" + EndCraftingDelay.ToString();
                 File.WriteAllText(SettingsFileDirectory, text);
             }
             catch
@@ -1264,11 +1269,13 @@ private void ReadSettingsFile()
                 var fileResult = File.ReadAllText(SettingsFileDirectory).Split('|');
                 AlwaysOnTopEnabled = Convert.ToBoolean(fileResult[0]);
                 StartCraftingDelay = Convert.ToInt32(fileResult[1]);
+                EndCraftingDelay= Convert.ToInt32(fileResult[2]);
             }
             catch
             {
                 AlwaysOnTopEnabled = false;
                 StartCraftingDelay = 0;
+                EndCraftingDelay = 0;
             }
             var resourceUrl = AlwaysOnTopEnabled ? "Resources/Images/Buttons/AlwaysOnTopOn.png" : "Resources/Images/Buttons/AlwaysOnTopOff.png";
             AlwaysOnTop_Label.Source = new BitmapImage(new Uri(resourceUrl, UriKind.Relative));
diff --git a/AutoSynthesis/Windows/Settings.xaml b/AutoSynthesis/Windows/Settings.xaml
index 5c524b3..f8ea529 100644
--- a/AutoSynthesis/Windows/Settings.xaml
+++ b/AutoSynthesis/Windows/Settings.xaml
@@ -94,6 +94,7 @@
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition />
+            <RowDefinition />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
@@ -108,7 +109,7 @@
             FontSize="16"
             Foreground="#FFDCEDFF" />
         <TextBox
-            x:Name="TXBDelay"
+            x:Name="TXBStartDelay"
             Grid.Row="0"
             Grid.Column="1"
             Width="30"
@@ -119,14 +120,36 @@
             FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
             FontSize="14"
             PreviewTextInput="NumberValidationTextBox"
+            Text="0" />
+        <Label
+            Grid.Row="1"
+            Grid.Column="0"
+            HorizontalAlignment="Left"
+            Content="Set the delay after finishing a craft"
+            FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+            FontSize="16"
+            Foreground="#FFDCEDFF" />
+        <TextBox
+            x:Name="TXBEndDelay"
+            Grid.Row="1"
+            Grid.Column="1"
+            Width="30"
+            Margin="2,2,2,2"
+            HorizontalContentAlignment="Center"
+            VerticalContentAlignment="Center"
+            Background="#FFDCEDFF"
+            FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+            FontSize="14"
+            PreviewTextInput="NumberValidationTextBox"
             Text="0"
             TextWrapping="Wrap" />
         <Button
             x:Name="BTNConfirm"
-            Grid.Row="1"
+            Grid.Row="2"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            Margin="2,2,2,2"
+            Margin="5,5,5,5"
+            Padding="5,5,5,5"
             HorizontalAlignment="Center"
             Click="BTNConfirm_Click"
             Content="Save"
diff --git a/AutoSynthesis/Windows/Settings.xaml.cs b/AutoSynthesis/Windows/Settings.xaml.cs
index 94880de..14ffde7 100644
--- a/AutoSynthesis/Windows/Settings.xaml.cs
+++ b/AutoSynthesis/Windows/Settings.xaml.cs
@@ -20,14 +20,20 @@ namespace AutoSynthesis.Windows
     /// </summary>
     public partial class Settings : Window
     {
-        public string Time {
-            get { return TXBDelay.Text; }
+        public string StartDelay {
+            get { return TXBStartDelay.Text; }
         }
 
-        public Settings(string initialTime)
+        public string EndDelay
+        {
+            get { return TXBEndDelay.Text; }
+        }
+
+        public Settings(string startDelayTime, string endDelayTime)
         {
             InitializeComponent();
-            TXBDelay.Text = initialTime;
+            TXBStartDelay.Text = startDelayTime;
+            TXBEndDelay.Text = endDelayTime;
         }
 
         private void NumberValidationTextBox(object sender, TextCompositionEventArgs e)
@@ -44,8 +50,8 @@ private void BTNConfirm_Click(object sender, RoutedEventArgs e)
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            TXBDelay.Focus();
-            TXBDelay.SelectAll();
+            TXBStartDelay.Focus();
+            TXBStartDelay.SelectAll();
         }
     }
 }

From dc7ddbeb1aea8fb8963622d1b4e77c6bfcd4734a Mon Sep 17 00:00:00 2001
From: "copiousfish@gmail.com" <copiousfish@hotmail.com>
Date: Fri, 23 Sep 2022 11:13:29 -0700
Subject: [PATCH 5/8] don't wrap craft count textbox

---
 AutoSynthesis/MainWindow.xaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AutoSynthesis/MainWindow.xaml b/AutoSynthesis/MainWindow.xaml
index face954..71eabe3 100644
--- a/AutoSynthesis/MainWindow.xaml
+++ b/AutoSynthesis/MainWindow.xaml
@@ -1549,8 +1549,7 @@
                     KeyDown="SetTimeValue"
                     LostFocus="TimeLostFocus"
                     Opacity="0.9"
-                    Text="0"
-                    TextWrapping="Wrap" />
+                    Text="0" />
             </Grid>
 
             <Grid

From cf8e6b24614cc40999d688381881d846f5b546c7 Mon Sep 17 00:00:00 2001
From: "copiousfish@gmail.com" <copiousfish@hotmail.com>
Date: Fri, 23 Sep 2022 11:16:35 -0700
Subject: [PATCH 6/8] minwidth on text boxes

---
 AutoSynthesis/MainWindow.xaml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/AutoSynthesis/MainWindow.xaml b/AutoSynthesis/MainWindow.xaml
index 71eabe3..d6553e2 100644
--- a/AutoSynthesis/MainWindow.xaml
+++ b/AutoSynthesis/MainWindow.xaml
@@ -975,7 +975,7 @@
                 x:Name="TXBMacro1Timer"
                 Grid.Row="1"
                 Grid.Column="3"
-                Width="30"
+                MinWidth="30"
                 Margin="2,2,2,2"
                 Padding="2,2,2,2"
                 HorizontalContentAlignment="Center"
@@ -1041,7 +1041,7 @@
                 x:Name="TXBMacro2Timer"
                 Grid.Row="2"
                 Grid.Column="3"
-                Width="30"
+                MinWidth="30"
                 Margin="2,2,2,2"
                 Padding="2,2,2,2"
                 HorizontalContentAlignment="Center"
@@ -1109,7 +1109,7 @@
                 x:Name="TXBMacro3Timer"
                 Grid.Row="3"
                 Grid.Column="3"
-                Width="30"
+                MinWidth="30"
                 Margin="2,2,2,2"
                 Padding="2,2,2,2"
                 HorizontalContentAlignment="Center"
@@ -1208,7 +1208,7 @@
                 x:Name="TXBFoodTimer"
                 Grid.Row="5"
                 Grid.Column="3"
-                Width="30"
+                MinWidth="30"
                 Margin="2,2,2,2"
                 Padding="2,2,2,2"
                 HorizontalContentAlignment="Center"
@@ -1279,7 +1279,7 @@
                 x:Name="TXBSyrupTimer"
                 Grid.Row="7"
                 Grid.Column="3"
-                Width="30"
+                MinWidth="30"
                 Margin="2,2,2,2"
                 Padding="2,2,2,2"
                 HorizontalContentAlignment="Center"
@@ -1535,7 +1535,7 @@
                     x:Name="TXBCraftCount"
                     Grid.Row="0"
                     Grid.Column="2"
-                    Width="30"
+                    MinWidth="50"
                     Margin="2,2,2,2"
                     Padding="2,2,2,2"
                     HorizontalContentAlignment="Center"
@@ -1549,7 +1549,7 @@
                     KeyDown="SetTimeValue"
                     LostFocus="TimeLostFocus"
                     Opacity="0.9"
-                    Text="0" />
+                    Text="100" />
             </Grid>
 
             <Grid
@@ -1732,6 +1732,7 @@
                 Grid.Row="0"
                 Grid.RowSpan="4"
                 Grid.Column="0"
+                MinWidth="120"
                 Margin="2,2,2,2"
                 Padding="25,25,25,25"
                 Click="BTNCraftInitiate"

From f27dee1fc0a49b9ae1daf21283a0e37052729471 Mon Sep 17 00:00:00 2001
From: "copiousfish@gmail.com" <copiousfish@hotmail.com>
Date: Fri, 23 Sep 2022 11:18:31 -0700
Subject: [PATCH 7/8] default craft count 0

---
 AutoSynthesis/MainWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AutoSynthesis/MainWindow.xaml b/AutoSynthesis/MainWindow.xaml
index d6553e2..b05f8be 100644
--- a/AutoSynthesis/MainWindow.xaml
+++ b/AutoSynthesis/MainWindow.xaml
@@ -1549,7 +1549,7 @@
                     KeyDown="SetTimeValue"
                     LostFocus="TimeLostFocus"
                     Opacity="0.9"
-                    Text="100" />
+                    Text="0" />
             </Grid>
 
             <Grid

From 6bb4f80833a0d475cc6960725547f9bc997e53f9 Mon Sep 17 00:00:00 2001
From: copiousfish <copiousfish@gmail.com>
Date: Mon, 10 Apr 2023 11:48:15 -0700
Subject: [PATCH 8/8] food expiration (#1)

Co-authored-by: copiousfish@gmail.com <copiousfish@hotmail.com>
---
 .../Classes/Backend/CraftingEngine.cs         | 259 ++++++++++++------
 .../Classes/Backend/KeyInputEngine.cs         |   4 +-
 .../Classes/Backend/UICommunicator.cs         |  40 ++-
 .../Classes/UI Classes/HotkeyProcessor.cs     |   4 +-
 AutoSynthesis/DataTypes/SettingsContainer.cs  |   4 +-
 AutoSynthesis/MainWindow.xaml                 | 229 +++++++++-------
 AutoSynthesis/MainWindow.xaml.cs              |  71 +++--
 7 files changed, 401 insertions(+), 210 deletions(-)

diff --git a/AutoSynthesis/Classes/Backend/CraftingEngine.cs b/AutoSynthesis/Classes/Backend/CraftingEngine.cs
index 28367c6..505a1e1 100644
--- a/AutoSynthesis/Classes/Backend/CraftingEngine.cs
+++ b/AutoSynthesis/Classes/Backend/CraftingEngine.cs
@@ -14,25 +14,41 @@ static class CraftingEngine
         private static SettingsContainer Settings { get; set; }
         public static bool CraftingActive { get; set; } = false;
         public static DateTime NextFoodUse { get; set; }
+        public static DateTime FoodExpiration { get; set; }
         public static DateTime NextSyrupUse { get; set; }
         public static CancellationTokenSource Cts { get; set; }
         private static Action EndCraftCallback { get; set; }
         public static Action<Exception> ErrorMessageHandler { get; set; }
         private static Action<int, int> SetFoodAndSyrupTimings { get; set; }
+
+        // Action to update the "Craft Count" text box
+        private static Action<int> SetCraftCount { get; set; }
+
         private static bool CraftPrimedToCancel { get; set; }
+        private static bool FoodPrimedToCancel { get; set; }
 
         private const int CONSUMABLE_MARGIN_IN_MINUTES = 2;
         private const int STANDARD_SYRUP_TIME = 15;
         private const int STANDARD_MENU_DELAY = 2000;
         private const int STANDARD_ANIMATION_DELAY = 2000;
         private const int STANDARD_TICK_TIME = 50;
-        private static int CraftCount = 0;
+
+        // The current craft number
+        private static int CraftNumber = 0;
+
+        // The craft number target
+        private static int CraftCountTarget = 0;
+
+        // The number of crafts completed
         private static int CompletedCount = 0;
+
+        private static int FoodConsumed = 0;
         #endregion
 
         #region System Methods
         public static void InitiateCraftingEngine(Dictionary<HKType, Hotkey> hotKeyDictionary,
-            SettingsContainer userSettings, Action endCraftCallback, Action<Exception> errorMessageHandler, Action<int, int> setFoodAndSyrupTimings)
+            SettingsContainer userSettings, Action endCraftCallback, Action<Exception> errorMessageHandler,
+            Action<int, int> setFoodAndSyrupTimings, Action<int> setCraftCount)
         {
             // Ensure craft is not already happening
             if (CraftingActive)
@@ -48,12 +64,14 @@ public static void InitiateCraftingEngine(Dictionary<HKType, Hotkey> hotKeyDicti
                 EndCraftCallback = endCraftCallback;
                 ErrorMessageHandler = errorMessageHandler;
                 SetFoodAndSyrupTimings = setFoodAndSyrupTimings;
+                SetCraftCount = setCraftCount;
 
                 // Load process or throw error if process does not exist
                 ProcessManager.LoadProcess();
 
                 // Set values 
                 CraftPrimedToCancel = false;
+                FoodPrimedToCancel = false;
 
                 // Store values
                 HotkeySet = hotKeyDictionary;
@@ -71,6 +89,21 @@ public static void InitiateCraftingEngine(Dictionary<HKType, Hotkey> hotKeyDicti
             }
         }
 
+        public static void CancelAfterFood()
+        {
+            if (!CraftingActive)
+                return;
+
+            if (!FoodPrimedToCancel)
+            {
+                FoodPrimedToCancel = true;
+                UICommunicator.UpdateStatus("Finishing this food...", true);
+                return;
+            }
+
+            UICommunicator.UpdateStatus("Ending Food...");
+        }
+
         public static void CancelCrafting()
         {
             if (!CraftingActive)
@@ -108,14 +141,18 @@ private static void RunCraftingEngine(CancellationToken token)
                 UICommunicator.UpdateStatus("Setting up for Crafting...");
                 UICommunicator.StartTimedProgressBarUpdates();
 
-                CraftCount = 1;
+                CraftNumber = 1;
+                CraftCountTarget = Settings.CraftCount;
                 CompletedCount = 0;
+                FoodConsumed = 0;
                 if (HotkeySet[HKType.Food] != null)
                 {
+                    UICommunicator.UpdateFoodUIInfo(FoodConsumed, Settings.FoodCount);
                     NextFoodUse = CalculateNextConsumableUse(Settings.StartingFoodTime, DateTime.Now);
                     UICommunicator.UpdateFood(NextFoodUse);
 
-                    RunFoodProgressBar(Settings.StartingFoodTime);
+                    FoodExpiration = DateTime.Now.AddMinutes(Settings.StartingFoodTime);
+                    RunFoodProgressBar(Settings.StartingFoodTime * 60 * 1000);
                 }
                 if (HotkeySet[HKType.Syrup] != null)
                 {
@@ -124,13 +161,14 @@ private static void RunCraftingEngine(CancellationToken token)
                 }
 
                 RunTotalProgressBar();
+                DateTime craftStartTime = DateTime.Now;
 
                 // If crafts remaining was 0, loop infinitely
                 // If not, craft until quota is met
                 while (!CraftingComplete())
                 {
                     // UI MESSAGE: Set timer for overall craft
-                    UICommunicator.UpdateCraftUIInfo(CraftCount, Settings.CraftCount);
+                    UICommunicator.UpdateCraftUIInfo(CraftNumber, CraftCountTarget);
 
                     // Begin Craft Timer:
                     RunCraftProgressBar();
@@ -148,12 +186,12 @@ private static void RunCraftingEngine(CancellationToken token)
                     SendMacroInput(HotkeySet[HKType.Macro3], 3);
 
                     // Finish and add requested end delay
-                    Break(STANDARD_MENU_DELAY+ Settings.EndingDelay);
+                    Break(STANDARD_MENU_DELAY + Settings.EndingDelay);
 
                     // Collectable Menu Option
                     SendCollectableConfirmationInput();
 
-                    CompletedCount = CraftCount;
+                    CompletedCount = CraftNumber;
 
                     // Use Food and Syrup
                     SendFoodAndSyrupInput();
@@ -161,8 +199,11 @@ private static void RunCraftingEngine(CancellationToken token)
                     // Prepare next craft if crafting is not finished
                     PrepareNextCraftInput();
 
-                    CraftCount += 1;
+                    CraftNumber += 1;
                 }
+
+                var totalCraftTime = (int)(DateTime.Now - craftStartTime).TotalSeconds;
+                Logger.Write($"Actual total craft time of {totalCraftTime}");
             }
             catch (Exception e) when (!(e is CraftCancelRequest))
             {
@@ -180,14 +221,21 @@ private static void EndCraftingProcess()
             UICommunicator.EndAllProgress();
             UICommunicator.UpdateStatus("Crafting Finished!");
             var craftCompleted = "Completed ";
-            craftCompleted += Settings.CraftCount > 0 ? $"{CompletedCount}/{Settings.CraftCount}" : $"{CompletedCount}";
+            craftCompleted += CraftCountTarget > 0 ? $"{CompletedCount}/{CraftCountTarget}" : $"{CompletedCount}";
             UICommunicator.UpdateStatus2(craftCompleted);
             CraftingActive = false;
 
-            var foodRemaining = (int)(NextFoodUse - DateTime.Now).TotalMinutes;
+            var foodRemaining = (int)(FoodExpiration - DateTime.Now).TotalMinutes;
             var syrupRemaining = (int)(NextSyrupUse - DateTime.Now).TotalMinutes;
             SetFoodAndSyrupTimings.Invoke(foodRemaining, syrupRemaining);
 
+            if (Settings.CraftCount > 0)
+            {
+                // Update the "Craft Count" text box
+                var craftsRemaining = CraftCountTarget - CompletedCount;
+                SetCraftCount.Invoke(craftsRemaining);
+            }
+
             EndCraftCallback.Invoke();
         }
 
@@ -213,7 +261,6 @@ private static void SendMacroInput(Hotkey hotkey, int macroNumber)
             SendInput(hotkey);
         }
 
-
         private static void SendCollectableConfirmationInput()
         {
             if (Settings.CollectableCraft == false)
@@ -228,7 +275,7 @@ private static void SendCollectableConfirmationInput()
 
         private static bool CraftingComplete()
         {
-            return CraftPrimedToCancel || ((Settings.CraftCount != 0) && (CompletedCount >= Settings.CraftCount));
+            return CraftPrimedToCancel || ((CraftCountTarget != 0) && (CompletedCount >= CraftCountTarget));
         }
 
         private static void SendFoodAndSyrupInput()
@@ -243,6 +290,18 @@ private static void SendFoodAndSyrupInput()
             // leave if neither are to be used
             if (!useFood && !useSyrup)
                 return;
+
+            if (useFood && FoodPrimedToCancel || (Settings.FoodCount > 0 && FoodConsumed >= Settings.FoodCount))
+            {
+                // Only cancel crafting if food is actually about to expire
+                if (DateTime.Compare(FoodExpiration, DateTime.Now) <= 0)
+                {
+                    throw new CraftCancelRequest();
+                }
+                // Don't use food
+                return;
+            }
+
             UICommunicator.UpdateStatus("Refreshing Consumables...");
             Logger.Write("Refreshing Consumables");
 
@@ -254,14 +313,13 @@ private static void SendFoodAndSyrupInput()
                 ProcessManager.DisableInputs();
                 Break(100);
                 SendInput(HotkeySet[HKType.Confirm], 3);
-                SendInput(HotkeySet[HKType.Cancel]);
             }
             finally
             {
                 ProcessManager.EnableInputs();
             }
 
-            Break(1500);
+            Break(STANDARD_ANIMATION_DELAY);
 
             try
             {
@@ -284,10 +342,15 @@ private static void SendFoodAndSyrupInput()
                 UICommunicator.UpdateStatus("Using Food...");
                 Logger.Write("Using Food");
                 SendInput(HotkeySet[HKType.Food]);
-                NextFoodUse = CalculateNextConsumableUse(Settings.FoodDuration, DateTime.Now);
+
+                FoodConsumed++;
+                UICommunicator.UpdateFoodUIInfo(FoodConsumed, Settings.FoodCount);
+
+                NextFoodUse = CalculateNextConsumableUse(Settings.FoodDuration, FoodExpiration);
                 UICommunicator.UpdateFood(NextFoodUse);
 
-                RunFoodProgressBar(Settings.FoodDuration);
+                FoodExpiration = FoodExpiration.AddMinutes(Settings.FoodDuration);
+                RunFoodProgressBar((int)(FoodExpiration - DateTime.Now).TotalMilliseconds);
             }
             if (useSyrup)
             {
@@ -319,6 +382,11 @@ private static void PrepareNextCraftInput()
 
             Break(STANDARD_ANIMATION_DELAY);
         }
+
+        #endregion
+
+        #region Calculation Methods
+
         private static DateTime CalculateNextConsumableUse(int timeRemainingInMinutes, DateTime start)
         {
             var timeMargin = CalculateFoodSyrupMargin();
@@ -327,12 +395,44 @@ private static DateTime CalculateNextConsumableUse(int timeRemainingInMinutes, D
 
         private static double CalculateFoodSyrupMargin()
         {
-            double totalTime = HotkeySet[HKType.Macro1].TimerInMilliseconds;
-            if (HotkeySet[HKType.Macro2] != null)
-                totalTime += HotkeySet[HKType.Macro2].TimerInMilliseconds;
-            if (HotkeySet[HKType.Macro3] != null)
-                totalTime += HotkeySet[HKType.Macro3].TimerInMilliseconds;
-            return totalTime / (1000 * 60) + 0.25;
+            return (double)CalculateMacroTime() / (1000 * 60) + 0.25;
+        }
+
+        private static int CalculateInputTime(HKType type)
+        {
+            if (HotkeySet[type] == null)
+            {
+                return 0;
+            }
+
+            int totalTime = HotkeySet[type].TimerInMilliseconds;
+            if (HotkeySet[type].ModKeyCodes != null)
+            {
+                totalTime += 50;
+            }
+            return totalTime;
+        }
+
+        private static int CalculateMacroTime()
+        {
+            int totalTime = CalculateInputTime(HKType.Macro1);
+            totalTime += CalculateInputTime(HKType.Macro2);
+            totalTime += CalculateInputTime(HKType.Macro3);
+            return totalTime;
+        }
+
+        private static int CalculateCraftTime()
+        {
+            int totalTime = Settings.StartingDelay;
+            totalTime += CalculateMacroTime();
+            totalTime += STANDARD_MENU_DELAY;
+            totalTime += Settings.EndingDelay;
+            if (Settings.CollectableCraft)
+            {
+                totalTime += CalculateInputTime(HKType.Confirm) * 2;
+                totalTime += STANDARD_MENU_DELAY;
+            }
+            return totalTime;
         }
 
         #endregion
@@ -340,103 +440,91 @@ private static double CalculateFoodSyrupMargin()
         #region UI Methods
         private static void RunTotalProgressBar()
         {
+            // Don't set up the total progress bar if we don't have targets
+            if (CraftCountTarget == 0 && Settings.FoodCount == 0)
+            {
+                return;
+            }
+
             DateTime start = DateTime.Now;
             DateTime simulated = start;
             DateTime simulatedNextFood = NextFoodUse;
             DateTime simulatedNextSyrup = NextSyrupUse;
-            for (int i = 0; i < Settings.CraftCount; i++)
+            DateTime simulatedFoodExpiration = FoodExpiration;
+            bool done = false;
+            int craftsCompleted = 0;
+            int foodConsumed = 0;
+            while (!done)
             {
-                simulated = simulated.AddMilliseconds(Settings.StartingDelay);
-
-                simulated = simulated.AddMilliseconds(HotkeySet[HKType.Macro1].TimerInMilliseconds);
-                if (HotkeySet[HKType.Macro2] != null)
-                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Macro2].TimerInMilliseconds);
-                if (HotkeySet[HKType.Macro3] != null)
-                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Macro3].TimerInMilliseconds);
-                
-                simulated = simulated.AddMilliseconds(STANDARD_MENU_DELAY);
-                simulated = simulated.AddMilliseconds(Settings.EndingDelay);
-
-                if (Settings.CollectableCraft)
+                simulated = simulated.AddMilliseconds(CalculateCraftTime());
+                craftsCompleted++;
+
+                if (CraftCountTarget > 0 && craftsCompleted >= CraftCountTarget)
                 {
-                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Confirm].TimerInMilliseconds * 2);
-                    simulated = simulated.AddMilliseconds(STANDARD_MENU_DELAY);
+                    break;
                 }
 
-
-                bool useFood = (HotkeySet[HKType.Food] != null && DateTime.Compare(simulatedNextFood, start) <= 0);
-                bool useSyrup = (HotkeySet[HKType.Syrup] != null && DateTime.Compare(simulatedNextSyrup, start) <= 0);
+                bool useFood = (HotkeySet[HKType.Food] != null && DateTime.Compare(simulatedNextFood, simulated) <= 0);
+                bool useSyrup = (HotkeySet[HKType.Syrup] != null && DateTime.Compare(simulatedNextSyrup, simulated) <= 0);
+                if (Settings.FoodCount > 0 &&
+                    HotkeySet[HKType.Food] != null &&
+                    foodConsumed >= Settings.FoodCount
+                    && DateTime.Compare(simulatedFoodExpiration, simulated) <= 0)
+                {
+                    break;
+                }
                 if (useFood || useSyrup)
                 {
-                    simulated = simulated.AddMilliseconds(Settings.StartingDelay);
-                    simulated = simulated.AddMilliseconds(100);
-                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Confirm].TimerInMilliseconds * 3);
-                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Cancel].TimerInMilliseconds);
-                    simulated = simulated.AddMilliseconds(1500);
-                    simulated = simulated.AddMilliseconds(100);
-                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Confirm].TimerInMilliseconds);
-                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Cancel].TimerInMilliseconds);
-                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Confirm].TimerInMilliseconds);
-                    simulated = simulated.AddMilliseconds(STANDARD_MENU_DELAY);
+                    simulated = simulated.AddMilliseconds(
+                        Settings.StartingDelay +
+                        100 +
+                        CalculateInputTime(HKType.Confirm) * 3 +
+                        STANDARD_ANIMATION_DELAY +
+                        100 +
+                        CalculateInputTime(HKType.Confirm) +
+                        CalculateInputTime(HKType.Cancel) +
+                        CalculateInputTime(HKType.Confirm) +
+                        STANDARD_MENU_DELAY);
                     if (useFood)
                     {
-                        simulated = simulated.AddMilliseconds(HotkeySet[HKType.Food].TimerInMilliseconds);
-                        simulatedNextFood = CalculateNextConsumableUse(Settings.FoodDuration, simulated);
+                        simulated = simulated.AddMilliseconds(CalculateInputTime(HKType.Food));
+                        simulatedFoodExpiration = simulatedFoodExpiration.AddMinutes(Settings.FoodDuration);
+                        simulatedNextFood = CalculateNextConsumableUse(Settings.FoodDuration, simulatedFoodExpiration);
+                        foodConsumed++;
                     }
                     if (useSyrup)
                     {
-                        simulated = simulated.AddMilliseconds(HotkeySet[HKType.Syrup].TimerInMilliseconds);
+                        simulated = simulated.AddMilliseconds(CalculateInputTime(HKType.Syrup));
                         simulatedNextSyrup = CalculateNextConsumableUse(STANDARD_SYRUP_TIME, simulated);
                     }
                 }
 
                 // Prepare next craft input
-                if (i + 1 < Settings.CraftCount)
-                {
-                    simulated = simulated.AddMilliseconds(100);
-                    simulated = simulated.AddMilliseconds(HotkeySet[HKType.Confirm].TimerInMilliseconds * 3);
-                    simulated = simulated.AddMilliseconds(STANDARD_ANIMATION_DELAY);
-                }
+                simulated = simulated.AddMilliseconds(
+                    100 +
+                    CalculateInputTime(HKType.Confirm) * 3 +
+                    STANDARD_ANIMATION_DELAY);
 
                 // For each craft, add an artificial execution delay
-                simulated = simulated.AddMilliseconds(650);
+                simulated = simulated.AddMilliseconds(400);
             }
 
+            CraftCountTarget = craftsCompleted;
             var totalDuration = (int)(simulated - start).TotalMilliseconds;
+            Logger.Write($"Estimating total craft time of {totalDuration}");
             UICommunicator.BeginTotalTimer(totalDuration);
         }
 
         private static void RunCraftProgressBar()
         {
-            int totalTime = Settings.StartingDelay;
-
-            totalTime += HotkeySet[HKType.Macro1].TimerInMilliseconds;
-            if (HotkeySet[HKType.Macro2] != null)
-                totalTime += HotkeySet[HKType.Macro2].TimerInMilliseconds;
-            if (HotkeySet[HKType.Macro3] != null)
-                totalTime += HotkeySet[HKType.Macro3].TimerInMilliseconds;
-
-            totalTime += Settings.EndingDelay;
-
-            totalTime += STANDARD_MENU_DELAY;
-            if (CraftCount + 1 < Settings.CraftCount)
-                totalTime += STANDARD_ANIMATION_DELAY;
-
+            int totalTime = CalculateCraftTime();
             UICommunicator.BeginCraftTimer(totalTime);
         }
 
-        private static void RunFoodProgressBar(int time)
+        private static void RunFoodProgressBar(int milliseconds)
         {
-            int totalTime = time * 60 * 1000;
-
-            totalTime -= HotkeySet[HKType.Macro1].TimerInMilliseconds;
-            if (HotkeySet[HKType.Macro2] != null)
-                totalTime -= HotkeySet[HKType.Macro2].TimerInMilliseconds;
-            if (HotkeySet[HKType.Macro3] != null)
-                totalTime -= HotkeySet[HKType.Macro3].TimerInMilliseconds;
-            totalTime -= 15000;
-
-            UICommunicator.BeginFoodTimer(totalTime);
+            // int totalTime = minutes * 60 * 1000;
+            UICommunicator.BeginFoodTimer(milliseconds);
 
         }
         #endregion
@@ -467,6 +555,7 @@ private static void SleepThread(int timeInMilliseconds)
                 Thread.Sleep(STANDARD_TICK_TIME);
             }
         }
+
         #endregion
     }
 }
diff --git a/AutoSynthesis/Classes/Backend/KeyInputEngine.cs b/AutoSynthesis/Classes/Backend/KeyInputEngine.cs
index 99ea086..de204a2 100644
--- a/AutoSynthesis/Classes/Backend/KeyInputEngine.cs
+++ b/AutoSynthesis/Classes/Backend/KeyInputEngine.cs
@@ -30,9 +30,9 @@ public static void SendKeysToGame(VirtualKeyCode key, VirtualKeyCode[] modKeys =
                 {
                     SendMessage(ProcessManager.ProcessPtr(), WM_KEYDOWN, (int)modKey, 0);
                 }
-            }
 
-            Thread.Sleep(50);
+                Thread.Sleep(50);
+            }
 
             // send key command 
             SendMessage(ProcessManager.ProcessPtr(), WM_KEYDOWN, (int)key, 0);
diff --git a/AutoSynthesis/Classes/Backend/UICommunicator.cs b/AutoSynthesis/Classes/Backend/UICommunicator.cs
index c93178d..9a46008 100644
--- a/AutoSynthesis/Classes/Backend/UICommunicator.cs
+++ b/AutoSynthesis/Classes/Backend/UICommunicator.cs
@@ -46,7 +46,9 @@ static class UICommunicator
         private static DateTime NullDateTime { get; set; }
         private static int MacroNumber { get; set; }
         private static int CraftNumber { get; set; }
-        private static int MaxNumber { get; set; }
+        private static int MaxCraft { get; set; }
+        private static int FoodNumber { get; set; }
+        private static int MaxFood { get; set; }
 
         private static DateTime NextFood { get; set; }
         private static DateTime NextSyrup { get; set; }
@@ -105,7 +107,7 @@ public static void ConnectUI(Label totalLabel, Label updateLabel, Label updateLa
         public static void ResetValues()
         {
             CraftNumber = 0;
-            MaxNumber = 0;
+            MaxCraft = 0;
             MacroNumber = 0;
             FoodEnabled = false;
             SyrupEnabled = false;
@@ -127,12 +129,18 @@ public static void ResetValues()
         #endregion
 
         #region Update Methods (Called by External Functions)
+        // Updates visual display on craft status
         public static void UpdateCraftUIInfo(int craftCount, int max)
         {
-            // Updates visual display on craft status
-            // Label
             CraftNumber = craftCount;
-            MaxNumber = max;
+            MaxCraft = max;
+        }
+
+        // Updates visual display on food status
+        public static void UpdateFoodUIInfo(int foodCount, int max)
+        {
+            FoodNumber = foodCount;
+            MaxFood = max;
         }
 
         public static void UpdateMacroUIInfo(int macroNumber, int macroTimer)
@@ -158,10 +166,15 @@ public static void BeginCraftTimer(int totalTime)
 
         public static void BeginFoodTimer(int totalTime)
         {
-            FoodEnabled = true;
             ProgressFoodTimeDuration = totalTime;
-            ProgressFoodTime = DateTime.Now.AddMilliseconds(totalTime);
-            NextFood = DateTime.Now.AddMilliseconds(totalTime);
+            if (IsDateNull(ProgressFoodTime))
+            {
+                ProgressFoodTime = DateTime.Now.AddMilliseconds(totalTime);
+            }
+            else
+            {
+                ProgressFoodTime = ProgressFoodTime.AddMilliseconds(totalTime);
+            }
         }
 
         public static void UpdateFood(DateTime nextFood)
@@ -287,8 +300,8 @@ private static void UpdateTotalTimerText()
         private static void UpdateCraftTimerText()
         {
             var output = $"Craft {CraftNumber}";
-            if (MaxNumber > 0)
-                output += $"/{MaxNumber}";
+            if (MaxCraft > 0)
+                output += $"/{MaxCraft}";
             output += ": ";
             var timer = GetTimeRemainingString(ProgressCraftTime);
             output += timer;
@@ -313,7 +326,12 @@ private static void UpdateMacroTimerText()
 
         private static void UpdateFoodTimerText()
         {
-            var output = "Food: ";
+            var output = $"Food {FoodNumber}";
+            if (MaxFood > 0)
+            {
+                output += $"/{MaxFood}";
+            }
+            output += ": ";
             var timer = GetTimeRemainingString(ProgressFoodTime);
             output += timer;
 
diff --git a/AutoSynthesis/Classes/UI Classes/HotkeyProcessor.cs b/AutoSynthesis/Classes/UI Classes/HotkeyProcessor.cs
index f2f6f8a..c900308 100644
--- a/AutoSynthesis/Classes/UI Classes/HotkeyProcessor.cs	
+++ b/AutoSynthesis/Classes/UI Classes/HotkeyProcessor.cs	
@@ -203,8 +203,8 @@ private static void SetDictionaryValues()
             KeyCodeToVKCode.Add(Key.Escape, VirtualKeyCode.END);
             KeyCodeToVKCode.Add(Key.F, VirtualKeyCode.VK_F);
             KeyCodeToVKCode.Add(Key.F1, VirtualKeyCode.F1);
-            KeyCodeToVKCode.Add(Key.F10, VirtualKeyCode.F2);
-            KeyCodeToVKCode.Add(Key.F11, VirtualKeyCode.F3);
+            KeyCodeToVKCode.Add(Key.F10, VirtualKeyCode.F10);
+            KeyCodeToVKCode.Add(Key.F11, VirtualKeyCode.F11);
             KeyCodeToVKCode.Add(Key.F12, VirtualKeyCode.F12);
             KeyCodeToVKCode.Add(Key.F2, VirtualKeyCode.F2);
             KeyCodeToVKCode.Add(Key.F3, VirtualKeyCode.F3);
diff --git a/AutoSynthesis/DataTypes/SettingsContainer.cs b/AutoSynthesis/DataTypes/SettingsContainer.cs
index ee6b63a..ff9b4bb 100644
--- a/AutoSynthesis/DataTypes/SettingsContainer.cs
+++ b/AutoSynthesis/DataTypes/SettingsContainer.cs
@@ -10,6 +10,7 @@ class SettingsContainer
     {
         // contains settings metadata
         public int CraftCount { get; set; } // Set to 0 if endless craft
+        public int FoodCount { get; set; }
         public int FoodDuration { get; set; }
         public bool CollectableCraft { get; set; }
         public int StartingFoodTime { get; set; }
@@ -17,7 +18,7 @@ class SettingsContainer
         public int StartingDelay { get; set; }
         public int EndingDelay { get; set; }
 
-        public SettingsContainer(int craftCount, bool collectableCraft, int foodDuration, int startingFoodTime, int startingSyrupTime, int startingDelay, int endingDelay)
+        public SettingsContainer(int craftCount, int foodCount, bool collectableCraft, int foodDuration, int startingFoodTime, int startingSyrupTime, int startingDelay, int endingDelay)
         {
             if (craftCount < 0)
             {
@@ -25,6 +26,7 @@ public SettingsContainer(int craftCount, bool collectableCraft, int foodDuration
             }
 
             CraftCount = craftCount;
+            FoodCount = foodCount;
             CollectableCraft = collectableCraft;
             FoodDuration = foodDuration;
             StartingFoodTime = startingFoodTime;
diff --git a/AutoSynthesis/MainWindow.xaml b/AutoSynthesis/MainWindow.xaml
index b05f8be..e51354a 100644
--- a/AutoSynthesis/MainWindow.xaml
+++ b/AutoSynthesis/MainWindow.xaml
@@ -896,6 +896,7 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
@@ -1295,99 +1296,100 @@
                 Opacity="0.9"
                 Text="0"
                 TextWrapping="Wrap" />
-        </Grid>
 
-        <Grid
-            Name="FoodTimerGrid"
-            Grid.Row="2"
-            Grid.Column="0">
-            <Grid.RowDefinitions>
-                <RowDefinition />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <!--  Food Duration  -->
-            <Label
-                x:Name="LabelFoodTimer"
-                Grid.Row="0"
+            <Grid
+                Name="FoodTimerGrid"
+                Grid.Row="8"
                 Grid.Column="0"
-                Padding="5,5,5,5"
-                HorizontalAlignment="Left"
-                VerticalContentAlignment="Center"
-                Content="Food Duration"
-                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
-                FontSize="17"
-                Foreground="#FFDCEDFF">
-                <Label.Effect>
-                    <DropShadowEffect ShadowDepth="1" />
-                </Label.Effect>
-            </Label>
-            <RadioButton
-                x:Name="RDFood30"
-                Grid.Row="0"
-                Grid.Column="1"
-                Margin="5,5,5,5"
-                VerticalContentAlignment="Center"
-                Background="#FFDCEDFF"
-                Checked="RDFood30_Checked"
-                Content="30 Min"
-                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
-                FontSize="13"
-                Foreground="#FFDCEDFF"
-                GotFocus="CheckRadioGain"
-                GroupName="RDFoodTimer"
-                IsChecked="True"
-                LostFocus="CheckRadioLoss">
-                <RadioButton.Effect>
-                    <DropShadowEffect BlurRadius="1" ShadowDepth="1" />
-                </RadioButton.Effect>
-            </RadioButton>
-            <RadioButton
-                x:Name="RDFood40"
-                Grid.Row="0"
-                Grid.Column="2"
-                Margin="5,5,5,5"
-                VerticalContentAlignment="Center"
-                Background="#FFDCEDFF"
-                Checked="RDFood40_Checked"
-                Content="40 Min"
-                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
-                FontSize="13"
-                Foreground="#FFDCEDFF"
-                GotFocus="CheckRadioGain"
-                GroupName="RDFoodTimer"
-                LostFocus="CheckRadioLoss">
-                <RadioButton.Effect>
-                    <DropShadowEffect BlurRadius="1" ShadowDepth="1" />
-                </RadioButton.Effect>
-            </RadioButton>
-            <RadioButton
-                x:Name="RDFood45"
-                Grid.Row="0"
-                Grid.Column="3"
-                Margin="5,5,5,5"
-                VerticalContentAlignment="Center"
-                Background="#FFDCEDFF"
-                Checked="RDFood45_Checked"
-                Content="45 Min"
-                FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
-                FontSize="13"
-                Foreground="#FFDCEDFF"
-                GotFocus="CheckRadioGain"
-                GroupName="RDFoodTimer"
-                LostFocus="CheckRadioLoss">
-                <RadioButton.Effect>
-                    <DropShadowEffect BlurRadius="1" ShadowDepth="1" />
-                </RadioButton.Effect>
-            </RadioButton>
+                Grid.ColumnSpan="4">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
 
+                <!--  Food Duration  -->
+                <Label
+                    x:Name="LabelFoodTimer"
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Padding="5,5,5,5"
+                    HorizontalAlignment="Left"
+                    VerticalContentAlignment="Center"
+                    Content="Food Duration"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="17"
+                    Foreground="#FFDCEDFF">
+                    <Label.Effect>
+                        <DropShadowEffect ShadowDepth="1" />
+                    </Label.Effect>
+                </Label>
+                <RadioButton
+                    x:Name="RDFood30"
+                    Grid.Row="0"
+                    Grid.Column="1"
+                    Margin="5,5,5,5"
+                    VerticalContentAlignment="Center"
+                    Background="#FFDCEDFF"
+                    Checked="RDFood30_Checked"
+                    Content="30 Min"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="13"
+                    Foreground="#FFDCEDFF"
+                    GotFocus="CheckRadioGain"
+                    GroupName="RDFoodTimer"
+                    IsChecked="True"
+                    LostFocus="CheckRadioLoss">
+                    <RadioButton.Effect>
+                        <DropShadowEffect BlurRadius="1" ShadowDepth="1" />
+                    </RadioButton.Effect>
+                </RadioButton>
+                <RadioButton
+                    x:Name="RDFood40"
+                    Grid.Row="0"
+                    Grid.Column="2"
+                    Margin="5,5,5,5"
+                    VerticalContentAlignment="Center"
+                    Background="#FFDCEDFF"
+                    Checked="RDFood40_Checked"
+                    Content="40 Min"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="13"
+                    Foreground="#FFDCEDFF"
+                    GotFocus="CheckRadioGain"
+                    GroupName="RDFoodTimer"
+                    LostFocus="CheckRadioLoss">
+                    <RadioButton.Effect>
+                        <DropShadowEffect BlurRadius="1" ShadowDepth="1" />
+                    </RadioButton.Effect>
+                </RadioButton>
+                <RadioButton
+                    x:Name="RDFood45"
+                    Grid.Row="0"
+                    Grid.Column="3"
+                    Margin="5,5,5,5"
+                    VerticalContentAlignment="Center"
+                    Background="#FFDCEDFF"
+                    Checked="RDFood45_Checked"
+                    Content="45 Min"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="13"
+                    Foreground="#FFDCEDFF"
+                    GotFocus="CheckRadioGain"
+                    GroupName="RDFoodTimer"
+                    LostFocus="CheckRadioLoss">
+                    <RadioButton.Effect>
+                        <DropShadowEffect BlurRadius="1" ShadowDepth="1" />
+                    </RadioButton.Effect>
+                </RadioButton>
+            </Grid>
         </Grid>
 
+
         <Grid
             Name="RightGrid"
             Grid.Row="1"
@@ -1497,6 +1499,7 @@
                 Grid.ColumnSpan="3">
                 <Grid.RowDefinitions>
                     <RowDefinition />
+                    <RowDefinition />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
@@ -1504,7 +1507,6 @@
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-
                 <Label
                     x:Name="LabelCraftCount"
                     Grid.Row="0"
@@ -1519,7 +1521,7 @@
                 </Label>
                 <CheckBox
                     x:Name="CHBCraftCount"
-                    Grid.Row="4"
+                    Grid.Row="0"
                     Grid.Column="1"
                     Margin="5,5,5,5"
                     HorizontalAlignment="Center"
@@ -1550,6 +1552,51 @@
                     LostFocus="TimeLostFocus"
                     Opacity="0.9"
                     Text="0" />
+                <Label
+                    x:Name="LabelFoodCount"
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Content="Food Count"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="17"
+                    Foreground="#FFDCEDFF">
+                    <Label.Effect>
+                        <DropShadowEffect ShadowDepth="1" />
+                    </Label.Effect>
+                </Label>
+                <CheckBox
+                    x:Name="CHBFoodCount"
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Margin="5,5,5,5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Background="#FFDCEDFF"
+                    Checked="CHBFoodCount_Checked"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    GotFocus="CheckFocusGain"
+                    LostFocus="CheckFocusLoss"
+                    Opacity="0.9"
+                    Unchecked="CHBFoodCount_Checked" />
+                <TextBox
+                    x:Name="TXBFoodCount"
+                    Grid.Row="1"
+                    Grid.Column="2"
+                    MinWidth="50"
+                    Margin="2,2,2,2"
+                    Padding="2,2,2,2"
+                    HorizontalContentAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    Background="#FFDCEDFF"
+                    FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
+                    FontSize="16"
+                    GotFocus="TimeGetFocus"
+                    IsEnabled="False"
+                    IsReadOnly="True"
+                    KeyDown="SetTimeValue"
+                    LostFocus="TimeLostFocus"
+                    Opacity="0.9"
+                    Text="0" />
             </Grid>
 
             <Grid
@@ -1734,14 +1781,12 @@
                 Grid.Column="0"
                 MinWidth="120"
                 Margin="2,2,2,2"
-                Padding="25,25,25,25"
                 Click="BTNCraftInitiate"
                 Content="Start"
                 FontFamily="/AutoSynthesis;component/Resources/Fonts/#Sen"
                 FontSize="18"
                 Foreground="#FFDCEDFF"
                 Style="{DynamicResource ButtonStyleIdle}" />
-
             <!--  Status  -->
             <ProgressBar
                 x:Name="PGBTotal"
diff --git a/AutoSynthesis/MainWindow.xaml.cs b/AutoSynthesis/MainWindow.xaml.cs
index 0630764..d68e950 100644
--- a/AutoSynthesis/MainWindow.xaml.cs
+++ b/AutoSynthesis/MainWindow.xaml.cs
@@ -65,6 +65,7 @@ private enum SystemStates
             IDLE,
             PREPARINGCCRAFT,
             ACTIVECRAFTING,
+            COMPLETINGFINALFOOD,
             COMPLETINGFINALCRAFT,
             CANCELLINGCRAFT
         }
@@ -73,6 +74,7 @@ private enum SystemStates
         private Dictionary<SystemStates, string> MainButtonText { get; set; }
         public Action<Exception> ErrorMessageHandler { get; set; }
         public Action<int, int> GetFoodAndSyrupTimings { get; set; }
+        public Action<int> GetCraftCount { get; set; }
         private System.Windows.Forms.NotifyIcon Notify { get; set; }
         private bool NotifyFlagged { get; set; } = true;
         private int StartCraftingDelay { get; set; } = 0;
@@ -97,6 +99,7 @@ public MainWindow()
             SetErrorAction();
             SetupSystemTray();
             SetupFoodAndSyrupTimings();
+            SetupCraftCount();
             ReadSettingsFile();
 
             // Set up UICommunicator
@@ -144,6 +147,7 @@ private void SetContainerValues()
             TimerContainers.Add(TXBFoodTimer, new TimeInputContainer());
             TimerContainers.Add(TXBSyrupTimer, new TimeInputContainer());
             TimerContainers.Add(TXBCraftCount, new TimeInputContainer(false));
+            TimerContainers.Add(TXBFoodCount, new TimeInputContainer(false));
         }
 
         private void SetUIDictionaries()
@@ -167,6 +171,7 @@ private void SetUIDictionaries()
                 { SystemStates.IDLE, Resources["ButtonStyleIdle"] as Style },
                 { SystemStates.PREPARINGCCRAFT,Resources["ButtonStyleProcessing"] as Style },
                 { SystemStates.ACTIVECRAFTING, Resources["ButtonStyleCrafting"] as Style },
+                { SystemStates.COMPLETINGFINALFOOD, Resources["ButtonStyleCrafting"] as Style },
                 { SystemStates.COMPLETINGFINALCRAFT, Resources["ButtonStyleCrafting"] as Style },
                 { SystemStates.CANCELLINGCRAFT, Resources["ButtonStyleProcessing"] as Style }
             };
@@ -177,7 +182,8 @@ private void SetUIDictionaries()
                 { SystemStates.IDLE, "Start" },
                 { SystemStates.PREPARINGCCRAFT, "Preparing..." },
                 { SystemStates.ACTIVECRAFTING, "Crafting" },
-                { SystemStates.COMPLETINGFINALCRAFT, "Ending..." },
+                { SystemStates.COMPLETINGFINALFOOD, "Last food..." },
+                { SystemStates.COMPLETINGFINALCRAFT, "Last craft..." },
                 { SystemStates.CANCELLINGCRAFT, "Ending..." }
             };
         }
@@ -203,8 +209,8 @@ private void SetDefaultValues()
             bool collectableCraft = false;
             int foodDuration = 30;
 
-            var profile = new Profile(macro1, macro1timer, macro2, macro2timer, macro2check, macro3, macro3timer, 
-                          macro3check, food, foodcheck, syrup, syrupcheck, confirm, cancel, 
+            var profile = new Profile(macro1, macro1timer, macro2, macro2timer, macro2check, macro3, macro3timer,
+                          macro3check, food, foodcheck, syrup, syrupcheck, confirm, cancel,
                           collectableCraft, foodDuration);
             SetAllHoykeys(profile);
         }
@@ -234,18 +240,27 @@ private void SetupFoodAndSyrupTimings()
             GetFoodAndSyrupTimings = (int foodTime, int syrupTime) =>
             {
                 foodTime = Math.Max(0, foodTime);
-                syrupTime = Math.Max(0, syrupTime);
-
                 var FoodTimeContainer = TimerContainers[TXBFoodTimer];
-                var SyrupTimeContainer = TimerContainers[TXBSyrupTimer];
-
                 FoodTimeContainer.Timer = foodTime;
-                SyrupTimeContainer.Timer = syrupTime;
-
                 TXBFoodTimer.Dispatcher.Invoke(() => { TXBFoodTimer.Text = foodTime.ToString(); });
+
+                syrupTime = Math.Max(0, syrupTime);
+                var SyrupTimeContainer = TimerContainers[TXBSyrupTimer];
+                SyrupTimeContainer.Timer = syrupTime;
                 TXBSyrupTimer.Dispatcher.Invoke(() => { TXBSyrupTimer.Text = syrupTime.ToString(); });
             };
         }
+
+        private void SetupCraftCount()
+        {
+            GetCraftCount = (int craftCount) =>
+            {
+                craftCount = Math.Max(0, craftCount);
+                var CraftCountContainer = TimerContainers[TXBCraftCount];
+                CraftCountContainer.Timer = craftCount;
+                TXBCraftCount.Dispatcher.Invoke(() => { TXBCraftCount.Text = craftCount.ToString(); });
+            };
+        }
         #endregion
 
         #region Crafting Methods
@@ -271,7 +286,7 @@ private void BTNCraftInitiate(object sender, RoutedEventArgs e)
                     hkContainer = HKTContainers[TXBMacro1Key];
                     timerContainer = TimerContainers[TXBMacro1Timer];
                     ValidateHotkeyInputs(hkContainer, timerContainer, "Macro 1");
-                    hotkeys.Add(HKType.Macro1, new Hotkey(hkContainer.Keys(), hkContainer.ModKeys(), 
+                    hotkeys.Add(HKType.Macro1, new Hotkey(hkContainer.Keys(), hkContainer.ModKeys(),
                                 TXBMacro1Key.Text, timerContainer.Timer * 1000));
 
                     // Macro 2
@@ -280,7 +295,7 @@ private void BTNCraftInitiate(object sender, RoutedEventArgs e)
                         hkContainer = HKTContainers[TXBMacro2Key];
                         timerContainer = TimerContainers[TXBMacro2Timer];
                         ValidateHotkeyInputs(hkContainer, timerContainer, "Macro 2");
-                        hotkeys.Add(HKType.Macro2, new Hotkey(hkContainer.Keys(), hkContainer.ModKeys(), 
+                        hotkeys.Add(HKType.Macro2, new Hotkey(hkContainer.Keys(), hkContainer.ModKeys(),
                                     TXBMacro2Key.Text, timerContainer.Timer * 1000));
                     }
                     else
@@ -343,12 +358,14 @@ private void BTNCraftInitiate(object sender, RoutedEventArgs e)
                     if ((bool)CHBCraftCount.IsChecked && TimerContainers[TXBCraftCount].Timer == 0)
                         throw new InvalidUserParametersException("Craft Count must be greater than 0");
                     var craftCount = (bool)CHBCraftCount.IsChecked ? TimerContainers[TXBCraftCount].Timer : 0;
+                    var foodCount = (bool)CHBFoodCount.IsChecked ? TimerContainers[TXBFoodCount].Timer : 0;
                     settings = new SettingsContainer(
                         craftCount,
+                        foodCount,
                         (bool)CHBCollectableCraft.IsChecked,
                         FoodTimer,
                         TimerContainers[TXBFoodTimer].Timer,
-                        TimerContainers[TXBSyrupTimer].Timer, 
+                        TimerContainers[TXBSyrupTimer].Timer,
                         StartCraftingDelay * 1000,
                         EndCraftingDelay * 1000
                     );
@@ -367,7 +384,7 @@ private void BTNCraftInitiate(object sender, RoutedEventArgs e)
                 };
                 try
                 {
-                    CraftingEngine.InitiateCraftingEngine(hotkeys, settings, action, ErrorMessageHandler, GetFoodAndSyrupTimings);
+                    CraftingEngine.InitiateCraftingEngine(hotkeys, settings, action, ErrorMessageHandler, GetFoodAndSyrupTimings, GetCraftCount);
                     SetCraftingStatus(SystemStates.ACTIVECRAFTING);
                 }
                 catch (ProcessMissingException)
@@ -388,6 +405,19 @@ private void BTNCraftInitiate(object sender, RoutedEventArgs e)
             {
                 // Cancel the craft
                 SetCraftingStatus(SystemStates.CANCELLINGCRAFT);
+                if ((bool)CHBFood.IsChecked)
+                {
+                    CraftingEngine.CancelAfterFood();
+                    SetCraftingStatus(SystemStates.COMPLETINGFINALFOOD);
+                }
+                else
+                {
+                    CraftingEngine.CancelCrafting();
+                    SetCraftingStatus(SystemStates.COMPLETINGFINALCRAFT);
+                }
+            }
+            else if (SystemState == SystemStates.COMPLETINGFINALFOOD)
+            {
                 CraftingEngine.CancelCrafting();
                 SetCraftingStatus(SystemStates.COMPLETINGFINALCRAFT);
             }
@@ -1004,6 +1034,12 @@ private void CHBCraftCount_Checked(object sender, RoutedEventArgs e)
             bool check = (bool)CHBCraftCount.IsChecked;
             TXBCraftCount.IsEnabled = check;
         }
+
+        private void CHBFoodCount_Checked(object sender, RoutedEventArgs e)
+        {
+            bool check = (bool)CHBFoodCount.IsChecked;
+            TXBFoodCount.IsEnabled = check;
+        }
         #endregion
 
         #region Misc Functions
@@ -1113,11 +1149,12 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
         private void Window_Deactivated(object sender, EventArgs e)
         {
             Window window = (Window)sender;
-            
+
             if (AlwaysOnTopEnabled)
             {
                 window.Topmost = true;
-            } else
+            }
+            else
             {
                 window.Topmost = false;
             }
@@ -1199,7 +1236,7 @@ private void CheckForUpdates()
                 Process.Start(directory);
                 Application.Current.Shutdown();
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 MessageBox.Show(e.Message);
                 return;
@@ -1269,7 +1306,7 @@ private void ReadSettingsFile()
                 var fileResult = File.ReadAllText(SettingsFileDirectory).Split('|');
                 AlwaysOnTopEnabled = Convert.ToBoolean(fileResult[0]);
                 StartCraftingDelay = Convert.ToInt32(fileResult[1]);
-                EndCraftingDelay= Convert.ToInt32(fileResult[2]);
+                EndCraftingDelay = Convert.ToInt32(fileResult[2]);
             }
             catch
             {