From 4eba58fd9a86891660644c80d419f4f2acc5a665 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Tue, 21 Apr 2020 11:28:10 +0100
Subject: [PATCH 01/20] Ported GamestateParameterPicker from defunct rewrite.

---
 .../Controls/GameStateParameterPicker.xaml    |  53 +++
 .../Controls/GameStateParameterPicker.xaml.cs | 309 ++++++++++++++++++
 .../Project-Aurora/Project-Aurora.csproj      |   9 +-
 .../Settings/Layers/Control_PercentLayer.xaml |   4 +-
 .../Layers/Control_PercentLayer.xaml.cs       |  13 +-
 .../Utils/FrameworkElementUtils.cs            |  22 +-
 .../Project-Aurora/Utils/GameStateUtils.cs    |  63 ++--
 7 files changed, 431 insertions(+), 42 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml
 create mode 100644 Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs

diff --git a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml
new file mode 100644
index 000000000..df6fd58b3
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml
@@ -0,0 +1,53 @@
+<UserControl x:Class="Aurora.Controls.GameStateParameterPicker"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:l="clr-namespace:Aurora.Controls" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             mc:Ignorable="d" 
+             Height="22" MinWidth="120">
+
+    <UserControl.Resources>
+        <DataTemplate x:Key="ListItemTemplate">
+            <TextBlock Text="{Binding .}" Padding="4,1" />
+        </DataTemplate>
+        <l:IsStringNotNullOrWhitespaceConverter x:Key="IsStringNotNullConv" />
+        <l:PropertyTypeToGridLengthConverter x:Key="PropTypeToHeightConv" />
+    </UserControl.Resources>
+
+    <Grid>
+        <!-- Main dropdown toggle button -->
+        <ToggleButton x:Name="pickerToggleButton" HorizontalContentAlignment="Left" Padding="4,1" Content="{Binding SelectedPath, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}" IsChecked="{Binding IsOpen, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}" />
+        <Path Width="10" Height="6" HorizontalAlignment="Right" Margin="0,0,9,0" Fill="#FF858585" Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z " Stretch="Fill" IsHitTestVisible="False" />
+
+        <!-- Dropdown content -->
+        <Popup x:Name="pickerPopup" StaysOpen="False" IsOpen="{Binding IsOpen, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}">
+            <Grid x:Name="popupContent" Height="280" Width="{Binding ActualWidth, ElementName=pickerToggleButton}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="1*" />
+                    <RowDefinition Height="{Binding PropertyType, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}, Converter={StaticResource PropTypeToHeightConv}}" />
+                </Grid.RowDefinitions>
+
+                <!-- Up button and current "directory" -->
+                <StackPanel Grid.Row="0" Orientation="Vertical">
+                    <Button Content="⬅ Previous" IsEnabled="{Binding WorkingPathStr, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}, Converter={StaticResource IsStringNotNullConv}}" Margin="6" Padding="6,2" Click="BackBtn_Click" />
+                    <TextBlock Text="{Binding WorkingPathStr, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}" Margin="6,0,6,6" VerticalAlignment="Center" />
+                </StackPanel>
+
+                <!-- List boxes (aux is for animation) -->
+                <ListBox x:Name="mainListBox" Grid.Row="1" ItemsSource="{Binding CurrentParameterListItems, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}" ItemTemplate="{StaticResource ListItemTemplate}" Width="{Binding ActualWidth, ElementName=pickerToggleButton}" HorizontalAlignment="Left" l:GameStateParameterPicker.TransformRelativeOffset="0" RenderTransform="{l:DoubleToRelativeTransformOffset}" PreviewMouseLeftButtonDown="MainListBox_PreviewMouseLeftButtonDown" />
+                <ListBox x:Name="auxillaryListbox" Grid.Row="1" ItemTemplate="{StaticResource ListItemTemplate}" Width="{Binding ActualWidth, ElementName=pickerToggleButton}" HorizontalAlignment="Left" l:GameStateParameterPicker.TransformRelativeOffset="-1" RenderTransform="{l:DoubleToRelativeTransformOffset}" />
+
+                <!-- Numeric input for numeric types -->
+                <DockPanel Grid.Row="2" LastChildFill="True">
+                    <TextBlock Text="Or enter number:" VerticalAlignment="Center" Margin="6,4,0,6" DockPanel.Dock="Left" />
+                    <xctk:DoubleUpDown x:Name="numericEntry" Margin="6" ValueChanged="NumericEntry_ValueChanged" />
+                </DockPanel>
+
+                <!-- Border around all popup content -->
+                <Border BorderBrush="#454545" BorderThickness="1" Grid.RowSpan="999" />
+            </Grid>
+        </Popup>
+    </Grid>
+</UserControl>
diff --git a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs
new file mode 100644
index 000000000..0eb4e745e
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs
@@ -0,0 +1,309 @@
+using Aurora.Profiles;
+using Aurora.Utils;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using Application = Aurora.Profiles.Application;
+
+namespace Aurora.Controls {
+
+    public partial class GameStateParameterPicker : UserControl, INotifyPropertyChanged {
+
+        public event EventHandler<SelectedPathChangedEventArgs> SelectedPathChanged;
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private List<string> parameterList;
+
+        public GameStateParameterPicker() {
+            InitializeComponent();
+        }
+
+        #region UI Properties
+        /// <summary>
+        /// The current parts that make up the path. E.G. "LocalPCInfo/RAM" -> "LocalPCInfo", "RAM"
+        /// </summary>
+        private Stack<string> WorkingPath { get; set; } = new Stack<string>();
+
+        /// <summary>
+        /// Lazy-evaluated list of parameters for this application and property type.
+        /// </summary>
+        public List<string> ParameterList => parameterList ?? (parameterList = Application?.ParameterLookup?.GetParameters(PropertyType).ToList());
+
+        /// <summary>
+        /// Gets a list of items that should be displayed in the parameter list (based on the current "parent" variable).
+        /// </summary>
+        public List<string> CurrentParameterListItems {
+            get {
+                // If the application or param lookup is null, we don't know the parameters so do nothing
+                if (Application?.ParameterLookup == null) return null;
+
+                // If the given working path is a path to a variable (which it shouldn't be), pop the last item (the variable name) from the path to give just the "directory"
+                if (Application.ParameterLookup.IsValidParameter(WorkingPathStr))
+                    WorkingPath.Pop();
+
+                // Generate the string version of this working path (and cache it)
+                var _workingPath = WorkingPathStr;
+                return ParameterList // With all properties in the current param lookup that are of a valid type (e.g. numbers)
+                    .Where(path => path.StartsWith(_workingPath)) // Pick only the ones that start with the same working path
+                    .Select(path => path.Substring(_workingPath == "" ? 0 : _workingPath.Length + 1).Split('/').First()) // Select only the next part of the path
+                    .Distinct() // And ensure there are no duplicates (get distinct elements) so that we don't show "directories" multiple times (e.g. only once will "LocalPCInfo" be shown)
+                    .OrderBy(p => p.ToLowerInvariant()) // Order the items alphabetically (case insensitive)
+                    .ToList();
+            }
+        }
+
+        /// <summary>
+        /// Returns the string representation of the current working path.
+        /// </summary>
+        public string WorkingPathStr => string.Join("/", WorkingPath.Reverse());
+        #endregion
+
+        #region IsOpen Dependency Property
+        /// <summary>
+        /// Whether or not the dropdown for this picker is open.
+        /// </summary>
+        public bool IsOpen {
+            get => (bool)GetValue(IsOpenProperty);
+            set => SetValue(IsOpenProperty, value);
+        }
+
+        public static readonly DependencyProperty IsOpenProperty =
+            DependencyProperty.Register(nameof(IsOpen), typeof(bool), typeof(GameStateParameterPicker), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.AffectsRender));
+        #endregion
+
+        #region SelectedPath Dependency Property
+        /// <summary>
+        /// The path to a GameStateVariable the user has selected.
+        /// </summary>
+        public string SelectedPath {
+            get => (string)GetValue(SelectedPathProperty);
+            set => SetValue(SelectedPathProperty, value);
+        }
+
+        public static readonly DependencyProperty SelectedPathProperty =
+            DependencyProperty.Register(nameof(SelectedPath), typeof(string), typeof(GameStateParameterPicker), new FrameworkPropertyMetadata("", FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, SelectedPathDPChanged));
+
+        private static void SelectedPathDPChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e) {
+            // Do nothing if the value hasn't actually changed.
+            if (e.OldValue == e.NewValue || e.NewValue == null) return;
+
+            var picker = (GameStateParameterPicker)sender;
+            if (double.TryParse(e.NewValue.ToString(), out double val)) {
+                // If a raw number has been entered, fill in the numeric stepper
+                picker.numericEntry.Value = val;
+            } else {
+                // Else if an actual path has been given, split it up into it's ""directories""
+                // For the path to be valid (and to be passed as a param to this method) it will be a path to a variable, not a "directory". We use this assumption.
+                picker.WorkingPath = new Stack<string>(e.NewValue.ToString().Split('/'));
+                picker.WorkingPath.Pop(); // Remove the last one, since the working path should not include the actual var name
+                picker.NotifyChanged(nameof(WorkingPath), nameof(WorkingPathStr), nameof(ParameterList), nameof(CurrentParameterListItems)); // All these things will be different now, so trigger an update of anything requiring them
+                picker.mainListBox.SelectedItem = e.NewValue.ToString().Split('/').Last(); // The selected item in the list will be the last part of the path
+            }
+
+            // Raise an event informing subscribers
+            picker.SelectedPathChanged?.Invoke(picker, new SelectedPathChangedEventArgs(e.OldValue.ToString(), e.NewValue.ToString()));
+        }
+        #endregion
+
+        #region Application Dependency Property
+        /// <summary>
+        /// The current application whose context this picker is for. Determines the available variables.
+        /// </summary>
+        public Application Application {
+            get => (Application)GetValue(ApplicationProperty);
+            set => SetValue(ApplicationProperty, value);
+        }
+
+        public static readonly DependencyProperty ApplicationProperty =
+            DependencyProperty.Register(nameof(Application), typeof(Application), typeof(GameStateParameterPicker), new PropertyMetadata(null, ApplicationOrPropertyTypeChange));
+        #endregion
+
+        #region PropertyType Dependency Property
+        /// <summary>
+        /// The types of properties that will be shown to the user.
+        /// </summary>
+        public PropertyType PropertyType {
+            get => (PropertyType)GetValue(PropertyTypeProperty);
+            set => SetValue(PropertyTypeProperty, value);
+        }
+
+        public static readonly DependencyProperty PropertyTypeProperty =
+            DependencyProperty.Register(nameof(PropertyType), typeof(PropertyType), typeof(GameStateParameterPicker), new PropertyMetadata(PropertyType.Number, ApplicationOrPropertyTypeChange));
+
+        public static void ApplicationOrPropertyTypeChange(DependencyObject sender, DependencyPropertyChangedEventArgs e) {
+            var picker = (GameStateParameterPicker)sender;
+            picker.parameterList = null;
+            picker.NotifyChanged(nameof(ParameterList), nameof(CurrentParameterListItems));
+        }
+        #endregion
+
+        #region Animation
+        /// <summary>Animates the list boxes.</summary>
+        /// <param name="dx">Direction of animation. -1 for previous, 1 for next.</param>
+        private void Animate(int dx) {
+            var auxillaryScrollViewer = auxillaryListbox.FindChildOfType<ScrollViewer>();
+            var mainScrollViewer = mainListBox.FindChildOfType<ScrollViewer>();
+            auxillaryScrollViewer.ScrollToVerticalOffset(mainScrollViewer.VerticalOffset);
+
+            // Move the aux to the centre and move the main to the side of it
+            SetTransformRelativeOffset(mainListBox, dx);
+            SetTransformRelativeOffset(mainListBox, 0);
+
+            // Animate the aux moving away and the main moving in
+            CreateStoryboard(dx, 0, mainListBox).Begin();
+            CreateStoryboard(0, -dx, auxillaryListbox).Begin();
+        }
+
+        /// <summary>Creates a storyboard animation that changes the TransformRelativeOffsetProperty property from `fromX` to `toX` for the given target.</summary>
+        private Storyboard CreateStoryboard(int from, int to, UIElement target) {
+            var sb = new Storyboard {
+                Children = new TimelineCollection(new[] {
+                    new DoubleAnimation(from, to, new Duration(new TimeSpan(0, 0, 0, 0, 300))) {
+                        EasingFunction = new PowerEase { EasingMode = EasingMode.EaseInOut }
+                    }
+                })
+            };
+            Storyboard.SetTarget(sb, target);
+            Storyboard.SetTargetProperty(sb, new PropertyPath(TransformRelativeOffsetProperty));
+            return sb;
+        }
+
+        #region TransformRelativeOffset Attached Property
+        public static double GetTransformRelativeOffset(DependencyObject obj) => (double)obj.GetValue(TransformRelativeOffsetProperty);
+        public static void SetTransformRelativeOffset(DependencyObject obj, double value) => obj.SetValue(TransformRelativeOffsetProperty, value);
+
+        public static readonly DependencyProperty TransformRelativeOffsetProperty =
+            DependencyProperty.RegisterAttached("TransformRelativeOffset", typeof(double), typeof(GameStateParameterPicker), new PropertyMetadata(0d));
+        #endregion
+        #endregion
+
+        #region Event Handlers
+        private void BackBtn_Click(object sender, RoutedEventArgs e) {
+            if (WorkingPath.Count > 0) {
+                // Make the aux list box take on the same items as the current one so that when animated (since the aux is moved to the middle first) it looks natural
+                auxillaryListbox.ItemsSource = CurrentParameterListItems;
+
+                Animate(-1);
+                WorkingPath.Pop(); // Remove the last "directory" off the working path
+                NotifyChanged(nameof(CurrentParameterListItems), nameof(WorkingPathStr)); // These properties will have changed so any UI stuff that relies on it should update
+            }
+        }
+
+        private void MainListBox_PreviewMouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e) {
+            /* The reason this is a PreviewMouseLeftButtonDown event rather than using a SelectionChanged event is because I was having issues where when the next items
+             * were loaded it was immediately selecting the first item and then selecting a path the user didn't click. There is no click event available for the ListBox
+             * so that was out of the question. Next I tried double click but it was counter-intuitive as items were being selected by not actually chosen, which could
+             * easily confuse users. It also felt unresponsive as it would be a few hundred milliseconds after the double click that it actually called this method.
+             * Finally preview left down was chosen as, after a bit of tweaking, it seemed to work properly - felt responsive and didn't repeatedly select new items. The
+             * only real downside of this is that the user can't use the up and down arrows to change the selected item but I think that's a small price to pay.
+             * Side note: THIS PICKER HAS TAKEN ME SO DAMN LONG TO MAKE. Probably longer than the actual GSI plugin system itself.... But hey, I'm proud of it. */
+
+            // Element selection code is adapted from http://kevin-berridge.blogspot.com/2008/06/wpf-listboxitem-double-click.html
+            var el = (UIElement)mainListBox.InputHitTest(e.GetPosition(mainListBox));
+            while (el != null && el != mainListBox) {
+                if (el is ListBoxItem item) {
+
+                    // Since the user has picked an item on the list, we want to clear the numeric box so it is obvious to the user that the number is having no effect.
+                    numericEntry.Value = null;
+
+                    // Copy the current list items to the aux list box incase the list box is animated later. This must be done BEFORE the workingpath.push call.
+                    auxillaryListbox.ItemsSource = CurrentParameterListItems;
+
+                    // Add the clicked item to the working path (even if it is an end variable, not a "directory")
+                    WorkingPath.Push(item.Content.ToString());
+
+                    var path = string.Join("/", WorkingPath.Reverse());
+                    if (Application?.ParameterLookup?.IsValidParameter(path) ?? false) {
+                        // If it turns out the user has selected an end variable, we want to update the DependencyObject for the selected path
+                        SelectedPath = path;
+                        NotifyChanged(nameof(SelectedPath));
+                    } else {
+                        // If the user has selected a directory instead (i.e. isn't not a valid parameter) then perform the animation since there will now be new properties to choose from
+                        Animate(1);
+                    }
+
+                    // Regardless of whether it was a variable or a directory, the list and path will have changed
+                    NotifyChanged(nameof(CurrentParameterListItems), nameof(WorkingPathStr));
+                }
+                el = (UIElement)VisualTreeHelper.GetParent(el);
+            }
+        }
+
+        private void NumericEntry_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e) {
+            var v = (sender as Xceed.Wpf.Toolkit.DoubleUpDown).Value;
+
+            // If there is no value, then this will have been set programmatically, so do nothing since we don't want to end up in a change event handler loop
+            if (!v.HasValue) return;
+
+            mainListBox.SelectedItem = null; // Clear the selection on the list box (to emphasise to the user it is now irrelevant)
+            SelectedPath = v.ToString(); // Set the selectedpath to be the value of this numeric stepper
+            NotifyChanged(nameof(SelectedPath));
+        }
+        #endregion
+
+        private void NotifyChanged(params string[] propNames) {
+            foreach (var prop in propNames)
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(prop));
+        }
+    }
+
+
+    /// <summary>
+    /// EventArgs for an event that is thrown when the selected path of a <see cref="GameStateParameterPicker"/> changes.
+    /// </summary>
+    public class SelectedPathChangedEventArgs : EventArgs {
+
+        public SelectedPathChangedEventArgs(string oldPath, string newPath) {
+            OldPath = oldPath;
+            NewPath = newPath;
+        }
+
+        public string OldPath { get; }
+        public string NewPath { get; }
+    }
+
+
+    /// <summary>
+    /// Converter that checks to see if a string is null or whitespace. Returns true if it HAS A VALUE, or false if it IS NULL/WHITESPACE.
+    /// </summary>
+    public class IsStringNotNullOrWhitespaceConverter : IValueConverter {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) => !string.IsNullOrWhiteSpace(value?.ToString());
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => new NotImplementedException();
+    }
+
+
+    /// <summary>
+    /// Converter that converts a PropertyType enum value to a GridLength. Used for binding onto one of the row definition properties to hide a row when
+    /// the property type is anything other than <see cref="PropertyType.Number" />.
+    /// </summary>
+    public class PropertyTypeToGridLengthConverter : IValueConverter {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) => new GridLength(0, (PropertyType)value == PropertyType.Number ? GridUnitType.Auto : GridUnitType.Pixel);
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => new NotImplementedException();
+    }
+
+
+    /// <summary>
+    /// A binding that will create a <see cref="TranslateTransform"/> based on the target's TransformRelativeOffset. The value will be relative to the
+    /// size of the element (e.g. if the element's width is 150 and the TransformRelativeOffset is 0.5, then the TranslateTransform's X will be 75).
+    /// </summary>
+    public class DoubleToRelativeTransformOffset : MultiBinding {
+
+        public DoubleToRelativeTransformOffset() {
+            Bindings.Add(new Binding("ActualWidth") { RelativeSource = new RelativeSource(RelativeSourceMode.Self) });
+            Bindings.Add(new Binding() { Path = new PropertyPath(GameStateParameterPicker.TransformRelativeOffsetProperty), RelativeSource = new RelativeSource(RelativeSourceMode.Self) });
+            Converter = new Conv();
+        }
+
+        class Conv : IMultiValueConverter {
+            public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) => new TranslateTransform((double)values[0] * (double)values[1], 0);
+            public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index adfb36701..b3f31e6b3 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -378,6 +378,9 @@
     <Compile Include="Controls\Control_FieldPresenter.xaml.cs">
       <DependentUpon>Control_FieldPresenter.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\GameStateParameterPicker.xaml.cs">
+      <DependentUpon>GameStateParameterPicker.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Profiles\EliteDangerous\EliteConfig.cs" />
     <Compile Include="Profiles\EliteDangerous\EliteDangerousSettings.cs" />
     <Compile Include="Profiles\EliteDangerous\GSI\Nodes\Journal\Events\DockFighter.cs" />
@@ -1824,6 +1827,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Controls\GameStateParameterPicker.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Profiles\EliteDangerous\Layers\Control_EliteDangerousAnimationLayer.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentLayer.xaml b/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentLayer.xaml
index a50e3b8fd..19406524d 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentLayer.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentLayer.xaml
@@ -30,14 +30,14 @@
         <Label HorizontalAlignment="Left"  Content="Background Color:" VerticalAlignment="Top" Margin="0,89,0,0" Padding="0"/>
         <xctk:ColorPicker x:Name="ColorPicker_backgroundColor" HorizontalAlignment="Left" Height="24" Margin="103,85,0,0" VerticalAlignment="Top" Width="164" ColorMode="ColorCanvas" SelectedColorChanged="ColorPicker_backgroundColor_SelectedColorChanged" UsingAlphaChannel="True"/>
         <Label HorizontalAlignment="Left" Padding="0" Content="Current Value:" VerticalAlignment="Top" Margin="0,4,0,0"/>
-        <ComboBox x:Name="ComboBox_variable" HorizontalAlignment="Left" Margin="79,0,0,0" VerticalAlignment="Top" Width="188" IsEditable="True" TextBoxBase.TextChanged="ComboBox_variable_TextChanged" Height="22"/>
+        <Controls:GameStateParameterPicker x:Name="variablePicker" SelectedPath="{Binding Path=Properties._VariablePath}" PropertyType="Number" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="79,0,0,0" Width="188" />
         <Label HorizontalAlignment="Left" Padding="0" Content="Maximum Value:" VerticalAlignment="Top" Margin="0,31,0,0"/>
         <Label HorizontalAlignment="Left" Margin="0,145,0,-23" Padding="0" Content="Blink threshold: " VerticalAlignment="Top"/>
         <ComboBox x:Name="ComboBox_effect_type" HorizontalAlignment="Left" Margin="67,114,0,0" VerticalAlignment="Top" Width="200" SelectionChanged="ComboBox_effect_type_SelectionChanged" ItemsSource="{Binding Source={StaticResource PercentEffectType}}" ItemTemplate="{Binding Source={StaticResource PercentEffectTypeTemplate}}" />
         <Label HorizontalAlignment="Left" Margin="0,117,0,0" Padding="0" Content="Effect Type:" VerticalAlignment="Top"/>
         <xctk:IntegerUpDown x:Name="updown_blink_value" HorizontalAlignment="Left" Height="24" Margin="90,141,0,-27" VerticalAlignment="Top" Width="50" Value="1" Maximum="100" Minimum="0" MouseWheelActiveOnFocus="True" ValueChanged="updown_blink_value_ValueChanged"/>
         <Label HorizontalAlignment="Left" Margin="145,145,0,-23" Padding="0" Content="%" VerticalAlignment="Top" RenderTransformOrigin="0.6,0.542"/>
-        <ComboBox x:Name="ComboBox_max_variable" HorizontalAlignment="Left" Margin="92,29,0,0" VerticalAlignment="Top" Width="175" IsEditable="True" TextBoxBase.TextChanged="ComboBox_max_variable_TextChanged" Height="22"/>
+        <Controls:GameStateParameterPicker x:Name="maxVariablePicker" SelectedPath="{Binding Path=Properties._MaxVariablePath}" PropertyType="Number" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="92,29,0,0" Width="175" />
         <CheckBox x:Name="CheckBox_threshold_reverse" Content="Reverse blink threshold" HorizontalAlignment="Left" Margin="3,166,0,0" VerticalAlignment="Top" Checked="CheckBox_threshold_reverse_Checked" Unchecked="CheckBox_threshold_reverse_Checked"/>
         <Controls:KeySequence x:Name="KeySequence_keys" Margin="272,0,0,0" RecordingTag="PercentLayer" Title="Affected Keys" SequenceUpdated="KeySequence_keys_SequenceUpdated" HorizontalAlignment="Left" Width="230"/>
         <CheckBox x:Name="CheckBox_blinkbackground" Content="Blink background instead" HorizontalAlignment="Left" Margin="3,181,0,0" VerticalAlignment="Top" Checked="CheckBox_blinkbackground_Checked" Unchecked="CheckBox_blinkbackground_Checked"/>
diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentLayer.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentLayer.xaml.cs
index 22607ec32..a73cf9989 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentLayer.xaml.cs
@@ -37,8 +37,6 @@ public void SetSettings()
         {
             if (this.DataContext is PercentLayerHandler && !settingsset)
             {
-                this.ComboBox_variable.Text = (this.DataContext as PercentLayerHandler).Properties._VariablePath;
-                this.ComboBox_max_variable.Text = (this.DataContext as PercentLayerHandler).Properties._MaxVariablePath;
                 this.ColorPicker_progressColor.SelectedColor = Utils.ColorUtils.DrawingColorToMediaColor((this.DataContext as PercentLayerHandler).Properties._PrimaryColor ?? System.Drawing.Color.Empty);
                 this.ColorPicker_backgroundColor.SelectedColor = Utils.ColorUtils.DrawingColorToMediaColor((this.DataContext as PercentLayerHandler).Properties._SecondaryColor ?? System.Drawing.Color.Empty);
                 this.ComboBox_effect_type.SelectedIndex = (int)(this.DataContext as PercentLayerHandler).Properties._PercentType;
@@ -53,16 +51,7 @@ internal void SetProfile(Profiles.Application profile)
         {
             if (profile != null && !profileset && profile.ParameterLookup != null)
             {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                this.ComboBox_variable.Items.Clear();
-                foreach (var item in var_types_numerical)
-                    this.ComboBox_variable.Items.Add(item.Key);
-
-                this.ComboBox_max_variable.Items.Clear();
-                foreach (var item in var_types_numerical)
-                    this.ComboBox_max_variable.Items.Add(item.Key);
-
+                variablePicker.Application = maxVariablePicker.Application = profile;
                 profileset = true;
             }
             settingsset = false;
diff --git a/Project-Aurora/Project-Aurora/Utils/FrameworkElementUtils.cs b/Project-Aurora/Project-Aurora/Utils/FrameworkElementUtils.cs
index dc1b7f857..323af168f 100644
--- a/Project-Aurora/Project-Aurora/Utils/FrameworkElementUtils.cs
+++ b/Project-Aurora/Project-Aurora/Utils/FrameworkElementUtils.cs
@@ -1,11 +1,31 @@
-using System.Windows;
+using System.Collections.Generic;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Markup;
+using System.Windows.Media;
 
 namespace Aurora.Utils {
     public static class FrameworkElementExtensions {
 
+        /// <summary>
+        /// Performs a breadth-first search from the given element and returns the first found visual child of the target type.
+        /// Returns null if an element of the target type was not found.
+        /// </summary>
+        public static T FindChildOfType<T>(this DependencyObject self) where T : DependencyObject {
+            var toSearch = new Queue<DependencyObject>();
+            toSearch.Enqueue(self);
+            while (toSearch.Count > 0) {
+                var cur = toSearch.Dequeue();
+                for (int i = 0, count = VisualTreeHelper.GetChildrenCount(cur); i < count; i++) {
+                    var child = VisualTreeHelper.GetChild(cur, i);
+                    if (child is T tChild) return tChild;
+                    toSearch.Enqueue(child);
+                }
+            }
+            return null;
+        }
+
         /// <summary>
         /// Tiny extension for the FrameworkElement that allows to set a binding on an element and return that element (so it can be chained).
         /// Used in the TypeControlMap to shorten the code.
diff --git a/Project-Aurora/Project-Aurora/Utils/GameStateUtils.cs b/Project-Aurora/Project-Aurora/Utils/GameStateUtils.cs
index 4142b9ad1..7bac7e2af 100644
--- a/Project-Aurora/Project-Aurora/Utils/GameStateUtils.cs
+++ b/Project-Aurora/Project-Aurora/Utils/GameStateUtils.cs
@@ -6,6 +6,7 @@
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using GamestateParameterLookup = System.Collections.Generic.Dictionary<string, System.Tuple<System.Type, System.Type>>;
 
 namespace Aurora.Utils
 {
@@ -16,9 +17,9 @@ public static class GameStateUtils
             { typeof(string), true },
         };
 
-        public static Dictionary<string, Tuple<Type, Type>> ReflectGameStateParameters(Type typ)
+        public static GamestateParameterLookup ReflectGameStateParameters(Type typ)
         {
-            Dictionary<string, Tuple<Type, Type>> parameters = new Dictionary<string, Tuple<Type, Type>>();
+            var parameters = new GamestateParameterLookup();
 
             foreach (MemberInfo prop in typ.GetFields().Cast<MemberInfo>().Concat(typ.GetProperties().Cast<MemberInfo>()).Concat(typ.GetMethods().Where(m => !m.IsSpecialName).Cast<MemberInfo>()))
             {
@@ -98,10 +99,10 @@ public static Dictionary<string, Tuple<Type, Type>> ReflectGameStateParameters(T
                     }
                     else
                     {
-                        Dictionary<string, Tuple<Type, Type>> sub_params;
+                        GamestateParameterLookup sub_params;
 
                         if (prop_type == typ)
-                            sub_params = new Dictionary<string, Tuple<Type, Type>>(parameters);
+                            sub_params = new GamestateParameterLookup(parameters);
                         else
                             sub_params = ReflectGameStateParameters(prop_type);
 
@@ -159,21 +160,14 @@ private static object _RetrieveGameStateParameter(IGameState state, string param
             return val;
         }
 
-        public static object RetrieveGameStateParameter(IGameState state, string parameter_path, params object[] input_values)
-        {
-            if (Global.isDebug)
+        public static object RetrieveGameStateParameter(IGameState state, string parameter_path, params object[] input_values) {
+            try {
                 return _RetrieveGameStateParameter(state, parameter_path, input_values);
-            else
-            {
-                try
-                {
-                    return _RetrieveGameStateParameter(state, parameter_path, input_values);
-                }
-                catch (Exception exc)
-                {
-                    Global.logger.Error($"Exception: {exc}");
-                    return null;
-                }
+            } catch (Exception exc) {
+                Global.logger.Error($"Exception: {exc}");
+                if (Global.isDebug)
+                    throw exc;
+                return null;
             }
         }
 
@@ -186,10 +180,8 @@ public static double TryGetDoubleFromState(IGameState state, string path) {
             if (!double.TryParse(path, out double value) && !string.IsNullOrWhiteSpace(path)) {
                 try {
                     value = Convert.ToDouble(RetrieveGameStateParameter(state, path));
-                } catch (Exception exc) {
+                } catch {
                     value = 0;
-                    if (Global.isDebug)
-                        throw exc;
                 }
             }
             return value;
@@ -223,11 +215,30 @@ public static Enum TryGetEnumFromState(IGameState state, string path) {
         }
 
 
-        /*public static object RetrieveGameStateParameter(GameState state, string parameter_path, Type type = null)
-        {
-
+        #region ParameterLookup Extensions
+        /// <summary>
+        /// Checks if the given parameter is valid for the current parameter lookup.
+        /// </summary>
+        public static bool IsValidParameter(this GamestateParameterLookup parameterLookup, string parameter)
+            => parameterLookup.ContainsKey(parameter);
 
-            return null;
-        }*/
+        /// <summary>
+        /// Gets a list of the names of all variables (inc. path) of a certain type in this parameter map.
+        /// </summary>
+        public static IEnumerable<string> GetParameters(this GamestateParameterLookup parameterLookup, PropertyType type)
+            => parameterLookup.Where(PropertyTypePredicate[type]).Select(kvp => kvp.Key);
+
+        static Dictionary<PropertyType, Func<KeyValuePair<string, Tuple<Type, Type>>, bool>> PropertyTypePredicate { get; } = new Dictionary<PropertyType, Func<KeyValuePair<string, Tuple<Type, Type>>, bool>> {
+            [PropertyType.Number] = kvp => TypeUtils.IsNumericType(kvp.Value.Item1),
+            [PropertyType.Number] = kvp => TypeUtils.IsNumericType(kvp.Value.Item1),
+            [PropertyType.Number] = kvp => TypeUtils.IsNumericType(kvp.Value.Item1),
+            [PropertyType.Number] = kvp => TypeUtils.IsNumericType(kvp.Value.Item1)
+        };
+        #endregion
     }
+
+    /// <summary>
+    /// Available types that can be handled by the gamestate parameter methods.
+    /// </summary>
+    public enum PropertyType { Number, Boolean, String, Enum }
 }

From 9521c2c3cd51f10929ab9c07f88b1d4c32c2b260 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Tue, 21 Apr 2020 16:42:52 +0100
Subject: [PATCH 02/20] Removed `SetApplication` and the Application parameter
 from `GetControl()` on IEvaluatable. An inherited attached application
 property has been added which can be used to pass an application context down
 through the visual tree of the nested nodes. This fixes issues where the
 application context is not applied properly and variable lists don't appear.
 No more having to manually forward the application down to child
 evaluatables. Logic for checking for a valid path has been moved into the
 GameStateParameterPicker, so this logic can be removed from all evaluatables
 and the code-behind for all layer controls where this was done. On the
 downside, Evaluatables no longer know their own application, though I
 couldn't think of an actual use case where they'd need to anymore.

---
 .../Controls/GameStateParameterPicker.xaml    |  7 +-
 .../Controls/GameStateParameterPicker.xaml.cs | 29 ++++++-
 .../Project-Aurora/Profiles/GameState.cs      | 16 ++--
 .../Project-Aurora/Project-Aurora.csproj      |  3 +-
 .../Layers/Control_AnimationLayer.xaml.cs     |  2 +-
 .../Overrides/Control_OverridesEditor.xaml    |  3 +-
 .../Overrides/Control_OverridesEditor.xaml.cs | 11 ++-
 .../Logic/Boolean/Boolean_GameState.cs        | 48 +----------
 .../Logic/Boolean/Boolean_LogicOperators.cs   | 41 ++-------
 .../Boolean/Boolean_NumericChangeDetector.cs  | 13 +--
 .../Logic/Boolean/Boolean_PeripheralInput.cs  | 71 ++++-----------
 .../Logic/Boolean/Boolean_ProcessRunning.cs   |  7 +-
 .../Logic/Boolean/Boolean_TrueExtender.cs     | 14 +--
 .../Boolean/Control_BooleanGSIBoolean.xaml    |  5 +-
 .../Boolean/Control_BooleanGSIBoolean.xaml.cs |  9 +-
 .../Logic/Boolean/Control_BooleanGSIEnum.xaml |  3 +-
 .../Boolean/Control_BooleanGSIEnum.xaml.cs    | 11 +--
 .../Boolean/Control_BooleanGSINumeric.xaml    |  7 +-
 .../Boolean/Control_BooleanGSINumeric.xaml.cs | 13 +--
 .../Logic/Boolean/Control_BooleanNot.xaml     |  2 +-
 .../Logic/Boolean/Control_BooleanNot.xaml.cs  | 29 +------
 .../Logic/Control_BinaryOperationHolder.xaml  |  4 +-
 .../Control_BinaryOperationHolder.xaml.cs     | 14 +--
 .../Control_EvaluatablePresenter.xaml.cs      | 16 +---
 .../Logic/Control_OverrideDynamicValue.xaml   |  3 +-
 .../Control_OverrideDynamicValue.xaml.cs      |  4 +-
 .../Logic/Control_OverrideLookupTable.xaml    |  2 +-
 .../Logic/Control_OverrideLookupTable.xaml.cs |  4 +-
 .../Logic/Control_SublogicHolder.xaml         |  2 +-
 .../Logic/Control_SublogicHolder.xaml.cs      | 27 ++----
 .../Logic/Generic/Control_IfElse.xaml         | 10 +--
 .../Logic/Generic/Control_IfElse.xaml.cs      |  4 +-
 .../Overrides/Logic/Generic/IfElseIf.cs       | 10 +--
 .../Settings/Overrides/Logic/IEvaluatable.cs  | 10 +--
 .../Overrides/Logic/IOverrideLogic.cs         |  2 +-
 .../Logic/Number/Control_NumericMap.xaml      | 10 +--
 .../Logic/Number/Control_NumericMap.xaml.cs   |  9 +-
 .../Number/Control_NumericUnaryOpHolder.xaml  |  2 +-
 .../Control_NumericUnaryOpHolder.xaml.cs      | 12 +--
 .../Logic/Number/Number_GameState.cs          | 31 ++-----
 .../Overrides/Logic/Number/Number_Maths.cs    | 86 +++----------------
 .../Logic/Number/Number_PeripheralInput.cs    |  7 +-
 .../Overrides/Logic/Number/Number_Waves.cs    | 19 +---
 .../Overrides/Logic/OverrideDynamicValue.cs   |  4 +-
 .../Overrides/Logic/OverrideLookupTable.cs    |  2 +-
 .../Overrides/Logic/String/String_Constant.cs | 17 +---
 .../Logic/String/String_GameState.cs          | 29 ++-----
 .../Logic/String/String_LogicOperators.cs     | 23 ++---
 .../Utils/AttachedApplication.cs              | 31 +++++++
 .../Project-Aurora/Utils/GameStateUtils.cs    | 17 +++-
 50 files changed, 230 insertions(+), 525 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Utils/AttachedApplication.cs

diff --git a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml
index df6fd58b3..bfc7fe0df 100644
--- a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml
+++ b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml
@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:l="clr-namespace:Aurora.Controls" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
+             xmlns:u="clr-namespace:Aurora.Utils"
              Height="22" MinWidth="120">
 
     <UserControl.Resources>
@@ -17,12 +18,12 @@
 
     <Grid>
         <!-- Main dropdown toggle button -->
-        <ToggleButton x:Name="pickerToggleButton" HorizontalContentAlignment="Left" Padding="4,1" Content="{Binding SelectedPath, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}" IsChecked="{Binding IsOpen, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}" />
+        <ToggleButton x:Name="pickerToggleButton" HorizontalContentAlignment="Left" Padding="4,1,25,1" Content="{Binding SelectedPath, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}" IsChecked="{Binding IsOpen, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}" />
         <Path Width="10" Height="6" HorizontalAlignment="Right" Margin="0,0,9,0" Fill="#FF858585" Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z " Stretch="Fill" IsHitTestVisible="False" />
 
         <!-- Dropdown content -->
         <Popup x:Name="pickerPopup" StaysOpen="False" IsOpen="{Binding IsOpen, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}">
-            <Grid x:Name="popupContent" Height="280" Width="{Binding ActualWidth, ElementName=pickerToggleButton}">
+            <Grid x:Name="popupContent" Background="#1A1A1A" Height="280" Width="{Binding ActualWidth, ElementName=pickerToggleButton}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="1*" />
diff --git a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs
index 0eb4e745e..1cef81d22 100644
--- a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs
@@ -93,8 +93,16 @@ public string SelectedPath {
         private static void SelectedPathDPChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e) {
             // Do nothing if the value hasn't actually changed.
             if (e.OldValue == e.NewValue || e.NewValue == null) return;
-
+            
             var picker = (GameStateParameterPicker)sender;
+            
+            // If the path isn't valid, set it to "".
+            if (!picker.ValidatePath((string)e.NewValue)) {
+                picker.SelectedPath = "";
+                // We need to return out of this method as we don't want to change anything since NewValue is now no longer respective of the new new value.
+                return;
+            }
+
             if (double.TryParse(e.NewValue.ToString(), out double val)) {
                 // If a raw number has been entered, fill in the numeric stepper
                 picker.numericEntry.Value = val;
@@ -135,15 +143,32 @@ public PropertyType PropertyType {
         }
 
         public static readonly DependencyProperty PropertyTypeProperty =
-            DependencyProperty.Register(nameof(PropertyType), typeof(PropertyType), typeof(GameStateParameterPicker), new PropertyMetadata(PropertyType.Number, ApplicationOrPropertyTypeChange));
+            DependencyProperty.Register(nameof(PropertyType), typeof(PropertyType), typeof(GameStateParameterPicker), new PropertyMetadata(PropertyType.None, ApplicationOrPropertyTypeChange));
 
         public static void ApplicationOrPropertyTypeChange(DependencyObject sender, DependencyPropertyChangedEventArgs e) {
             var picker = (GameStateParameterPicker)sender;
             picker.parameterList = null;
             picker.NotifyChanged(nameof(ParameterList), nameof(CurrentParameterListItems));
+
+            if (!picker.ValidatePath(picker.SelectedPath ))
+                picker.SelectedPath = "";
         }
         #endregion
 
+        /// <summary>
+        /// Determines if the selected path is a valid one (i.e. it is a number or a valid variable in the current application context).
+        /// If the current application context is null (i.e. not yet loaded), the path is assumed to be valid.
+        /// </summary>
+        private bool ValidatePath(string path) =>
+            // If application parameter context doesn't exist or there is no set type, assume non loaded and allow the path
+            Application?.ParameterLookup == null || PropertyType == PropertyType.None
+            // An empty path is fine
+            || string.IsNullOrEmpty(path)
+            // If we're in number mode, allow the selected path to be a double
+            || (PropertyType == PropertyType.Number && double.TryParse(path, out var _))
+            // If not in number mode, must be a valid path and have the same type as the expected property type
+            || Application.ParameterLookup.IsValidParameter(path, PropertyType);
+
         #region Animation
         /// <summary>Animates the list boxes.</summary>
         /// <param name="dx">Direction of animation. -1 for previous, 1 for next.</param>
diff --git a/Project-Aurora/Project-Aurora/Profiles/GameState.cs b/Project-Aurora/Project-Aurora/Profiles/GameState.cs
index 3cbb55732..96dce4896 100644
--- a/Project-Aurora/Project-Aurora/Profiles/GameState.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/GameState.cs
@@ -39,10 +39,10 @@ public interface IGameState
         /// </summary>
         //LocalPCInformation LocalPCInfo { get; }
 
-        Newtonsoft.Json.Linq.JObject _ParsedData { get; set; }
+        JObject _ParsedData { get; set; }
         string json { get; set; }
-
-        String GetNode(string name);
+        
+        string GetNode(string name);
     }
 
     public class GameState<TSelf> : StringProperty<TSelf>, IGameState where TSelf : GameState<TSelf>
@@ -57,8 +57,8 @@ public class GameState<TSelf> : StringProperty<TSelf>, IGameState where TSelf :
         /// </summary>
         public LocalPCInformation LocalPCInfo => _localpcinfo ?? (_localpcinfo = new LocalPCInformation());
 
-        public JObject _ParsedData { get; set; }
-        public string json { get; set; }
+        [GameStateIgnore] public JObject _ParsedData { get; set; }
+        [GameStateIgnore] public string json { get; set; }
 
         /// <summary>
         /// Creates a default GameState instance.
@@ -92,7 +92,7 @@ public GameState(IGameState other_state) : base()
             json = other_state.json;
         }
 
-        public String GetNode(string name)
+        [GameStateIgnore] public string GetNode(string name)
         {
             Newtonsoft.Json.Linq.JToken value;
 
@@ -105,14 +105,14 @@ public String GetNode(string name)
         /// <summary>
         /// Use this method to more-easily lazily return the child node of the given name that exists on this AutoNode.
         /// </summary>
-        protected TNode NodeFor<TNode>(string name) where TNode : Node<TNode>
+        [GameStateIgnore] protected TNode NodeFor<TNode>(string name) where TNode : Node<TNode>
             => (TNode)(childNodes.TryGetValue(name, out var n) ? n : (childNodes[name] = Instantiator<TNode, string>.Create(_ParsedData[name]?.ToString() ?? "")));
 
         /// <summary>
         /// Displays the JSON, representative of the GameState data
         /// </summary>
         /// <returns>JSON String</returns>
-        public override string ToString()
+        [GameStateIgnore] public override string ToString()
         {
             return json;
         }
diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index b3f31e6b3..d14f16f3a 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -880,6 +880,7 @@
     <Compile Include="Settings\Window_ProcessSelection.xaml.cs">
       <DependentUpon>Window_ProcessSelection.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Utils\AttachedApplication.cs" />
     <Compile Include="Utils\WindowPlacement.cs" />
     <Compile Include="Utils\Converters.cs" />
     <Compile Include="Utils\DesktopUtils.cs" />
diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml.cs
index b9a4bbe4a..9fd2a201e 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml.cs
@@ -79,7 +79,7 @@ public void SetSettings() {
         internal void SetProfile(Profiles.Application profile) {
             if (profile != null && !profileset) {
                 this.profile = profile;
-                triggerEvaluatable.Application = profile;
+                AttachedApplication.SetApplication(triggerEvaluatable, profile);
                 UpdatePathCombobox();
                 profileset = true;
             }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Control_OverridesEditor.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Control_OverridesEditor.xaml
index 7a9e0b3fd..08d822f51 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Control_OverridesEditor.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Control_OverridesEditor.xaml
@@ -7,6 +7,7 @@
              xmlns:conditions="clr-namespace:Aurora.Settings.Overrides.Logic"
              xmlns:controls="clr-namespace:Aurora.Controls"
              xmlns:overrides="clr-namespace:Aurora.Settings.Overrides"
+             xmlns:utils="clr-namespace:Aurora.Utils"
              mc:Ignorable="d" 
              d:DesignHeight="520" d:DesignWidth="920">
     <UserControl.Resources>
@@ -43,7 +44,7 @@
         <!--<GridSplitter Grid.Column="1" Width="4" HorizontalAlignment="Center" Background="#6000" MaxHeight="480" />-->
 
         <Border Grid.Column="2" Margin="4" Padding="4" Background="#A51E1E1E" CornerRadius="8">
-            <Grid>
+            <Grid utils:AttachedApplication.Application="{Binding Application}">
                 <Label Content="Override mode:" Margin="0,2,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
                 <ComboBox ItemsSource="{Binding OverrideTypes}" SelectedValue="{Binding SelectedLogicType, Mode=TwoWay}" DisplayMemberPath="Key" SelectedValuePath="Value" IsEnabled="{Binding SelectedProperty, Converter={StaticResource HasValToBoolConv}}" Margin="96,4,0,0" Width="180" HorizontalAlignment="Left" VerticalAlignment="Top" />
                 <ContentControl Margin="0,28,0,0" Content="{Binding SelectedLogicControl}" />
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Control_OverridesEditor.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Control_OverridesEditor.xaml.cs
index 662dea52e..f6672428e 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Control_OverridesEditor.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Control_OverridesEditor.xaml.cs
@@ -79,7 +79,7 @@ public Tuple<string, string, Type> SelectedProperty {
             get => _selectedProperty;
             set {
                 _selectedProperty = value;
-                OnPropertyChanged("SelectedProperty", "SelectedLogic", "SelectedLogicType", "SelectedLogicControl");
+                OnPropertyChanged(nameof(SelectedProperty), nameof(SelectedLogic), nameof(SelectedLogicType), nameof(SelectedLogicControl));
             }
         }
 
@@ -101,13 +101,16 @@ public Type SelectedLogicType {
                         ((IValueOverridable)Layer.Handler.Properties).Overrides.SetValueFromString(_selectedProperty.Item1, null);
                     }  else // Else if the user selected a non-"None" option, create a new instance of that OverrideLogic and assign it to this property
                         Layer.OverrideLogic[_selectedProperty.Item1] = (IOverrideLogic)Activator.CreateInstance(value, _selectedProperty.Item3);
-                    OnPropertyChanged("SelectedLogic", "SelectedLogicType", "SelectedLogicControl"); // Raise an event to update the control
+                    OnPropertyChanged(nameof(SelectedLogic), nameof(SelectedLogicType), nameof(SelectedLogicControl)); // Raise an event to update the control
                 }
             }
         }
 
         // The control for the currently selected logic
-        public System.Windows.Media.Visual SelectedLogicControl => SelectedLogic?.GetControl(Layer?.AssociatedApplication);
+        public System.Windows.Media.Visual SelectedLogicControl => SelectedLogic?.GetControl();
+
+        // Application context for logic
+        public Profiles.Application Application => Layer?.AssociatedApplication;
         #endregion
 
         #region Dependency Objects
@@ -117,7 +120,7 @@ private static void OnLayerChange(DependencyObject overridesEditor, DependencyPr
             // Ensure the layer has the property-override map
             if (layer.OverrideLogic == null)
                 layer.OverrideLogic = new Dictionary<string, IOverrideLogic>();
-            control.OnPropertyChanged("Layer", "AvailableLayerProperties", "SelectedProperty", "SelectedLogic", "SelectedLogicType", "SelectedLogicControl");
+            control.OnPropertyChanged(nameof(Layer), nameof(AvailableLayerProperties), nameof(SelectedProperty), nameof(SelectedLogic), nameof(SelectedLogicType), nameof(SelectedLogicControl), nameof(Application));
         }
 
         public static readonly DependencyProperty LayerProperty = DependencyProperty.Register("Layer", typeof(Layer), typeof(Control_OverridesEditor), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender, OnLayerChange));
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs
index 996670537..f52f81012 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs
@@ -24,11 +24,7 @@ public BooleanGSIBoolean() { }
         /// so that the application be updated if required.</summary>
         [Newtonsoft.Json.JsonIgnore]
         private Control_ConditionGSIBoolean control;
-        public Visual GetControl(Application application) {
-            if (control == null)
-                control = new Control_ConditionGSIBoolean(this, application);
-            return control;
-        }
+        public Visual GetControl() => control ?? (control = new Control_ConditionGSIBoolean(this));
 
         /// <summary>Fetches the given boolean value from the game state and returns it.</summary>
         public bool Evaluate(IGameState gameState) {
@@ -42,15 +38,6 @@ public bool Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Update the assigned control with the new application.</summary>
-        public void SetApplication(Application application) {
-            control?.SetApplication(application);
-
-            // Check to ensure the variable path is valid
-            if (application != null && !string.IsNullOrWhiteSpace(VariablePath) && !application.ParameterLookup.ContainsKey(VariablePath))
-                VariablePath = string.Empty;
-        }
-
         public IEvaluatable<bool> Clone() => new BooleanGSIBoolean { VariablePath = VariablePath };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
@@ -82,11 +69,7 @@ public BooleanGSINumeric() { }
         // Control assigned to this condition
         [Newtonsoft.Json.JsonIgnore]
         private Control_ConditionGSINumeric control;
-        public Visual GetControl(Application application) {
-            if (control == null)
-                control = new Control_ConditionGSINumeric(this, application);
-            return control;
-        }
+        public Visual GetControl() => control ?? (control = new Control_ConditionGSINumeric(this));
 
         /// <summary>Parses the numbers, compares the result, and returns the result.</summary>
         public bool Evaluate(IGameState gameState) {
@@ -107,17 +90,6 @@ public bool Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Update the assigned control with the new application.</summary>
-        public void SetApplication(Application application) {
-            control?.SetApplication(application);
-
-            // Check to ensure the variable paths are valid
-            if (application != null && !double.TryParse(Operand1Path, out _) && !string.IsNullOrWhiteSpace(Operand1Path) && !application.ParameterLookup.ContainsKey(Operand1Path))
-                Operand1Path = string.Empty;
-            if (application != null && !double.TryParse(Operand2Path, out _) && !string.IsNullOrWhiteSpace(Operand2Path) && !application.ParameterLookup.ContainsKey(Operand2Path))
-                Operand2Path = string.Empty;
-        }
-
         public IEvaluatable<bool> Clone() => new BooleanGSINumeric { Operand1Path = Operand1Path, Operand2Path = Operand2Path, Operator = Operator };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
@@ -145,12 +117,7 @@ public BooleanGSIEnum() { }
 
         // Control
         private Control_BooleanGSIEnum control;
-        public Visual GetControl(Application application) {
-            if (control == null)
-                control = new Control_BooleanGSIEnum(this);
-            control.SetApplication(application);
-            return control;
-        }
+        public Visual GetControl() => control ?? (control = new Control_BooleanGSIEnum(this));
 
         /// <summary>Parses the numbers, compares the result, and returns the result.</summary>
         public bool Evaluate(IGameState gameState) {
@@ -159,15 +126,6 @@ public bool Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Update the assigned control with the new application.</summary>
-        public void SetApplication(Application application) {
-            control?.SetApplication(application);
-
-            // Check to ensure the variable paths are valid
-            if (application != null && !string.IsNullOrWhiteSpace(StatePath) && !application.ParameterLookup.ContainsKey(StatePath))
-                StatePath = string.Empty;
-        }
-
         public IEvaluatable<bool> Clone() => new BooleanGSIEnum { StatePath = StatePath, EnumValue = EnumValue };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
index 1255aa305..7da10ba14 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
@@ -1,10 +1,12 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
 using Aurora.Profiles;
+using Aurora.Utils;
 using Newtonsoft.Json;
 
 namespace Aurora.Settings.Overrides.Logic {
@@ -27,18 +29,11 @@ public BooleanOr(IEnumerable<IEvaluatable<bool>> subconditions) {
 
         [JsonIgnore]
         private Control_SubconditionHolder control;
-        public Visual GetControl(Application app) => control ?? (control = new Control_SubconditionHolder(this, app, "Require atleast one of the following is true..."));
+        public Visual GetControl() => control ?? (control = new Control_SubconditionHolder(this, "Require atleast one of the following is true..."));
 
         public bool Evaluate(IGameState gameState) => SubConditions.Any(subcondition => subcondition?.Evaluate(gameState) ?? false);
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        public void SetApplication(Application application) {
-            if (control != null)
-                control.Application = application;
-            foreach (var subcondition in SubConditions)
-                subcondition.SetApplication(application);
-        }
-
         public IEvaluatable<bool> Clone() => new BooleanOr { SubConditions = new ObservableCollection<IEvaluatable<bool>>(SubConditions.Select(e => e.Clone())) };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
@@ -62,18 +57,11 @@ public BooleanAnd(IEnumerable<IEvaluatable<bool>> subconditions) {
 
         [JsonIgnore]
         private Control_SubconditionHolder control;
-        public Visual GetControl(Application app) => control ?? (control = new Control_SubconditionHolder(this, app, "Require all of the following are true..."));
+        public Visual GetControl() => control ?? (control = new Control_SubconditionHolder(this, "Require all of the following are true..."));
 
         public bool Evaluate(IGameState gameState) => SubConditions.All(subcondition => subcondition?.Evaluate(gameState) ?? false);
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        public void SetApplication(Application application) {
-            if (control != null)
-                control.Application = application;
-            foreach (var subcondition in SubConditions)
-                subcondition.SetApplication(application);
-        }
-
         public IEvaluatable<bool> Clone() => new BooleanAnd { SubConditions = new ObservableCollection<IEvaluatable<bool>>(SubConditions.Select(e => { var x = e.Clone(); return x; })) };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
@@ -97,16 +85,11 @@ public BooleanNot(IEvaluatable<bool> subcondition) {
         public IEvaluatable<bool> SubCondition { get; set; } = new BooleanConstant();
 
         private Control_ConditionNot control;
-        public Visual GetControl(Application app) => control ?? (control = new Control_ConditionNot(this, app));
+        public Visual GetControl() => control ?? (control = new Control_ConditionNot(this));
 
         public bool Evaluate(IGameState gameState) => !SubCondition.Evaluate(gameState);
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        public void SetApplication(Application application) {
-           // control.app
-            SubCondition?.SetApplication(application);
-        }
-
         public IEvaluatable<bool> Clone() => new BooleanNot { SubCondition = SubCondition.Clone() };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
@@ -128,23 +111,13 @@ public BooleanConstant(bool state) { }
         public bool State { get; set; }
 
         // Create a checkbox to use to set the constant value
-        [JsonIgnore]
-        private CheckBox control;
-        public Visual GetControl(Application application) {
-            if (control == null) {
-                control = new CheckBox { Content = "True/False" };
-                control.SetBinding(CheckBox.IsCheckedProperty, new Binding("State") { Source = this, Mode = BindingMode.TwoWay });
-            }
-            return control;
-        }
+        public Visual GetControl() => new CheckBox { Content = "True/False" }
+            .WithBinding(CheckBox.IsCheckedProperty, new Binding("State") { Source = this, Mode = BindingMode.TwoWay });
 
         // Simply return the current state
         public bool Evaluate(IGameState _) => State;
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        // Application-independent evaluatable, do nothing.
-        public void SetApplication(Application application) { }
-
         // Creates a new BooleanConstant
         public IEvaluatable<bool> Clone() => new BooleanConstant { State = State };
         IEvaluatable IEvaluatable.Clone() => Clone();
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
index ccbd91682..2cc6be6d4 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
@@ -30,12 +30,10 @@ public NumericChangeDetector(IEvaluatable<double> eval, bool detectRising = true
         public bool DetectFalling { get; set; } = true;
         public double DetectionThreshold { get; set; } = 0;
 
-        private StackPanel control;
-        private Control_EvaluatablePresenter ep;
-        public Visual GetControl(Application a) => control ?? (control = new StackPanel()
+        public Visual GetControl() => new StackPanel()
             .WithChild(new DockPanel { LastChildFill = true }
                 .WithChild(new Label { Content = "Expression", VerticalAlignment = System.Windows.VerticalAlignment.Center }, Dock.Left)
-                .WithChild(ep = new Control_EvaluatablePresenter { EvalType = EvaluatableType.Number, Margin = new System.Windows.Thickness(24, 0, 0, 0) }
+                .WithChild(new Control_EvaluatablePresenter { EvalType = EvaluatableType.Number, Margin = new System.Windows.Thickness(24, 0, 0, 0) }
                     .WithBinding(Control_EvaluatablePresenter.ExpressionProperty, this, "Evaluatable", BindingMode.TwoWay)))
             .WithChild(new CheckBox { Content = "Trigger on increase" }
                 .WithBinding(CheckBox.IsCheckedProperty, this, "DetectRising"))
@@ -44,7 +42,7 @@ public NumericChangeDetector(IEvaluatable<double> eval, bool detectRising = true
             .WithChild(new DockPanel { LastChildFill = true }
                 .WithChild(new Label { Content = "Change required", VerticalAlignment = System.Windows.VerticalAlignment.Center }, Dock.Left)
                 .WithChild(new DoubleUpDown { Minimum = 0 }
-                    .WithBinding(DoubleUpDown.ValueProperty, this, "DetectionThreshold"))));
+                    .WithBinding(DoubleUpDown.ValueProperty, this, "DetectionThreshold")));
 
         public bool Evaluate(IGameState gameState) {
             var val = Evaluatable.Evaluate(gameState);
@@ -62,11 +60,6 @@ public bool Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        public void SetApplication(Application application) {
-            ep.Application = application;
-            Evaluatable?.SetApplication(application);
-        }
-
         public IEvaluatable<bool> Clone() => new NumericChangeDetector { Evaluatable = Evaluatable.Clone(), DetectRising = DetectRising, DetectFalling = DetectFalling, DetectionThreshold = DetectionThreshold };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs
index 61fc078f9..ec8c44f04 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs
@@ -27,19 +27,13 @@ public BooleanKeyDown() { }
         public Keys TargetKey { get; set; } = Keys.Space;
 
         /// <summary>Create a control where the user can select the key they wish to detect.</summary>
-        public Visual GetControl(Application application) {
-            var c = new Controls.Control_FieldPresenter { Type = typeof(Keys), Margin = new System.Windows.Thickness(0, 0, 0, 6) };
-            c.SetBinding(Controls.Control_FieldPresenter.ValueProperty, new Binding("TargetKey") { Source = this, Mode = BindingMode.TwoWay });
-            return c;
-        }
+        public Visual GetControl() => new Controls.Control_FieldPresenter { Type = typeof(Keys), Margin = new System.Windows.Thickness(0, 0, 0, 6) }
+            .WithBinding(Controls.Control_FieldPresenter.ValueProperty, new Binding("TargetKey") { Source = this, Mode = BindingMode.TwoWay });
 
         /// <summary>True if the global event bus's pressed key list contains the target key.</summary>
         public bool Evaluate(IGameState gameState) => Global.InputEvents.PressedKeys.Contains(TargetKey);
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Do nothing - this is an application-independent condition.</summary>
-        public void SetApplication(Application application) { }
-
         public IEvaluatable<bool> Clone() => new BooleanKeyDown { TargetKey = TargetKey };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
@@ -63,31 +57,15 @@ public BooleanKeyDownWithTimer() { }
         public float Seconds { get; set; } = 1;
 
         /// <summary>Create a control where the user can select the key they wish to detect.</summary>
-        public Visual GetControl(Application application)
-        {
-            StackPanel panel = new StackPanel();
-
-            var c = new Controls.Control_FieldPresenter { Type = typeof(Keys), Margin = new System.Windows.Thickness(0, 0, 0, 6) };
-            c.SetBinding(Controls.Control_FieldPresenter.ValueProperty, new Binding("TargetKey") { Source = this, Mode = BindingMode.TwoWay });
-            panel.Children.Add(c);
-
-            StackPanel time = new StackPanel();
-            time.Orientation = Orientation.Horizontal;
-            var text = new TextBlock();
-            text.Text = "For";
-            time.Children.Add(text);
-
-            c = new Controls.Control_FieldPresenter { Type = typeof(float), Margin = new System.Windows.Thickness(5, 0, 5, 6) };
-            c.SetBinding(Controls.Control_FieldPresenter.ValueProperty, new Binding("Seconds") { Source = this, Mode = BindingMode.TwoWay });
-            time.Children.Add(c);
-
-            text = new TextBlock();
-            text.Text = "Seconds";
-            time.Children.Add(text);
-            
-            panel.Children.Add(time);
-            return panel;
-        }
+        public Visual GetControl() => new StackPanel()
+            .WithChild(new Controls.Control_FieldPresenter { Type = typeof(Keys), Margin = new System.Windows.Thickness(0, 0, 0, 6) }
+                .WithBinding(Controls.Control_FieldPresenter.ValueProperty, new Binding("TargetKey") { Source = this, Mode = BindingMode.TwoWay }))
+            .WithChild(new StackPanel { Orientation = Orientation.Horizontal }
+                .WithChild(new TextBlock { Text = "For" })
+                .WithChild(new Controls.Control_FieldPresenter { Type = typeof(float), Margin = new System.Windows.Thickness(5, 0, 5, 6) }
+                    .WithBinding(Controls.Control_FieldPresenter.ValueProperty, new Binding("Seconds") { Source = this, Mode = BindingMode.TwoWay }))
+                .WithChild(new TextBlock { Text = "Seconds" }));
+
         /// <summary>True if the global event bus's pressed key list contains the target key.</summary>
         public bool Evaluate(IGameState gameState) {
             if (Global.InputEvents.PressedKeys.Contains(TargetKey))
@@ -106,9 +84,6 @@ public bool Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Do nothing - this is an application-independent condition.</summary>
-        public void SetApplication(Application application) { }
-
         public IEvaluatable<bool> Clone() => new BooleanKeyDown { TargetKey = TargetKey };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
@@ -129,19 +104,13 @@ public BooleanMouseDown() { }
         public System.Windows.Forms.MouseButtons TargetButton { get; set; } = System.Windows.Forms.MouseButtons.Left;
         
         /// <summary>Create a control where the user can select the mouse button they wish to detect.</summary>
-        public Visual GetControl(Application application) {
-            var c = new Controls.Control_FieldPresenter { Type = typeof(System.Windows.Forms.MouseButtons), Margin = new System.Windows.Thickness(0, 0, 0, 6) };
-            c.SetBinding(Controls.Control_FieldPresenter.ValueProperty, new Binding("TargetButton") { Source = this, Mode = BindingMode.TwoWay });
-            return c;
-        }
+        public Visual GetControl() => new Controls.Control_FieldPresenter { Type = typeof(System.Windows.Forms.MouseButtons), Margin = new System.Windows.Thickness(0, 0, 0, 6) }
+            .WithBinding(Controls.Control_FieldPresenter.ValueProperty, new Binding("TargetButton") { Source = this, Mode = BindingMode.TwoWay });
 
         /// <summary>True if the global event bus's pressed mouse button list contains the target button.</summary>
         public bool Evaluate(IGameState gameState) => Global.InputEvents.PressedButtons.Contains(TargetButton);
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Do nothing - this is an application-independent condition.</summary>
-        public void SetApplication(Application application) { }
-
         public IEvaluatable<bool> Clone() => new BooleanMouseDown { TargetButton = TargetButton };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
@@ -161,19 +130,13 @@ public BooleanLockKeyActive() { }
         public Keys TargetKey { get; set; } = Keys.CapsLock;
 
         /// <summary>Create a control allowing the user to specify which lock key to check.</summary>
-        public Visual GetControl(Application application) {
-            var cb = new ComboBox { ItemsSource = new[] { Keys.CapsLock, Keys.NumLock, Keys.Scroll } };
-            cb.SetBinding(ComboBox.SelectedValueProperty, new Binding("TargetKey") { Source = this, Mode=BindingMode.TwoWay });
-            return cb;
-        }
+        public Visual GetControl() => new ComboBox { ItemsSource = new[] { Keys.CapsLock, Keys.NumLock, Keys.Scroll } }
+            .WithBinding(ComboBox.SelectedValueProperty, new Binding("TargetKey") { Source = this, Mode=BindingMode.TwoWay });
 
         /// <summary>Return true if the target lock key is active.</summary>
         public bool Evaluate(IGameState gameState) => System.Windows.Forms.Control.IsKeyLocked(TargetKey);
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Do nothing - this is an application-independent condition.</summary>
-        public void SetApplication(Application application) { }
-
         public IEvaluatable<bool> Clone() => new BooleanLockKeyActive { TargetKey = TargetKey };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
@@ -206,7 +169,7 @@ public BooleanAwayTimer(double time, TimeUnit unit) {
         #endregion
 
         private Control_TimeAndUnit control;
-        public Visual GetControl(Application app) => control ?? (control = new Control_TimeAndUnit()
+        public Visual GetControl() => control ?? (control = new Control_TimeAndUnit()
             .WithBinding(Control_TimeAndUnit.TimeProperty, new Binding("InactiveTime") { Source = this, Mode = BindingMode.TwoWay })
             .WithBinding(Control_TimeAndUnit.UnitProperty, new Binding("TimeUnit") { Source = this, Mode = BindingMode.TwoWay }));
 
@@ -223,8 +186,6 @@ public bool Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        public void SetApplication(Application application) { }
-
         public IEvaluatable<bool> Clone() => new BooleanAwayTimer { InactiveTime = InactiveTime, TimeUnit = TimeUnit };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
index c64a3471d..b48c24344 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
@@ -17,16 +17,13 @@ public class BooleanProcessRunning : IEvaluatable<bool> {
         public BooleanProcessRunning() { }
         public BooleanProcessRunning(string processName) { ProcessName = processName; }
 
-        private TextBox control;
-        public Visual GetControl(Application application) => control ?? (control = new TextBox { MinWidth = 80 }
-            .WithBinding(TextBox.TextProperty, new Binding("ProcessName") { Source = this, Mode = BindingMode.TwoWay }));
+        public Visual GetControl() => new TextBox { MinWidth = 80 }
+            .WithBinding(TextBox.TextProperty, new Binding("ProcessName") { Source = this, Mode = BindingMode.TwoWay });
 
         public bool Evaluate(IGameState gameState)
             => Global.LightingStateManager.RunningProcessMonitor.IsProcessRunning(ProcessName);
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        public void SetApplication(Application application) { }
-
         public IEvaluatable<bool> Clone() => new BooleanProcessRunning { ProcessName = ProcessName };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
index 0dfb4271d..58606c722 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
@@ -25,15 +25,12 @@ public BooleanExtender() { }
         public double ExtensionTime { get; set; } = 5;
         public TimeUnit TimeUnit { get; set; } = TimeUnit.Seconds;
 
-        private StackPanel sp;
-        private Control_EvaluatablePresenter ep;
-        public Visual GetControl(Application a) => sp ?? (sp = new StackPanel()
-            .WithChild(ep = new Control_EvaluatablePresenter { EvalType = EvaluatableType.Boolean, Margin = new System.Windows.Thickness(24, 0, 0, 0) }
+        public Visual GetControl() => new StackPanel()
+            .WithChild(new Control_EvaluatablePresenter { EvalType = EvaluatableType.Boolean, Margin = new System.Windows.Thickness(24, 0, 0, 0) }
                 .WithBinding(Control_EvaluatablePresenter.ExpressionProperty, new Binding("Evaluatable") { Source = this, Mode = BindingMode.TwoWay }))
             .WithChild(new Control_TimeAndUnit()
                 .WithBinding(Control_TimeAndUnit.TimeProperty, new Binding("ExtensionTime") { Source = this, Mode = BindingMode.TwoWay })
-                .WithBinding(Control_TimeAndUnit.UnitProperty, new Binding("TimeUnit") { Source = this, Mode = BindingMode.TwoWay })
-            ));
+                .WithBinding(Control_TimeAndUnit.UnitProperty, new Binding("TimeUnit") { Source = this, Mode = BindingMode.TwoWay }));
 
         public bool Evaluate(IGameState gameState) {
             var res = Evaluatable.Evaluate(gameState);
@@ -48,11 +45,6 @@ public bool Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        public void SetApplication(Application application) {
-            ep.Application = application;
-            Evaluatable.SetApplication(application);
-        }
-
         public IEvaluatable<bool> Clone() => new BooleanExtender { Evaluatable = Evaluatable.Clone(), ExtensionTime = ExtensionTime, TimeUnit = TimeUnit };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIBoolean.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIBoolean.xaml
index 1b3640871..c71274ded 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIBoolean.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIBoolean.xaml
@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Aurora.Settings.Overrides.Logic"
+             xmlns:c="clr-namespace:Aurora.Controls"
+             xmlns:u="clr-namespace:Aurora.Utils"
              mc:Ignorable="d">
-    <ComboBox x:Name="ValidPathsCombo" SelectedItem="{Binding VariablePath}" Margin="0,0,0,6" />
+    <c:GameStateParameterPicker SelectedPath="{Binding VariablePath}" PropertyType="Boolean" Application="{u:AttachedApplicationBinding}"  Margin="0,0,0,6" />
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIBoolean.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIBoolean.xaml.cs
index fee2251ba..f02441579 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIBoolean.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIBoolean.xaml.cs
@@ -9,16 +9,9 @@ namespace Aurora.Settings.Overrides.Logic {
     /// </summary>
     public partial class Control_ConditionGSIBoolean : UserControl {
 
-        public Control_ConditionGSIBoolean(BooleanGSIBoolean context, Application application) {
+        public Control_ConditionGSIBoolean(BooleanGSIBoolean context) {
             InitializeComponent();
             DataContext = context;
-            SetApplication(application);
-        }
-
-        internal void SetApplication(Application application) {
-            ValidPathsCombo.ItemsSource = application?.ParameterLookup?
-                .Where(kvp => Type.GetTypeCode(kvp.Value.Item1) == TypeCode.Boolean)
-                .Select(kvp => kvp.Key);
         }
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml
index 782f2bc31..6e694487e 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:c="clr-namespace:Aurora.Controls"
+             xmlns:u="clr-namespace:Aurora.Utils"
              mc:Ignorable="d" d:DesignWidth="400">
     <Grid Margin="0,0,0,6">
         <Grid.ColumnDefinitions>
@@ -12,7 +13,7 @@
             <ColumnDefinition Width="1*" />
         </Grid.ColumnDefinitions>
 
-        <ComboBox x:Name="GSIPath" SelectedItem="{Binding StatePath}" Grid.Column="0" SelectionChanged="GSIPath_SelectionChanged" />
+        <c:GameStateParameterPicker SelectedPath="{Binding StatePath}" PropertyType="Enum" Application="{u:AttachedApplicationBinding}"  Grid.Column="0" SelectedPathChanged="GameStateParameterPicker_SelectedPathChanged" />
         <TextBlock Text="=" FontWeight="Bold" Grid.Column="1" Margin="4,0" VerticalAlignment="Center" />
         <ComboBox x:Name="EnumVal" SelectedValue="{Binding EnumValue}" DisplayMemberPath="Key" SelectedValuePath="Value" Grid.Column="2" HorizontalAlignment="Stretch" />
     </Grid>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml.cs
index a7d97c4b0..be12a1486 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml.cs
@@ -8,23 +8,16 @@ namespace Aurora.Settings.Overrides.Logic {
 
     public partial class Control_BooleanGSIEnum : UserControl {
 
-        private Profiles.Application application;
-
         public Control_BooleanGSIEnum(BooleanGSIEnum context) {
             InitializeComponent();
             ((FrameworkElement)Content).DataContext = context;
-        }
-
-        /// <summary>Updates the application providing data to this evaluatable context. Updates the dropdowns.</summary>
-        public void SetApplication(Profiles.Application application) {
-            this.application = application;
-            GSIPath.ItemsSource = application?.ParameterLookup?.Where(kvp => kvp.Value.Item1.IsEnum).Select(x => x.Key);
             UpdateEnumDropDown();
         }
 
         /// <summary>Updates the enum value dropdown with a list of enum values for the current application and selected variable path.</summary>
         private void UpdateEnumDropDown() {
             Type selectedEnumType = null;
+            var application = Utils.AttachedApplication.GetApplication(this);
             var isValid = ((FrameworkElement)Content).DataContext is BooleanGSIEnum ctx
                 && !string.IsNullOrWhiteSpace(ctx.StatePath) // If the path to the enum GSI isn't empty
                 && application?.ParameterLookup != null // If the application parameter lookup is ready (and application isn't null)
@@ -36,7 +29,7 @@ private void UpdateEnumDropDown() {
         }
 
         // Update the enum dropdown when the user selects a different enum path
-        private void GSIPath_SelectionChanged(object sender, SelectionChangedEventArgs e) {
+        private void GameStateParameterPicker_SelectedPathChanged(object sender, Controls.SelectedPathChangedEventArgs e) {
             UpdateEnumDropDown();
         }
     }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSINumeric.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSINumeric.xaml
index 56d9b2ec8..8b547b6fe 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSINumeric.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSINumeric.xaml
@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Aurora.Settings.Overrides.Logic"
+             xmlns:c="clr-namespace:Aurora.Controls"
+             xmlns:u="clr-namespace:Aurora.Utils"
              mc:Ignorable="d" d:DesignWidth="400">
     <Grid Margin="0,0,0,6">
         <Grid.ColumnDefinitions>
@@ -12,8 +13,8 @@
             <ColumnDefinition Width="1*" />
         </Grid.ColumnDefinitions>
 
-        <ComboBox x:Name="Operand1Cb" Text="{Binding Operand1Path}" IsEditable="True" Grid.Column="0" />
+        <c:GameStateParameterPicker x:Name="x" SelectedPath="{Binding Operand1Path}" Application="{u:AttachedApplicationBinding}" PropertyType="Number" Grid.Column="0" />
         <ComboBox x:Name="OperatorCb" SelectedValue="{Binding Operator}" SelectedValuePath="Value" DisplayMemberPath="Key" Grid.Column="1" Margin="6,0" />
-        <ComboBox x:Name="Operand2Cb" Text="{Binding Operand2Path}" IsEditable="True" Grid.Column="2" />
+        <c:GameStateParameterPicker SelectedPath="{Binding Operand2Path}" Application="{u:AttachedApplicationBinding}" PropertyType="Number" Grid.Column="2" />
     </Grid>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSINumeric.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSINumeric.xaml.cs
index 73897be43..db2e267c6 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSINumeric.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSINumeric.xaml.cs
@@ -1,8 +1,4 @@
 using Aurora.Profiles;
-using System;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
 using System.Windows.Controls;
 
 namespace Aurora.Settings.Overrides.Logic {
@@ -11,17 +7,10 @@ namespace Aurora.Settings.Overrides.Logic {
     /// </summary>
     public partial class Control_ConditionGSINumeric : UserControl {
 
-        public Control_ConditionGSINumeric(BooleanGSINumeric context, Application application) {
+        public Control_ConditionGSINumeric(BooleanGSINumeric context) {
             InitializeComponent();
             DataContext = context;
-            SetApplication(application);
             OperatorCb.ItemsSource = Utils.EnumUtils.GetEnumItemsSource<ComparisonOperator>();
         }
-
-        internal void SetApplication(Application application) {
-            Operand1Cb.ItemsSource = Operand2Cb.ItemsSource = application?.ParameterLookup?
-                .Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1))
-                .Select(kvp => kvp.Key);
-        }
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml
index 991dda210..485092666 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml
@@ -7,6 +7,6 @@
              mc:Ignorable="d">
     <Grid>
         <TextBlock Text="!" FontSize="18" VerticalAlignment="Center" />
-        <local:Control_EvaluatablePresenter Expression="{Binding ParentExpr.SubCondition, Mode=TwoWay}" Application="{Binding Application}" EvalType="Boolean" Margin="15,0,0,0" />
+        <local:Control_EvaluatablePresenter Expression="{Binding SubCondition, Mode=TwoWay}" EvalType="Boolean" Margin="15,0,0,0" />
     </Grid>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml.cs
index dc7d4eb00..31e3b953e 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml.cs
@@ -7,34 +7,9 @@ namespace Aurora.Settings.Overrides.Logic {
     /// Interaction logic for Control_ConditionNot.xaml
     /// </summary>
     public partial class Control_ConditionNot : UserControl {
-        public Control_ConditionNot(BooleanNot context, Profiles.Application application) {
+        public Control_ConditionNot(BooleanNot context) {
             InitializeComponent();
-            ParentExpr = context;
-            Application = application;
-            ((FrameworkElement)Content).DataContext = this;
+            DataContext = context;
         }
-
-        #region Properties/Dependency Properties
-        /// <summary>The parent <see cref="BooleanNot"/> evaluatable of this control.</summary>
-        public BooleanNot ParentExpr { get; }
-        
-        /// <summary>The application context of this control. Is passed to the EvaluatablePresenter children.</summary>
-        public Profiles.Application Application {
-            get => (Profiles.Application)GetValue(ApplicationProperty);
-            set => SetValue(ApplicationProperty, value);
-        }
-
-        /// <summary>The property used as a backing store for the application context.</summary>
-        public static readonly DependencyProperty ApplicationProperty =
-            DependencyProperty.Register("Application", typeof(Profiles.Application), typeof(Control_ConditionNot), new PropertyMetadata(null));
-        #endregion
-    }
-
-    /// <summary>
-    /// The datatype that is used as the DataContext for `Control_ConditionNot`.
-    /// </summary>
-    internal class Control_ConditionNot_Context {
-        public BooleanNot ParentCondition { get; set; }
-        public Profiles.Application Application { get; set; }
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml
index f70e7f3b4..9fc92d7d6 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml
@@ -15,7 +15,7 @@
                 <Rectangle Fill="#6000" Width="4" HorizontalAlignment="Left" VerticalAlignment="Stretch" />
                 <Rectangle Fill="#6000" Height="4" Width="6" Margin="4,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
                 <Border Margin="10,0,0,0" BorderThickness="1" BorderBrush="#6000" Background="#3000">
-                    <local:Control_EvaluatablePresenter Expression="{Binding Operand1, Mode=TwoWay}" Application="{Binding Application}" EvalType="{Binding EvalType}" Margin="6,2,6,0" />
+                    <local:Control_EvaluatablePresenter Expression="{Binding Operand1, Mode=TwoWay}" EvalType="{Binding EvalType}" Margin="6,2,6,0" />
                 </Border>
             </Grid>
 
@@ -36,7 +36,7 @@
                 <Rectangle Fill="#6000" Width="4" HorizontalAlignment="Left" VerticalAlignment="Stretch" />
                 <Rectangle Fill="#6000" Height="4" Width="6" Margin="4,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Bottom" />
                 <Border Margin="10,0,0,0" BorderThickness="1" BorderBrush="#6000" Background="#3000" Grid.RowSpan="2">
-                    <local:Control_EvaluatablePresenter Expression="{Binding Operand2, Mode=TwoWay}" Application="{Binding Application}" EvalType="{Binding EvalType}" Margin="6,2,6,0" />
+                    <local:Control_EvaluatablePresenter Expression="{Binding Operand2, Mode=TwoWay}" EvalType="{Binding EvalType}" Margin="6,2,6,0" />
                 </Border>
             </Grid>
         </StackPanel>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml.cs
index a8c895d4a..d93cd77c7 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml.cs
@@ -15,9 +15,8 @@ public partial class Control_BinaryOperationHolder : UserControl {
         /// <summary>
         /// Creates a new numeric binary operation holder control.
         /// </summary>
-        public Control_BinaryOperationHolder(Profiles.Application application, EvaluatableType evalType) {
+        public Control_BinaryOperationHolder(EvaluatableType evalType) {
             InitializeComponent();
-            Application = application;
             EvalType = evalType;
             DataContext = this;
         }
@@ -25,20 +24,11 @@ public Control_BinaryOperationHolder(Profiles.Application application, Evaluatab
         /// <summary>
         /// Creates a new numeric binary operation holder control using the values of the specified enum as the operators item source.
         /// </summary>
-        public Control_BinaryOperationHolder(Profiles.Application application, EvaluatableType evalType, Type enumType) : this(application, evalType) {
+        public Control_BinaryOperationHolder(EvaluatableType evalType, Type enumType) : this(evalType) {
             operatorSelection.ItemsSource = Utils.EnumUtils.GetEnumItemsSource(enumType);
         }
 
-        #region Properties
-        public Profiles.Application Application { get; set; }
         public EvaluatableType EvalType { get; set; }
-        #endregion
-
-        #region Methods
-        public void SetApplication(Profiles.Application application) {
-            Application = application;
-        }
-        #endregion Methods
 
         #region Dependency Properties
         public static readonly DependencyProperty Operand1Property = DependencyProperty.Register("Operand1", typeof(IEvaluatable), typeof(Control_BinaryOperationHolder), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender));
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
index 36d3246af..324fd4f48 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
@@ -80,8 +80,7 @@ private void PasteButton_Click(object sender, RoutedEventArgs e) {
         private static void OnExpressionChange(DependencyObject evaluatablePresenter, DependencyPropertyChangedEventArgs eventArgs) {
             var control = (Control_EvaluatablePresenter)evaluatablePresenter;
             var expr = (IEvaluatable)eventArgs.NewValue;
-            var x = expr?.GetType();
-            control.ContentContainer.Content = expr?.GetControl(control.Application);
+            control.ContentContainer.Content = expr?.GetControl();
             control.settingTypeSelection = true;
             control.expressionSelection.SelectedValue = expr?.GetType();
             control.settingTypeSelection = false;
@@ -92,19 +91,6 @@ public IEvaluatable Expression {
             get => (IEvaluatable)GetValue(ExpressionProperty);
             set => SetValue(ExpressionProperty, value);
         }
-
-        // Application Property (the application passed to the component's UserControl to allow it do detect GSI variables names and such)
-        private static void OnApplicationChange(DependencyObject evaluatablePresenter, DependencyPropertyChangedEventArgs eventArgs) {
-            var control = (Control_EvaluatablePresenter)evaluatablePresenter;
-            control.Expression?.SetApplication((Profiles.Application)eventArgs.NewValue);
-        }
-
-        public static readonly DependencyProperty ApplicationProperty = DependencyProperty.Register("Application", typeof(Profiles.Application), typeof(Control_EvaluatablePresenter), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender, OnApplicationChange));
-        public Profiles.Application Application {
-            get => (Profiles.Application)GetValue(ApplicationProperty);
-            set => SetValue(ApplicationProperty, value);
-        }
-
         // The subtype of evaluatable to restrict the user to (e.g. IEvaluatable<bool>)
         private static void OnEvalTypeChange(DependencyObject evaluatablePresenter, DependencyPropertyChangedEventArgs eventArgs) {
             var control = (Control_EvaluatablePresenter)evaluatablePresenter;
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml
index 7b96d4394..871e74dfb 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aurora.Settings.Overrides.Logic"
+             xmlns:u="clr-namespace:Aurora.Utils"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
@@ -24,7 +25,7 @@
                                 <Run Text="{Binding Item1, Mode=OneWay}" TextDecorations="{Binding Item4, Converter={StaticResource UnderlineConv}}" Cursor="{Binding Item4, Converter={StaticResource CursorConv}}" ToolTip="{Binding Item4, Mode=OneWay}" />
                                 <Run Text="=" />
                             </TextBlock>
-                            <local:Control_EvaluatablePresenter Expression="{Binding Item3, Mode=OneWay}" EvalType="{Binding Item2}" Application="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=DataContext.Application}" ExpressionChanged="VariableEvaluatable_ExpressionChanged" />
+                            <local:Control_EvaluatablePresenter Expression="{Binding Item3, Mode=OneWay}" EvalType="{Binding Item2}" ExpressionChanged="VariableEvaluatable_ExpressionChanged" />
                         </DockPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml.cs
index 67660e24e..85b22118d 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml.cs
@@ -14,13 +14,11 @@ namespace Aurora.Settings.Overrides.Logic {
     public partial class Control_OverrideDynamicValue : UserControl {
 
         public OverrideDynamicValue Context { get; }
-        public Profiles.Application Application { get; }
         public List<Tuple<string, EvaluatableType, IEvaluatable, string>> Parameters { get; }
 
-        public Control_OverrideDynamicValue(OverrideDynamicValue context, Profiles.Application application) {
+        public Control_OverrideDynamicValue(OverrideDynamicValue context) {
             InitializeComponent();
             Context = context;
-            Application = application;
             // Get a list that contains the label (string), the type of evaluatable (to restrict the list box), the evaluatable itself and the description.
             Parameters = context.ConstructorParameters.Select(kvp => new Tuple<string, EvaluatableType, IEvaluatable, string>(
                 kvp.Key,
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml
index 61105655f..33340a066 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml
@@ -59,7 +59,7 @@
                                     <!-- Main item content -->
                                     <controls:Control_FieldPresenter Value="{Binding Value, Mode=TwoWay}" Type="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=DataContext.Table.VarType}" Grid.Column="0" VerticalAlignment="Center" Margin="8,4,8,8" />
                                     <TextBlock Text="When" FontStyle="Italic" FontWeight="Bold" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <local:Control_EvaluatablePresenter Application="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=DataContext.Application}" Expression="{Binding Condition, Mode=TwoWay}" EvalType="Boolean" Grid.Column="2" VerticalAlignment="Center" Margin="8,4,8,8" />
+                                    <local:Control_EvaluatablePresenter Expression="{Binding Condition, Mode=TwoWay}" EvalType="Boolean" Grid.Column="2" VerticalAlignment="Center" Margin="8,4,8,8" />
 
                                     <!-- Delete button -->
                                     <Button Margin="6" Grid.Column="3" VerticalAlignment="Center" ToolTip="Remove this lookup entry" Click="DeleteLookupEntry_Click">
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml.cs
index 35b4d36a8..e6e0bf7a0 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml.cs
@@ -20,12 +20,10 @@ namespace Aurora.Settings.Overrides.Logic {
     public partial class Control_OverrideLookupTable : UserControl {
 
         public OverrideLookupTable Table { get; }
-        public Profiles.Application Application { get; }
 
-        public Control_OverrideLookupTable(OverrideLookupTable context, Profiles.Application application) {
+        public Control_OverrideLookupTable(OverrideLookupTable context) {
             InitializeComponent();
             Table = context;
-            Application = application;
             DataContext = this;
         }
 
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml
index e123b66a8..475263819 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml
@@ -16,7 +16,7 @@
                         <Rectangle Fill="#6000" Height="4" Width="10" HorizontalAlignment="Left" VerticalAlignment="Center" />
                         <Border Margin="10,0,0,0" BorderThickness="1" BorderBrush="#6000" Background="#3000">
                             <Grid>
-                                <local:Control_EvaluatablePresenter Expression="{Binding .}" Application="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ItemsControl}}, Path=DataContext.Application}" EvalType="Boolean" ExpressionChanged="ConditionPresenter_ConditionChanged" Margin="6,2,36,0" />
+                                <local:Control_EvaluatablePresenter Expression="{Binding .}" EvalType="Boolean" ExpressionChanged="ConditionPresenter_ConditionChanged" Margin="6,2,36,0" />
                                 <Button Margin="6" HorizontalAlignment="Right" VerticalAlignment="Center" Click="DeleteButton_Click" ToolTip="Remove this subcondition">
                                     <Image Source="/Aurora;component/Resources/Layers_Remove.png" Width="18" Height="18" Margin="2" />
                                 </Button>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml.cs
index 3e47092db..8a221d7f3 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml.cs
@@ -8,14 +8,19 @@ namespace Aurora.Settings.Overrides.Logic {
     /// Interaction logic for Control_SubconditionHolder.xaml
     /// </summary>
     public partial class Control_SubconditionHolder : UserControl {
-        public Control_SubconditionHolder(IHasSubConditons parent, Profiles.Application app, string description="") {
+        public Control_SubconditionHolder(IHasSubConditons parent, string description="") {
             InitializeComponent();
             ParentExpr = parent;
-            Application = app;
             Description = description;
             ((FrameworkElement)Content).DataContext = this;
         }
 
+        /// <summary>The parent evaluatable of this control. Must be an evaluatable that has sub conditions.</summary>
+        public IHasSubConditons ParentExpr { get; }
+
+        /// <summary>The title/description text of this control.</summary>
+        public string Description { get; }
+
         private void AddSubconditionButton_Click(object sender, RoutedEventArgs e) {
             ParentExpr.SubConditions.Add(new BooleanConstant());
         }
@@ -33,23 +38,5 @@ private void DeleteButton_Click(object sender, RoutedEventArgs e) {
             var cond = (IEvaluatable<bool>)((FrameworkElement)sender).DataContext;
             ParentExpr.SubConditions.Remove(cond);
         }
-
-        #region Properties/Dependency Properties
-        /// <summary>The parent evaluatable of this control. Must be an evaluatable that has sub conditions.</summary>
-        public IHasSubConditons ParentExpr { get; }
-
-        /// <summary>The title/description text of this control.</summary>
-        public string Description { get; }
-
-        /// <summary>The application context of this control. Is passed to the EvaluatablePresenter children.</summary>
-        public Profiles.Application Application {
-            get => (Profiles.Application)GetValue(ApplicationProperty);
-            set => SetValue(ApplicationProperty, value);
-        }
-        
-        /// <summary>The property used as a backing store for the application context.</summary>
-        public static readonly DependencyProperty ApplicationProperty =
-            DependencyProperty.Register("Application", typeof(Profiles.Application), typeof(Control_SubconditionHolder), new PropertyMetadata(null));
-        #endregion
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml
index 9a330fa60..dda42ee59 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml
@@ -17,7 +17,7 @@
         <!--<Border Margin="0" BorderThickness="1" BorderBrush="#6000" Background="#3000">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="If" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                    <local:Control_EvaluatablePresenter Expression="{Binding ParentCondition.Condition, Mode=TwoWay}" Application="{Binding Application}" EvalType="Boolean" Margin="5,0,0,0" />
+                    <local:Control_EvaluatablePresenter Expression="{Binding ParentCondition.Condition, Mode=TwoWay}" EvalType="Boolean" Margin="5,0,0,0" />
                 </StackPanel>
             </Border>
             <Grid>
@@ -27,7 +27,7 @@
                         <Border Margin="10,0,0,0" BorderThickness="1" BorderBrush="#6000" Background="#3000">
                             <Grid>
                                 <TextBlock Text="Then" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                                <local:Control_EvaluatablePresenter Expression="{Binding ParentCondition.CaseTrue, Mode=TwoWay}" Application="{Binding Application}" EvalType="{Binding EvaluatableType}" Margin="45,0,0,0" />
+                                <local:Control_EvaluatablePresenter Expression="{Binding ParentCondition.CaseTrue, Mode=TwoWay}" EvalType="{Binding EvaluatableType}" Margin="45,0,0,0" />
                             </Grid>
                         </Border>
                     </Grid>
@@ -37,7 +37,7 @@
 
                             <Grid>
                                 <TextBlock Text="Else" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                                <local:Control_EvaluatablePresenter Expression="{Binding ParentCondition.CaseFalse, Mode=TwoWay}" Application="{Binding Application}" EvalType="{Binding EvaluatableType}" Margin="45,0,0,0" />
+                                <local:Control_EvaluatablePresenter Expression="{Binding ParentCondition.CaseFalse, Mode=TwoWay}" EvalType="{Binding EvaluatableType}" Margin="45,0,0,0" />
                             </Grid>
                         </Border>
                     </Grid>
@@ -71,7 +71,7 @@
                                     <Button Content="↓" VerticalAlignment="Center" Padding="4,2" Click="CaseDown_Click" />
                                     <Button Content="X" VerticalAlignment="Center" Padding="4,2" Click="DeleteCase_Click" />
                                 </StackPanel>
-                                <local:Control_EvaluatablePresenter Expression="{Binding Condition, Mode=TwoWay}" Application="{Binding Path=DataContext.Application, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" EvalType="Boolean" Margin="5,0,0,0" Visibility="{Binding Path=Condition, Converter={StaticResource IsNullToVisibilityConverter}}" />
+                                <local:Control_EvaluatablePresenter Expression="{Binding Condition, Mode=TwoWay}" EvalType="Boolean" Margin="5,0,0,0" Visibility="{Binding Path=Condition, Converter={StaticResource IsNullToVisibilityConverter}}" />
                             </DockPanel>
                         </Border>
 
@@ -79,7 +79,7 @@
                         <Border Margin="28,8,0,8" BorderThickness="1" BorderBrush="#6000" Background="#3000" Grid.Row="1">
                             <DockPanel LastChildFill="True">
                                 <TextBlock DockPanel.Dock="Left" Text="Then" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,0,0,0" />
-                                <local:Control_EvaluatablePresenter Expression="{Binding Value, Mode=TwoWay}" Application="{Binding Path=DataContext.Application, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" EvalType="{Binding Path=DataContext.EvaluatableType, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="5,0,0,0" />
+                                <local:Control_EvaluatablePresenter Expression="{Binding Value, Mode=TwoWay}" EvalType="{Binding Path=DataContext.EvaluatableType, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="5,0,0,0" />
                             </DockPanel>
                         </Border>
                     </Grid>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml.cs
index 6066ce5d9..cb897fd80 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml.cs
@@ -25,9 +25,8 @@ public partial class Control_Ternary<T> : Control_Ternary {
 
         private Control_Ternary_Context<T> context;
 
-        public Control_Ternary(IfElseGeneric<T> context, Profiles.Application application) : base() {
+        public Control_Ternary(IfElseGeneric<T> context) : base() {
             DataContext = this.context = new Control_Ternary_Context<T> {
-                Application = application,
                 ParentCondition = context,
                 EvaluatableType = EvaluatableTypeResolver.GetEvaluatableType(typeof(IEvaluatable<T>))
             };
@@ -82,7 +81,6 @@ protected override void DeleteCase_Click(object sender, RoutedEventArgs e) {
     /// </summary>
     internal class Control_Ternary_Context<T> {
         public IfElseGeneric<T> ParentCondition { get; set; }
-        public Profiles.Application Application { get; set; }
         public EvaluatableType EvaluatableType { get; set; }
     }
 
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
index 8078fe3ef..800a0067f 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
@@ -28,7 +28,7 @@ public IfElseGeneric() { }
         /// <summary>Creates a new evaluatable using the given case tree.</summary>
         public IfElseGeneric(ObservableCollection<Branch> cases) : this() { Cases = cases; }
 
-        public Visual GetControl(Application application) => new Control_Ternary<T>(this, application);
+        public Visual GetControl() => new Control_Ternary<T>(this);
 
         /// <summary>Evaluate conditions and return the appropriate evaluation.</summary>
         public T Evaluate(IGameState gameState) {
@@ -40,14 +40,6 @@ public T Evaluate(IGameState gameState) {
 
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Update the applications of the children evaluatables.</summary>
-        public void SetApplication(Application application) {
-            foreach (var kvp in Cases) {
-                kvp.Condition?.SetApplication(application);
-                kvp.Value?.SetApplication(application);
-            }
-        }
-
         public IEvaluatable<T> Clone() => new IfElseGeneric<T>(new ObservableCollection<Branch>(Cases));
         IEvaluatable IEvaluatable.Clone() => Clone();
 
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IEvaluatable.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IEvaluatable.cs
index 522694353..81615d88c 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IEvaluatable.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IEvaluatable.cs
@@ -43,19 +43,15 @@ public static class EvaluatableTypeResolver {
     #endregion
 
     /// <summary>
-    /// Interface that defines a logic operand that can be evaluated into a value. Should also have a Visual control that can
-    /// be used to edit the operand. The control will be given the current application that can be used to have contextual
-    /// prompts (e.g. a dropdown list with the valid game state variable paths) for that application.
+    /// Interface that defines a logic operand that can be evaluated into a value. Should also have a Visual control
+    /// that can be used to edit the operand.
     /// </summary>
     public interface IEvaluatable {
         /// <summary>Should evaluate the operand and return the evaluation result.</summary>
         object Evaluate(IGameState gameState);
 
         /// <summary>Should return a control that is bound to this logic element.</summary>
-        Visual GetControl(Application application);
-
-        /// <summary>Indicates the UserControl should be updated with a new application.</summary>
-        void SetApplication(Application application);
+        Visual GetControl();
 
         /// <summary>Creates a copy of this IEvaluatable.</summary>
         IEvaluatable Clone();
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IOverrideLogic.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IOverrideLogic.cs
index 113df418c..718acd57c 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IOverrideLogic.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IOverrideLogic.cs
@@ -14,6 +14,6 @@ public interface IOverrideLogic : System.ComponentModel.INotifyPropertyChanged {
         /// <summary>
         /// Gets a control for editing this overridge logic system.
         /// </summary>
-        System.Windows.Media.Visual GetControl(Profiles.Application application);
+        System.Windows.Media.Visual GetControl();
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml
index 7b327a52c..8798fb716 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml
@@ -21,15 +21,15 @@
         <!-- Value -->
         <Border BorderThickness="1" BorderBrush="#6000" Background="#3000" Grid.ColumnSpan="3" />
         <TextBlock Text="Map value:" Margin="6,2" FontWeight="Bold" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding Map.Value, Mode=TwoWay}" Application="{Binding Application}" EvalType="Number" Margin="6,10,6,0" Grid.ColumnSpan="3" />
+        <logic:Control_EvaluatablePresenter Expression="{Binding Value, Mode=TwoWay}" EvalType="Number" Margin="6,10,6,0" Grid.ColumnSpan="3" />
         
         <!-- From range -->
         <Border BorderThickness="1,0,1,1" BorderBrush="#6000" Background="#3000" Grid.Row="1" Grid.RowSpan="2" />
         <TextBlock Text="From range:" Margin="6,2" FontWeight="Bold" Grid.Row="1" />
         <TextBlock Text="Min:" Margin="8,18" Grid.Row="1" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding Map.FromMin, Mode=TwoWay}" Application="{Binding Application}" EvalType="Number" Margin="6,28,6,0" Grid.Row="1" />
+        <logic:Control_EvaluatablePresenter Expression="{Binding FromMin, Mode=TwoWay}" EvalType="Number" Margin="6,28,6,0" Grid.Row="1" />
         <TextBlock Text="Max:" Margin="8,0" Grid.Row="2" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding Map.FromMax, Mode=TwoWay}" Application="{Binding Application}" EvalType="Number" Margin="6,10,6,0" Grid.Row="2" />
+        <logic:Control_EvaluatablePresenter Expression="{Binding FromMax, Mode=TwoWay}" EvalType="Number" Margin="6,10,6,0" Grid.Row="2" />
 
         <!-- Arrow -->
         <TextBlock Text="&#x2794;" Margin="6" FontSize="18" Grid.Row="1" Grid.RowSpan="2" Grid.Column="1" VerticalAlignment="Center" />
@@ -38,8 +38,8 @@
         <Border BorderThickness="1,0,1,1" BorderBrush="#6000" Background="#3000" Grid.Row="1" Grid.RowSpan="2" Grid.Column="2" />
         <TextBlock Text="Onto range:" Margin="6,2" FontWeight="Bold" Grid.Row="1" Grid.Column="2" />
         <TextBlock Text="Min:" Margin="8,18" Grid.Row="1" Grid.Column="2" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding Map.ToMin, Mode=TwoWay}" Application="{Binding Application}" EvalType="Number" Margin="6,28,6,0" Grid.Row="1" Grid.Column="2" />
+        <logic:Control_EvaluatablePresenter Expression="{Binding ToMin, Mode=TwoWay}" EvalType="Number" Margin="6,28,6,0" Grid.Row="1" Grid.Column="2" />
         <TextBlock Text="Max:" Margin="8,0" Grid.Row="2" Grid.Column="2" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding Map.ToMax, Mode=TwoWay}" Application="{Binding Application}" EvalType="Number" Margin="6,10,6,0" Grid.Row="2" Grid.Column="2" />
+        <logic:Control_EvaluatablePresenter Expression="{Binding ToMax, Mode=TwoWay}" EvalType="Number" Margin="6,10,6,0" Grid.Row="2" Grid.Column="2" />
     </Grid>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml.cs
index 5efc1a9ac..6e31b3f25 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml.cs
@@ -5,14 +5,9 @@ namespace Aurora.Settings.Overrides.Logic {
 
     public partial class Control_NumericMap : UserControl {
 
-        public NumberMap Map { get; set; }
-        public Application Application { get; set; }
-
-        public Control_NumericMap(NumberMap context, Application application) {
+        public Control_NumericMap(NumberMap context) {
             InitializeComponent();
-            Map = context;
-            Application = application;
-            DataContext = this;
+            DataContext = context;
         }
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml
index 85aa14527..8f2af9d3c 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml
@@ -14,7 +14,7 @@
         <!-- Controls -->
         <ComboBox ItemsSource="{Binding OperatorList}" SelectedValue="{Binding SelectedOperator}" Visibility="{Binding OperatorList, Converter={StaticResource NullableToVisConv}}" SelectedValuePath="Value" DisplayMemberPath="Key" VerticalAlignment="Center" HorizontalAlignment="Left" Width="100" />
         <TextBlock Text="{Binding StaticOperator}" TextAlignment="Right" Visibility="{Binding StaticOperator, Converter={StaticResource NullableToVisConv}}" VerticalAlignment="Center" HorizontalAlignment="Left" Width="96" />
-        <local:Control_EvaluatablePresenter Expression="{Binding Operand, Mode=TwoWay}" Application="{Binding Application}" EvalType="Number" Margin="119,0,19,0" />
+        <local:Control_EvaluatablePresenter Expression="{Binding Operand, Mode=TwoWay}" EvalType="Number" Margin="119,0,19,0" />
 
         <!-- Left bracket -->
         <Ellipse Width="30" Stroke="White" StrokeThickness="3" HorizontalAlignment="Left" Margin="102,0,0,0">
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml.cs
index a99ac5cbc..33d4cc791 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml.cs
@@ -15,23 +15,21 @@ namespace Aurora.Settings.Overrides.Logic {
     public partial class Control_NumericUnaryOpHolder : UserControl {
 
         /// <summary>Base constructor for the unary operation holder.</summary>
-        public Control_NumericUnaryOpHolder(Profiles.Application application) {
+        public Control_NumericUnaryOpHolder() {
             InitializeComponent();
-            Application = application;
             DataContext = this;
         }
 
         /// <summary>Creates a new unary operation control using the given Enum type as a source for the possible operators to choose from.</summary>
-        public Control_NumericUnaryOpHolder(Profiles.Application application, Type enumType) : this(application) {
+        public Control_NumericUnaryOpHolder(Type enumType) : this() {
             OperatorList = Utils.EnumUtils.GetEnumItemsSource(enumType).ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
         }
 
         /// <summary>Creates a new unary opeartion control using the given string as the name of the operator, disallowing the user to choose an option.</summary>
-        public Control_NumericUnaryOpHolder(Profiles.Application application, string operatorName) : this(application) {
+        public Control_NumericUnaryOpHolder(string operatorName) : this() {
             StaticOperator = operatorName;
         }
 
-        public Profiles.Application Application { get; set; }
         public Dictionary<string, object> OperatorList { get; set; } = null;
         public string StaticOperator { get; set; } = null;
 
@@ -48,9 +46,5 @@ public object SelectedOperator {
             get => GetValue(SelectedOperatorProperty);
             set => SetValue(SelectedOperatorProperty, value);
         }
-
-        public void SetApplication(Profiles.Application application) {
-            Application = application;
-        }
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
index cb58bfa76..4146d1d48 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
@@ -1,4 +1,6 @@
-using Aurora.Profiles;
+using Aurora.Controls;
+using Aurora.Profiles;
+using Aurora.Utils;
 using System;
 using System.Linq;
 using System.Windows.Controls;
@@ -22,33 +24,14 @@ public NumberGSINumeric() { }
         public string VariablePath { get; set; }
 
         // Control assigned to this evaluatable
-        [Newtonsoft.Json.JsonIgnore]
-        private ComboBox control;
-        public Visual GetControl(Application application) {
-            if (control == null) {
-                control = new ComboBox { Margin = new System.Windows.Thickness(0, 0, 0, 6) };
-                control.SetBinding(ComboBox.SelectedItemProperty, new Binding("VariablePath") { Source = this });
-                SetApplication(application);
-            }
-            return control;
-        }
+        public Visual GetControl() => new GameStateParameterPicker { Margin = new System.Windows.Thickness(0, 0, 0, 6), PropertyType = PropertyType.Number }
+            .WithBinding(GameStateParameterPicker.ApplicationProperty, new AttachedApplicationBinding())
+            .WithBinding(GameStateParameterPicker.SelectedPathProperty, new Binding("VariablePath") { Source = this });
 
         /// <summary>Parses the numbers, compares the result, and returns the result.</summary>
-        public double Evaluate(IGameState gameState) => Utils.GameStateUtils.TryGetDoubleFromState(gameState, VariablePath);
+        public double Evaluate(IGameState gameState) => GameStateUtils.TryGetDoubleFromState(gameState, VariablePath);
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Update the assigned control with the new application.</summary>
-        public void SetApplication(Application application) {
-            if (control != null)
-                control.ItemsSource = application?.ParameterLookup?
-                    .Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1))
-                    .Select(kvp => kvp.Key);
-
-            // Check to ensure the variable path is valid
-            if (application != null && !double.TryParse(VariablePath, out _) && !string.IsNullOrWhiteSpace(VariablePath) && !application.ParameterLookup.ContainsKey(VariablePath))
-                VariablePath = string.Empty;
-        }
-
         public IEvaluatable<double> Clone() => new NumberGSINumeric { VariablePath = VariablePath };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs
index ea5b5f738..1dfc3a57b 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs
@@ -6,6 +6,7 @@
 using System.Windows.Data;
 using System.Windows.Media;
 using Aurora.Profiles;
+using Aurora.Utils;
 using Newtonsoft.Json;
 using Xceed.Wpf.Toolkit;
 
@@ -37,18 +38,10 @@ public NumberMathsOperation() { }
         public IEvaluatable<double> Operand2 { get; set; } = new NumberConstant();
         public MathsOperator Operator { get; set; } = MathsOperator.Add;
         
-        // The control allowing the user to edit the evaluatable
-        [JsonIgnore]
-        private Control_BinaryOperationHolder control;
-        public Visual GetControl(Application application) {
-            if (control == null) {
-                control = new Control_BinaryOperationHolder(application, EvaluatableType.Number, typeof(MathsOperator));
-                control.SetBinding(Control_BinaryOperationHolder.Operand1Property, new Binding("Operand1") { Source = this, Mode = BindingMode.TwoWay });
-                control.SetBinding(Control_BinaryOperationHolder.Operand2Property, new Binding("Operand2") { Source = this, Mode = BindingMode.TwoWay });
-                control.SetBinding(Control_BinaryOperationHolder.SelectedOperatorProperty, new Binding("Operator") { Source = this, Mode = BindingMode.TwoWay });
-            }
-            return control;
-        }
+        public Visual GetControl() => new Control_BinaryOperationHolder(EvaluatableType.Number, typeof(MathsOperator))
+            .WithBinding(Control_BinaryOperationHolder.Operand1Property, new Binding("Operand1") { Source = this, Mode = BindingMode.TwoWay })
+            .WithBinding(Control_BinaryOperationHolder.Operand2Property, new Binding("Operand2") { Source = this, Mode = BindingMode.TwoWay })
+            .WithBinding(Control_BinaryOperationHolder.SelectedOperatorProperty, new Binding("Operator") { Source = this, Mode = BindingMode.TwoWay });
 
         /// <summary>Resolves the two operands and then compares them using the user specified operator</summary>
         public double Evaluate(IGameState gameState) {
@@ -65,13 +58,6 @@ public double Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Updates the user control and the operands with a new application context.</summary>
-        public void SetApplication(Application application) {
-            control?.SetApplication(application);
-            Operand1?.SetApplication(application);
-            Operand2?.SetApplication(application);
-        }
-
         /// <summary>Creates a copy of this maths operation.</summary>
         public IEvaluatable<double> Clone() => new NumberMathsOperation { Operand1 = Operand1.Clone(), Operand2 = Operand2.Clone(), Operator = Operator };
         IEvaluatable IEvaluatable.Clone() => Clone();
@@ -94,22 +80,13 @@ public NumberAbsValue() { }
         public IEvaluatable<double> Operand { get; set; } = new NumberConstant();
 
         // Get the control allowing the user to set the operand
-        [JsonIgnore]
-        private Control_NumericUnaryOpHolder control;
-        public Visual GetControl(Application application) {
-            if (control == null) {
-                control = new Control_NumericUnaryOpHolder(application, "Absolute");
-                control.SetBinding(Control_NumericUnaryOpHolder.OperandProperty, new Binding("Operand") { Source = this, Mode = BindingMode.TwoWay });
-            }
-            return control;
-        }
+        public Visual GetControl() => new Control_NumericUnaryOpHolder("Absolute")
+            .WithBinding(Control_NumericUnaryOpHolder.OperandProperty, new Binding("Operand") { Source = this, Mode = BindingMode.TwoWay });
 
         /// <summary>Evaluate the operand and return the absolute value of it.</summary>
         public double Evaluate(IGameState gameState) => Math.Abs(Operand.Evaluate(gameState));
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        public void SetApplication(Application application) => Operand?.SetApplication(application);
-
         public IEvaluatable<double> Clone() => new NumberAbsValue { Operand = Operand.Clone() };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
@@ -143,17 +120,10 @@ public BooleanMathsComparison() { }
         public ComparisonOperator Operator { get; set; } = ComparisonOperator.EQ;
 
         // The control allowing the user to edit the evaluatable
-        [JsonIgnore]
-        private Control_BinaryOperationHolder control;
-        public Visual GetControl(Application application) {
-            if (control == null) {
-                control = new Control_BinaryOperationHolder(application, EvaluatableType.Number, typeof(ComparisonOperator));
-                control.SetBinding(Control_BinaryOperationHolder.Operand1Property, new Binding("Operand1") { Source = this, Mode = BindingMode.TwoWay });
-                control.SetBinding(Control_BinaryOperationHolder.Operand2Property, new Binding("Operand2") { Source = this, Mode = BindingMode.TwoWay });
-                control.SetBinding(Control_BinaryOperationHolder.SelectedOperatorProperty, new Binding("Operator") { Source = this, Mode = BindingMode.TwoWay });
-            }
-            return control;
-        }
+        public Visual GetControl() => new Control_BinaryOperationHolder(EvaluatableType.Number, typeof(ComparisonOperator))
+            .WithBinding(Control_BinaryOperationHolder.Operand1Property, new Binding("Operand1") { Source = this, Mode = BindingMode.TwoWay })
+            .WithBinding(Control_BinaryOperationHolder.Operand2Property, new Binding("Operand2") { Source = this, Mode = BindingMode.TwoWay })
+            .WithBinding(Control_BinaryOperationHolder.SelectedOperatorProperty, new Binding("Operator") { Source = this, Mode = BindingMode.TwoWay });
 
         /// <summary>Resolves the two operands and then compares them with the user-specified operator.</summary>
         public bool Evaluate(IGameState gameState) {
@@ -171,13 +141,6 @@ public bool Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Updates the user control and the operands with a new application context.</summary>
-        public void SetApplication(Application application) {
-            control?.SetApplication(application);
-            Operand1?.SetApplication(application);
-            Operand2?.SetApplication(application);
-        }
-
         /// <summary>Creates a copy of this mathematical comparison.</summary>
         public IEvaluatable<bool> Clone() => new BooleanMathsComparison { Operand1 = Operand1.Clone(), Operand2 = Operand2.Clone() };
         IEvaluatable IEvaluatable.Clone() => Clone();
@@ -214,9 +177,7 @@ public NumberMap() { }
         public IEvaluatable<double> ToMax { get; set; } = new NumberConstant(1);
 
         // The control to edit the map parameters
-        [JsonIgnore]
-        private Control_NumericMap control;
-        public Visual GetControl(Application application) => control ?? (control = new Control_NumericMap(this, application));
+        public Visual GetControl() => new Control_NumericMap(this);
 
         /// <summary>Evaluate the from range and to range and return the value in the new range.</summary>
         public double Evaluate(IGameState gameState) {
@@ -231,15 +192,6 @@ public double Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary> Updates the applications on all sub evaluatables.</summary>
-        public void SetApplication(Application application) {
-            Value?.SetApplication(application);
-            FromMin?.SetApplication(application);
-            ToMin?.SetApplication(application);
-            FromMax?.SetApplication(application);
-            ToMax?.SetApplication(application);
-        }
-
         public IEvaluatable<double> Clone() => new NumberMap { Value = Value.Clone(), FromMin = FromMin.Clone(), ToMin = ToMin.Clone(), FromMax = FromMax.Clone(), ToMax = ToMax.Clone() };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
@@ -261,23 +213,13 @@ public NumberConstant() { }
         public double Value { get; set; }
 
         // The control allowing the user to edit the number value
-        [JsonIgnore]
-        private DoubleUpDown control;
-        public Visual GetControl(Application application) {
-            if (control == null) {
-                control = new DoubleUpDown { Margin = new System.Windows.Thickness(0, 0, 0, 6) };
-                control.SetBinding(DoubleUpDown.ValueProperty, new Binding("Value") { Source = this });
-            }
-            return control;
-        }
+        public Visual GetControl() => new DoubleUpDown { Margin = new System.Windows.Thickness(0, 0, 0, 6) }
+            .WithBinding(DoubleUpDown.ValueProperty, new Binding("Value") { Source = this });
 
         /// <summary>Simply returns the constant value specified by the user</summary>
         public double Evaluate(IGameState gameState) => Value;
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Does nothing - this evaluatable is application-independant.</summary>
-        public void SetApplication(Application application) { }
-
         /// <summary>Creates a copy of this number constant</summary>
         public IEvaluatable<double> Clone() => new NumberConstant { Value = Value };
         IEvaluatable IEvaluatable.Clone() => Clone();
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_PeripheralInput.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_PeripheralInput.cs
index 22bf01941..6949480af 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_PeripheralInput.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_PeripheralInput.cs
@@ -30,12 +30,11 @@ public NumberAwayTime(TimeUnit unit) {
         #endregion
 
         // Control
-        private ComboBox control;
-        public Visual GetControl(Application app) => control ?? (control = new ComboBox {
+        public Visual GetControl() => new ComboBox {
                 DisplayMemberPath = "Key",
                 SelectedValuePath = "Value",
                 ItemsSource = EnumUtils.GetEnumItemsSource<TimeUnit>()
-            }.WithBinding(ComboBox.SelectedValueProperty, this, "TimeUnit", BindingMode.TwoWay));
+            }.WithBinding(ComboBox.SelectedValueProperty, this, "TimeUnit", BindingMode.TwoWay);
 
         /// <summary>Checks to see if the duration since the last input is greater than the given inactive time.</summary>
         public double Evaluate(IGameState gameState) {
@@ -50,8 +49,6 @@ public double Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        public void SetApplication(Application application) { }
-
         public IEvaluatable<double> Clone() => new NumberAwayTime { TimeUnit = TimeUnit };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Waves.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Waves.cs
index 06860c832..0dadda7cf 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Waves.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Waves.cs
@@ -1,4 +1,5 @@
 using Aurora.Profiles;
+using Aurora.Utils;
 using Newtonsoft.Json;
 using System;
 using System.Windows.Data;
@@ -23,16 +24,9 @@ public NumberWaveFunction() { }
         /// <summary>The type of wave to generate.</summary>
         public WaveFunctionType WaveFunc { get; set; } = WaveFunctionType.Sine;
 
-        [JsonIgnore]
-        private Control_NumericUnaryOpHolder control;
-        public Visual GetControl(Application application) {
-            if (control == null) {
-                control = new Control_NumericUnaryOpHolder(application, typeof(WaveFunctionType));
-                control.SetBinding(Control_NumericUnaryOpHolder.OperandProperty, new Binding("Operand") { Source = this, Mode = BindingMode.TwoWay });
-                control.SetBinding(Control_NumericUnaryOpHolder.SelectedOperatorProperty, new Binding("WaveFunc") { Source = this, Mode = BindingMode.TwoWay });
-            }
-            return control;
-        }
+        public Visual GetControl() => new Control_NumericUnaryOpHolder(typeof(WaveFunctionType))
+                .WithBinding(Control_NumericUnaryOpHolder.OperandProperty, new Binding("Operand") { Source = this, Mode = BindingMode.TwoWay })
+                .WithBinding(Control_NumericUnaryOpHolder.SelectedOperatorProperty, new Binding("WaveFunc") { Source = this, Mode = BindingMode.TwoWay });
 
         /// <summary>
         /// Evaluates this wave function generator using the result of the operand and the given wave type.
@@ -48,11 +42,6 @@ public double Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        public void SetApplication(Application application) {
-            control?.SetApplication(application);
-            Operand?.SetApplication(application);
-        }
-
         public IEvaluatable<double> Clone() => new NumberWaveFunction { Operand = Operand.Clone() };
         IEvaluatable IEvaluatable.Clone() => Clone();
     }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideDynamicValue.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideDynamicValue.cs
index 46561b007..b029c19dc 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideDynamicValue.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideDynamicValue.cs
@@ -72,9 +72,9 @@ public object Evaluate(IGameState gameState) => typeDynamicDefMap.ContainsKey(Va
         /// <summary>
         /// Creates the control that is used to edit the IEvaluatables used as parameters for this DynamicValue logic
         /// </summary>
-        public Visual GetControl(Application application) => typeDynamicDefMap.ContainsKey(VarType)
+        public Visual GetControl() => typeDynamicDefMap.ContainsKey(VarType)
             // If this has a valid type (i.e. supported by the dynamic constructor), then create the control and pass in `this` and `application` for context
-            ? new Control_OverrideDynamicValue(this, application)
+            ? new Control_OverrideDynamicValue(this)
             // If it is an invalid type, then simply show a red warning message
             : (Visual)new Label { Content = "This property type is not supported with the dynamic value editor. Sorry :(", Foreground = Brushes.Red, Margin = new System.Windows.Thickness(6) };
         #endregion
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideLookupTable.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideLookupTable.cs
index ecdcb6961..66908b3cc 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideLookupTable.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideLookupTable.cs
@@ -61,7 +61,7 @@ public object Evaluate(IGameState gameState) {
         /// <summary>
         /// Gets the control allowing the user to edit this LookupTable.
         /// </summary>   
-        public Visual GetControl(Application application) => _control ?? (_control = new Control_OverrideLookupTable(this, application));
+        public Visual GetControl() => _control ?? (_control = new Control_OverrideLookupTable(this));
         [JsonIgnore]
         private Control_OverrideLookupTable _control;
 
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs
index 0d8d2e78e..42b120e54 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs
@@ -1,4 +1,5 @@
 using Aurora.Profiles;
+using Aurora.Utils;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
@@ -14,23 +15,13 @@ public class StringConstant : IEvaluatable<string> {
         public string Value { get; set; } = "";
 
         /// <summary>A control for setting the string value</summary>
-        [Newtonsoft.Json.JsonIgnore]
-        private TextBox control;
-        public Visual GetControl(Application application) {
-            if (control == null) {
-                control = new TextBox { Margin = new System.Windows.Thickness(0, 0, 0, 6) };
-                control.SetBinding(TextBox.TextProperty, new Binding("Value") { Source = this, Mode = BindingMode.TwoWay });
-            }
-            return control;
-        }
+        public Visual GetControl() => new TextBox { Margin = new System.Windows.Thickness(0, 0, 0, 6) }
+            .WithBinding(TextBox.TextProperty, new Binding("Value") { Source = this, Mode = BindingMode.TwoWay });
 
         /// <summary>Simply return the constant value.</summary>
         public string Evaluate(IGameState gameState) => Value;
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
-
-        /// <summary>Does nothing. This is an application-independent evaluatable.</summary>
-        public void SetApplication(Application application) { }
-
+        
         /// <summary>Clones this constant string value.</summary>
         public IEvaluatable<string> Clone() => new StringConstant { Value = Value };
         IEvaluatable IEvaluatable.Clone() => Clone();
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
index 488b4c1ca..ba5c75e4b 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
@@ -1,4 +1,6 @@
-using Aurora.Profiles;
+using Aurora.Controls;
+using Aurora.Profiles;
+using Aurora.Utils;
 using System;
 using System.Linq;
 using System.Windows.Controls;
@@ -14,16 +16,9 @@ public class StringGSIString : IEvaluatable<string> {
         public string VariablePath { get; set; } = "";
 
         /// <summary>Control assigned to this logic node.</summary>
-        [Newtonsoft.Json.JsonIgnore]
-        private ComboBox control;
-        public Visual GetControl(Application application) {
-            if (control == null) {
-                control = new ComboBox { Margin = new System.Windows.Thickness(0, 0, 0, 6) };
-                control.SetBinding(ComboBox.SelectedItemProperty, new Binding("VariablePath") { Source = this });
-                SetApplication(application);
-            }
-            return control;
-        }
+        public Visual GetControl() => new GameStateParameterPicker { PropertyType = PropertyType.String, Margin = new System.Windows.Thickness(0, 0, 0, 6) }
+            .WithBinding(GameStateParameterPicker.ApplicationProperty, new AttachedApplicationBinding())
+            .WithBinding(GameStateParameterPicker.SelectedPathProperty, new Binding("VariablePath") { Source = this });
 
         /// <summary>Attempts to return the string at the given state variable.</summary>
         public string Evaluate(IGameState gameState) {
@@ -34,18 +29,6 @@ public string Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Update the assigned combobox with the new application context.</summary>
-        public void SetApplication(Application application) {
-            if (control != null)
-                control.ItemsSource = application?.ParameterLookup?
-                    .Where(kvp => Type.GetTypeCode(kvp.Value.Item1) == TypeCode.String)
-                    .Select(kvp => kvp.Key);
-
-            // Check to ensure var path is valid
-            if (application != null && !string.IsNullOrWhiteSpace(VariablePath) && !application.ParameterLookup.ContainsKey(VariablePath))
-                VariablePath = string.Empty;
-        }
-
         /// <summary>Clones this StringGSIString.</summary>
         public IEvaluatable<string> Clone() => new StringGSIString { VariablePath = VariablePath };
         IEvaluatable IEvaluatable.Clone() => Clone();
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs
index d4e0c365a..eb337ce5c 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs
@@ -1,4 +1,5 @@
 using Aurora.Profiles;
+using Aurora.Utils;
 using System;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -19,17 +20,10 @@ public class StringComparison : IEvaluatable<bool> {
         public bool CaseInsensitive { get; set; } = false;
 
         // Control allowing the user to edit the comparison
-        [Newtonsoft.Json.JsonIgnore]
-        private Control_BinaryOperationHolder control;
-        public Visual GetControl(Application application) {
-            if (control == null) {
-                control = new Control_BinaryOperationHolder(application, EvaluatableType.String, typeof(StringComparisonOperator));
-                control.SetBinding(Control_BinaryOperationHolder.Operand1Property, new Binding("Operand1") { Source = this, Mode = BindingMode.TwoWay });
-                control.SetBinding(Control_BinaryOperationHolder.Operand2Property, new Binding("Operand2") { Source = this, Mode = BindingMode.TwoWay });
-                control.SetBinding(Control_BinaryOperationHolder.SelectedOperatorProperty, new Binding("Operator") { Source = this, Mode = BindingMode.TwoWay });
-            }
-            return control;
-        }
+        public Visual GetControl() => new Control_BinaryOperationHolder(EvaluatableType.String, typeof(StringComparisonOperator))
+            .WithBinding(Control_BinaryOperationHolder.Operand1Property, new Binding("Operand1") { Source = this, Mode = BindingMode.TwoWay })
+            .WithBinding(Control_BinaryOperationHolder.Operand2Property, new Binding("Operand2") { Source = this, Mode = BindingMode.TwoWay })
+            .WithBinding(Control_BinaryOperationHolder.SelectedOperatorProperty, new Binding("Operator") { Source = this, Mode = BindingMode.TwoWay });
 
         /// <summary>Compares the two strings with the given operator</summary>
         public bool Evaluate(IGameState gameState) {
@@ -57,13 +51,6 @@ public bool Evaluate(IGameState gameState) {
         }
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        /// <summary>Updates the application for this IEvaluatable.</summary>
-        public void SetApplication(Application application) {
-            control?.SetApplication(application);
-            Operand1?.SetApplication(application);
-            Operand2?.SetApplication(application);
-        }
-
         /// <summary>Clones this StringComparison.</summary>
         public IEvaluatable<bool> Clone() => new StringComparison { Operand1 = Operand1.Clone(), Operand2 = Operand2.Clone(), Operator = Operator, CaseInsensitive = CaseInsensitive };
         IEvaluatable IEvaluatable.Clone() => Clone();
diff --git a/Project-Aurora/Project-Aurora/Utils/AttachedApplication.cs b/Project-Aurora/Project-Aurora/Utils/AttachedApplication.cs
new file mode 100644
index 000000000..d1445d5ea
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Utils/AttachedApplication.cs
@@ -0,0 +1,31 @@
+using System.Windows;
+using System.Windows.Data;
+using Application = Aurora.Profiles.Application;
+
+namespace Aurora.Utils {
+
+    /// <summary>
+    /// This class exposes an inherited attached property which allows for providing a cascading application context down to subcontrols.
+    /// </summary>
+    public static class AttachedApplication {
+
+        /* This attached property allows for providing a cascading application context down to subcontrols.
+         * Also provides a binding that will automatically provide this value to relevant dependency properties. */
+        public static Application GetApplication(DependencyObject obj) => (Application)obj.GetValue(ApplicationProperty);
+        public static void SetApplication(DependencyObject obj, Application value) => obj.SetValue(ApplicationProperty, value);
+
+        // Using a DependencyProperty as the backing store for Application.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty ApplicationProperty =
+            DependencyProperty.RegisterAttached("Application", typeof(Application), typeof(AttachedApplication), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.OverridesInheritanceBehavior | FrameworkPropertyMetadataOptions.AffectsRender));
+    }
+
+    /// <summary>
+    /// A binding that automatically sets itself up to be bound to the <see cref="AttachedApplication.ApplicationProperty"/> attached property.
+    /// </summary>
+    public class AttachedApplicationBinding : Binding {
+        public AttachedApplicationBinding() {
+            Path = new PropertyPath("(0)", AttachedApplication.ApplicationProperty);
+            RelativeSource = new RelativeSource(RelativeSourceMode.Self);
+        }
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Utils/GameStateUtils.cs b/Project-Aurora/Project-Aurora/Utils/GameStateUtils.cs
index 7bac7e2af..40eb6688a 100644
--- a/Project-Aurora/Project-Aurora/Utils/GameStateUtils.cs
+++ b/Project-Aurora/Project-Aurora/Utils/GameStateUtils.cs
@@ -36,6 +36,8 @@ public static GamestateParameterLookup ReflectGameStateParameters(Type typ)
                     case MemberTypes.Property:
                         prop_type = ((PropertyInfo)prop).PropertyType;
                         break;
+
+                    /* Why is this here? There is no way of passing parameters to methods from the game state UI?? */
                     case MemberTypes.Method:
                         //if (((MethodInfo)prop).IsSpecialName)
                             //continue;
@@ -222,6 +224,12 @@ public static Enum TryGetEnumFromState(IGameState state, string path) {
         public static bool IsValidParameter(this GamestateParameterLookup parameterLookup, string parameter)
             => parameterLookup.ContainsKey(parameter);
 
+        /// <summary>
+        /// Checks if the given parameter is valid for the current parameter lookup and if the type of parameter matches the given <see cref="PropertyType"/>.
+        /// </summary>
+        public static bool IsValidParameter(this GamestateParameterLookup parameterLookup, string parameter, PropertyType type)
+            => parameterLookup.TryGetValue(parameter, out var paramDef) && PropertyTypePredicate[type](new KeyValuePair<string, Tuple<Type, Type>>(parameter, paramDef));
+
         /// <summary>
         /// Gets a list of the names of all variables (inc. path) of a certain type in this parameter map.
         /// </summary>
@@ -229,10 +237,11 @@ public static IEnumerable<string> GetParameters(this GamestateParameterLookup pa
             => parameterLookup.Where(PropertyTypePredicate[type]).Select(kvp => kvp.Key);
 
         static Dictionary<PropertyType, Func<KeyValuePair<string, Tuple<Type, Type>>, bool>> PropertyTypePredicate { get; } = new Dictionary<PropertyType, Func<KeyValuePair<string, Tuple<Type, Type>>, bool>> {
+            [PropertyType.None] = _ => false,
             [PropertyType.Number] = kvp => TypeUtils.IsNumericType(kvp.Value.Item1),
-            [PropertyType.Number] = kvp => TypeUtils.IsNumericType(kvp.Value.Item1),
-            [PropertyType.Number] = kvp => TypeUtils.IsNumericType(kvp.Value.Item1),
-            [PropertyType.Number] = kvp => TypeUtils.IsNumericType(kvp.Value.Item1)
+            [PropertyType.Boolean] = kvp => Type.GetTypeCode(kvp.Value.Item1) == TypeCode.Boolean,
+            [PropertyType.String] = kvp => Type.GetTypeCode(kvp.Value.Item1) == TypeCode.String,
+            [PropertyType.Enum] = kvp => kvp.Value.Item1.IsEnum
         };
         #endregion
     }
@@ -240,5 +249,5 @@ public static IEnumerable<string> GetParameters(this GamestateParameterLookup pa
     /// <summary>
     /// Available types that can be handled by the gamestate parameter methods.
     /// </summary>
-    public enum PropertyType { Number, Boolean, String, Enum }
+    public enum PropertyType { None, Number, Boolean, String, Enum }
 }

From 62b5e20b218665cfed58ae6b24e3dccd54cce7ec Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Tue, 21 Apr 2020 17:11:40 +0100
Subject: [PATCH 03/20] Added ProcessPicker to the Running Process evaluatable.

---
 .../Logic/Boolean/Boolean_ProcessRunning.cs   | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
index b48c24344..2cd752b38 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
@@ -1,5 +1,6 @@
 using Aurora.Profiles;
 using Aurora.Utils;
+using System.ComponentModel;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
@@ -10,15 +11,31 @@ namespace Aurora.Settings.Overrides.Logic {
     /// Evaluatable that returns true/false depending on whether the given process name is running.
     /// </summary>
     [OverrideLogic("Process Running", category: OverrideLogicCategory.Misc)]
-    public class BooleanProcessRunning : IEvaluatable<bool> {
+    public class BooleanProcessRunning : IEvaluatable<bool>, INotifyPropertyChanged {
 
         public string ProcessName { get; set; } = "";
 
         public BooleanProcessRunning() { }
         public BooleanProcessRunning(string processName) { ProcessName = processName; }
 
-        public Visual GetControl() => new TextBox { MinWidth = 80 }
-            .WithBinding(TextBox.TextProperty, new Binding("ProcessName") { Source = this, Mode = BindingMode.TwoWay });
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public Visual GetControl() {
+            var selectButton = new Button { Content = "Select", Padding = new System.Windows.Thickness(8, 0, 8, 0), Margin = new System.Windows.Thickness(8, 0, 0, 0) };
+            DockPanel.SetDock(selectButton, Dock.Right);
+            selectButton.Click += (sender, e) => {
+                var wnd = new Window_ProcessSelection { ButtonLabel = "Select" };
+                if (wnd.ShowDialog() == true && !string.IsNullOrWhiteSpace(wnd.ChosenExecutableName)) {
+                    ProcessName = wnd.ChosenExecutableName;
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ProcessName)));
+                }
+            };
+
+            return new DockPanel { LastChildFill = true }
+                .WithChild(selectButton)
+                .WithChild(new TextBox { MinWidth = 80 }
+                    .WithBinding(TextBox.TextProperty, new Binding("ProcessName") { Source = this, Mode = BindingMode.TwoWay }));
+        }
 
         public bool Evaluate(IGameState gameState)
             => Global.LightingStateManager.RunningProcessMonitor.IsProcessRunning(ProcessName);

From ebe87be25172db4c80f66587bbcdfaa7d064852f Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Tue, 21 Apr 2020 20:49:13 +0100
Subject: [PATCH 04/20] Ported the evaluatable dragging from the UI rework Only
 done the core dragging system so far, still need to add the toolbox.

---
 .../Project-Aurora/Project-Aurora.csproj      |   3 +-
 .../Layers/Control_AnimationLayer.xaml.cs     |  10 +-
 .../Boolean/Boolean_NumericChangeDetector.cs  |   2 +-
 .../Logic/Boolean/Boolean_TrueExtender.cs     |   2 +-
 .../Logic/Boolean/Control_BooleanNot.xaml     |   3 +-
 .../Control_BinaryOperationHolder.xaml.cs     |   6 +-
 .../Logic/Control_EvaluatablePresenter.xaml   |  41 ++--
 .../Control_EvaluatablePresenter.xaml.cs      | 217 ++++++++++++------
 .../Control_OverrideDynamicValue.xaml.cs      |   4 +-
 .../Logic/Control_OverrideLookupTable.xaml    |   3 +-
 .../Logic/Control_SublogicHolder.xaml         |   5 +-
 .../Logic/Generic/Control_IfElse.xaml         |   5 +-
 .../Logic/Generic/Control_IfElse.xaml.cs      |   6 +-
 .../Overrides/Logic/Generic/IfElseIf.cs       |   4 +-
 .../Settings/Overrides/Logic/IEvaluatable.cs  |  58 ++---
 .../Logic/Number/Control_NumericMap.xaml      |  11 +-
 .../Number/Control_NumericUnaryOpHolder.xaml  |   3 +-
 .../Overrides/Logic/Number/Number_Maths.cs    |   8 +-
 .../Overrides/Logic/OverrideDynamicValue.cs   |  34 +--
 .../Logic/String/String_LogicOperators.cs     |   2 +-
 .../Project-Aurora/Utils/DragBehaviour.cs     |  95 ++++++++
 .../Utils/FrameworkElementUtils.cs            |  17 ++
 .../Project-Aurora/Utils/TypeUtils.cs         |  24 +-
 23 files changed, 377 insertions(+), 186 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Utils/DragBehaviour.cs

diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index d14f16f3a..07ec393a9 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -881,6 +881,7 @@
       <DependentUpon>Window_ProcessSelection.xaml</DependentUpon>
     </Compile>
     <Compile Include="Utils\AttachedApplication.cs" />
+    <Compile Include="Utils\DragBehaviour.cs" />
     <Compile Include="Utils\WindowPlacement.cs" />
     <Compile Include="Utils\Converters.cs" />
     <Compile Include="Utils\DesktopUtils.cs" />
diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml.cs
index 9fd2a201e..386fced7e 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml.cs
@@ -173,13 +173,13 @@ private void triggerMode_SelectionChanged(object sender, SelectionChangedEventAr
             UpdateUI();
 
             // If the evaluatable is not the correct type or it is null, then create the default Evaluatable for it
-            if (AnimationLayerHandler.IsTriggerEvaluatableNumericValueBased(selectedItem) && !TypeUtils.IsInterface(Context.Properties._EvaluatableTrigger?.GetType(), typeof(IEvaluatable<double>)))
-                Context.Properties._EvaluatableTrigger = EvaluatableTypeResolver.GetDefault(EvaluatableType.Number);
-            else if (AnimationLayerHandler.IsTriggerEvaluatableBooleanValueBased(selectedItem) && !TypeUtils.IsInterface(Context.Properties._EvaluatableTrigger?.GetType(), typeof(IEvaluatable<bool>)))
-                Context.Properties._EvaluatableTrigger = EvaluatableTypeResolver.GetDefault(EvaluatableType.Boolean);
+            if (AnimationLayerHandler.IsTriggerEvaluatableNumericValueBased(selectedItem) && !typeof(IEvaluatable<double>).IsAssignableFrom(Context.Properties._EvaluatableTrigger?.GetType()))
+                Context.Properties._EvaluatableTrigger = EvaluatableDefaults.Get<double>();
+            else if (AnimationLayerHandler.IsTriggerEvaluatableBooleanValueBased(selectedItem) && typeof(IEvaluatable<bool>).IsAssignableFrom(Context.Properties._EvaluatableTrigger?.GetType()))
+                Context.Properties._EvaluatableTrigger = EvaluatableDefaults.Get<bool>();
 
             // Update the evaluatable control
-            triggerEvaluatable.EvalType = AnimationLayerHandler.IsTriggerEvaluatableNumericValueBased(selectedItem) ? EvaluatableType.Number : EvaluatableType.Boolean;
+            triggerEvaluatable.EvalType = AnimationLayerHandler.IsTriggerEvaluatableNumericValueBased(selectedItem) ? typeof(double) : typeof(bool);
             triggerEvaluatable.Expression = Context.Properties._EvaluatableTrigger;
         }
 
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
index 2cc6be6d4..1cd0d740d 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
@@ -33,7 +33,7 @@ public NumericChangeDetector(IEvaluatable<double> eval, bool detectRising = true
         public Visual GetControl() => new StackPanel()
             .WithChild(new DockPanel { LastChildFill = true }
                 .WithChild(new Label { Content = "Expression", VerticalAlignment = System.Windows.VerticalAlignment.Center }, Dock.Left)
-                .WithChild(new Control_EvaluatablePresenter { EvalType = EvaluatableType.Number, Margin = new System.Windows.Thickness(24, 0, 0, 0) }
+                .WithChild(new Control_EvaluatablePresenter { EvalType = typeof(double), Margin = new System.Windows.Thickness(24, 0, 0, 0) }
                     .WithBinding(Control_EvaluatablePresenter.ExpressionProperty, this, "Evaluatable", BindingMode.TwoWay)))
             .WithChild(new CheckBox { Content = "Trigger on increase" }
                 .WithBinding(CheckBox.IsCheckedProperty, this, "DetectRising"))
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
index 58606c722..cd94e8d67 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
@@ -26,7 +26,7 @@ public BooleanExtender() { }
         public TimeUnit TimeUnit { get; set; } = TimeUnit.Seconds;
 
         public Visual GetControl() => new StackPanel()
-            .WithChild(new Control_EvaluatablePresenter { EvalType = EvaluatableType.Boolean, Margin = new System.Windows.Thickness(24, 0, 0, 0) }
+            .WithChild(new Control_EvaluatablePresenter { EvalType = typeof(bool), Margin = new System.Windows.Thickness(24, 0, 0, 0) }
                 .WithBinding(Control_EvaluatablePresenter.ExpressionProperty, new Binding("Evaluatable") { Source = this, Mode = BindingMode.TwoWay }))
             .WithChild(new Control_TimeAndUnit()
                 .WithBinding(Control_TimeAndUnit.TimeProperty, new Binding("ExtensionTime") { Source = this, Mode = BindingMode.TwoWay })
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml
index 485092666..3983f37b3 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml
@@ -3,10 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:local="clr-namespace:Aurora.Settings.Overrides.Logic"
              mc:Ignorable="d">
     <Grid>
         <TextBlock Text="!" FontSize="18" VerticalAlignment="Center" />
-        <local:Control_EvaluatablePresenter Expression="{Binding SubCondition, Mode=TwoWay}" EvalType="Boolean" Margin="15,0,0,0" />
+        <local:Control_EvaluatablePresenter Expression="{Binding SubCondition, Mode=TwoWay}" EvalType="{x:Type sys:Boolean}" Margin="15,0,0,0" />
     </Grid>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml.cs
index d93cd77c7..5b4ab7158 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml.cs
@@ -15,7 +15,7 @@ public partial class Control_BinaryOperationHolder : UserControl {
         /// <summary>
         /// Creates a new numeric binary operation holder control.
         /// </summary>
-        public Control_BinaryOperationHolder(EvaluatableType evalType) {
+        public Control_BinaryOperationHolder(Type evalType) {
             InitializeComponent();
             EvalType = evalType;
             DataContext = this;
@@ -24,11 +24,11 @@ public Control_BinaryOperationHolder(EvaluatableType evalType) {
         /// <summary>
         /// Creates a new numeric binary operation holder control using the values of the specified enum as the operators item source.
         /// </summary>
-        public Control_BinaryOperationHolder(EvaluatableType evalType, Type enumType) : this(evalType) {
+        public Control_BinaryOperationHolder(Type evalType, Type enumType) : this(evalType) {
             operatorSelection.ItemsSource = Utils.EnumUtils.GetEnumItemsSource(enumType);
         }
 
-        public EvaluatableType EvalType { get; set; }
+        public Type EvalType { get; set; }
 
         #region Dependency Properties
         public static readonly DependencyProperty Operand1Property = DependencyProperty.Register("Operand1", typeof(IEvaluatable), typeof(Control_BinaryOperationHolder), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender));
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml
index 312804201..7748329ab 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml
@@ -3,33 +3,18 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Aurora.Settings.Overrides.Logic"
-             mc:Ignorable="d"
-             d:DesignWidth="100" d:DesignHeight="40">
-    <Grid>
-        <!-- Expression type selection -->
-        <Label Content="Expression Type:" FontWeight="Bold" Margin="0,6,0,0" />
-        <ComboBox x:Name="expressionSelection" SelectedValuePath="Key" DisplayMemberPath="Value.Name" Margin="104,6,50,0" Height="26" VerticalAlignment="Top" SelectionChanged="ExpressionSelection_SelectionChanged">
-            <ComboBox.GroupStyle>
-                <GroupStyle>
-                    <GroupStyle.HeaderTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="{Binding Name}" Background="#1FFF" FontWeight="Bold" Margin="0,4,0,0" Padding="4,0,4,2" />
-                        </DataTemplate>
-                    </GroupStyle.HeaderTemplate>
-                </GroupStyle>
-            </ComboBox.GroupStyle>
-        </ComboBox>
-        
-        <!-- Menu button -->
-        <Button Height="26" Width="26" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,5.5,0,0" Click="PasteButton_Click"> <!-- We use 5.5 because for some reason the edge is blurry if we use 6. -->
-            <Image Source="/Aurora;component/Resources/Layers_Paste.png" Width="18" Height="18" Opacity=".6" />
-        </Button>
-        <Button Height="26" Width="26" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,5.5,25,0" Click="CopyButton_Click">
-            <Image Source="/Aurora;component/Resources/Layers_Copy.png" Width="18" Height="18" Opacity=".6" />
-        </Button>
+             xmlns:u="clr-namespace:Aurora.Utils"
+             mc:Ignorable="d" d:DesignWidth="30" d:DesignHeight="120"
+             MinWidth="30" MinHeight="30"
+             VerticalAlignment="Top" HorizontalAlignment="Left"
+             AllowDrop="True">
 
-        <!-- Evaluatable control -->
-        <ContentPresenter x:Name="ContentContainer" Margin="0,36,0,0" VerticalAlignment="Top" />
-    </Grid>
+    <Border Padding="4" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" Background="#883498DB">
+        <Grid>
+            <ContentPresenter x:Name="EvaluatableControl" Margin="17,0,0,0" />
+            <Border Width="2" Margin="5,0,0,0" Height="16" Background="#2FFF" HorizontalAlignment="Left" VerticalAlignment="Center" />
+            <Border Width="2" Margin="10,0,0,0" Height="16" Background="#2FFF" HorizontalAlignment="Left" VerticalAlignment="Center" />
+            <Rectangle Width="17" Cursor="SizeAll" Fill="Transparent" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="DragArea_StartDrag" />
+        </Grid>
+    </Border>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
index 324fd4f48..765b0e765 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
@@ -1,106 +1,193 @@
+using Aurora.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Media;
 
 namespace Aurora.Settings.Overrides.Logic {
+
     /// <summary>
-    /// Interaction logic for Control_EvaluatablePresenter.xaml
+    /// A control that can be used to present the controls of an IEvaluatable to the user, allowing them to edit the parameters.
+    /// <para>Can set the type of value the presenter accepts using the <see cref="EvalType"/> dependency property.</para>
     /// </summary>
     public partial class Control_EvaluatablePresenter : UserControl {
 
-        #region Fields
-        /// <summary>Whether or not the type selection box is being programmatically set.</summary>
-        private bool settingTypeSelection = false;
-        #endregion
-
-        /// <summary>
-        /// Creates a new ExpressionPresenter. Use the properties/dependency objects to set the application, expression and evaltype.
-        /// </summary>
         public Control_EvaluatablePresenter() {
             InitializeComponent();
-            //UpdateExpressionListItems(typeof(IEvaluatable));
         }
 
-        #region Events
-        /// <summary>
-        /// Event that is raised when the expression is changed and the parent should update it's reference to the expression.
-        /// </summary>
+        /// <summary>Event that fires when a new evaluatable replaces the current one. Note that this only fires when the user replaces
+        /// the evaluatable by dropping a new one onto the presenter, not when it is changed by code.</summary>
         public event EventHandler<ExpressionChangeEventArgs> ExpressionChanged;
+
+
+        #region Expression Property
+        public IEvaluatable Expression {
+            get => (IEvaluatable)GetValue(ExpressionProperty);
+            set => SetValue(ExpressionProperty, value);
+        }
+
+        public static readonly DependencyProperty ExpressionProperty =
+            DependencyProperty.Register("Expression", typeof(IEvaluatable), typeof(Control_EvaluatablePresenter), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender, OnExpressionChange));
+
+        private static void OnExpressionChange(DependencyObject evaluatablePresenter, DependencyPropertyChangedEventArgs eventArgs) {
+            if (eventArgs.NewValue == null || eventArgs.NewValue.Equals(eventArgs.OldValue)) return;
+            var control = (Control_EvaluatablePresenter)evaluatablePresenter;
+            var expr = (IEvaluatable)eventArgs.NewValue;
+            control.EvaluatableControl.Content = expr?.GetControl();
+        }
         #endregion
 
-        #region Methods
+        #region EvalType Property
         /// <summary>
-        /// Re-creates the list collection view that is used for the expression selection list.
+        /// The subtype of evaluatable to restrict the user to (e.g. specifying bool would indicate IEvaluatable&lt;bool&gt;).<para/>
+        /// Do NOT provide a type <c>IEvaluatable&lt;T&gt;</c> to this.
         /// </summary>
-        private void UpdateExpressionListItems(EvaluatableType t) {
-            ListCollectionView lcv = new ListCollectionView(EvaluatableRegistry
-                .Get(EvaluatableTypeResolver.Resolve(t)) // Get all condition types that match the required type
-                .OrderBy(kvp => (int)kvp.Value.Category) // Order them by the numeric value of the category (so they appear in the order specified)
-                .ThenBy(kvp => kvp.Value.Name) // Then, order the items alphabetically in their category
-                .ToList());
-            lcv.GroupDescriptions.Add(new PropertyGroupDescription("Value.CategoryStr"));
-            expressionSelection.ItemsSource = lcv;
+        public Type EvalType {
+            get => (Type)GetValue(EvalTypeProperty);
+            set => SetValue(EvalTypeProperty, value);
         }
+        public static readonly DependencyProperty EvalTypeProperty =
+            DependencyProperty.Register("EvalType", typeof(Type), typeof(Control_EvaluatablePresenter), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender, null, CoerceEvalType));
+
+        // Coerce any numeric types into double
+        private static Type[] evalTypeNumerics = new[] { typeof(int), typeof(long), typeof(short), typeof(float), typeof(decimal) };
+        private static object CoerceEvalType(DependencyObject d, object value) =>
+            evalTypeNumerics.Contains(value as Type) ? typeof(double) : value;
+        #endregion
 
-        // Fires when the expression selection combobox changes. Creates a new expression to replace the old one.
-        private void ExpressionSelection_SelectionChanged(object sender, SelectionChangedEventArgs e) {
-            if (settingTypeSelection) return; // Do nothing if the source is NOT from the combobox being changed (we dont want to create a new instance when it's being set from Binding)
-            var selectedType = (Type)expressionSelection.SelectedValue; // The SelectedValue (NOT SelectedItem) of the combobox references a Type that implements IEvaluatable.
-            if (selectedType == null || Expression == null || selectedType == Expression.GetType()) return; // Do nothing if the types are the same.
-            var newExpression = (IEvaluatable)Activator.CreateInstance(selectedType); // Create an instance from the selected type
-            ExpressionChanged?.Invoke(this, new ExpressionChangeEventArgs { OldExpression = Expression, NewExpression = newExpression });
-            Expression = newExpression;
+        /// <summary>Write-only property to set the highlight status of this presenter.</summary>
+        protected bool Highlighted {
+            set => Background = value ? Brushes.Yellow : Brushes.Transparent;
         }
 
+        #region Drag Handlers
         /// <summary>
-        /// Copies the current IEvaluatable to the clipboard
+        /// Method that handles when the user is dragging something and their mouse enters this presenter. If the dragged data is accepted
+        /// by this presenter, it's visual state will change to indicate to the user it will be accepted.
         /// </summary>
-        private void CopyButton_Click(object sender, RoutedEventArgs e) {
-            if (Expression != null)
-                Global.Clipboard = Expression.Clone(); // We clone it so if the user changes the evaluatable after pressing copy, the changes don't effect the one on the clipboard.
+        protected override void OnDragEnter(DragEventArgs e) {
+            // When the user is dragging something over this presenter, check to see if it can be accepted (if the evaluatable type of the
+            // dragged data matches the type specified in the property).
+            if (TryGetData(e.Data, out _, out var source) && !source.IsParentOf(this)) {
+                // If so, highlight this presenter to give users visual feedback of where it will land.
+                Highlighted = true;
+
+                // Mark the event as handled so when the event bubbles up, other parent presenters will not highlight themselves as if they
+                // will accept the drag-drop evaluatable instead.
+                e.Handled = true;
+            }
+
+            // If the dragged data can't be accepted, don't mark the event as handled which will allow bubbling of the event to parent
+            // presenters to allow them to check to see if they can handle the data.
         }
 
         /// <summary>
-        /// Replaces the current IEvaluatable with the one on the clipboard
+        /// Method that handles when the user is dragging an item and their mouse leaves this presenter. Remove any highlighting that is
+        /// currently set.
         /// </summary>
-        private void PasteButton_Click(object sender, RoutedEventArgs e) {
-            if (Global.Clipboard is IEvaluatable clipboardContents && MessageBox.Show("Are you sure you wish to REPLACE this expression with the one on your clipboard?", "Confirm paste", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes) {
-                var @new = clipboardContents.Clone(); // We clone again when pasting so that if the user pastes it in two places, they aren't the same object
-                ExpressionChanged?.Invoke(this, new ExpressionChangeEventArgs { OldExpression = Expression, NewExpression = @new });
-                Expression = @new;
-            }
+        protected override void OnDragLeave(DragEventArgs e) {
+            Highlighted = false;
         }
-        #endregion
 
-        #region Dependency Objects
-        // Expression Property (the expression whose UserControl this component should host)
-        private static void OnExpressionChange(DependencyObject evaluatablePresenter, DependencyPropertyChangedEventArgs eventArgs) {
-            var control = (Control_EvaluatablePresenter)evaluatablePresenter;
-            var expr = (IEvaluatable)eventArgs.NewValue;
-            control.ContentContainer.Content = expr?.GetControl();
-            control.settingTypeSelection = true;
-            control.expressionSelection.SelectedValue = expr?.GetType();
-            control.settingTypeSelection = false;
+        /// <summary>
+        /// Method that fires when the mouse moves while dragging something over this presenter. If the dragged evaluatable data can be
+        /// accepted by this presenter, will indicate which effect will occur depending on whether the user is holding the CTRL key.
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnDragOver(DragEventArgs e) {
+            // If the evaluatable data can be accepted by this presenter...
+            if (TryGetData(e.Data, out _, out _)) {
+                // If the user is holding the CTRL key, indicate they will copy the evaluatable, otherwise they'll move it.
+                e.Effects = (e.KeyStates & DragDropKeyStates.ControlKey) > 0 ? DragDropEffects.Copy : DragDropEffects.Move;
+                // Mark the event as handled so any parent presenters don't attempt to override the effects with their own logic.
+                e.Handled = true;
+            }
         }
 
-        public static readonly DependencyProperty ExpressionProperty = DependencyProperty.Register("Expression", typeof(IEvaluatable), typeof(Control_EvaluatablePresenter), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender, OnExpressionChange));
-        public IEvaluatable Expression {
-            get => (IEvaluatable)GetValue(ExpressionProperty);
-            set => SetValue(ExpressionProperty, value);
+        /// <summary>
+        /// Method to handle dropping a dragged item on the presenter. If the dragged item is an evaluatable and can be accepted, it will
+        /// replaced the current expression (and trigger an event). If the item cannot be accepted, it is left unhandled so as to bubble.
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnDrop(DragEventArgs e) {
+            if (TryGetData(e.Data, out var eval, out var source)) {
+
+                // Check for a special case when the item is being dragged into an evaluatable slot of itself (e.g. dragging an 'Or' into one of it's own operands). Disallow this.
+                if (source.IsParentOf(this))
+                    return;
+
+                // If the dragged item is not a parent of this, or this isn't a parent of the dragged item, simply swap them round
+
+                // Before we update this evaluatable, keep a reference to it for the event listener
+                var oldExpression = Expression;
+
+                // Update the expression depending on source and ctrl key:
+                var ctrlKey = (e.KeyStates & DragDropKeyStates.ControlKey) > 0;
+                if (source != null && ctrlKey) {
+                    // If ctrl key is down and we are dragging from another presenter (i.e. not a spawner), clone the existing evaluatable into this
+                    Expression = eval.Clone();
+
+                    // If the dragged eval was a child of this, the original source will have implicitly removed from the expression, so we need to dispose it
+                    if (this.IsParentOf(source)) {
+                        (eval as IDisposable)?.Dispose();
+                        source.Expression = null;
+                    }
+
+                } else if (source != null && !ctrlKey) {
+                    // If ctrl key is NOT down, and we are dragging from another presenter (not spawner), swap the evaluatable of that presenter with this one
+                    // We also need to call the changed event on the other presenter (since this is not done by the DependencyProperty to prevent a invoker-subscriber loop with WPF updating itself)
+
+                    // Also check for a special case when the item being dragged is replacing a parent. In this case we only want to update this expression. If we use the regular logic,
+                    // it will set the other evaluatable to be a part of itself, which then tries to update the UI and causes a stack overflow due to recursively creating the UI.
+                    source.Expression = this.IsParentOf(source) ? null : Expression;
+                    source.ExpressionChanged?.Invoke(source, new ExpressionChangeEventArgs { NewExpression = Expression, OldExpression = eval });
+
+                    // For the special parent-child drag, this expression is now no longer needed, so dispose it
+                    if (this.IsParentOf(source))
+                        (Expression as IDisposable)?.Dispose();
+
+                    Expression = eval;
+
+                } else {
+                    // Otherwise if we are dragging from a spawner (regardless of whether the ctrl key is down) just set this expression to the data (the spawner
+                    // is responsible for instantiating a new evaluatable for us).
+                    Expression = eval;
+                }
+
+                // Raise an event to indicate the change.
+                ExpressionChanged?.Invoke(this, new ExpressionChangeEventArgs { OldExpression = oldExpression, NewExpression = Expression });
+
+                // Reset any highlighting that this presenter has due to dragging an acceptable item over this presenter.
+                Highlighted = false;
+
+                // Mark event as handled so parent presenters do not end up also handling the data.
+                e.Handled = true;
+            }
         }
-        // The subtype of evaluatable to restrict the user to (e.g. IEvaluatable<bool>)
-        private static void OnEvalTypeChange(DependencyObject evaluatablePresenter, DependencyPropertyChangedEventArgs eventArgs) {
-            var control = (Control_EvaluatablePresenter)evaluatablePresenter;
-            control.UpdateExpressionListItems((EvaluatableType)eventArgs.NewValue);
+
+        /// <summary>Event that is applied to the drag area that allows the user to pick up this evaluatable.</summary>
+        private void DragArea_StartDrag(object sender, MouseEventArgs e, Point initialPoint) {
+            var @do = new DataObject(Expression);
+            @do.SetData("SourcePresenter", this);
+            DragDrop.DoDragDrop(this, @do, DragDropEffects.Move | DragDropEffects.Copy);
         }
 
-        public static readonly DependencyProperty EvalTypeProperty = DependencyProperty.Register("EvalType", typeof(EvaluatableType), typeof(Control_EvaluatablePresenter), new FrameworkPropertyMetadata(EvaluatableType.All, FrameworkPropertyMetadataOptions.AffectsRender, OnEvalTypeChange));
-        public EvaluatableType EvalType {
-            get => (EvaluatableType)GetValue(EvalTypeProperty);
-            set => SetValue(EvalTypeProperty, value);
+        /// <summary>Attempts to get an evaluatable from the suppliied data object. Will return true/false indicating if data is of correct format
+        /// (an <see cref="IEvaluatable{T}"/> where T matches the <see cref="EvalType"/> property.</summary>
+        private bool TryGetData(IDataObject @do, out IEvaluatable evaluatable, out Control_EvaluatablePresenter source) {
+            if (@do.GetData(@do.GetFormats().FirstOrDefault(x => x != "SourcePresenter")) is IEvaluatable data && Utils.TypeUtils.ImplementsGenericInterface(data.GetType(), typeof(IEvaluatable<>), EvalType)) {
+                evaluatable = data;
+                source = @do.GetData("SourcePresenter") as Control_EvaluatablePresenter;
+                return true;
+            }
+            evaluatable = null;
+            source = null;
+            return false;
         }
         #endregion
     }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml.cs
index 85b22118d..725e36567 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml.cs
@@ -14,13 +14,13 @@ namespace Aurora.Settings.Overrides.Logic {
     public partial class Control_OverrideDynamicValue : UserControl {
 
         public OverrideDynamicValue Context { get; }
-        public List<Tuple<string, EvaluatableType, IEvaluatable, string>> Parameters { get; }
+        public List<Tuple<string, Type, IEvaluatable, string>> Parameters { get; }
 
         public Control_OverrideDynamicValue(OverrideDynamicValue context) {
             InitializeComponent();
             Context = context;
             // Get a list that contains the label (string), the type of evaluatable (to restrict the list box), the evaluatable itself and the description.
-            Parameters = context.ConstructorParameters.Select(kvp => new Tuple<string, EvaluatableType, IEvaluatable, string>(
+            Parameters = context.ConstructorParameters.Select(kvp => new Tuple<string, Type, IEvaluatable, string>(
                 kvp.Key,
                 OverrideDynamicValue.typeDynamicDefMap[context.VarType].constructorParameters.First(p => p.name == kvp.Key).type,
                 kvp.Value,
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml
index 33340a066..589661330 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:local="clr-namespace:Aurora.Settings.Overrides.Logic"
              xmlns:controls="clr-namespace:Aurora.Controls"
              mc:Ignorable="d" 
@@ -59,7 +60,7 @@
                                     <!-- Main item content -->
                                     <controls:Control_FieldPresenter Value="{Binding Value, Mode=TwoWay}" Type="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=DataContext.Table.VarType}" Grid.Column="0" VerticalAlignment="Center" Margin="8,4,8,8" />
                                     <TextBlock Text="When" FontStyle="Italic" FontWeight="Bold" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <local:Control_EvaluatablePresenter Expression="{Binding Condition, Mode=TwoWay}" EvalType="Boolean" Grid.Column="2" VerticalAlignment="Center" Margin="8,4,8,8" />
+                                    <local:Control_EvaluatablePresenter Expression="{Binding Condition, Mode=TwoWay}" EvalType="{x:Type sys:Boolean}" Grid.Column="2" VerticalAlignment="Center" Margin="8,4,8,8" />
 
                                     <!-- Delete button -->
                                     <Button Margin="6" Grid.Column="3" VerticalAlignment="Center" ToolTip="Remove this lookup entry" Click="DeleteLookupEntry_Click">
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml
index 475263819..6b962daf9 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml
@@ -2,7 +2,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:local="clr-namespace:Aurora.Settings.Overrides.Logic"
              mc:Ignorable="d" 
              d:DesignHeight="200" d:DesignWidth="200">
@@ -16,7 +17,7 @@
                         <Rectangle Fill="#6000" Height="4" Width="10" HorizontalAlignment="Left" VerticalAlignment="Center" />
                         <Border Margin="10,0,0,0" BorderThickness="1" BorderBrush="#6000" Background="#3000">
                             <Grid>
-                                <local:Control_EvaluatablePresenter Expression="{Binding .}" EvalType="Boolean" ExpressionChanged="ConditionPresenter_ConditionChanged" Margin="6,2,36,0" />
+                                <local:Control_EvaluatablePresenter Expression="{Binding .}" EvalType="{x:Type sys:Boolean}" ExpressionChanged="ConditionPresenter_ConditionChanged" Margin="6,2,36,0" />
                                 <Button Margin="6" HorizontalAlignment="Right" VerticalAlignment="Center" Click="DeleteButton_Click" ToolTip="Remove this subcondition">
                                     <Image Source="/Aurora;component/Resources/Layers_Remove.png" Width="18" Height="18" Margin="2" />
                                 </Button>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml
index dda42ee59..76be5ecb2 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml
@@ -2,7 +2,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:local="clr-namespace:Aurora.Settings.Overrides.Logic"
              xmlns:util="clr-namespace:Aurora.Utils"
              mc:Ignorable="d">
@@ -71,7 +72,7 @@
                                     <Button Content="↓" VerticalAlignment="Center" Padding="4,2" Click="CaseDown_Click" />
                                     <Button Content="X" VerticalAlignment="Center" Padding="4,2" Click="DeleteCase_Click" />
                                 </StackPanel>
-                                <local:Control_EvaluatablePresenter Expression="{Binding Condition, Mode=TwoWay}" EvalType="Boolean" Margin="5,0,0,0" Visibility="{Binding Path=Condition, Converter={StaticResource IsNullToVisibilityConverter}}" />
+                                <local:Control_EvaluatablePresenter Expression="{Binding Condition, Mode=TwoWay}" EvalType="{x:Type sys:Boolean}" Margin="5,0,0,0" Visibility="{Binding Path=Condition, Converter={StaticResource IsNullToVisibilityConverter}}" />
                             </DockPanel>
                         </Border>
 
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml.cs
index cb897fd80..76ba6ed96 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml.cs
@@ -28,14 +28,14 @@ public partial class Control_Ternary<T> : Control_Ternary {
         public Control_Ternary(IfElseGeneric<T> context) : base() {
             DataContext = this.context = new Control_Ternary_Context<T> {
                 ParentCondition = context,
-                EvaluatableType = EvaluatableTypeResolver.GetEvaluatableType(typeof(IEvaluatable<T>))
+                EvaluatableType = typeof(T)
             };
         }
 
         protected override void AddElseIfCase_Click(object sender, RoutedEventArgs e) {
             context.ParentCondition.Cases.Insert(
                 context.ParentCondition.Cases.Count - (HasElseCase ? 2 : 1), // If there is an "Else" case, we need to insert this Else-If before that
-                new IfElseGeneric<T>.Branch(new BooleanConstant(), (IEvaluatable<T>)EvaluatableTypeResolver.GetDefault(context.EvaluatableType))
+                new IfElseGeneric<T>.Branch(new BooleanConstant(), EvaluatableDefaults.Get<T>())
             );
         }
 
@@ -81,7 +81,7 @@ protected override void DeleteCase_Click(object sender, RoutedEventArgs e) {
     /// </summary>
     internal class Control_Ternary_Context<T> {
         public IfElseGeneric<T> ParentCondition { get; set; }
-        public EvaluatableType EvaluatableType { get; set; }
+        public Type EvaluatableType { get; set; }
     }
 
 
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
index 800a0067f..4080342ea 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
@@ -17,8 +17,8 @@ public class IfElseGeneric<T> : IEvaluatable<T> {
         /// </summary>
         public ObservableCollection<Branch> Cases { get; set; } = CreateDefaultCases(
             new BooleanConstant(), // Condition
-            (IEvaluatable<T>)EvaluatableTypeResolver.GetDefault(EvaluatableTypeResolver.GetEvaluatableType(typeof(IEvaluatable<T>))), // True
-            (IEvaluatable<T>)EvaluatableTypeResolver.GetDefault(EvaluatableTypeResolver.GetEvaluatableType(typeof(IEvaluatable<T>))) // False
+            EvaluatableDefaults.Get<T>(), // True
+            EvaluatableDefaults.Get<T>() // False
         );
 
         /// <summary>Creates a new If-Else evaluatable with default evaluatables.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IEvaluatable.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IEvaluatable.cs
index 81615d88c..1eb3946ab 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IEvaluatable.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IEvaluatable.cs
@@ -2,46 +2,9 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Media;
-using System.Linq;
 
 namespace Aurora.Settings.Overrides.Logic {
 
-    #region Types Enum
-    /** Unfortunately, this section has been added to allow the genericness of the EvaluatablePresenter. We required it to be able to handle
-     multiple types of IEvaluatable, but allow it to be restricted to one specific type (e.g. IEvaluatable<bool>). To do this I, originally
-     had it take a "EvalType" property as a System.Type and you would pass the interface type that you wanted (e.g. IEvaluatable<bool>),
-     which I thought worked well as it was possible to do in XAML by setting `EvalType="{x:Type, local:IEvaluatable}`, but it turns out that
-     with XAML you cannot reference _interfaces_ that way, only actually classes. This seems like a design flaw with XAML if you ask me.
-     The next option was to then bind the EvalType to a property, however this meant that I was adding extra properties to the DataContexts
-     which was cluttering the class and was frankly quite ugly.
-     The final solution I've settled on is to make the EvalType a enum instead (EvaluatableType) enum. That way, it can easily be set in the
-     XAML editor (since enums are supported) and also does not polute the DataContext of the presenter containers. The downside is, I needed
-     some way of converting the enum to interface type so that the code can generate a list of the matching classes. That's what this is: */
-
-    /// <summary>Enum of all evaluatable types.</summary>
-    public enum EvaluatableType { All, Boolean, Number, String }
-    /// <summary>Class that stores a dictionary to convert EvaluatableType enums into the interface type.</summary>
-    public static class EvaluatableTypeResolver {
-        private static Dictionary<EvaluatableType, Type> enumToTypeDictionary = new Dictionary<EvaluatableType, Type> {
-            { EvaluatableType.All, typeof(IEvaluatable) },
-            { EvaluatableType.Boolean, typeof(IEvaluatable<bool>) },
-            { EvaluatableType.Number, typeof(IEvaluatable<double>) },
-            { EvaluatableType.String, typeof(IEvaluatable<string>) }
-        };
-
-        private static Dictionary<Type, EvaluatableType> typeToEnumDictionary = enumToTypeDictionary.ToList().ToDictionary(s => s.Value, s=> s.Key);
-        private static Dictionary<EvaluatableType, Func<IEvaluatable>> enumToDefaultDictionary = new Dictionary<EvaluatableType, Func<IEvaluatable>> {
-            { EvaluatableType.All, () => null },
-            { EvaluatableType.Boolean, () => new BooleanConstant() },
-            { EvaluatableType.Number, () => new NumberConstant() },
-            { EvaluatableType.String, () => new StringConstant() }
-        };
-        public static Type Resolve(EvaluatableType inType) => enumToTypeDictionary.TryGetValue(inType, out Type outType) ? outType : typeof(IEvaluatable);
-        public static IEvaluatable GetDefault(EvaluatableType inType) => enumToDefaultDictionary.TryGetValue(inType, out Func<IEvaluatable> outFunc) ? outFunc() : null;
-        public static EvaluatableType GetEvaluatableType(Type inType) => typeToEnumDictionary.TryGetValue(inType, out EvaluatableType outVal) ? outVal : throw new Exception($"No EvaluatableType matches Type {inType.ToString()}");
-    }
-    #endregion
-
     /// <summary>
     /// Interface that defines a logic operand that can be evaluated into a value. Should also have a Visual control
     /// that can be used to edit the operand.
@@ -65,4 +28,25 @@ public interface IEvaluatable<T> : IEvaluatable
         /// <summary>Creates a copy of this IEvaluatable.</summary>
         new IEvaluatable<T> Clone();
     }
+
+
+    /// <summary>
+    /// Class that provides a lookup for the default Evaluatable for a particular type.
+    /// </summary>
+    public static class EvaluatableDefaults {
+
+        private static Dictionary<Type, Type> defaultsMap = new Dictionary<Type, Type> {
+            [typeof(bool)] = typeof(BooleanConstant),
+            [typeof(double)] = typeof(NumberConstant),
+            [typeof(string)] = typeof(StringConstant)
+        };
+
+        public static IEvaluatable<T> Get<T>() => (IEvaluatable<T>)Get(typeof(T));
+
+        public static IEvaluatable Get(Type t) {
+            if (!defaultsMap.TryGetValue(t, out Type @default))
+                throw new ArgumentException($"Type '{t.Name}' does not have a default evaluatable type.");
+            return (IEvaluatable)Activator.CreateInstance(@default);
+        }
+    }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml
index 8798fb716..356bbbceb 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:logic="clr-namespace:Aurora.Settings.Overrides.Logic"
              mc:Ignorable="d" 
              d:DesignWidth="500">
@@ -21,15 +22,15 @@
         <!-- Value -->
         <Border BorderThickness="1" BorderBrush="#6000" Background="#3000" Grid.ColumnSpan="3" />
         <TextBlock Text="Map value:" Margin="6,2" FontWeight="Bold" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding Value, Mode=TwoWay}" EvalType="Number" Margin="6,10,6,0" Grid.ColumnSpan="3" />
+        <logic:Control_EvaluatablePresenter Expression="{Binding Value, Mode=TwoWay}" EvalType="{x:Type sys:Double}" Margin="6,10,6,0" Grid.ColumnSpan="3" />
         
         <!-- From range -->
         <Border BorderThickness="1,0,1,1" BorderBrush="#6000" Background="#3000" Grid.Row="1" Grid.RowSpan="2" />
         <TextBlock Text="From range:" Margin="6,2" FontWeight="Bold" Grid.Row="1" />
         <TextBlock Text="Min:" Margin="8,18" Grid.Row="1" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding FromMin, Mode=TwoWay}" EvalType="Number" Margin="6,28,6,0" Grid.Row="1" />
+        <logic:Control_EvaluatablePresenter Expression="{Binding FromMin, Mode=TwoWay}" EvalType="{x:Type sys:Double}" Margin="6,28,6,0" Grid.Row="1" />
         <TextBlock Text="Max:" Margin="8,0" Grid.Row="2" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding FromMax, Mode=TwoWay}" EvalType="Number" Margin="6,10,6,0" Grid.Row="2" />
+        <logic:Control_EvaluatablePresenter Expression="{Binding FromMax, Mode=TwoWay}" EvalType="{x:Type sys:Double}" Margin="6,10,6,0" Grid.Row="2" />
 
         <!-- Arrow -->
         <TextBlock Text="&#x2794;" Margin="6" FontSize="18" Grid.Row="1" Grid.RowSpan="2" Grid.Column="1" VerticalAlignment="Center" />
@@ -38,8 +39,8 @@
         <Border BorderThickness="1,0,1,1" BorderBrush="#6000" Background="#3000" Grid.Row="1" Grid.RowSpan="2" Grid.Column="2" />
         <TextBlock Text="Onto range:" Margin="6,2" FontWeight="Bold" Grid.Row="1" Grid.Column="2" />
         <TextBlock Text="Min:" Margin="8,18" Grid.Row="1" Grid.Column="2" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding ToMin, Mode=TwoWay}" EvalType="Number" Margin="6,28,6,0" Grid.Row="1" Grid.Column="2" />
+        <logic:Control_EvaluatablePresenter Expression="{Binding ToMin, Mode=TwoWay}" EvalType="{x:Type sys:Double}" Margin="6,28,6,0" Grid.Row="1" Grid.Column="2" />
         <TextBlock Text="Max:" Margin="8,0" Grid.Row="2" Grid.Column="2" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding ToMax, Mode=TwoWay}" EvalType="Number" Margin="6,10,6,0" Grid.Row="2" Grid.Column="2" />
+        <logic:Control_EvaluatablePresenter Expression="{Binding ToMax, Mode=TwoWay}" EvalType="{x:Type sys:Double}" Margin="6,10,6,0" Grid.Row="2" Grid.Column="2" />
     </Grid>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml
index 8f2af9d3c..a70409d17 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:local="clr-namespace:Aurora.Settings.Overrides.Logic"
              xmlns:utils="clr-namespace:Aurora.Utils"
              mc:Ignorable="d" 
@@ -14,7 +15,7 @@
         <!-- Controls -->
         <ComboBox ItemsSource="{Binding OperatorList}" SelectedValue="{Binding SelectedOperator}" Visibility="{Binding OperatorList, Converter={StaticResource NullableToVisConv}}" SelectedValuePath="Value" DisplayMemberPath="Key" VerticalAlignment="Center" HorizontalAlignment="Left" Width="100" />
         <TextBlock Text="{Binding StaticOperator}" TextAlignment="Right" Visibility="{Binding StaticOperator, Converter={StaticResource NullableToVisConv}}" VerticalAlignment="Center" HorizontalAlignment="Left" Width="96" />
-        <local:Control_EvaluatablePresenter Expression="{Binding Operand, Mode=TwoWay}" EvalType="Number" Margin="119,0,19,0" />
+        <local:Control_EvaluatablePresenter Expression="{Binding Operand, Mode=TwoWay}" EvalType="{x:Type sys:Double}" Margin="119,0,19,0" />
 
         <!-- Left bracket -->
         <Ellipse Width="30" Stroke="White" StrokeThickness="3" HorizontalAlignment="Left" Margin="102,0,0,0">
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs
index 1dfc3a57b..761ce434c 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs
@@ -38,7 +38,7 @@ public NumberMathsOperation() { }
         public IEvaluatable<double> Operand2 { get; set; } = new NumberConstant();
         public MathsOperator Operator { get; set; } = MathsOperator.Add;
         
-        public Visual GetControl() => new Control_BinaryOperationHolder(EvaluatableType.Number, typeof(MathsOperator))
+        public Visual GetControl() => new Control_BinaryOperationHolder(typeof(double), typeof(MathsOperator))
             .WithBinding(Control_BinaryOperationHolder.Operand1Property, new Binding("Operand1") { Source = this, Mode = BindingMode.TwoWay })
             .WithBinding(Control_BinaryOperationHolder.Operand2Property, new Binding("Operand2") { Source = this, Mode = BindingMode.TwoWay })
             .WithBinding(Control_BinaryOperationHolder.SelectedOperatorProperty, new Binding("Operator") { Source = this, Mode = BindingMode.TwoWay });
@@ -51,8 +51,8 @@ public double Evaluate(IGameState gameState) {
                 case MathsOperator.Add: return op1 + op2;
                 case MathsOperator.Sub: return op1 - op2;
                 case MathsOperator.Mul: return op1 * op2;
-                case MathsOperator.Div: return op2 == 0 ? 0 : op1 / op2; // Return 0 if user tried to divide by zero. Easier than having to deal with Infinity (which C# returns).
-                case MathsOperator.Mod: return op2 == 0 ? 0 : op1 % op2;
+                case MathsOperator.Div when op2 != 0: return op1 / op2; // Return 0 if user tried to divide by zero.
+                case MathsOperator.Mod when op2 != 0: return op1 % op2;
                 default: return 0;
             }
         }
@@ -120,7 +120,7 @@ public BooleanMathsComparison() { }
         public ComparisonOperator Operator { get; set; } = ComparisonOperator.EQ;
 
         // The control allowing the user to edit the evaluatable
-        public Visual GetControl() => new Control_BinaryOperationHolder(EvaluatableType.Number, typeof(ComparisonOperator))
+        public Visual GetControl() => new Control_BinaryOperationHolder(typeof(double), typeof(ComparisonOperator))
             .WithBinding(Control_BinaryOperationHolder.Operand1Property, new Binding("Operand1") { Source = this, Mode = BindingMode.TwoWay })
             .WithBinding(Control_BinaryOperationHolder.Operand2Property, new Binding("Operand2") { Source = this, Mode = BindingMode.TwoWay })
             .WithBinding(Control_BinaryOperationHolder.SelectedOperatorProperty, new Binding("Operator") { Source = this, Mode = BindingMode.TwoWay });
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideDynamicValue.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideDynamicValue.cs
index b029c19dc..778fbf5ce 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideDynamicValue.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideDynamicValue.cs
@@ -30,7 +30,7 @@ public OverrideDynamicValue(Type type) {
             // a new instance of the default IEvaluatable for each parameter. E.G. for a parameter specified as EvaluatableType.Boolean, a new true
             // constant will be put in the constructor parameters dictionary.
             ConstructorParameters = typeDynamicDefMap.ContainsKey(type)
-                ? typeDynamicDefMap[type].constructorParameters.ToDictionary(dcpd => dcpd.name, dcpd => EvaluatableTypeResolver.GetDefault(dcpd.type))
+                ? typeDynamicDefMap[type].constructorParameters.ToDictionary(dcpd => dcpd.name, dcpd => EvaluatableDefaults.Get(dcpd.type))
                 : null;
         }
 
@@ -87,33 +87,33 @@ public Visual GetControl() => typeDynamicDefMap.ContainsKey(VarType)
         /// </summary>
         internal static readonly Dictionary<Type, DCD> typeDynamicDefMap = new Dictionary<Type, DCD> {
             // Boolean
-            { typeof(bool), new DCD(p => p["Value"], new[]{ new DCPD("Value", EvaluatableType.Boolean) }) },
+            { typeof(bool), new DCD(p => p["Value"], new[]{ new DCPD("Value", typeof(bool)) }) },
 
             // Numeric
-            { typeof(int), new DCD(p => Convert.ToInt32(p["Value"]), new[]{ new DCPD("Value", EvaluatableType.Number) }) },
-            { typeof(long), new DCD(p => Convert.ToInt64(p["Value"]), new[]{ new DCPD("Value", EvaluatableType.Number) }) },
-            { typeof(float), new DCD(p => Convert.ToSingle(p["Value"]), new[]{ new DCPD("Value", EvaluatableType.Number) }) },
-            { typeof(double), new DCD(p => p["Value"], new[]{ new DCPD("Value", EvaluatableType.Number) }) },
+            { typeof(int), new DCD(p => Convert.ToInt32(p["Value"]), new[]{ new DCPD("Value", typeof(double)) }) },
+            { typeof(long), new DCD(p => Convert.ToInt64(p["Value"]), new[]{ new DCPD("Value", typeof(double)) }) },
+            { typeof(float), new DCD(p => Convert.ToSingle(p["Value"]), new[]{ new DCPD("Value", typeof(double)) }) },
+            { typeof(double), new DCD(p => p["Value"], new[]{ new DCPD("Value", typeof(double)) }) },
 
             // Special
             { typeof(System.Drawing.Color), new DCD(
                 p => System.Drawing.Color.FromArgb(ToColorComp(p["Alpha"]), ToColorComp(p["Red"]), ToColorComp(p["Green"]), ToColorComp(p["Blue"])),
                 new[] {
-                    new DCPD("Alpha", EvaluatableType.Number, "A value between 0 (transparent) and 1 (opaque) for the transparency of the color."),
-                    new DCPD("Red", EvaluatableType.Number, "A value between 0 and 1 for the amount of red in the color."),
-                    new DCPD("Green", EvaluatableType.Number, "A value between 0 and 1 for the amount of green in the color."),
-                    new DCPD("Blue", EvaluatableType.Number, "A value between 0 and 1 for the amount of blue in the color.")
+                    new DCPD("Alpha", typeof(double), "A value between 0 (transparent) and 1 (opaque) for the transparency of the color."),
+                    new DCPD("Red", typeof(double), "A value between 0 and 1 for the amount of red in the color."),
+                    new DCPD("Green", typeof(double), "A value between 0 and 1 for the amount of green in the color."),
+                    new DCPD("Blue", typeof(double), "A value between 0 and 1 for the amount of blue in the color.")
                 }
             ) },
 
             { typeof(KeySequence), new DCD(
                 p => new KeySequence(new FreeFormObject(Convert.ToSingle(p["X"]), Convert.ToSingle(p["Y"]), Convert.ToSingle(p["Width"]), Convert.ToSingle(p["Height"]), Convert.ToSingle(p["Angle"]))),
                 new[] {
-                    new DCPD("X", EvaluatableType.Number),
-                    new DCPD("Y", EvaluatableType.Number),
-                    new DCPD("Width", EvaluatableType.Number),
-                    new DCPD("Height", EvaluatableType.Number),
-                    new DCPD("Angle", EvaluatableType.Number)
+                    new DCPD("X", typeof(double)),
+                    new DCPD("Y", typeof(double)),
+                    new DCPD("Width", typeof(double)),
+                    new DCPD("Height", typeof(double)),
+                    new DCPD("Angle", typeof(double))
                 }
             ) }
         };
@@ -143,11 +143,11 @@ struct DynamicConstructorParamDefinition {
         /// <summary>Parameter name.</summary>
         public string name;
         /// <summary>The type of variable this parameter is.</summary>
-        public EvaluatableType type;
+        public Type type;
         /// <summary>A simple description of the parameter for the user.</summary>
         public string description;
 
-        public DynamicConstructorParamDefinition(string name, EvaluatableType type, string description=null) {
+        public DynamicConstructorParamDefinition(string name, Type type, string description=null) {
             this.name = name;
             this.type = type;
             this.description = description;
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs
index eb337ce5c..084d13926 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs
@@ -20,7 +20,7 @@ public class StringComparison : IEvaluatable<bool> {
         public bool CaseInsensitive { get; set; } = false;
 
         // Control allowing the user to edit the comparison
-        public Visual GetControl() => new Control_BinaryOperationHolder(EvaluatableType.String, typeof(StringComparisonOperator))
+        public Visual GetControl() => new Control_BinaryOperationHolder(typeof(string), typeof(StringComparisonOperator))
             .WithBinding(Control_BinaryOperationHolder.Operand1Property, new Binding("Operand1") { Source = this, Mode = BindingMode.TwoWay })
             .WithBinding(Control_BinaryOperationHolder.Operand2Property, new Binding("Operand2") { Source = this, Mode = BindingMode.TwoWay })
             .WithBinding(Control_BinaryOperationHolder.SelectedOperatorProperty, new Binding("Operator") { Source = this, Mode = BindingMode.TwoWay });
diff --git a/Project-Aurora/Project-Aurora/Utils/DragBehaviour.cs b/Project-Aurora/Project-Aurora/Utils/DragBehaviour.cs
new file mode 100644
index 000000000..40b40fde9
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Utils/DragBehaviour.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Windows;
+using System.Windows.Input;
+
+namespace Aurora.Utils {
+
+	/// <summary>
+	/// Behaviour that can be attached to any <see cref="UIElement"/> to provide an event that fires when the user clicks and drags the element
+	/// with their left mouse button. Abstracts away the code to store initial mouse position and calculate different to current mouse position.
+	/// </summary>
+	public static class DragBehaviour {
+
+		#region MouseDownStart Property
+		// Property that is attached to an element and used to determine the location the mouse when down relative to the element to decide whether or not to
+		// initiate a drag. This is private as there is no need for this to be accessed outside of the StartDrag property.
+		private static Point? GetMouseDownStart(DependencyObject obj) => (Point?)obj.GetValue(MouseDownStartProperty);
+		private static void SetMouseDownStart(DependencyObject obj, Point? value) => obj.SetValue(MouseDownStartProperty, value);
+		private static readonly DependencyProperty MouseDownStartProperty =
+			DependencyProperty.RegisterAttached("MouseDownStart", typeof(Point?), typeof(DragBehaviour), new PropertyMetadata(null));
+		#endregion
+
+		#region StartDrag Property
+		/// <summary>Sets the event that will be called when the target element is pressed and the mosue moved a minimum distance as set by the system parameters.</summary>
+		/// <param name="obj">The target element which the event should be attached to.</param>
+		public static StartDragEventHandler GetStartDrag(DependencyObject obj) => (StartDragEventHandler)obj.GetValue(StartDragProperty);
+		/// <summary>Sets the event that will be called when the target element is pressed and the mosue moved a minimum distance as set by the system parameters.</summary>
+		/// <param name="obj">The target element which the event should be attached to. Has no effect on DependencyProperties that are not <see cref="UIElement"/>s.</param>
+		/// <param name="value">The event that will be called when the drag is started.</param>
+		public static void SetStartDrag(DependencyObject obj, StartDragEventHandler value) => obj.SetValue(StartDragProperty, value);
+
+		/// <summary>This property represents an event that is fired when the drag is initiated.</summary>
+		public static readonly DependencyProperty StartDragProperty =
+			DependencyProperty.RegisterAttached("StartDrag", typeof(StartDragEventHandler), typeof(DragBehaviour), new UIPropertyMetadata(null, StartDragPropertyChanged));
+
+		/// <summary>Callback that will update the event handlers on the target when the StartDrag property is changed.</summary>
+		private static void StartDragPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e) {
+			// Can only add MouseEvents onto UIElements.
+			if (!(sender is UIElement el)) return;
+
+			// If there is not an existing DragEvent, but there is one being set, add the relevant event listeners.
+			if (e.OldValue == null && e.NewValue != null) {
+				el.MouseLeftButtonDown += DependencyTarget_MouseLeftButtonDown;
+				el.MouseMove += DependencyTarget_MouseMove;
+				el.MouseLeftButtonUp += DependencyTarget_MouseLeftButtonUp;
+
+				// If there is an existing DragEvent, but the new one is now null, remove the relevant event listeners.
+			} else if (e.OldValue != null && e.NewValue == null) {
+				el.MouseLeftButtonDown -= DependencyTarget_MouseLeftButtonDown;
+				el.MouseMove -= DependencyTarget_MouseMove;
+			}
+		}
+		#endregion
+
+		#region Events
+		/// <summary>LeftButtonDown event for any elements who have the behaviour attached. Will set that object's <see cref="MouseDownStartProperty" /> to the
+		/// current position of the mouse relative to the sending object.</summary>
+		private static void DependencyTarget_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) {
+			var trg = (UIElement)sender;
+			e.Handled = true;
+			trg.CaptureMouse(); // Capture mouse to detect mouse movement off the element
+			SetMouseDownStart(trg, e.GetPosition((IInputElement)sender));
+		}
+
+		/// <summary>MouseMove event from any elements who have the behaviour attached. Will check if the mouse went down on this element and then if the user
+		/// has dragged the mouse atleast the distance set by the system parameters. If both these cases are true, fires a single StartDrag event.</summary>
+		private static void DependencyTarget_MouseMove(object sender, MouseEventArgs e) {
+			var @do = (UIElement)sender;
+			var p = GetMouseDownStart(@do);
+			var delta = e.GetPosition((IInputElement)sender) - p; // Calculate the distance between the current mouse position and the initial mouse down position
+																  // Note that this is a Vector? because one of the operands (GetMouseDownStart) is a Point?, so if the Point is null, this cascades to the Vector.
+
+			// If this element is being dragged (delta will be null if not), then check the delta is atleast as much as the system parameters
+			if (delta != null && (Math.Abs(delta.Value.X) > SystemParameters.MinimumHorizontalDragDistance || Math.Abs(delta.Value.Y) > SystemParameters.MinimumVerticalDragDistance)) {
+				@do.ReleaseMouseCapture();
+				GetStartDrag(@do)?.Invoke(sender, e, p.Value); // Invoke the StartDrag event assigned to the DependecyObject
+				SetMouseDownStart(@do, null); // Set the start mouse point to null to prevent this StartDrag being called again for this drag.
+			}
+		}
+
+		/// <summary>LeftButtonUp handler for any elements with the behaviour attached. Will set that object's <see cref="MouseDownStartProperty"/> to null to prevent
+		/// the <see cref="DependencyTarget_MouseMove(object, MouseEventArgs)"/> event from running and triggering a StartDrag event.</summary>
+		private static void DependencyTarget_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) {
+			var trg = (UIElement)sender;
+			trg.ReleaseMouseCapture();
+			SetMouseDownStart(trg, null);
+		}
+		#endregion
+	}
+
+	/// <summary>Event handler that is called when the StartDrag event is triggered.</summary>
+	/// <param name="sender">The object that initiated the event.</param>
+	/// <param name="e">The event of the most recent MouseMove event that caused the StartDrag event to fire.</param>
+	/// <param name="initialPoint">The initial mouse location relative to the target when the mouse was originally pressed.</param>
+	public delegate void StartDragEventHandler(object sender, MouseEventArgs e, Point initialPoint);
+}
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Utils/FrameworkElementUtils.cs b/Project-Aurora/Project-Aurora/Utils/FrameworkElementUtils.cs
index 323af168f..9c61999a6 100644
--- a/Project-Aurora/Project-Aurora/Utils/FrameworkElementUtils.cs
+++ b/Project-Aurora/Project-Aurora/Utils/FrameworkElementUtils.cs
@@ -26,6 +26,22 @@ public static T FindChildOfType<T>(this DependencyObject self) where T : Depende
             return null;
         }
 
+        /// <summary>Tests to see if the given 'parent' object is a parent of the given 'child' object (as according to
+        /// <see cref="VisualTreeHelper.GetParent(DependencyObject)"/>).</summary>
+        /// <param name="parent">The parent element. Will return true if 'child' is inside this.</param>
+        /// <param name="child">The child element. Will return true if this is inside 'parent'.</param>
+        public static bool IsParentOf(this DependencyObject parent, DependencyObject child) {
+            var cur = child; // Starting at the child,
+            while (cur != null) { // Continuing until we run out of elements
+                if (cur == parent) // If the current item is the parent, return true
+                    return true;
+                cur = VisualTreeHelper.GetParent(cur); // Move on to the parent of the current element
+            }
+            return false; // If we ran out of elements, 'parent' is not a parent of 'child'.
+        }
+
+
+        #region Fluent Helper Methods
         /// <summary>
         /// Tiny extension for the FrameworkElement that allows to set a binding on an element and return that element (so it can be chained).
         /// Used in the TypeControlMap to shorten the code.
@@ -62,5 +78,6 @@ public static T WithChild<T>(this T self, UIElement child, Dock dock) where T :
             self.Children.Add(child);
             return self;
         }
+        #endregion
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Utils/TypeUtils.cs b/Project-Aurora/Project-Aurora/Utils/TypeUtils.cs
index 7d95a67a4..bb4a481ec 100644
--- a/Project-Aurora/Project-Aurora/Utils/TypeUtils.cs
+++ b/Project-Aurora/Project-Aurora/Utils/TypeUtils.cs
@@ -51,9 +51,25 @@ public static IEnumerable<KeyValuePair<Type, T>> GetTypesWithCustomAttribute<T>(
                 .Where(kvp => kvp.Value != null); // Filter out any where the attribute is null (i.e. doesn't exist)
         }
 
-        /// <summary>
-        /// Checks if the given type implements the given interface type.
-        /// </summary>
-        public static bool IsInterface(Type type, Type @interface) => @interface.IsAssignableFrom(type);
+
+        /// <summary>Checks whether the given 'this' type extends the given *generic* interface, regardless of type parameters.</summary>
+        /// <param name="type">The type that will be checked to see if ti implements the given interface.</param>
+        /// <param name="interfaceType">The type of generic interface to check if 'type' extends. Does not account for type parameters.</param>
+        public static bool ImplementsGenericInterface(this Type type, Type interfaceType) =>
+            type.GetInterfaces().Select(i => i.IsGenericType ? i.GetGenericTypeDefinition() : i).Contains(interfaceType);
+
+        /// <summary>Checks whether the given 'this' type extends the given *generic* interface with the given type parameters.</summary>
+        /// <param name="type">The type that will be checked to see if it implements the given interface.</param>
+        /// <param name="interfaceType">The type of generic interface to check if 'type' extends.</param>
+        /// <param name="interfaceGenericParameters">An array of types to check against the type parameters in the generic interface.
+        /// Note that the length of this array must match the number of type parameters in the target interface.</param>
+        public static bool ImplementsGenericInterface(Type type, Type interfaceType, params Type[] interfaceGenericParameters) =>
+            type.GetInterfaces()
+                .Where(i => i.IsGenericType)
+                .SingleOrDefault(i => i.GetGenericTypeDefinition() == interfaceType)?
+                .GetGenericArguments()
+                    .Select((arg, i) => arg == interfaceGenericParameters[i])
+                    .All(v => v)
+                ?? false;
     }
 }

From a58a2999a3cf61f1f29b74fe7fd1c2f643e06c9f Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Tue, 21 Apr 2020 21:57:35 +0100
Subject: [PATCH 05/20] Implemented the evaluatable spawner toolbox.

---
 Project-Aurora/Project-Aurora/App.xaml        | 25 +++++++---
 .../Controls/GameStateParameterPicker.xaml    |  8 +--
 .../Project-Aurora/Project-Aurora.csproj      | 11 +++-
 .../Logic/Boolean/Boolean_GameState.cs        |  6 +--
 .../Logic/Boolean/Boolean_LogicOperators.cs   |  8 +--
 .../Boolean/Boolean_NumericChangeDetector.cs  |  2 +-
 .../Logic/Boolean/Boolean_PeripheralInput.cs  | 10 ++--
 .../Logic/Boolean/Boolean_ProcessRunning.cs   |  2 +-
 .../Logic/Boolean/Boolean_TrueExtender.cs     |  2 +-
 .../Logic/Control_EvaluatablePresenter.xaml   |  6 ++-
 .../Control_EvaluatablePresenter.xaml.cs      | 17 +++++++
 .../Logic/Control_EvaluatableToolbox.xaml     | 39 +++++++++++++++
 .../Logic/Control_EvaluatableToolbox.xaml.cs  | 25 ++++++++++
 .../Logic/Control_OverrideDynamicValue.xaml   | 17 +++++--
 .../Logic/Control_OverrideLookupTable.xaml    |  4 ++
 ...icAttribute.cs => EvaluatableAttribute.cs} |  9 ++--
 .../Overrides/Logic/EvaluatableRegistry.cs    | 50 ++++++++++++-------
 .../Overrides/Logic/Generic/IfElseIf.cs       |  6 +--
 .../Logic/Number/Number_GameState.cs          |  2 +-
 .../Overrides/Logic/Number/Number_Maths.cs    | 10 ++--
 .../Logic/Number/Number_PeripheralInput.cs    |  2 +-
 .../Overrides/Logic/Number/Number_Waves.cs    |  2 +-
 .../Overrides/Logic/String/String_Constant.cs |  2 +-
 .../Logic/String/String_GameState.cs          |  2 +-
 .../Logic/String/String_LogicOperators.cs     |  2 +-
 .../Project-Aurora/Utils/TypeUtils.cs         | 10 ++++
 26 files changed, 209 insertions(+), 70 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
 create mode 100644 Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
 rename Project-Aurora/Project-Aurora/Settings/Overrides/Logic/{OverrideLogicAttribute.cs => EvaluatableAttribute.cs} (83%)

diff --git a/Project-Aurora/Project-Aurora/App.xaml b/Project-Aurora/Project-Aurora/App.xaml
index ffe649af5..fc90bbd93 100644
--- a/Project-Aurora/Project-Aurora/App.xaml
+++ b/Project-Aurora/Project-Aurora/App.xaml
@@ -1,15 +1,24 @@
 <Application x:Class="Aurora.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    DispatcherUnhandledException="App_DispatcherUnhandledException"
-    >
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:s="clr-namespace:System;assembly=mscorlib"
+             DispatcherUnhandledException="App_DispatcherUnhandledException">
+
     <Application.Resources>
-        <!--<ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary>
+            <!--<ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Themes/MetroDark/MetroDark.MSControls.Core.Implicit.xaml"/>
                 <ResourceDictionary Source="Themes/MetroDark/MetroDark.MSControls.Toolkit.Implicit.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>-->
+            </ResourceDictionary.MergedDictionaries>-->
+
+            <!-- Dictionary containing the colors of the evalutable presenters for each type of override type. -->
+            <ResourceDictionary x:Key="OverridesTypeColors">
+                <SolidColorBrush x:Key="{x:Type s:Double}" Color="#8834DB4C" />
+                <SolidColorBrush x:Key="{x:Type s:Boolean}" Color="#883498DB" />
+                <SolidColorBrush x:Key="{x:Type s:String}" Color="#88DB3453" />
+            </ResourceDictionary>
+            <SolidColorBrush x:Key="OverridesTypeFallbackColor" Color="#88DBDBDB" />
+        </ResourceDictionary>
     </Application.Resources>
 
 </Application>
diff --git a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml
index bfc7fe0df..6301656c0 100644
--- a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml
+++ b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml
@@ -6,7 +6,7 @@
              xmlns:l="clr-namespace:Aurora.Controls" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              mc:Ignorable="d"
              xmlns:u="clr-namespace:Aurora.Utils"
-             Height="22" MinWidth="120">
+             Height="22" MinWidth="60">
 
     <UserControl.Resources>
         <DataTemplate x:Key="ListItemTemplate">
@@ -23,7 +23,7 @@
 
         <!-- Dropdown content -->
         <Popup x:Name="pickerPopup" StaysOpen="False" IsOpen="{Binding IsOpen, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}">
-            <Grid x:Name="popupContent" Background="#1A1A1A" Height="280" Width="{Binding ActualWidth, ElementName=pickerToggleButton}">
+            <Grid x:Name="popupContent" Background="#1A1A1A" Height="280" Width="200">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="1*" />
@@ -37,8 +37,8 @@
                 </StackPanel>
 
                 <!-- List boxes (aux is for animation) -->
-                <ListBox x:Name="mainListBox" Grid.Row="1" ItemsSource="{Binding CurrentParameterListItems, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}" ItemTemplate="{StaticResource ListItemTemplate}" Width="{Binding ActualWidth, ElementName=pickerToggleButton}" HorizontalAlignment="Left" l:GameStateParameterPicker.TransformRelativeOffset="0" RenderTransform="{l:DoubleToRelativeTransformOffset}" PreviewMouseLeftButtonDown="MainListBox_PreviewMouseLeftButtonDown" />
-                <ListBox x:Name="auxillaryListbox" Grid.Row="1" ItemTemplate="{StaticResource ListItemTemplate}" Width="{Binding ActualWidth, ElementName=pickerToggleButton}" HorizontalAlignment="Left" l:GameStateParameterPicker.TransformRelativeOffset="-1" RenderTransform="{l:DoubleToRelativeTransformOffset}" />
+                <ListBox x:Name="mainListBox" Grid.Row="1" ItemsSource="{Binding CurrentParameterListItems, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}" ItemTemplate="{StaticResource ListItemTemplate}" Width="{Binding ActualWidth, ElementName=popupContent}" HorizontalAlignment="Left" l:GameStateParameterPicker.TransformRelativeOffset="0" RenderTransform="{l:DoubleToRelativeTransformOffset}" PreviewMouseLeftButtonDown="MainListBox_PreviewMouseLeftButtonDown" />
+                <ListBox x:Name="auxillaryListbox" Grid.Row="1" ItemTemplate="{StaticResource ListItemTemplate}" Width="{Binding ActualWidth, ElementName=popupContent}" HorizontalAlignment="Left" l:GameStateParameterPicker.TransformRelativeOffset="-1" RenderTransform="{l:DoubleToRelativeTransformOffset}" />
 
                 <!-- Numeric input for numeric types -->
                 <DockPanel Grid.Row="2" LastChildFill="True">
diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index 07ec393a9..854fae21e 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -788,6 +788,9 @@
     <Compile Include="Settings\Overrides\Logic\Control_BinaryOperationHolder.xaml.cs">
       <DependentUpon>Control_BinaryOperationHolder.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Settings\Overrides\Logic\Control_EvaluatableToolbox.xaml.cs">
+      <DependentUpon>Control_EvaluatableToolbox.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Settings\Overrides\Logic\Control_TimeAndUnit.xaml.cs">
       <DependentUpon>Control_TimeAndUnit.xaml</DependentUpon>
     </Compile>
@@ -815,7 +818,7 @@
     <Compile Include="Settings\Overrides\Logic\IOverrideLogic.cs" />
     <Compile Include="Settings\Overrides\Logic\Number\Number_Maths.cs" />
     <Compile Include="Settings\Overrides\Logic\OverrideDynamicValue.cs" />
-    <Compile Include="Settings\Overrides\Logic\OverrideLogicAttribute.cs" />
+    <Compile Include="Settings\Overrides\Logic\EvaluatableAttribute.cs" />
     <Compile Include="Settings\Overrides\Logic\Boolean\Boolean_GameState.cs" />
     <Compile Include="Settings\Overrides\Logic\Boolean\Control_BooleanGSIBoolean.xaml.cs">
       <DependentUpon>Control_BooleanGSIBoolean.xaml</DependentUpon>
@@ -2289,6 +2292,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Settings\Overrides\Logic\Control_EvaluatableToolbox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Settings\Overrides\Logic\Control_TimeAndUnit.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs
index f52f81012..e062d40e9 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs
@@ -9,7 +9,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Condition that accesses a specific game state variable (of boolean type) and returns the state.
     /// </summary>
-    [OverrideLogic("Boolean State Variable", category: OverrideLogicCategory.State)]
+    [Evaluatable("Boolean State Variable", category: OverrideLogicCategory.State)]
     public class BooleanGSIBoolean : IEvaluatable<bool> {
 
         /// <summary>Creates an empty boolean state variable lookup.</summary>
@@ -47,7 +47,7 @@ public bool Evaluate(IGameState gameState) {
     /// <summary>
     /// Condition that accesses some specified game state variables (of numeric type) and returns a comparison between them.
     /// </summary>
-    [OverrideLogic("Numeric State Variable", category: OverrideLogicCategory.State)]
+    [Evaluatable("Numeric State Variable", category: OverrideLogicCategory.State)]
     public class BooleanGSINumeric : IEvaluatable<bool> {
 
         /// <summary>Creates a blank numeric game state lookup evaluatable.</summary>
@@ -99,7 +99,7 @@ public bool Evaluate(IGameState gameState) {
     /// <summary>
     /// Condition that accesses a specified game state variable (of any enum type) and returns a comparison between it and a static enum of the same type.
     /// </summary>
-    [OverrideLogic("Enum State Variable", category: OverrideLogicCategory.State)]
+    [Evaluatable("Enum State Variable", category: OverrideLogicCategory.State)]
     public class BooleanGSIEnum : IEvaluatable<bool> {
 
         /// <summary>Creates a blank enum game state lookup evaluatable.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
index 7da10ba14..9c765ce4b 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
@@ -14,7 +14,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Condition that checks a set of subconditions for atleast one of them being true.
     /// </summary>
-    [OverrideLogic("Or", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("Or", category: OverrideLogicCategory.Logic)]
     public class BooleanOr : IEvaluatable<bool>, IHasSubConditons {
 
         /// <summary>Creates a new Or evaluatable with no subconditions.</summary>
@@ -42,7 +42,7 @@ public BooleanOr(IEnumerable<IEvaluatable<bool>> subconditions) {
     /// <summary>
     /// Condition that checks a set of subconditions and requires them all to be true.
     /// </summary>
-    [OverrideLogic("And", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("And", category: OverrideLogicCategory.Logic)]
     public class BooleanAnd : IEvaluatable<bool>, IHasSubConditons {
 
         /// <summary>Creates a new And evaluatable with no subconditions.</summary>
@@ -71,7 +71,7 @@ public BooleanAnd(IEnumerable<IEvaluatable<bool>> subconditions) {
     /// <summary>
     /// Condition that inverts another condition.
     /// </summary>
-    [OverrideLogic("Not", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("Not", category: OverrideLogicCategory.Logic)]
     public class BooleanNot : IEvaluatable<bool> {
 
         /// <summary>Creates a new NOT evaluatable with the default BooleanTrue subcondition.</summary>
@@ -99,7 +99,7 @@ public BooleanNot(IEvaluatable<bool> subcondition) {
     /// Condition that always returns true. Useful as a default condition as it means that
     /// the layer will always be visible.
     /// </summary>
-    [OverrideLogic("Boolean Constant", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("Boolean Constant", category: OverrideLogicCategory.Logic)]
     public class BooleanConstant : IEvaluatable<bool> {
 
         /// <summary>Creates a new constant true boolean.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
index 1cd0d740d..af7da183a 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
@@ -12,7 +12,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// Evaluatable that detects when the value of the given numeric evaluatable changes by a particular amount.
     /// <para>Can be used in conjunction with the <see cref="BooleanExtender"/> to make the 'true' last longer than a single eval tick.</para>
     /// </summary>
-    [OverrideLogic("Number Change Detector", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Number Change Detector", category: OverrideLogicCategory.Maths)]
     public class NumericChangeDetector : IEvaluatable<bool> {
 
         private double? lastValue;
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs
index ec8c44f04..db245f9ad 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs
@@ -15,7 +15,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Condition that is true when a specific keyboard button is held down.
     /// </summary>
-    [OverrideLogic("Key Held", category: OverrideLogicCategory.Input)]
+    [Evaluatable("Key Held", category: OverrideLogicCategory.Input)]
     public class BooleanKeyDown : IEvaluatable<bool> {
 
         /// <summary>Creates a new key held condition with the default key (Space) as the trigger key.</summary>
@@ -42,7 +42,7 @@ public BooleanKeyDown() { }
     /// <summary>
     /// Condition that is true when a specific keyboard button is held down.
     /// </summary>
-    [OverrideLogic("Key Press (Retain for duration)", category: OverrideLogicCategory.Input)]
+    [Evaluatable("Key Press (Retain for duration)", category: OverrideLogicCategory.Input)]
     public class BooleanKeyDownWithTimer : IEvaluatable<bool>
     {
         private Stopwatch watch = new Stopwatch();
@@ -92,7 +92,7 @@ public bool Evaluate(IGameState gameState) {
     /// <summary>
     /// Condition that is true when a specific mouse button is held down.
     /// </summary>
-    [OverrideLogic("Mouse Button Held", category: OverrideLogicCategory.Input)]
+    [Evaluatable("Mouse Button Held", category: OverrideLogicCategory.Input)]
     public class BooleanMouseDown : IEvaluatable<bool> {
 
         /// <summary>Creates a new key held condition with the default mouse button (Left) as the trigger button.</summary>
@@ -119,7 +119,7 @@ public BooleanMouseDown() { }
     /// <summary>
     /// Condition that is true when the specified lock key (e.g. caps lock) is active.
     /// </summary>
-    [OverrideLogic("Lock Key Active", category: OverrideLogicCategory.Input)]
+    [Evaluatable("Lock Key Active", category: OverrideLogicCategory.Input)]
     public class BooleanLockKeyActive : IEvaluatable<bool> {
 
         /// <summary>Creates a new key held condition with the default lock type (CapsLock) as the lock type.</summary>
@@ -146,7 +146,7 @@ public BooleanLockKeyActive() { }
     /// <summary>
     /// An evaluatable that returns true when the specified time has elapsed without the user pressing a keyboard button or clicking the mouse.
     /// </summary>
-    [OverrideLogic("Away Timer", category: OverrideLogicCategory.Input)]
+    [Evaluatable("Away Timer", category: OverrideLogicCategory.Input)]
     public class BooleanAwayTimer : IEvaluatable<bool> {
 
         /// <summary>Gets or sets the time before this timer starts returning true after there has been no user input.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
index 2cd752b38..d2b1f832a 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
@@ -10,7 +10,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Evaluatable that returns true/false depending on whether the given process name is running.
     /// </summary>
-    [OverrideLogic("Process Running", category: OverrideLogicCategory.Misc)]
+    [Evaluatable("Process Running", category: OverrideLogicCategory.Misc)]
     public class BooleanProcessRunning : IEvaluatable<bool>, INotifyPropertyChanged {
 
         public string ProcessName { get; set; } = "";
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
index cd94e8d67..6f34c96aa 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
@@ -12,7 +12,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <see cref="ExtensionTime"/> set to 3 seconds, the result of this would be a 3 second long "true" signal. Receiving another true
     /// signal while already extending an existing signal will restart the timer.
     /// </summary>
-    [OverrideLogic("True Extender", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("True Extender", category: OverrideLogicCategory.Logic)]
     public class BooleanExtender : IEvaluatable<bool> {
 
         private Stopwatch sw = new Stopwatch();
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml
index 7748329ab..59877212d 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml
@@ -3,13 +3,17 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:l="clr-namespace:Aurora.Settings.Overrides.Logic"
              xmlns:u="clr-namespace:Aurora.Utils"
              mc:Ignorable="d" d:DesignWidth="30" d:DesignHeight="120"
              MinWidth="30" MinHeight="30"
              VerticalAlignment="Top" HorizontalAlignment="Left"
              AllowDrop="True">
+    <UserControl.Resources>
+        <l:EvaluatableBackgroundSelector x:Key="EvaluatableBackgroundSelector" />
+    </UserControl.Resources>
 
-    <Border Padding="4" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" Background="#883498DB">
+    <Border Padding="4" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" Background="{Binding EvalType, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource EvaluatableBackgroundSelector}}">
         <Grid>
             <ContentPresenter x:Name="EvaluatableControl" Margin="17,0,0,0" />
             <Border Width="2" Margin="5,0,0,0" Height="16" Background="#2FFF" HorizontalAlignment="Left" VerticalAlignment="Center" />
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
index 765b0e765..0681767a6 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
@@ -1,6 +1,7 @@
 using Aurora.Utils;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -192,6 +193,22 @@ private bool TryGetData(IDataObject @do, out IEvaluatable evaluatable, out Contr
         #endregion
     }
 
+
+    /// <summary>
+    /// Converter that takes a type and returns the color (as defined in the theme) that is used to represent evaluatables of this type.
+    /// </summary>
+    public class EvaluatableBackgroundSelector : IValueConverter {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
+            var dic = App.Current.FindResource("OverridesTypeColors") as ResourceDictionary;
+            return (value != null && dic.Contains(value) ? dic[value] : App.Current.FindResource("OverridesTypeFallbackColor")) as SolidColorBrush;
+        }
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();
+    }
+
+
+    /// <summary>
+    /// Event arguments passed to subscribers when the IEvaluatable expression changes on a <see cref="Control_EvaluatablePresenter"/>.
+    /// </summary>
     public class ExpressionChangeEventArgs : EventArgs {
         public IEvaluatable OldExpression { get; set; }
         public IEvaluatable NewExpression { get; set; }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
new file mode 100644
index 000000000..8ef958891
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
@@ -0,0 +1,39 @@
+<UserControl x:Class="Aurora.Settings.Overrides.Logic.Control_EvaluatableToolbox"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:o="clr-namespace:Aurora.Settings.Overrides.Logic"
+             xmlns:u="clr-namespace:Aurora.Utils"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+
+    <UserControl.Resources>
+        <o:EvaluatableBackgroundSelector x:Key="EvaluatableBackgroundSelector" />
+    </UserControl.Resources>
+
+    <TabControl ItemsSource="{Binding GroupedEvalutables, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TabStripPlacement="Top">
+        <TabControl.ItemContainerStyle>
+            <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource {x:Type TabItem}}">
+                <Setter Property="Header" Value="{Binding Key}" />
+                <Setter Property="ContentTemplate">
+                    <Setter.Value>
+                        <DataTemplate>
+                            <ScrollViewer>
+                                <ItemsControl ItemsSource="{Binding .}">
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate>
+                                            <Border Background="{Binding Path=ResultType, Converter={StaticResource EvaluatableBackgroundSelector}}" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="EvaluatableSpawnerItem_StartDrag">
+                                                <TextBlock Text="{Binding Path=Metadata.Name}" Margin="4" />
+                                            </Border>
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                </ItemsControl>
+                            </ScrollViewer>
+                        </DataTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+        </TabControl.ItemContainerStyle>
+    </TabControl>
+</UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
new file mode 100644
index 000000000..dbb6c0e5a
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Aurora.Settings.Overrides.Logic {
+
+    public partial class Control_EvaluatableToolbox : UserControl {
+
+        public Control_EvaluatableToolbox() {
+            InitializeComponent();
+        }
+
+        /// <summary>Returns a list of all detected evaluatables grouped by their category.</summary>
+        public IEnumerable<IGrouping<OverrideLogicCategory, EvaluatableRegistry.EvaluatableTypeContainer>> GroupedEvalutables =>
+            EvaluatableRegistry.Get().GroupBy(x => x.Metadata.Category);
+
+        private void EvaluatableSpawnerItem_StartDrag(object sender, MouseEventArgs e, Point initial) {
+            var dc = (EvaluatableRegistry.EvaluatableTypeContainer)((FrameworkElement)sender).DataContext;
+            DragDrop.DoDragDrop(this, Activator.CreateInstance(dc.Evaluatable), DragDropEffects.Move);
+        }
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml
index 871e74dfb..ff888ea99 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml
@@ -11,12 +11,18 @@
         <local:UnderlineConverter x:Key="UnderlineConv" />
         <local:CurosrConverter x:Key="CursorConv" />
     </UserControl.Resources>
-    <DockPanel>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="2*" />
+            <RowDefinition Height="1*" />
+        </Grid.RowDefinitions>
+        
         <!-- Description -->
-        <TextBlock Text="A dynamic value allows you to set the value of the selected property using another variable. For example, you can set the opacity of a layer to be the result of health divided by maxhealth, causing the layer to fade out as your character takes damage (in supported games). Not all property types can have a dynamic value created for them." Margin="8" TextWrapping="Wrap" DockPanel.Dock="Top" />
+        <TextBlock Text="A dynamic value allows you to set the value of the selected property using another variable. For example, you can set the opacity of a layer to be the result of health divided by maxhealth, causing the layer to fade out as your character takes damage (in supported games). Not all property types can have a dynamic value created for them." Margin="8" TextWrapping="Wrap" Grid.Row="0" />
 
         <!-- Parameter list -->
-        <ScrollViewer Margin="6,0,6,6">
+        <ScrollViewer Margin="6,0,6,6" Grid.Row="1">
             <ItemsControl ItemsSource="{Binding Parameters}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
@@ -31,5 +37,8 @@
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
         </ScrollViewer>
-    </DockPanel>
+
+        <!-- Toolbox -->
+        <local:Control_EvaluatableToolbox Grid.Row="2" />
+    </Grid>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml
index 589661330..0eaf53ca4 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml
@@ -13,6 +13,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="2*" />
             <RowDefinition Height="1*" />
         </Grid.RowDefinitions>
         
@@ -80,5 +81,8 @@
                 </StackPanel>
             </ScrollViewer>
         </Border>
+
+        <!-- Toolbox -->
+        <local:Control_EvaluatableToolbox Grid.Row="4" />
     </Grid>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideLogicAttribute.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableAttribute.cs
similarity index 83%
rename from Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideLogicAttribute.cs
rename to Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableAttribute.cs
index 29ee6d795..ffdee98fb 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/OverrideLogicAttribute.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableAttribute.cs
@@ -6,15 +6,16 @@
 using System.Threading.Tasks;
 
 namespace Aurora.Settings.Overrides.Logic {
+
     /// <summary>
     /// Simple attribute that can be added to conditions to add metadata to them and register them as conditions.
     /// Unregistered conditions will still work, but they will not be shown in the dropdown list when editing layer visibility conditions.
     /// </summary>
     [AttributeUsage(AttributeTargets.Class)]
-    public class OverrideLogicAttribute : Attribute {
+    public class EvaluatableAttribute : Attribute {
 
         /// <param name="name">The name of the condition (will appear in the dropdown list).</param>
-        public OverrideLogicAttribute(string name, OverrideLogicCategory category = OverrideLogicCategory.Misc) {
+        public EvaluatableAttribute(string name, OverrideLogicCategory category = OverrideLogicCategory.Misc) {
             Name = name;
             Category = category;
         }
@@ -34,7 +35,7 @@ public enum OverrideLogicCategory {
         [Description("State Variable")] State,
         [Description("Input")] Input,
         [Description("Misc.")] Misc,
-        [Description("Maths (Advanced)")] Maths,
-        [Description("String (Advanced)")] String
+        [Description("Maths")] Maths,
+        [Description("String")] String
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableRegistry.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableRegistry.cs
index 98d4caa94..f74fda42a 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableRegistry.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableRegistry.cs
@@ -1,3 +1,4 @@
+using Aurora.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,31 +11,44 @@ namespace Aurora.Settings.Overrides.Logic {
     public static class EvaluatableRegistry {
 
         /// <summary>Cached list of all classes that have the OverrideLogic attribute applied to them.</summary>
-        private static readonly Dictionary<Type, OverrideLogicAttribute> allOverrideLogics = Utils.TypeUtils
-            .GetTypesWithCustomAttribute<OverrideLogicAttribute>()
+        private static readonly IEnumerable<EvaluatableTypeContainer> allOverrideLogics = Utils.TypeUtils
+            .GetTypesWithCustomAttribute<EvaluatableAttribute>()
             .Where(kvp => typeof(IEvaluatable).IsAssignableFrom(kvp.Key))
-            .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-
-        /// <summary>Cached list of all classes with a OverrideLogic attribute that also are a specific subtype.</summary>
-        private static readonly Dictionary<Type, Dictionary<Type, OverrideLogicAttribute>> specificOverrideLogics = new Dictionary<Type, Dictionary<Type, OverrideLogicAttribute>>();
+            .Select(kvp => new EvaluatableTypeContainer {
+                Evaluatable = kvp.Key,
+                Metadata = kvp.Value,
+                ResultType = kvp.Key.GetGenericInterfaceTypes(typeof(IEvaluatable<>))[0]
+            });
 
         /// <summary>Fetches a specific subset of logic operand types (e.g. all booleans).
         /// Caches results to that subsequent calls are marginally faster.</summary>
-        /// <typeparam name="T">The type to fetch (e.g. IEvaluatable<bool>).</typeparam>
-        public static Dictionary<Type, OverrideLogicAttribute> Get<T>() where T : IEvaluatable => Get(typeof(T));
+        /// <typeparam name="T">The type to fetch (e.g. IEvaluatable&lt;bool>&gt;).</typeparam>
+        public static IEnumerable<EvaluatableTypeContainer> Get<T>() where T : IEvaluatable => Get(typeof(T));
 
-        /// <summary>Fetches a specific subset of logic operand types (e.g. all booleans).
-        /// Caches results to that subsequent calls are marginally faster.</summary>
-        /// <param name="t">The type to fetch (e.g. IEvaluatable<bool>).</param>
-        public static Dictionary<Type, OverrideLogicAttribute> Get(Type t) {
-            if (!specificOverrideLogics.ContainsKey(t))
-                specificOverrideLogics[t] = allOverrideLogics
-                    .Where(kvp => t.IsAssignableFrom(kvp.Key))
-                    .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-            return specificOverrideLogics[t];
+        /// <summary>Fetches a specific subset of logic operand types (e.g. all booleans).</summary>
+        /// <param name="t">The type to fetch (e.g. IEvaluatable&lt;bool&gt;).</param>
+        public static IEnumerable<EvaluatableTypeContainer> Get(Type t) {
+            // Ensure all numbers (double, float, int, etc) become double
+            if (TypeUtils.IsNumericType(t)) t = typeof(double);
+
+            return allOverrideLogics.Where(kvp => kvp.ResultType == t);
         }
 
         /// <summary>Fetches all logic operands that have been found with the OverrideLogicAttribute attached.</summary>
-        public static Dictionary<Type, OverrideLogicAttribute> Get() => allOverrideLogics;
+        public static IEnumerable<EvaluatableTypeContainer> Get() => allOverrideLogics;
+
+
+
+        public class EvaluatableTypeContainer {
+
+            /// <summary>The <see cref="Type"/> that represents the evaluatable.</summary>
+            public Type Evaluatable { get; set; }
+
+            /// <summary>The <see cref="EvaluatableAttribute"/> that contains the metadata about this evaluatable.</summary>
+            public EvaluatableAttribute Metadata { get; set; }
+
+            /// <summary>The <see cref="Type"/> that represents the type of value that is returned when this evaluatable is evaluated.</summary>
+            public Type ResultType { get; set; }
+        }
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
index 4080342ea..4a0bc5739 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
@@ -59,7 +59,7 @@ public Branch() { }
     }
 
 
-    [OverrideLogic("If - Else If - Else", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("If - Else If - Else", category: OverrideLogicCategory.Logic)]
     public class IfElseBoolean : IfElseGeneric<bool> {
         /// <summary>Creates a new If-Else evaluatable with default evaluatables.</summary>
         public IfElseBoolean() : base() { }
@@ -72,7 +72,7 @@ public IfElseBoolean(ObservableCollection<Branch> cases) : base(cases) { }
     }
 
 
-    [OverrideLogic("If - Else If - Else", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("If - Else If - Else", category: OverrideLogicCategory.Logic)]
     public class IfElseNumeric : IfElseGeneric<double> {
         /// <summary>Creates a new If-Else evaluatable with default evaluatables.</summary>
         public IfElseNumeric() : base() { }
@@ -85,7 +85,7 @@ public IfElseNumeric(ObservableCollection<Branch> cases) : base(cases) { }
     }
 
 
-    [OverrideLogic("If - Else If - Else", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("If - Else If - Else", category: OverrideLogicCategory.Logic)]
     public class IfElseString : IfElseGeneric<string> {
         /// <summary>Creates a new If-Else evaluatable with default evaluatables.</summary>
         public IfElseString() : base() { }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
index 4146d1d48..1da7188f1 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
@@ -12,7 +12,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Evaluatable that accesses some specified game state variables (of numeric type) and returns it.
     /// </summary>
-    [OverrideLogic("Numeric State Variable", category: OverrideLogicCategory.State)]
+    [Evaluatable("Numeric State Variable", category: OverrideLogicCategory.State)]
     public class NumberGSINumeric : IEvaluatable<double> {
 
         /// <summary>Creates a new numeric game state lookup evaluatable that doesn't target anything.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs
index 761ce434c..7e1c672c9 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs
@@ -15,7 +15,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Evaluatable that performs a binary mathematical operation on two operands.
     /// </summary>
-    [OverrideLogic("Arithmetic Operation", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Arithmetic Operation", category: OverrideLogicCategory.Maths)]
     public class NumberMathsOperation : IEvaluatable<double> {
 
         /// <summary>Creates a new maths operation that has no values pre-set.</summary>
@@ -68,7 +68,7 @@ public double Evaluate(IGameState gameState) {
     /// <summary>
     /// Returns the absolute value of the given evaluatable.
     /// </summary>
-    [OverrideLogic("Absolute", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Absolute", category: OverrideLogicCategory.Maths)]
     public class NumberAbsValue : IEvaluatable<double> {
 
         /// <summary>Creates a new absolute operation with the default operand.</summary>
@@ -96,7 +96,7 @@ public NumberAbsValue() { }
     /// <summary>
     /// Evaluatable that compares two numerical evaluatables and returns a boolean depending on the comparison.
     /// </summary>
-    [OverrideLogic("Arithmetic Comparison", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Arithmetic Comparison", category: OverrideLogicCategory.Maths)]
     public class BooleanMathsComparison : IEvaluatable<bool> {
 
         /// <summary>Creates a new maths comparison that has no values pre-set.</summary>
@@ -151,7 +151,7 @@ public bool Evaluate(IGameState gameState) {
     /// <summary>
     /// Evaluatable that takes a number in a given range and linearly interpolates it onto another range.
     /// </summary>
-    [OverrideLogic("Lerp", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Lerp", category: OverrideLogicCategory.Maths)]
     public class NumberMap : IEvaluatable<double> {
 
         /// <summary>Creates a new numeric map with the default constant parameters.</summary>
@@ -201,7 +201,7 @@ public double Evaluate(IGameState gameState) {
     /// <summary>
     /// Evaluatable that resolves to a numerical constant.
     /// </summary>
-    [OverrideLogic("Number Constant", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Number Constant", category: OverrideLogicCategory.Maths)]
     public class NumberConstant : IEvaluatable<double> {
 
         /// <summary>Creates a new constant with the zero as the constant value.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_PeripheralInput.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_PeripheralInput.cs
index 6949480af..a01744706 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_PeripheralInput.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_PeripheralInput.cs
@@ -14,7 +14,7 @@ namespace Aurora.Settings.Overrides.Logic.Number {
     /// <summary>
     /// An evaluatable that returns the time since the user has pressed a keyboard key or clicked the mouse.
     /// </summary>
-    [OverrideLogic("Away Time", category: OverrideLogicCategory.Input)]
+    [Evaluatable("Away Time", category: OverrideLogicCategory.Input)]
     public class NumberAwayTime : IEvaluatable<double> {
 
         /// <summary>Gets or sets the time unit that the time is being measured in.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Waves.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Waves.cs
index 0dadda7cf..442d69757 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Waves.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Waves.cs
@@ -9,7 +9,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// A special operator that takes the given (x) input (between 0 and 1) and converts it to a waveform (y) between 0 and 1.
     /// </summary>
-    [OverrideLogic("Wave Function", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Wave Function", category: OverrideLogicCategory.Maths)]
     public class NumberWaveFunction : IEvaluatable<double> {
 
         /// <summary>Creates a new wave function evaluatable with the default parameters.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs
index 42b120e54..a7837bb34 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs
@@ -8,7 +8,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Represents a constant string value that will always evaluate to the same value.
     /// </summary>
-    [OverrideLogic("String Constant", category: OverrideLogicCategory.String)]
+    [Evaluatable("String Constant", category: OverrideLogicCategory.String)]
     public class StringConstant : IEvaluatable<string> {
 
         /// <summary>The value of the constant.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
index ba5c75e4b..c816830c6 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
@@ -9,7 +9,7 @@
 
 namespace Aurora.Settings.Overrides.Logic {
 
-    [OverrideLogic("String State Variable", category: OverrideLogicCategory.State)]
+    [Evaluatable("String State Variable", category: OverrideLogicCategory.State)]
     public class StringGSIString : IEvaluatable<string> {
 
         /// <summary>Path to the GSI variable</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs
index 084d13926..d8dadb3c2 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs
@@ -10,7 +10,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Logic that compares two strings using a selection of operators.
     /// </summary>
-    [OverrideLogic("String Comparison", category: OverrideLogicCategory.String)]
+    [Evaluatable("String Comparison", category: OverrideLogicCategory.String)]
     public class StringComparison : IEvaluatable<bool> {
 
         // Operands and operator
diff --git a/Project-Aurora/Project-Aurora/Utils/TypeUtils.cs b/Project-Aurora/Project-Aurora/Utils/TypeUtils.cs
index bb4a481ec..531caf319 100644
--- a/Project-Aurora/Project-Aurora/Utils/TypeUtils.cs
+++ b/Project-Aurora/Project-Aurora/Utils/TypeUtils.cs
@@ -71,5 +71,15 @@ public static bool ImplementsGenericInterface(Type type, Type interfaceType, par
                     .Select((arg, i) => arg == interfaceGenericParameters[i])
                     .All(v => v)
                 ?? false;
+
+        /// <summary>Gets the generic argument types of the given interface for the given type.</summary>
+        /// <param name="type">The type to check interfaces on.</param>
+        /// <param name="interfaceType">The type of interface whose generic parameters to fetch.</param>
+        /// <returns>An array containing all the types of generic parameters defined for this type on the given interface, or null if interface not found.</returns>
+        public static Type[] GetGenericInterfaceTypes(this Type type, Type interfaceType) =>
+            type.GetInterfaces()
+                .Where(i => i.IsGenericType)
+                .SingleOrDefault(i => i.GetGenericTypeDefinition() == interfaceType)?
+                .GetGenericArguments();
     }
 }

From 6692210df7c5a980e612af8ad382b1bee0a0ec1c Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Tue, 21 Apr 2020 23:02:07 +0100
Subject: [PATCH 06/20] Styling changes to the evaluatable controls. Removes
 some margins from some of the evals and generally reduces the amount of
 "stuff" on the controls.

---
 .../Logic/Boolean/Boolean_LogicOperators.cs   |  8 +-
 .../Boolean/Boolean_NumericChangeDetector.cs  |  6 +-
 .../Logic/Boolean/Boolean_PeripheralInput.cs  |  2 +-
 .../Logic/Boolean/Boolean_TrueExtender.cs     |  2 +-
 .../Boolean/Control_BooleanGSIBoolean.xaml    |  2 +-
 .../Logic/Boolean/Control_BooleanGSIEnum.xaml | 18 ++--
 .../Boolean/Control_BooleanGSINumeric.xaml    | 16 ++--
 .../Logic/Control_BinaryOperationHolder.xaml  | 41 ++-------
 .../Logic/Control_SublogicHolder.xaml         | 53 ++++++------
 .../Logic/Control_SublogicHolder.xaml.cs      | 15 ++--
 .../Logic/Generic/Control_IfElse.xaml         | 84 ++++++-------------
 .../Logic/Number/Number_GameState.cs          |  2 +-
 .../Overrides/Logic/String/String_Constant.cs |  2 +-
 .../Logic/String/String_GameState.cs          |  2 +-
 14 files changed, 85 insertions(+), 168 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
index 9c765ce4b..1847b0bcb 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
@@ -27,9 +27,7 @@ public BooleanOr(IEnumerable<IEvaluatable<bool>> subconditions) {
         [JsonProperty]
         public ObservableCollection<IEvaluatable<bool>> SubConditions { get; set; } = new ObservableCollection<IEvaluatable<bool>>();
 
-        [JsonIgnore]
-        private Control_SubconditionHolder control;
-        public Visual GetControl() => control ?? (control = new Control_SubconditionHolder(this, "Require atleast one of the following is true..."));
+        public Visual GetControl() => new Control_SubconditionHolder(this, "Or");
 
         public bool Evaluate(IGameState gameState) => SubConditions.Any(subcondition => subcondition?.Evaluate(gameState) ?? false);
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
@@ -55,9 +53,7 @@ public BooleanAnd(IEnumerable<IEvaluatable<bool>> subconditions) {
         [JsonProperty]
         public ObservableCollection<IEvaluatable<bool>> SubConditions { get; set; } = new ObservableCollection<IEvaluatable<bool>>();
 
-        [JsonIgnore]
-        private Control_SubconditionHolder control;
-        public Visual GetControl() => control ?? (control = new Control_SubconditionHolder(this, "Require all of the following are true..."));
+        public Visual GetControl() => new Control_SubconditionHolder(this, "And");
 
         public bool Evaluate(IGameState gameState) => SubConditions.All(subcondition => subcondition?.Evaluate(gameState) ?? false);
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
index af7da183a..2a6df2e88 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
@@ -31,10 +31,8 @@ public NumericChangeDetector(IEvaluatable<double> eval, bool detectRising = true
         public double DetectionThreshold { get; set; } = 0;
 
         public Visual GetControl() => new StackPanel()
-            .WithChild(new DockPanel { LastChildFill = true }
-                .WithChild(new Label { Content = "Expression", VerticalAlignment = System.Windows.VerticalAlignment.Center }, Dock.Left)
-                .WithChild(new Control_EvaluatablePresenter { EvalType = typeof(double), Margin = new System.Windows.Thickness(24, 0, 0, 0) }
-                    .WithBinding(Control_EvaluatablePresenter.ExpressionProperty, this, "Evaluatable", BindingMode.TwoWay)))
+            .WithChild(new Control_EvaluatablePresenter { EvalType = typeof(double) }
+                .WithBinding(Control_EvaluatablePresenter.ExpressionProperty, this, "Evaluatable", BindingMode.TwoWay))
             .WithChild(new CheckBox { Content = "Trigger on increase" }
                 .WithBinding(CheckBox.IsCheckedProperty, this, "DetectRising"))
             .WithChild(new CheckBox { Content = "Trigger on decrease" }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs
index db245f9ad..9c9bcbac3 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs
@@ -27,7 +27,7 @@ public BooleanKeyDown() { }
         public Keys TargetKey { get; set; } = Keys.Space;
 
         /// <summary>Create a control where the user can select the key they wish to detect.</summary>
-        public Visual GetControl() => new Controls.Control_FieldPresenter { Type = typeof(Keys), Margin = new System.Windows.Thickness(0, 0, 0, 6) }
+        public Visual GetControl() => new Controls.Control_FieldPresenter { Type = typeof(Keys) }
             .WithBinding(Controls.Control_FieldPresenter.ValueProperty, new Binding("TargetKey") { Source = this, Mode = BindingMode.TwoWay });
 
         /// <summary>True if the global event bus's pressed key list contains the target key.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
index 6f34c96aa..f4e3747c1 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
@@ -26,7 +26,7 @@ public BooleanExtender() { }
         public TimeUnit TimeUnit { get; set; } = TimeUnit.Seconds;
 
         public Visual GetControl() => new StackPanel()
-            .WithChild(new Control_EvaluatablePresenter { EvalType = typeof(bool), Margin = new System.Windows.Thickness(24, 0, 0, 0) }
+            .WithChild(new Control_EvaluatablePresenter { EvalType = typeof(bool) }
                 .WithBinding(Control_EvaluatablePresenter.ExpressionProperty, new Binding("Evaluatable") { Source = this, Mode = BindingMode.TwoWay }))
             .WithChild(new Control_TimeAndUnit()
                 .WithBinding(Control_TimeAndUnit.TimeProperty, new Binding("ExtensionTime") { Source = this, Mode = BindingMode.TwoWay })
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIBoolean.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIBoolean.xaml
index c71274ded..e713a6f3b 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIBoolean.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIBoolean.xaml
@@ -6,5 +6,5 @@
              xmlns:c="clr-namespace:Aurora.Controls"
              xmlns:u="clr-namespace:Aurora.Utils"
              mc:Ignorable="d">
-    <c:GameStateParameterPicker SelectedPath="{Binding VariablePath}" PropertyType="Boolean" Application="{u:AttachedApplicationBinding}"  Margin="0,0,0,6" />
+    <c:GameStateParameterPicker SelectedPath="{Binding VariablePath}" PropertyType="Boolean" Application="{u:AttachedApplicationBinding}" />
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml
index 6e694487e..3aa3674e5 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml
@@ -5,16 +5,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:c="clr-namespace:Aurora.Controls"
              xmlns:u="clr-namespace:Aurora.Utils"
-             mc:Ignorable="d" d:DesignWidth="400">
-    <Grid Margin="0,0,0,6">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="1*" />
-        </Grid.ColumnDefinitions>
-
-        <c:GameStateParameterPicker SelectedPath="{Binding StatePath}" PropertyType="Enum" Application="{u:AttachedApplicationBinding}"  Grid.Column="0" SelectedPathChanged="GameStateParameterPicker_SelectedPathChanged" />
-        <TextBlock Text="=" FontWeight="Bold" Grid.Column="1" Margin="4,0" VerticalAlignment="Center" />
-        <ComboBox x:Name="EnumVal" SelectedValue="{Binding EnumValue}" DisplayMemberPath="Key" SelectedValuePath="Value" Grid.Column="2" HorizontalAlignment="Stretch" />
-    </Grid>
+             mc:Ignorable="d">
+    <StackPanel Orientation="Horizontal">
+        <c:GameStateParameterPicker SelectedPath="{Binding StatePath}" PropertyType="Enum" Application="{u:AttachedApplicationBinding}" VerticalAlignment="Center" SelectedPathChanged="GameStateParameterPicker_SelectedPathChanged" />
+        <TextBlock Text="=" FontWeight="Bold" Margin="4,0" VerticalAlignment="Center" />
+        <ComboBox x:Name="EnumVal" SelectedValue="{Binding EnumValue}" DisplayMemberPath="Key" SelectedValuePath="Value" VerticalAlignment="Center" />
+    </StackPanel>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSINumeric.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSINumeric.xaml
index 8b547b6fe..49c753694 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSINumeric.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSINumeric.xaml
@@ -6,15 +6,9 @@
              xmlns:c="clr-namespace:Aurora.Controls"
              xmlns:u="clr-namespace:Aurora.Utils"
              mc:Ignorable="d" d:DesignWidth="400">
-    <Grid Margin="0,0,0,6">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*" />
-            <ColumnDefinition Width="62px" />
-            <ColumnDefinition Width="1*" />
-        </Grid.ColumnDefinitions>
-
-        <c:GameStateParameterPicker x:Name="x" SelectedPath="{Binding Operand1Path}" Application="{u:AttachedApplicationBinding}" PropertyType="Number" Grid.Column="0" />
-        <ComboBox x:Name="OperatorCb" SelectedValue="{Binding Operator}" SelectedValuePath="Value" DisplayMemberPath="Key" Grid.Column="1" Margin="6,0" />
-        <c:GameStateParameterPicker SelectedPath="{Binding Operand2Path}" Application="{u:AttachedApplicationBinding}" PropertyType="Number" Grid.Column="2" />
-    </Grid>
+    <StackPanel Orientation="Horizontal">
+        <c:GameStateParameterPicker SelectedPath="{Binding Operand1Path}" Application="{u:AttachedApplicationBinding}" PropertyType="Number" VerticalAlignment="Center" />
+        <ComboBox x:Name="OperatorCb" SelectedValue="{Binding Operator}" SelectedValuePath="Value" DisplayMemberPath="Key" Margin="6,0" VerticalAlignment="Center" />
+        <c:GameStateParameterPicker SelectedPath="{Binding Operand2Path}" Application="{u:AttachedApplicationBinding}" PropertyType="Number" VerticalAlignment="Center" />
+    </StackPanel>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml
index 9fc92d7d6..1bc68bc95 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_BinaryOperationHolder.xaml
@@ -6,41 +6,10 @@
              xmlns:local="clr-namespace:Aurora.Settings.Overrides.Logic"
              mc:Ignorable="d" 
              d:DesignWidth="260">
-    <Grid>
-        <Label Content="Perform the following operation:" />
 
-        <StackPanel Margin="12,28,0,0">
-            <!-- Operand 1 -->
-            <Grid Margin="2,0,0,6">
-                <Rectangle Fill="#6000" Width="4" HorizontalAlignment="Left" VerticalAlignment="Stretch" />
-                <Rectangle Fill="#6000" Height="4" Width="6" Margin="4,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
-                <Border Margin="10,0,0,0" BorderThickness="1" BorderBrush="#6000" Background="#3000">
-                    <local:Control_EvaluatablePresenter Expression="{Binding Operand1, Mode=TwoWay}" EvalType="{Binding EvalType}" Margin="6,2,6,0" />
-                </Border>
-            </Grid>
-
-            <!-- Operator -->
-            <Grid Margin="2,0,0,6">
-                <Rectangle Fill="#6000" Width="4" HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="0,-6" />
-                <Rectangle Fill="#6000" Height="4" Width="6" Margin="4,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
-                <ComboBox x:Name="operatorSelection" SelectedValue="{Binding SelectedOperator, Mode=TwoWay}" SelectedValuePath="Value" DisplayMemberPath="Key" Margin="10,2" HorizontalAlignment="Left" Width="180" />
-            </Grid>
-
-            <!-- Operand 2 -->
-            <Grid Margin="2,0,0,6">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*" />
-                    <RowDefinition Height="1*" />
-                </Grid.RowDefinitions>
-
-                <Rectangle Fill="#6000" Width="4" HorizontalAlignment="Left" VerticalAlignment="Stretch" />
-                <Rectangle Fill="#6000" Height="4" Width="6" Margin="4,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Bottom" />
-                <Border Margin="10,0,0,0" BorderThickness="1" BorderBrush="#6000" Background="#3000" Grid.RowSpan="2">
-                    <local:Control_EvaluatablePresenter Expression="{Binding Operand2, Mode=TwoWay}" EvalType="{Binding EvalType}" Margin="6,2,6,0" />
-                </Border>
-            </Grid>
-        </StackPanel>
-
-        <Rectangle Fill="#6000" Width="4" Height="10" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="14,18,0,0" />
-    </Grid>
+    <StackPanel Orientation="Horizontal">
+        <local:Control_EvaluatablePresenter Expression="{Binding Operand1, Mode=TwoWay}" EvalType="{Binding EvalType}" VerticalAlignment="Center" />
+        <ComboBox x:Name="operatorSelection" SelectedValue="{Binding SelectedOperator, Mode=TwoWay}" SelectedValuePath="Value" DisplayMemberPath="Key" Margin="8,2" VerticalAlignment="Center" />
+        <local:Control_EvaluatablePresenter Expression="{Binding Operand2, Mode=TwoWay}" EvalType="{Binding EvalType}" VerticalAlignment="Center" />
+    </StackPanel>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml
index 6b962daf9..8b6387323 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml
@@ -7,35 +7,30 @@
              xmlns:local="clr-namespace:Aurora.Settings.Overrides.Logic"
              mc:Ignorable="d" 
              d:DesignHeight="200" d:DesignWidth="200">
-    <Grid>
-        <Label Content="{Binding Description}" />
+    
+    <StackPanel Orientation="Horizontal">
+        <Label Content="{Binding Description, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left" />
 
-        <ItemsControl Margin="12,28,0,26" ItemsSource="{Binding ParentExpr.SubConditions}">
-            <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                    <Grid Margin="6,0,0,6">
-                        <Rectangle Fill="#6000" Height="4" Width="10" HorizontalAlignment="Left" VerticalAlignment="Center" />
-                        <Border Margin="10,0,0,0" BorderThickness="1" BorderBrush="#6000" Background="#3000">
-                            <Grid>
-                                <local:Control_EvaluatablePresenter Expression="{Binding .}" EvalType="{x:Type sys:Boolean}" ExpressionChanged="ConditionPresenter_ConditionChanged" Margin="6,2,36,0" />
-                                <Button Margin="6" HorizontalAlignment="Right" VerticalAlignment="Center" Click="DeleteButton_Click" ToolTip="Remove this subcondition">
-                                    <Image Source="/Aurora;component/Resources/Layers_Remove.png" Width="18" Height="18" Margin="2" />
-                                </Button>
-                            </Grid>
-                        </Border>
-                    </Grid>
-                </DataTemplate>
-            </ItemsControl.ItemTemplate>
-        </ItemsControl>
+        <StackPanel>
+            <ItemsControl ItemsSource="{Binding SubConditions}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Grid>
+                            <local:Control_EvaluatablePresenter Expression="{Binding .}" EvalType="{x:Type sys:Boolean}" ExpressionChanged="ConditionPresenter_ConditionChanged" Margin="0,2,36,2" />
+                            <Button Margin="6,0" HorizontalAlignment="Right" VerticalAlignment="Center" Click="DeleteButton_Click" ToolTip="Remove this subcondition">
+                                <Image Source="/Aurora;component/Resources/Layers_Remove.png" Width="18" Height="18" Margin="2" />
+                            </Button>
+                        </Grid>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
 
-        <Rectangle Fill="#6000" Width="4" HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="14,18,0,12" />
-        <Rectangle Fill="#6000" Height="4" Width="10" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="18,0,0,12" />
-
-        <Button Margin="28,0,2,2" HorizontalAlignment="Left" VerticalAlignment="Bottom" Click="AddSubconditionButton_Click">
-            <StackPanel Orientation="Horizontal">
-                <Image Source="/Aurora;component/Resources/Layers_Add.png" Width="18" Height="18" Margin="2" />
-                <TextBlock Text="Add subcondition" VerticalAlignment="Center" Margin="0,0,4,0" />
-            </StackPanel>
-        </Button>
-    </Grid>
+            <Button HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="2,2,0,1" Click="AddSubconditionButton_Click">
+                <StackPanel Orientation="Horizontal">
+                    <Image Source="/Aurora;component/Resources/Layers_Add.png" Width="18" Height="18" Margin="2" />
+                    <TextBlock Text="Add subcondition" VerticalAlignment="Center" Margin="0,0,4,0" />
+                </StackPanel>
+            </Button>
+        </StackPanel>
+    </StackPanel>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml.cs
index 8a221d7f3..4d1184663 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_SublogicHolder.xaml.cs
@@ -4,31 +4,32 @@
 using System.Windows.Controls;
 
 namespace Aurora.Settings.Overrides.Logic {
+
     /// <summary>
     /// Interaction logic for Control_SubconditionHolder.xaml
     /// </summary>
     public partial class Control_SubconditionHolder : UserControl {
-        public Control_SubconditionHolder(IHasSubConditons parent, string description="") {
+
+        public Control_SubconditionHolder(IHasSubConditons parent, string description = "") {
             InitializeComponent();
-            ParentExpr = parent;
+            DataContext = Context = parent;
             Description = description;
-            ((FrameworkElement)Content).DataContext = this;
         }
 
         /// <summary>The parent evaluatable of this control. Must be an evaluatable that has sub conditions.</summary>
-        public IHasSubConditons ParentExpr { get; }
+        public IHasSubConditons Context { get; }
 
         /// <summary>The title/description text of this control.</summary>
         public string Description { get; }
 
         private void AddSubconditionButton_Click(object sender, RoutedEventArgs e) {
-            ParentExpr.SubConditions.Add(new BooleanConstant());
+            Context.SubConditions.Add(new BooleanConstant());
         }
 
         // We cannot do a TwoWay binding on the items of an ObservableCollection if that item may be replaced (it would be fine if only the instance's
         // values were being changed), so we have to capture change events and replace them in the list.
         private void ConditionPresenter_ConditionChanged(object sender, ExpressionChangeEventArgs e) {
-            ParentExpr.SubConditions[ParentExpr.SubConditions.IndexOf((IEvaluatable<bool>)e.OldExpression)] = (IEvaluatable<bool>)e.NewExpression;
+            Context.SubConditions[Context.SubConditions.IndexOf((IEvaluatable<bool>)e.OldExpression)] = (IEvaluatable<bool>)e.NewExpression;
         }
 
         private void DeleteButton_Click(object sender, RoutedEventArgs e) {
@@ -36,7 +37,7 @@ private void DeleteButton_Click(object sender, RoutedEventArgs e) {
             // it is created for each item inside the ItemsControl items source.
             // We can then simply call remove on the conditions list to remove it.
             var cond = (IEvaluatable<bool>)((FrameworkElement)sender).DataContext;
-            ParentExpr.SubConditions.Remove(cond);
+            Context.SubConditions.Remove(cond);
         }
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml
index 76be5ecb2..337cd3cbd 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_IfElse.xaml
@@ -15,38 +15,6 @@
     </UserControl.Resources>
 
     <StackPanel>
-        <!--<Border Margin="0" BorderThickness="1" BorderBrush="#6000" Background="#3000">
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock Text="If" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                    <local:Control_EvaluatablePresenter Expression="{Binding ParentCondition.Condition, Mode=TwoWay}" EvalType="Boolean" Margin="5,0,0,0" />
-                </StackPanel>
-            </Border>
-            <Grid>
-                <StackPanel Margin="12,5,0,5">
-                    <Grid Margin="6,0,0,6">
-                        <Rectangle Fill="#6000" Height="4" Width="10" HorizontalAlignment="Left" VerticalAlignment="Center" />
-                        <Border Margin="10,0,0,0" BorderThickness="1" BorderBrush="#6000" Background="#3000">
-                            <Grid>
-                                <TextBlock Text="Then" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                                <local:Control_EvaluatablePresenter Expression="{Binding ParentCondition.CaseTrue, Mode=TwoWay}" EvalType="{Binding EvaluatableType}" Margin="45,0,0,0" />
-                            </Grid>
-                        </Border>
-                    </Grid>
-                    <Grid Margin="6,0,0,6">
-                        <Rectangle Fill="#6000" Height="4" Width="10" HorizontalAlignment="Left" VerticalAlignment="Center" />
-                        <Border Margin="10,0,0,0" BorderThickness="1" BorderBrush="#6000" Background="#3000">
-
-                            <Grid>
-                                <TextBlock Text="Else" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                                <local:Control_EvaluatablePresenter Expression="{Binding ParentCondition.CaseFalse, Mode=TwoWay}" EvalType="{Binding EvaluatableType}" Margin="45,0,0,0" />
-                            </Grid>
-                        </Border>
-                    </Grid>
-                </StackPanel>
-                <Rectangle Fill="#6000" Width="4" HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="14,0,0,0" />
-                <Rectangle Fill="#6000" Height="4" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="18,0,0,0" />
-            </Grid>-->
-
         <ItemsControl ItemsSource="{Binding Path=ParentCondition.Cases}">
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
@@ -57,39 +25,41 @@
                         </Grid.RowDefinitions>
 
                         <!-- Condition -->
-                        <Border Margin="0" BorderThickness="1" BorderBrush="#6000" Background="#3000">
-                            <DockPanel LastChildFill="True">
-                                <TextBlock DockPanel.Dock="Left" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,6,0,6">
-                                    <TextBlock.Text>
-                                        <MultiBinding Converter="{StaticResource IfElseTextConverter}">
-                                            <Binding Path="Condition" /> <!-- Current condition -->
-                                            <Binding RelativeSource="{RelativeSource PreviousData}" Path="Condition" /> <!-- Previous condition -->
-                                        </MultiBinding>
-                                    </TextBlock.Text>
-                                </TextBlock>
-                                <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Visibility="{Binding Condition, Converter={StaticResource IsNullToVisibilityConverter}}">
-                                    <Button Content="↑" VerticalAlignment="Center" Padding="4,2" Click="CaseUp_Click" />
-                                    <Button Content="↓" VerticalAlignment="Center" Padding="4,2" Click="CaseDown_Click" />
-                                    <Button Content="X" VerticalAlignment="Center" Padding="4,2" Click="DeleteCase_Click" />
-                                </StackPanel>
-                                <local:Control_EvaluatablePresenter Expression="{Binding Condition, Mode=TwoWay}" EvalType="{x:Type sys:Boolean}" Margin="5,0,0,0" Visibility="{Binding Path=Condition, Converter={StaticResource IsNullToVisibilityConverter}}" />
-                            </DockPanel>
-                        </Border>
+                        <DockPanel>
+                            <TextBlock DockPanel.Dock="Left" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,6,0,6">
+                                <TextBlock.Text>
+                                    <MultiBinding Converter="{StaticResource IfElseTextConverter}">
+                                        <Binding Path="Condition" />
+                                        <!-- Current condition -->
+                                        <Binding RelativeSource="{RelativeSource PreviousData}" Path="Condition" />
+                                        <!-- Previous condition -->
+                                    </MultiBinding>
+                                </TextBlock.Text>
+                            </TextBlock>
+                            <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Visibility="{Binding Condition, Converter={StaticResource IsNullToVisibilityConverter}}">
+                                <Button Content="↑" ToolTip="Increase priority of this branch" VerticalAlignment="Center" Padding="4,2" Click="CaseUp_Click" />
+                                <Button Content="↓" ToolTip="Decreate priority of this branch" VerticalAlignment="Center" Padding="4,2" Click="CaseDown_Click" />
+                                <Button Content="X" ToolTip="Remove this branch" VerticalAlignment="Center" Padding="4,2" Click="DeleteCase_Click" />
+                            </StackPanel>                            
+                            <local:Control_EvaluatablePresenter Expression="{Binding Condition, Mode=TwoWay}" EvalType="{x:Type sys:Boolean}" Margin="8,0" Visibility="{Binding Path=Condition, Converter={StaticResource IsNullToVisibilityConverter}}" />
+                        </DockPanel>
 
                         <!-- Value -->
-                        <Border Margin="28,8,0,8" BorderThickness="1" BorderBrush="#6000" Background="#3000" Grid.Row="1">
-                            <DockPanel LastChildFill="True">
-                                <TextBlock DockPanel.Dock="Left" Text="Then" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,0,0,0" />
-                                <local:Control_EvaluatablePresenter Expression="{Binding Value, Mode=TwoWay}" EvalType="{Binding Path=DataContext.EvaluatableType, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="5,0,0,0" />
-                            </DockPanel>
-                        </Border>
+                        <DockPanel Margin="28,4,0,16" Grid.Row="1" LastChildFill="True">
+                            <TextBlock DockPanel.Dock="Left" Text="Then" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,0,0,0" />
+                            <local:Control_EvaluatablePresenter Expression="{Binding Value, Mode=TwoWay}" EvalType="{Binding Path=DataContext.EvaluatableType, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="5,0,0,0" />
+                        </DockPanel>
+
+                        <!-- Separator -->
+                        <Rectangle Height="1" Margin="10,8" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Fill="#4000" Grid.RowSpan="999" />
+                        <Rectangle Height="1" Margin="10,7" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Fill="#2FFF" Grid.RowSpan="999" />
                     </Grid>
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ItemsControl>
 
         <StackPanel Orientation="Horizontal">
-            <Button Content="Add Else-If" Click="AddElseIfCase_Click" />
+            <Button Content="Add Else-If" Padding="8,3" Margin="0,0,0,3" Click="AddElseIfCase_Click" />
         </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
index 1da7188f1..6000daabc 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
@@ -24,7 +24,7 @@ public NumberGSINumeric() { }
         public string VariablePath { get; set; }
 
         // Control assigned to this evaluatable
-        public Visual GetControl() => new GameStateParameterPicker { Margin = new System.Windows.Thickness(0, 0, 0, 6), PropertyType = PropertyType.Number }
+        public Visual GetControl() => new GameStateParameterPicker { PropertyType = PropertyType.Number }
             .WithBinding(GameStateParameterPicker.ApplicationProperty, new AttachedApplicationBinding())
             .WithBinding(GameStateParameterPicker.SelectedPathProperty, new Binding("VariablePath") { Source = this });
 
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs
index a7837bb34..55133cec1 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs
@@ -15,7 +15,7 @@ public class StringConstant : IEvaluatable<string> {
         public string Value { get; set; } = "";
 
         /// <summary>A control for setting the string value</summary>
-        public Visual GetControl() => new TextBox { Margin = new System.Windows.Thickness(0, 0, 0, 6) }
+        public Visual GetControl() => new TextBox { MinWidth = 40 }
             .WithBinding(TextBox.TextProperty, new Binding("Value") { Source = this, Mode = BindingMode.TwoWay });
 
         /// <summary>Simply return the constant value.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
index c816830c6..a9bdc8a26 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
@@ -16,7 +16,7 @@ public class StringGSIString : IEvaluatable<string> {
         public string VariablePath { get; set; } = "";
 
         /// <summary>Control assigned to this logic node.</summary>
-        public Visual GetControl() => new GameStateParameterPicker { PropertyType = PropertyType.String, Margin = new System.Windows.Thickness(0, 0, 0, 6) }
+        public Visual GetControl() => new GameStateParameterPicker { PropertyType = PropertyType.String }
             .WithBinding(GameStateParameterPicker.ApplicationProperty, new AttachedApplicationBinding())
             .WithBinding(GameStateParameterPicker.SelectedPathProperty, new Binding("VariablePath") { Source = this });
 

From 172cd7f5539d4355554a60fb49ff890fdfbdae57 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Wed, 22 Apr 2020 09:49:09 +0100
Subject: [PATCH 07/20] Added evaluatable to delay signals.

---
 .../Project-Aurora/Project-Aurora.csproj      |  8 ++
 .../Logic/Generic/Control_Delay.xaml          | 16 ++++
 .../Logic/Generic/Control_Delay.xaml.cs       | 19 +++++
 .../Settings/Overrides/Logic/Generic/Delay.cs | 81 +++++++++++++++++++
 .../Overrides/Logic/Generic/IfElseIf.cs       | 13 +--
 5 files changed, 132 insertions(+), 5 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_Delay.xaml
 create mode 100644 Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_Delay.xaml.cs
 create mode 100644 Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Delay.cs

diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index 854fae21e..e61416616 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -794,9 +794,13 @@
     <Compile Include="Settings\Overrides\Logic\Control_TimeAndUnit.xaml.cs">
       <DependentUpon>Control_TimeAndUnit.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Settings\Overrides\Logic\Generic\Control_Delay.xaml.cs">
+      <DependentUpon>Control_Delay.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Settings\Overrides\Logic\Generic\Control_IfElse.xaml.cs">
       <DependentUpon>Control_IfElse.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Settings\Overrides\Logic\Generic\Delay.cs" />
     <Compile Include="Settings\Overrides\Logic\Generic\IfElseIf.cs" />
     <Compile Include="Settings\Overrides\Logic\Number\Control_NumericMap.xaml.cs">
       <DependentUpon>Control_NumericMap.xaml</DependentUpon>
@@ -2300,6 +2304,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Settings\Overrides\Logic\Generic\Control_Delay.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Settings\Overrides\Logic\Generic\Control_IfElse.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_Delay.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_Delay.xaml
new file mode 100644
index 000000000..4733d093c
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_Delay.xaml
@@ -0,0 +1,16 @@
+<UserControl x:Class="Aurora.Settings.Overrides.Logic.Generic.Control_Delay"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:l="clr-namespace:Aurora.Settings.Overrides.Logic" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             mc:Ignorable="d">
+    <StackPanel>
+        <l:Control_EvaluatablePresenter Expression="{Binding Path=Source, Mode=TwoWay}" EvalType="{Binding EvalType, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" />
+        <StackPanel Orientation="Horizontal">
+            <Label FontWeight="Bold">Delay:</Label>
+            <xctk:DoubleUpDown MinWidth="38" Value="{Binding Path=Delay, Mode=TwoWay}" />
+            <Label>secs</Label>
+        </StackPanel>
+    </StackPanel>
+</UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_Delay.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_Delay.xaml.cs
new file mode 100644
index 000000000..98011c205
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_Delay.xaml.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Windows.Controls;
+
+namespace Aurora.Settings.Overrides.Logic.Generic {
+
+    public partial class Control_Delay : UserControl {
+        public Control_Delay() {
+            InitializeComponent();
+        }
+    }
+
+    public class Control_Delay<T> : Control_Delay {
+        public Control_Delay(DelayGeneric<T> context) : base() {
+            DataContext = context;
+        }
+
+        public Type EvalType => typeof(T);
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Delay.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Delay.cs
new file mode 100644
index 000000000..0231aa215
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Delay.cs
@@ -0,0 +1,81 @@
+using Aurora.Profiles;
+using System;
+using System.Collections.Generic;
+using System.Windows.Media;
+
+namespace Aurora.Settings.Overrides.Logic.Generic {
+
+    /// <summary>
+    /// Generic evaluatable that delays the source input by a set amount of time.
+    /// </summary>
+    public abstract class DelayGeneric<T> : IEvaluatable<T> {
+
+        /// <summary>Keeps track of all changes that have happened and which will need to be repeated.</summary>
+        private readonly Queue<(DateTime changeTime, T value)> history = new Queue<(DateTime changeTime, T value)>();
+
+        /// <summary>The last value returned by the evaluation of the 'Source' evaluatable.</summary>
+        private T lastValue;
+
+        /// <summary>The currently (delayed) value returned by this evaluatable.</summary>
+        private T currentValue;
+
+        /// <summary>An evaluatable that will be delayed bu the desired amount.</summary>
+        public IEvaluatable<T> Source { get; set; }
+
+        /// <summary>The amount of time to delay the evaluatable by (in seconds).</summary>
+        public double Delay { get; set; } = 3;
+
+        // Ctors
+        public DelayGeneric() { Source = EvaluatableDefaults.Get<T>(); }
+        public DelayGeneric(IEvaluatable<T> source, double delay) { Source = source; Delay = delay; }
+
+        // Control
+        public Visual GetControl() => new Control_Delay<T>(this);
+
+        // Eval
+        public T Evaluate(IGameState gameState) {
+            // First, evaluate the source evaluatable and check if the returned value is different from the last one we read.
+            var val = Source.Evaluate(gameState);
+            if (!EqualityComparer<T>.Default.Equals(val, lastValue)) {
+                // If different, record the time it changed and (add the delay so that we don't have to keep adding when checking later)
+                history.Enqueue((DateTime.Now.AddSeconds(Delay), val));
+                lastValue = val;
+            }
+
+            // Next, check if the time next item in the queue changed has passed, update the current value
+            // Note that we don't need to check other items since they are kept in order by the queue
+            if (history.Count > 0 && history.Peek().changeTime < DateTime.Now)
+                currentValue = history.Dequeue().value;
+
+            return currentValue;
+        }
+        object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
+
+        // Clone
+        public abstract IEvaluatable<T> Clone();
+        IEvaluatable IEvaluatable.Clone() => Clone();
+    }
+
+
+    // Concrete classes
+    [Evaluatable("Delay", category: OverrideLogicCategory.Misc)]
+    public class DelayBoolean : DelayGeneric<bool> {
+        public DelayBoolean() : base() { }
+        public DelayBoolean(IEvaluatable<bool> source, double delay) : base(source, delay) { }
+        public override IEvaluatable<bool> Clone() => new DelayBoolean(Source, Delay);
+    }
+
+    [Evaluatable("Delay", category: OverrideLogicCategory.Misc)]
+    public class DelayNumeric : DelayGeneric<double> {
+        public DelayNumeric() : base() { }
+        public DelayNumeric(IEvaluatable<double> source, double delay) : base(source, delay) { }
+        public override IEvaluatable<double> Clone() => new DelayNumeric(Source, Delay);
+    }
+
+    [Evaluatable("Delay", category: OverrideLogicCategory.Misc)]
+    public class DelayString : DelayGeneric<string> {
+        public DelayString() : base() { }
+        public DelayString(IEvaluatable<string> source, double delay) : base(source, delay) { }
+        public override IEvaluatable<string> Clone() => new DelayString(Source, Delay);
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
index 4a0bc5739..b144c224d 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
@@ -8,10 +8,9 @@
 using System.Windows.Media;
 
 
-namespace Aurora.Settings.Overrides.Logic
-{
-    //[OverrideLogic("Numeric State Variable", category: OverrideLogicCategory.State)]
-    public class IfElseGeneric<T> : IEvaluatable<T> {
+namespace Aurora.Settings.Overrides.Logic {
+
+    public abstract class IfElseGeneric<T> : IEvaluatable<T> {
         /// <summary>
         /// A list of all branches of the conditional.
         /// </summary>
@@ -40,7 +39,7 @@ public T Evaluate(IGameState gameState) {
 
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
 
-        public IEvaluatable<T> Clone() => new IfElseGeneric<T>(new ObservableCollection<Branch>(Cases));
+        public abstract IEvaluatable<T> Clone();
         IEvaluatable IEvaluatable.Clone() => Clone();
 
         private static ObservableCollection<Branch> CreateDefaultCases(IEvaluatable<bool> condition, IEvaluatable<T> caseTrue, IEvaluatable<T> caseFalse) =>
@@ -59,6 +58,7 @@ public Branch() { }
     }
 
 
+    // Concrete classes
     [Evaluatable("If - Else If - Else", category: OverrideLogicCategory.Logic)]
     public class IfElseBoolean : IfElseGeneric<bool> {
         /// <summary>Creates a new If-Else evaluatable with default evaluatables.</summary>
@@ -69,6 +69,7 @@ public IfElseBoolean(IEvaluatable<bool> condition, IEvaluatable<bool> caseTrue,
 
         /// <summary>Creates a new evaluatable using the given case tree.</summary>
         public IfElseBoolean(ObservableCollection<Branch> cases) : base(cases) { }
+        public override IEvaluatable<bool> Clone() => new IfElseBoolean(new ObservableCollection<Branch>(Cases));
     }
 
 
@@ -82,6 +83,7 @@ public IfElseNumeric(IEvaluatable<bool> condition, IEvaluatable<double> caseTrue
 
         /// <summary>Creates a new evaluatable using the given case tree.</summary>
         public IfElseNumeric(ObservableCollection<Branch> cases) : base(cases) { }
+        public override IEvaluatable<double> Clone() => new IfElseNumeric(new ObservableCollection<Branch>(Cases));
     }
 
 
@@ -95,5 +97,6 @@ public IfElseString(IEvaluatable<bool> condition, IEvaluatable<string> caseTrue,
 
         /// <summary>Creates a new evaluatable using the given case tree.</summary>
         public IfElseString(ObservableCollection<Branch> cases) : base(cases) { }
+        public override IEvaluatable<string> Clone() => new IfElseString(new ObservableCollection<Branch>(Cases));
     }
 }

From ec485e46fa1b0726f59788c14f904e85e9e239dc Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Wed, 22 Apr 2020 10:16:59 +0100
Subject: [PATCH 08/20] Added an flip-flop/SR-latch evaluatable.

---
 .../Project-Aurora/Project-Aurora.csproj      |  1 +
 .../Logic/Boolean/Boolean_GameState.cs        |  6 +--
 .../Overrides/Logic/Boolean/Boolean_Latch.cs  | 48 +++++++++++++++++++
 .../Logic/Boolean/Boolean_LogicOperators.cs   |  8 ++--
 .../Boolean/Boolean_NumericChangeDetector.cs  |  2 +-
 .../Logic/Boolean/Boolean_PeripheralInput.cs  | 10 ++--
 .../Logic/Boolean/Boolean_ProcessRunning.cs   |  2 +-
 .../Logic/Boolean/Boolean_TrueExtender.cs     |  2 +-
 .../Logic/Control_EvaluatableToolbox.xaml.cs  |  2 +-
 .../Overrides/Logic/EvaluatableAttribute.cs   |  6 +--
 .../Settings/Overrides/Logic/Generic/Delay.cs |  6 +--
 .../Overrides/Logic/Generic/IfElseIf.cs       |  6 +--
 .../Logic/Number/Number_GameState.cs          |  2 +-
 .../Overrides/Logic/Number/Number_Maths.cs    | 10 ++--
 .../Logic/Number/Number_PeripheralInput.cs    |  2 +-
 .../Overrides/Logic/Number/Number_Waves.cs    |  2 +-
 .../Overrides/Logic/String/String_Constant.cs |  2 +-
 .../Logic/String/String_GameState.cs          |  2 +-
 .../Logic/String/String_LogicOperators.cs     |  2 +-
 19 files changed, 85 insertions(+), 36 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_Latch.cs

diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index e61416616..9d716a451 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -778,6 +778,7 @@
     <Compile Include="Settings\Layers\Control_BinaryCounterLayer.xaml.cs">
       <DependentUpon>Control_BinaryCounterLayer.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Settings\Overrides\Logic\Boolean\Boolean_Latch.cs" />
     <Compile Include="Settings\Overrides\Logic\Boolean\Boolean_NumericChangeDetector.cs" />
     <Compile Include="Settings\Overrides\Logic\Boolean\Boolean_PeripheralInput.cs" />
     <Compile Include="Settings\Overrides\Logic\Boolean\Boolean_ProcessRunning.cs" />
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs
index e062d40e9..d72e46fe9 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs
@@ -9,7 +9,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Condition that accesses a specific game state variable (of boolean type) and returns the state.
     /// </summary>
-    [Evaluatable("Boolean State Variable", category: OverrideLogicCategory.State)]
+    [Evaluatable("Boolean State Variable", category: EvaluatableCategory.State)]
     public class BooleanGSIBoolean : IEvaluatable<bool> {
 
         /// <summary>Creates an empty boolean state variable lookup.</summary>
@@ -47,7 +47,7 @@ public bool Evaluate(IGameState gameState) {
     /// <summary>
     /// Condition that accesses some specified game state variables (of numeric type) and returns a comparison between them.
     /// </summary>
-    [Evaluatable("Numeric State Variable", category: OverrideLogicCategory.State)]
+    [Evaluatable("Numeric State Variable", category: EvaluatableCategory.State)]
     public class BooleanGSINumeric : IEvaluatable<bool> {
 
         /// <summary>Creates a blank numeric game state lookup evaluatable.</summary>
@@ -99,7 +99,7 @@ public bool Evaluate(IGameState gameState) {
     /// <summary>
     /// Condition that accesses a specified game state variable (of any enum type) and returns a comparison between it and a static enum of the same type.
     /// </summary>
-    [Evaluatable("Enum State Variable", category: OverrideLogicCategory.State)]
+    [Evaluatable("Enum State Variable", category: EvaluatableCategory.State)]
     public class BooleanGSIEnum : IEvaluatable<bool> {
 
         /// <summary>Creates a blank enum game state lookup evaluatable.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_Latch.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_Latch.cs
new file mode 100644
index 000000000..4cf72aa4d
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_Latch.cs
@@ -0,0 +1,48 @@
+using Aurora.Profiles;
+using Aurora.Utils;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Aurora.Settings.Overrides.Logic.Boolean {
+
+    /// <summary>
+    /// A simple memory gate that can be used for storing a boolean state.
+    /// When 'Set' is true, the gate will start outputting true until 'Reset' becomes true.
+    /// </summary>
+    [Evaluatable("Flip-flop", category: EvaluatableCategory.Logic)]
+    public class Boolean_Latch : IEvaluatable<bool> {
+
+        private bool state = false;
+
+        public IEvaluatable<bool> Set { get; set; }
+        public IEvaluatable<bool> Reset { get; set; }
+
+        public Boolean_Latch() : this(EvaluatableDefaults.Get<bool>(),EvaluatableDefaults.Get<bool>()) { }
+        public Boolean_Latch(IEvaluatable<bool> set, IEvaluatable<bool> reset) { Set = set; Reset = reset; }
+
+        public bool Evaluate(IGameState gameState) {
+            if (Reset.Evaluate(gameState))
+                state = false;
+            if (Set.Evaluate(gameState))
+                state = true;
+            return state;
+        }
+        object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
+
+        public Visual GetControl() => new StackPanel()
+            .WithChild(new TextBlock { Text = "Flip-Flop", FontWeight = FontWeights.Bold })
+            .WithChild(new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, 4, 0, 4) }
+                .WithChild(new Label { Content = "Set" })
+                .WithChild(new Control_EvaluatablePresenter { EvalType = typeof(bool) }
+                    .WithBinding(Control_EvaluatablePresenter.ExpressionProperty, new Binding(nameof(Set)) { Source = this, Mode = BindingMode.TwoWay })))
+            .WithChild(new StackPanel { Orientation = Orientation.Horizontal }
+                .WithChild(new Label { Content = "Reset" })
+                .WithChild(new Control_EvaluatablePresenter { EvalType = typeof(bool) }
+                    .WithBinding(Control_EvaluatablePresenter.ExpressionProperty, new Binding(nameof(Reset)) { Source = this, Mode = BindingMode.TwoWay })));
+
+        public IEvaluatable<bool> Clone() => new Boolean_Latch(Set.Clone(), Reset.Clone());
+        IEvaluatable IEvaluatable.Clone() => Clone();        
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
index 1847b0bcb..7565c91bc 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
@@ -14,7 +14,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Condition that checks a set of subconditions for atleast one of them being true.
     /// </summary>
-    [Evaluatable("Or", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("Or", category: EvaluatableCategory.Logic)]
     public class BooleanOr : IEvaluatable<bool>, IHasSubConditons {
 
         /// <summary>Creates a new Or evaluatable with no subconditions.</summary>
@@ -40,7 +40,7 @@ public BooleanOr(IEnumerable<IEvaluatable<bool>> subconditions) {
     /// <summary>
     /// Condition that checks a set of subconditions and requires them all to be true.
     /// </summary>
-    [Evaluatable("And", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("And", category: EvaluatableCategory.Logic)]
     public class BooleanAnd : IEvaluatable<bool>, IHasSubConditons {
 
         /// <summary>Creates a new And evaluatable with no subconditions.</summary>
@@ -67,7 +67,7 @@ public BooleanAnd(IEnumerable<IEvaluatable<bool>> subconditions) {
     /// <summary>
     /// Condition that inverts another condition.
     /// </summary>
-    [Evaluatable("Not", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("Not", category: EvaluatableCategory.Logic)]
     public class BooleanNot : IEvaluatable<bool> {
 
         /// <summary>Creates a new NOT evaluatable with the default BooleanTrue subcondition.</summary>
@@ -95,7 +95,7 @@ public BooleanNot(IEvaluatable<bool> subcondition) {
     /// Condition that always returns true. Useful as a default condition as it means that
     /// the layer will always be visible.
     /// </summary>
-    [Evaluatable("Boolean Constant", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("Boolean Constant", category: EvaluatableCategory.Logic)]
     public class BooleanConstant : IEvaluatable<bool> {
 
         /// <summary>Creates a new constant true boolean.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
index 2a6df2e88..58d052184 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_NumericChangeDetector.cs
@@ -12,7 +12,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// Evaluatable that detects when the value of the given numeric evaluatable changes by a particular amount.
     /// <para>Can be used in conjunction with the <see cref="BooleanExtender"/> to make the 'true' last longer than a single eval tick.</para>
     /// </summary>
-    [Evaluatable("Number Change Detector", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Number Change Detector", category: EvaluatableCategory.Maths)]
     public class NumericChangeDetector : IEvaluatable<bool> {
 
         private double? lastValue;
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs
index 9c9bcbac3..b1c44f495 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_PeripheralInput.cs
@@ -15,7 +15,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Condition that is true when a specific keyboard button is held down.
     /// </summary>
-    [Evaluatable("Key Held", category: OverrideLogicCategory.Input)]
+    [Evaluatable("Key Held", category: EvaluatableCategory.Input)]
     public class BooleanKeyDown : IEvaluatable<bool> {
 
         /// <summary>Creates a new key held condition with the default key (Space) as the trigger key.</summary>
@@ -42,7 +42,7 @@ public BooleanKeyDown() { }
     /// <summary>
     /// Condition that is true when a specific keyboard button is held down.
     /// </summary>
-    [Evaluatable("Key Press (Retain for duration)", category: OverrideLogicCategory.Input)]
+    [Evaluatable("Key Press (Retain for duration)", category: EvaluatableCategory.Input)]
     public class BooleanKeyDownWithTimer : IEvaluatable<bool>
     {
         private Stopwatch watch = new Stopwatch();
@@ -92,7 +92,7 @@ public bool Evaluate(IGameState gameState) {
     /// <summary>
     /// Condition that is true when a specific mouse button is held down.
     /// </summary>
-    [Evaluatable("Mouse Button Held", category: OverrideLogicCategory.Input)]
+    [Evaluatable("Mouse Button Held", category: EvaluatableCategory.Input)]
     public class BooleanMouseDown : IEvaluatable<bool> {
 
         /// <summary>Creates a new key held condition with the default mouse button (Left) as the trigger button.</summary>
@@ -119,7 +119,7 @@ public BooleanMouseDown() { }
     /// <summary>
     /// Condition that is true when the specified lock key (e.g. caps lock) is active.
     /// </summary>
-    [Evaluatable("Lock Key Active", category: OverrideLogicCategory.Input)]
+    [Evaluatable("Lock Key Active", category: EvaluatableCategory.Input)]
     public class BooleanLockKeyActive : IEvaluatable<bool> {
 
         /// <summary>Creates a new key held condition with the default lock type (CapsLock) as the lock type.</summary>
@@ -146,7 +146,7 @@ public BooleanLockKeyActive() { }
     /// <summary>
     /// An evaluatable that returns true when the specified time has elapsed without the user pressing a keyboard button or clicking the mouse.
     /// </summary>
-    [Evaluatable("Away Timer", category: OverrideLogicCategory.Input)]
+    [Evaluatable("Away Timer", category: EvaluatableCategory.Input)]
     public class BooleanAwayTimer : IEvaluatable<bool> {
 
         /// <summary>Gets or sets the time before this timer starts returning true after there has been no user input.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
index d2b1f832a..a47b727d6 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
@@ -10,7 +10,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Evaluatable that returns true/false depending on whether the given process name is running.
     /// </summary>
-    [Evaluatable("Process Running", category: OverrideLogicCategory.Misc)]
+    [Evaluatable("Process Running", category: EvaluatableCategory.Misc)]
     public class BooleanProcessRunning : IEvaluatable<bool>, INotifyPropertyChanged {
 
         public string ProcessName { get; set; } = "";
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
index f4e3747c1..a675b3dfb 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
@@ -12,7 +12,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <see cref="ExtensionTime"/> set to 3 seconds, the result of this would be a 3 second long "true" signal. Receiving another true
     /// signal while already extending an existing signal will restart the timer.
     /// </summary>
-    [Evaluatable("True Extender", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("True Extender", category: EvaluatableCategory.Logic)]
     public class BooleanExtender : IEvaluatable<bool> {
 
         private Stopwatch sw = new Stopwatch();
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
index dbb6c0e5a..ca962a637 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
@@ -14,7 +14,7 @@ public Control_EvaluatableToolbox() {
         }
 
         /// <summary>Returns a list of all detected evaluatables grouped by their category.</summary>
-        public IEnumerable<IGrouping<OverrideLogicCategory, EvaluatableRegistry.EvaluatableTypeContainer>> GroupedEvalutables =>
+        public IEnumerable<IGrouping<EvaluatableCategory, EvaluatableRegistry.EvaluatableTypeContainer>> GroupedEvalutables =>
             EvaluatableRegistry.Get().GroupBy(x => x.Metadata.Category);
 
         private void EvaluatableSpawnerItem_StartDrag(object sender, MouseEventArgs e, Point initial) {
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableAttribute.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableAttribute.cs
index ffdee98fb..0b412f325 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableAttribute.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableAttribute.cs
@@ -15,7 +15,7 @@ namespace Aurora.Settings.Overrides.Logic {
     public class EvaluatableAttribute : Attribute {
 
         /// <param name="name">The name of the condition (will appear in the dropdown list).</param>
-        public EvaluatableAttribute(string name, OverrideLogicCategory category = OverrideLogicCategory.Misc) {
+        public EvaluatableAttribute(string name, EvaluatableCategory category = EvaluatableCategory.Misc) {
             Name = name;
             Category = category;
         }
@@ -24,13 +24,13 @@ public EvaluatableAttribute(string name, OverrideLogicCategory category = Overri
         public string Name { get; }
 
         /// <summary>The category this condition belongs to (items will be grouped by this in the dropdown list).</summary>
-        public OverrideLogicCategory Category { get; }
+        public EvaluatableCategory Category { get; }
 
         /// <summary>Gets the description of the category as a string.</summary>
         public string CategoryStr => Utils.EnumUtils.GetDescription(Category);
     }
 
-    public enum OverrideLogicCategory {
+    public enum EvaluatableCategory {
         [Description("Logic")] Logic,
         [Description("State Variable")] State,
         [Description("Input")] Input,
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Delay.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Delay.cs
index 0231aa215..da068b16f 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Delay.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Delay.cs
@@ -58,21 +58,21 @@ public T Evaluate(IGameState gameState) {
 
 
     // Concrete classes
-    [Evaluatable("Delay", category: OverrideLogicCategory.Misc)]
+    [Evaluatable("Delay", category: EvaluatableCategory.Misc)]
     public class DelayBoolean : DelayGeneric<bool> {
         public DelayBoolean() : base() { }
         public DelayBoolean(IEvaluatable<bool> source, double delay) : base(source, delay) { }
         public override IEvaluatable<bool> Clone() => new DelayBoolean(Source, Delay);
     }
 
-    [Evaluatable("Delay", category: OverrideLogicCategory.Misc)]
+    [Evaluatable("Delay", category: EvaluatableCategory.Misc)]
     public class DelayNumeric : DelayGeneric<double> {
         public DelayNumeric() : base() { }
         public DelayNumeric(IEvaluatable<double> source, double delay) : base(source, delay) { }
         public override IEvaluatable<double> Clone() => new DelayNumeric(Source, Delay);
     }
 
-    [Evaluatable("Delay", category: OverrideLogicCategory.Misc)]
+    [Evaluatable("Delay", category: EvaluatableCategory.Misc)]
     public class DelayString : DelayGeneric<string> {
         public DelayString() : base() { }
         public DelayString(IEvaluatable<string> source, double delay) : base(source, delay) { }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
index b144c224d..0bffffe99 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
@@ -59,7 +59,7 @@ public Branch() { }
 
 
     // Concrete classes
-    [Evaluatable("If - Else If - Else", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("If - Else If - Else", category: EvaluatableCategory.Logic)]
     public class IfElseBoolean : IfElseGeneric<bool> {
         /// <summary>Creates a new If-Else evaluatable with default evaluatables.</summary>
         public IfElseBoolean() : base() { }
@@ -73,7 +73,7 @@ public IfElseBoolean(ObservableCollection<Branch> cases) : base(cases) { }
     }
 
 
-    [Evaluatable("If - Else If - Else", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("If - Else If - Else", category: EvaluatableCategory.Logic)]
     public class IfElseNumeric : IfElseGeneric<double> {
         /// <summary>Creates a new If-Else evaluatable with default evaluatables.</summary>
         public IfElseNumeric() : base() { }
@@ -87,7 +87,7 @@ public IfElseNumeric(ObservableCollection<Branch> cases) : base(cases) { }
     }
 
 
-    [Evaluatable("If - Else If - Else", category: OverrideLogicCategory.Logic)]
+    [Evaluatable("If - Else If - Else", category: EvaluatableCategory.Logic)]
     public class IfElseString : IfElseGeneric<string> {
         /// <summary>Creates a new If-Else evaluatable with default evaluatables.</summary>
         public IfElseString() : base() { }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
index 6000daabc..5f9783dbc 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
@@ -12,7 +12,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Evaluatable that accesses some specified game state variables (of numeric type) and returns it.
     /// </summary>
-    [Evaluatable("Numeric State Variable", category: OverrideLogicCategory.State)]
+    [Evaluatable("Numeric State Variable", category: EvaluatableCategory.State)]
     public class NumberGSINumeric : IEvaluatable<double> {
 
         /// <summary>Creates a new numeric game state lookup evaluatable that doesn't target anything.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs
index 7e1c672c9..a9df885d4 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Maths.cs
@@ -15,7 +15,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Evaluatable that performs a binary mathematical operation on two operands.
     /// </summary>
-    [Evaluatable("Arithmetic Operation", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Arithmetic Operation", category: EvaluatableCategory.Maths)]
     public class NumberMathsOperation : IEvaluatable<double> {
 
         /// <summary>Creates a new maths operation that has no values pre-set.</summary>
@@ -68,7 +68,7 @@ public double Evaluate(IGameState gameState) {
     /// <summary>
     /// Returns the absolute value of the given evaluatable.
     /// </summary>
-    [Evaluatable("Absolute", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Absolute", category: EvaluatableCategory.Maths)]
     public class NumberAbsValue : IEvaluatable<double> {
 
         /// <summary>Creates a new absolute operation with the default operand.</summary>
@@ -96,7 +96,7 @@ public NumberAbsValue() { }
     /// <summary>
     /// Evaluatable that compares two numerical evaluatables and returns a boolean depending on the comparison.
     /// </summary>
-    [Evaluatable("Arithmetic Comparison", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Arithmetic Comparison", category: EvaluatableCategory.Maths)]
     public class BooleanMathsComparison : IEvaluatable<bool> {
 
         /// <summary>Creates a new maths comparison that has no values pre-set.</summary>
@@ -151,7 +151,7 @@ public bool Evaluate(IGameState gameState) {
     /// <summary>
     /// Evaluatable that takes a number in a given range and linearly interpolates it onto another range.
     /// </summary>
-    [Evaluatable("Lerp", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Lerp", category: EvaluatableCategory.Maths)]
     public class NumberMap : IEvaluatable<double> {
 
         /// <summary>Creates a new numeric map with the default constant parameters.</summary>
@@ -201,7 +201,7 @@ public double Evaluate(IGameState gameState) {
     /// <summary>
     /// Evaluatable that resolves to a numerical constant.
     /// </summary>
-    [Evaluatable("Number Constant", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Number Constant", category: EvaluatableCategory.Maths)]
     public class NumberConstant : IEvaluatable<double> {
 
         /// <summary>Creates a new constant with the zero as the constant value.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_PeripheralInput.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_PeripheralInput.cs
index a01744706..a1383ea7e 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_PeripheralInput.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_PeripheralInput.cs
@@ -14,7 +14,7 @@ namespace Aurora.Settings.Overrides.Logic.Number {
     /// <summary>
     /// An evaluatable that returns the time since the user has pressed a keyboard key or clicked the mouse.
     /// </summary>
-    [Evaluatable("Away Time", category: OverrideLogicCategory.Input)]
+    [Evaluatable("Away Time", category: EvaluatableCategory.Input)]
     public class NumberAwayTime : IEvaluatable<double> {
 
         /// <summary>Gets or sets the time unit that the time is being measured in.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Waves.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Waves.cs
index 442d69757..debfcca44 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Waves.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_Waves.cs
@@ -9,7 +9,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// A special operator that takes the given (x) input (between 0 and 1) and converts it to a waveform (y) between 0 and 1.
     /// </summary>
-    [Evaluatable("Wave Function", category: OverrideLogicCategory.Maths)]
+    [Evaluatable("Wave Function", category: EvaluatableCategory.Maths)]
     public class NumberWaveFunction : IEvaluatable<double> {
 
         /// <summary>Creates a new wave function evaluatable with the default parameters.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs
index 55133cec1..7b40b32fb 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_Constant.cs
@@ -8,7 +8,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Represents a constant string value that will always evaluate to the same value.
     /// </summary>
-    [Evaluatable("String Constant", category: OverrideLogicCategory.String)]
+    [Evaluatable("String Constant", category: EvaluatableCategory.String)]
     public class StringConstant : IEvaluatable<string> {
 
         /// <summary>The value of the constant.</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
index a9bdc8a26..5c4c32578 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
@@ -9,7 +9,7 @@
 
 namespace Aurora.Settings.Overrides.Logic {
 
-    [Evaluatable("String State Variable", category: OverrideLogicCategory.State)]
+    [Evaluatable("String State Variable", category: EvaluatableCategory.State)]
     public class StringGSIString : IEvaluatable<string> {
 
         /// <summary>Path to the GSI variable</summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs
index d8dadb3c2..00d7f3301 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_LogicOperators.cs
@@ -10,7 +10,7 @@ namespace Aurora.Settings.Overrides.Logic {
     /// <summary>
     /// Logic that compares two strings using a selection of operators.
     /// </summary>
-    [Evaluatable("String Comparison", category: OverrideLogicCategory.String)]
+    [Evaluatable("String Comparison", category: EvaluatableCategory.String)]
     public class StringComparison : IEvaluatable<bool> {
 
         // Operands and operator

From 53e500aaec2e48fe77be7c99483f2523d5749863 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Wed, 22 Apr 2020 12:30:55 +0100
Subject: [PATCH 09/20] Added ability to save evaluatables (and their children)
 in the toolbox as "templates". These are saved in the global config and are
 available to every application. Note that game state variable paths
 (excluding LocalPCInfo) are cleared if they are moved to a different
 application. Also added a reusabale text prompt window.

---
 .../Controls/Window_Prompt.xaml               |  19 ++
 .../Controls/Window_Prompt.xaml.cs            |  63 +++++++
 .../Project-Aurora/Project-Aurora.csproj      |   8 +
 .../Project-Aurora/Settings/Configuration.cs  |  39 ++--
 .../Control_EvaluatablePresenter.xaml.cs      |  13 +-
 .../Logic/Control_EvaluatableToolbox.xaml     |  70 ++++---
 .../Logic/Control_EvaluatableToolbox.xaml.cs  |  79 +++++++-
 .../Settings/Overrides/Logic/IEvaluatable.cs  |  22 +++
 .../Utils/ObservableConcurrentDictionary.cs   | 172 ++++++++++++++++++
 9 files changed, 436 insertions(+), 49 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml
 create mode 100644 Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml.cs
 create mode 100644 Project-Aurora/Project-Aurora/Utils/ObservableConcurrentDictionary.cs

diff --git a/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml b/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml
new file mode 100644
index 000000000..785294e00
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml
@@ -0,0 +1,19 @@
+<Window x:Class="Aurora.Controls.Window_Prompt"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d"
+             SizeToContent="Height"
+             Background="#181818"
+             WindowStyle="ToolWindow" Width="306.983">
+    <StackPanel>
+        <TextBlock Text="{Binding Path=Description, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Mode=OneWay}" Margin="8" TextWrapping="Wrap" />
+        <TextBlock Text="{Binding Path=ErrorMessage, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Mode=OneWay}" Foreground="Red" Margin="8,0,8,8" TextWrapping="Wrap" />
+        <TextBox Margin="8,0" Text="{Binding Path=Text, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="8">
+            <Button Content="Cancel" Padding="6,2" Margin="0,0,8,0" Click="CancelButton_Click" />
+            <Button Content="Okay" Padding="6,2" Click="OkayButton_Click" />
+        </StackPanel>
+    </StackPanel>
+</Window>
diff --git a/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml.cs b/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml.cs
new file mode 100644
index 000000000..28822f3a0
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml.cs
@@ -0,0 +1,63 @@
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Aurora.Controls {
+
+    public partial class Window_Prompt : Window {
+
+        public Window_Prompt() {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// A function that is executed before the handler of the okay button is executed.
+        /// If this method returns false, the dialog box is not closed.
+        /// An error message can be set using the <see cref="ErrorMessage"/> dependency property.
+        /// </summary>
+        public Func<string, bool> Validate { get; set; }
+
+        #region Description Property
+        /// <summary>Gets or sets the hint text that is shown to the user.</summary>
+        public string Description {
+            get => (string)GetValue(DescriptionProperty);
+            set => SetValue(DescriptionProperty, value);
+        }
+
+        public static readonly DependencyProperty DescriptionProperty =
+            DependencyProperty.Register("Description", typeof(string), typeof(Window_Prompt), new PropertyMetadata(""));
+        #endregion
+
+        #region Text Dependency Property
+        /// <summary>Gets or sets the value of the textbox.</summary>
+        public string Text {
+            get => (string)GetValue(TextProperty);
+            set => SetValue(TextProperty, value);
+        }
+
+        public static readonly DependencyProperty TextProperty =
+            DependencyProperty.Register("Text", typeof(string), typeof(Window_Prompt), new PropertyMetadata(""));
+        #endregion
+
+        #region ErrorMessage Dependency Property
+        /// <summary>Gets or sets the value of the error message.</summary>
+        public string ErrorMessage {
+            get => (string)GetValue(ErrorMessageProperty);
+            set => SetValue(ErrorMessageProperty, value);
+        }
+
+        public static readonly DependencyProperty ErrorMessageProperty =
+            DependencyProperty.Register("ErrorMessage", typeof(string), typeof(Window_Prompt), new PropertyMetadata(""));
+        #endregion
+
+        private void OkayButton_Click(object sender, RoutedEventArgs e) {
+            if (Validate?.Invoke(Text) != false)
+                DialogResult = true;
+        }
+
+        private void CancelButton_Click(object sender, RoutedEventArgs e) {
+            DialogResult = false;
+        }
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index 9d716a451..03257a47e 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -381,6 +381,9 @@
     <Compile Include="Controls\GameStateParameterPicker.xaml.cs">
       <DependentUpon>GameStateParameterPicker.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\Window_Prompt.xaml.cs">
+      <DependentUpon>Window_Prompt.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Profiles\EliteDangerous\EliteConfig.cs" />
     <Compile Include="Profiles\EliteDangerous\EliteDangerousSettings.cs" />
     <Compile Include="Profiles\EliteDangerous\GSI\Nodes\Journal\Events\DockFighter.cs" />
@@ -890,6 +893,7 @@
     </Compile>
     <Compile Include="Utils\AttachedApplication.cs" />
     <Compile Include="Utils\DragBehaviour.cs" />
+    <Compile Include="Utils\ObservableConcurrentDictionary.cs" />
     <Compile Include="Utils\WindowPlacement.cs" />
     <Compile Include="Utils\Converters.cs" />
     <Compile Include="Utils\DesktopUtils.cs" />
@@ -1841,6 +1845,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Controls\Window_Prompt.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Profiles\EliteDangerous\Layers\Control_EliteDangerousAnimationLayer.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Project-Aurora/Project-Aurora/Settings/Configuration.cs b/Project-Aurora/Project-Aurora/Settings/Configuration.cs
index 65db356ea..5ebe72ffa 100755
--- a/Project-Aurora/Project-Aurora/Settings/Configuration.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Configuration.cs
@@ -9,6 +9,9 @@
 using Aurora.Profiles;
 using Newtonsoft.Json.Serialization;
 using Aurora.Utils;
+using System.Collections.ObjectModel;
+using System.Collections.Concurrent;
+using Aurora.Settings.Overrides.Logic;
 
 namespace Aurora.Settings
 {
@@ -490,6 +493,9 @@ public class Configuration : Settings
         private bool httpWindowOnStartUp;
         public bool HttpWindowOnStartUp { get { return httpWindowOnStartUp; } set { httpWindowOnStartUp = value; InvokePropertyChanged(); } }
 
+        private ObservableConcurrentDictionary<string, IEvaluatable> evaluatableTemplates;
+        public ObservableConcurrentDictionary<string, IEvaluatable> EvaluatableTemplates { get => evaluatableTemplates; set { evaluatableTemplates = value; InvokePropertyChanged(); } }
+
         public List<string> ProfileOrder { get; set; } = new List<string>();
 
         public Configuration()
@@ -560,9 +566,21 @@ public Configuration()
             //ProfileOrder = new List<string>(ApplicationProfiles.Keys);
 
             VarRegistry = new VariableRegistry();
+
+            evaluatableTemplates = new ObservableConcurrentDictionary<string, IEvaluatable>();
         }
 
+        /// <summary>
+        /// Called after the configuration file has been deserialized or created for the first time.
+        /// </summary>
+        public void OnPostLoad() {
+            if (!unified_hid_disabled) {
+                devices_disabled.Add(typeof(Devices.UnifiedHID.UnifiedHIDDevice));
+                unified_hid_disabled = true;
+            }
 
+            evaluatableTemplates.CollectionChanged += (sender, e) => InvokePropertyChanged(nameof(EvaluatableTemplates));
+        }
     }
 
     public static class ExtensionHelpers
@@ -588,24 +606,19 @@ public class ConfigManager
 
         public static Configuration Load()
         {
+            Configuration config;
             var configPath = ConfigPath + ConfigExtension;
 
             if (!File.Exists(configPath))
-                return CreateDefaultConfigurationFile();
-
-            string content = File.ReadAllText(configPath, Encoding.UTF8);
-
-            if (String.IsNullOrWhiteSpace(content))
-                return CreateDefaultConfigurationFile();
-
-            Configuration config = JsonConvert.DeserializeObject<Configuration>(content, new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace, TypeNameHandling = TypeNameHandling.All, SerializationBinder = Aurora.Utils.JSONUtils.SerializationBinder, Error = DeserializeErrorHandler });
-
-            if (!config.unified_hid_disabled)
-            {
-                config.devices_disabled.Add(typeof(Devices.UnifiedHID.UnifiedHIDDevice));
-                config.unified_hid_disabled = true;
+                config = CreateDefaultConfigurationFile();
+            else {
+                string content = File.ReadAllText(configPath, Encoding.UTF8);
+                config = string.IsNullOrWhiteSpace(content)
+                    ? CreateDefaultConfigurationFile()
+                    : JsonConvert.DeserializeObject<Configuration>(content, new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace, TypeNameHandling = TypeNameHandling.All, SerializationBinder = Aurora.Utils.JSONUtils.SerializationBinder, Error = DeserializeErrorHandler });
             }
 
+            config.OnPostLoad();
             return config;
         }
 
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
index 0681767a6..f77b83ecb 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
@@ -180,16 +180,7 @@ private void DragArea_StartDrag(object sender, MouseEventArgs e, Point initialPo
 
         /// <summary>Attempts to get an evaluatable from the suppliied data object. Will return true/false indicating if data is of correct format
         /// (an <see cref="IEvaluatable{T}"/> where T matches the <see cref="EvalType"/> property.</summary>
-        private bool TryGetData(IDataObject @do, out IEvaluatable evaluatable, out Control_EvaluatablePresenter source) {
-            if (@do.GetData(@do.GetFormats().FirstOrDefault(x => x != "SourcePresenter")) is IEvaluatable data && Utils.TypeUtils.ImplementsGenericInterface(data.GetType(), typeof(IEvaluatable<>), EvalType)) {
-                evaluatable = data;
-                source = @do.GetData("SourcePresenter") as Control_EvaluatablePresenter;
-                return true;
-            }
-            evaluatable = null;
-            source = null;
-            return false;
-        }
+        private bool TryGetData(IDataObject @do, out IEvaluatable evaluatable, out Control_EvaluatablePresenter source) => EvaluatableHelpers.TryGetData(@do, out evaluatable, out source, EvalType);
         #endregion
     }
 
@@ -198,7 +189,7 @@ private bool TryGetData(IDataObject @do, out IEvaluatable evaluatable, out Contr
     /// Converter that takes a type and returns the color (as defined in the theme) that is used to represent evaluatables of this type.
     /// </summary>
     public class EvaluatableBackgroundSelector : IValueConverter {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
+        public virtual object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
             var dic = App.Current.FindResource("OverridesTypeColors") as ResourceDictionary;
             return (value != null && dic.Contains(value) ? dic[value] : App.Current.FindResource("OverridesTypeFallbackColor")) as SolidColorBrush;
         }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
index 8ef958891..b0a7a0c3a 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
@@ -10,30 +10,52 @@
 
     <UserControl.Resources>
         <o:EvaluatableBackgroundSelector x:Key="EvaluatableBackgroundSelector" />
+        <o:TemplateEvaluatableBackgroundSelector x:Key="TemplateEvaluatableBackgroundSelector" />
     </UserControl.Resources>
 
-    <TabControl ItemsSource="{Binding GroupedEvalutables, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TabStripPlacement="Top">
-        <TabControl.ItemContainerStyle>
-            <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource {x:Type TabItem}}">
-                <Setter Property="Header" Value="{Binding Key}" />
-                <Setter Property="ContentTemplate">
-                    <Setter.Value>
-                        <DataTemplate>
-                            <ScrollViewer>
-                                <ItemsControl ItemsSource="{Binding .}">
-                                    <ItemsControl.ItemTemplate>
-                                        <DataTemplate>
-                                            <Border Background="{Binding Path=ResultType, Converter={StaticResource EvaluatableBackgroundSelector}}" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="EvaluatableSpawnerItem_StartDrag">
-                                                <TextBlock Text="{Binding Path=Metadata.Name}" Margin="4" />
-                                            </Border>
-                                        </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                </ItemsControl>
-                            </ScrollViewer>
-                        </DataTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-        </TabControl.ItemContainerStyle>
-    </TabControl>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="1*" />
+        </Grid.ColumnDefinitions>
+        
+        <!-- Main spawner -->
+        <TabControl ItemsSource="{Binding GroupedEvalutables, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TabStripPlacement="Top" Grid.Column="0">
+            <TabControl.ItemContainerStyle>
+                <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource {x:Type TabItem}}">
+                    <Setter Property="Header" Value="{Binding Key}" />
+                    <Setter Property="ContentTemplate">
+                        <Setter.Value>
+                            <DataTemplate>
+                                <ScrollViewer>
+                                    <ItemsControl ItemsSource="{Binding .}">
+                                        <ItemsControl.ItemTemplate>
+                                            <DataTemplate>
+                                                <Border Background="{Binding Path=ResultType, Converter={StaticResource EvaluatableBackgroundSelector}}" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="EvaluatableSpawnerItem_StartDrag">
+                                                    <TextBlock Text="{Binding Path=Metadata.Name}" Margin="4" />
+                                                </Border>
+                                            </DataTemplate>
+                                        </ItemsControl.ItemTemplate>
+                                    </ItemsControl>
+                                </ScrollViewer>
+                            </DataTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </TabControl.ItemContainerStyle>
+        </TabControl>
+        
+        <!-- User's custom templates -->
+        <ScrollViewer Grid.Column="1">
+            <ItemsControl Background="Transparent" ItemsSource="{Binding TemplateSource, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" AllowDrop="True" DragEnter="EvaluatableTemplateList_DragEnter" Drop="EvaluatableTemplateList_Drop" u:AttachedApplication.Application="{x:Null}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Border Background="{Binding Path=Value, Converter={StaticResource TemplateEvaluatableBackgroundSelector}}" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" Cursor="SizeAll" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="EvaluatableTemplateItem_StartDrag">
+                            <TextBlock Text="{Binding Path=Key}" Margin="4" />
+                        </Border>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </ScrollViewer>
+    </Grid>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
index ca962a637..d4af62249 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
@@ -1,9 +1,15 @@
-using System;
+using Aurora.Controls;
+using Aurora.Utils;
+using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Input;
+using static Aurora.Settings.Overrides.Logic.EvaluatableHelpers;
 
 namespace Aurora.Settings.Overrides.Logic {
 
@@ -17,9 +23,80 @@ public Control_EvaluatableToolbox() {
         public IEnumerable<IGrouping<EvaluatableCategory, EvaluatableRegistry.EvaluatableTypeContainer>> GroupedEvalutables =>
             EvaluatableRegistry.Get().GroupBy(x => x.Metadata.Category);
 
+        /// <summary>Property that forwards the evaluatable template store from the global config.</summary>
+        public ObservableConcurrentDictionary<string, IEvaluatable> TemplateSource => Global.Configuration.EvaluatableTemplates;
+
+
+        #region New Evaluatable Spawning
+        /// <summary>Handler for when the user drags a new evalutable from the list of available evaluatables.</summary>
         private void EvaluatableSpawnerItem_StartDrag(object sender, MouseEventArgs e, Point initial) {
             var dc = (EvaluatableRegistry.EvaluatableTypeContainer)((FrameworkElement)sender).DataContext;
             DragDrop.DoDragDrop(this, Activator.CreateInstance(dc.Evaluatable), DragDropEffects.Move);
         }
+        #endregion
+
+
+        #region Evaluatable Templates
+        /// <summary>Handler for when the user drags an evaluatable out from their list of saved evaluatables.</summary>
+        private void EvaluatableTemplateItem_StartDrag(object sender, MouseEventArgs e, Point initial) {
+            var dc = (KeyValuePair<string, IEvaluatable>)((FrameworkElement)sender).DataContext;
+            DragDrop.DoDragDrop(this, dc.Value.Clone(), DragDropEffects.Move);
+        }
+
+        private void EvaluatableTemplateList_DragEnter(object sender, DragEventArgs e) {
+            // Check for an evaluatable in the drag data. Check also the source is non-null (i.e. check it
+            // must have come from a placed evaluatable, not from the toolbox or template list).
+            if (TryGetData(e.Data, out _, out var source, null) && source != null) {
+                e.Effects = DragDropEffects.Copy;
+                e.Handled = true;
+            } else {
+                e.Effects = DragDropEffects.None;
+            }
+        }
+
+        private void EvaluatableTemplateList_Drop(object sender, DragEventArgs e) {
+            // Check for an evaluatable in the drag data. Check also the source is non-null (i.e. check it
+            // must have come from a placed evaluatable, not from the toolbox or template list).
+            if (TryGetData(e.Data, out var eval, out var source, null) && source != null && AskUserForName(out var newName))
+                TemplateSource[newName] = eval.Clone();
+        }
+
+        /// <summary>Asks the user to enter a name for an evaluatable. Returns whether successful (false = user cancel).</summary>
+        private bool AskUserForName(out string name) {
+            var confirmName = "";
+            var wnd = new Window_Prompt {
+                Description = "Enter a name to save this evaluatable as a template."
+            };
+            wnd.Validate = n => {
+                // Check name isn't empty
+                if (string.IsNullOrWhiteSpace(n)) {
+                    wnd.ErrorMessage = "Name cannot be empty or only consist of whitespace.";
+                    return false;
+
+                // If an evaluatable with this name already exists, make the user confirm by clicking okay again.
+                } else if (TemplateSource.ContainsKey(n) && n != confirmName) {
+                    wnd.ErrorMessage = "A template with this name already exists. Click 'Okay' again to overwrite it.";
+                    confirmName = n;
+                    return false;
+                }
+
+                return true;
+            };
+
+            var res = wnd.ShowDialog() == true;
+            name = wnd.Text;
+            return res;
+        }
+        #endregion
+    }
+
+
+    /// <summary>
+    /// A more-specialised version of the <see cref="EvaluatableBackgroundSelector"/> that deals with selecting the relevant
+    /// background color for an evaluatable template.
+    /// </summary>
+    public class TemplateEvaluatableBackgroundSelector : EvaluatableBackgroundSelector {
+        public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
+            base.Convert(value.GetType().GetGenericInterfaceTypes(typeof(IEvaluatable<>))[0], targetType, parameter, culture);
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IEvaluatable.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IEvaluatable.cs
index 1eb3946ab..13ddfaf8f 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IEvaluatable.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/IEvaluatable.cs
@@ -1,6 +1,8 @@
 using Aurora.Profiles;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
 using System.Windows.Media;
 
 namespace Aurora.Settings.Overrides.Logic {
@@ -49,4 +51,24 @@ public static IEvaluatable Get(Type t) {
             return (IEvaluatable)Activator.CreateInstance(@default);
         }
     }
+
+
+    /// <summary>
+    /// Helper classes for the Evaluatables.
+    /// </summary>
+    public static class EvaluatableHelpers {
+        /// <summary>Attempts to get an evaluatable from the suppliied data object. Will return true/false indicating if data is of correct format
+        /// (an <see cref="IEvaluatable{T}"/> where T matches the given type. If the eval type is null, no type check is performed, the returned
+        /// evaluatable may be of any sub-type.</summary>
+        internal static bool TryGetData(IDataObject @do, out IEvaluatable evaluatable, out Control_EvaluatablePresenter source, Type evalType) {
+            if (@do.GetData(@do.GetFormats().FirstOrDefault(x => x != "SourcePresenter")) is IEvaluatable data && (evalType == null || Utils.TypeUtils.ImplementsGenericInterface(data.GetType(), typeof(IEvaluatable<>), evalType))) {
+                evaluatable = data;
+                source = @do.GetData("SourcePresenter") as Control_EvaluatablePresenter;
+                return true;
+            }
+            evaluatable = null;
+            source = null;
+            return false;
+        }
+    }
 }
diff --git a/Project-Aurora/Project-Aurora/Utils/ObservableConcurrentDictionary.cs b/Project-Aurora/Project-Aurora/Utils/ObservableConcurrentDictionary.cs
new file mode 100644
index 000000000..39cce7f32
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Utils/ObservableConcurrentDictionary.cs
@@ -0,0 +1,172 @@
+//--------------------------------------------------------------------------
+// 
+//  Copyright (c) Microsoft Corporation.  All rights reserved. 
+// 
+//  File: ObservableConcurrentDictionary.cs
+//
+//--------------------------------------------------------------------------
+
+
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Threading;
+using System.Diagnostics;
+
+namespace System.Collections.Concurrent {
+    /// <summary>
+    /// Provides a thread-safe dictionary for use with data binding.
+    /// </summary>
+    /// <typeparam name="TKey">Specifies the type of the keys in this collection.</typeparam>
+    /// <typeparam name="TValue">Specifies the type of the values in this collection.</typeparam>
+    [DebuggerDisplay("Count={Count}")]
+    public class ObservableConcurrentDictionary<TKey, TValue> :
+        ICollection<KeyValuePair<TKey, TValue>>, IDictionary<TKey, TValue>,
+        INotifyCollectionChanged, INotifyPropertyChanged {
+        private readonly SynchronizationContext _context;
+        private readonly ConcurrentDictionary<TKey, TValue> _dictionary;
+
+        /// <summary>
+        /// Initializes an instance of the ObservableConcurrentDictionary class.
+        /// </summary>
+        public ObservableConcurrentDictionary() {
+            _context = AsyncOperationManager.SynchronizationContext;
+            _dictionary = new ConcurrentDictionary<TKey, TValue>();
+        }
+
+        /// <summary>Event raised when the collection changes.</summary>
+        public event NotifyCollectionChangedEventHandler CollectionChanged;
+        /// <summary>Event raised when a property on the collection changes.</summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Notifies observers of CollectionChanged or PropertyChanged of an update to the dictionary.
+        /// </summary>
+        private void NotifyObserversOfChange() {
+            var collectionHandler = CollectionChanged;
+            var propertyHandler = PropertyChanged;
+            if (collectionHandler != null || propertyHandler != null) {
+                _context.Post(s => {
+                    if (collectionHandler != null) {
+                        collectionHandler(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+                    }
+                    if (propertyHandler != null) {
+                        propertyHandler(this, new PropertyChangedEventArgs("Count"));
+                        propertyHandler(this, new PropertyChangedEventArgs("Keys"));
+                        propertyHandler(this, new PropertyChangedEventArgs("Values"));
+                    }
+                }, null);
+            }
+        }
+
+        /// <summary>Attempts to add an item to the dictionary, notifying observers of any changes.</summary>
+        /// <param name="item">The item to be added.</param>
+        /// <returns>Whether the add was successful.</returns>
+        private bool TryAddWithNotification(KeyValuePair<TKey, TValue> item) {
+            return TryAddWithNotification(item.Key, item.Value);
+        }
+
+        /// <summary>Attempts to add an item to the dictionary, notifying observers of any changes.</summary>
+        /// <param name="key">The key of the item to be added.</param>
+        /// <param name="value">The value of the item to be added.</param>
+        /// <returns>Whether the add was successful.</returns>
+        private bool TryAddWithNotification(TKey key, TValue value) {
+            bool result = _dictionary.TryAdd(key, value);
+            if (result) NotifyObserversOfChange();
+            return result;
+        }
+
+        /// <summary>Attempts to remove an item from the dictionary, notifying observers of any changes.</summary>
+        /// <param name="key">The key of the item to be removed.</param>
+        /// <param name="value">The value of the item removed.</param>
+        /// <returns>Whether the removal was successful.</returns>
+        private bool TryRemoveWithNotification(TKey key, out TValue value) {
+            bool result = _dictionary.TryRemove(key, out value);
+            if (result) NotifyObserversOfChange();
+            return result;
+        }
+
+        /// <summary>Attempts to add or update an item in the dictionary, notifying observers of any changes.</summary>
+        /// <param name="key">The key of the item to be updated.</param>
+        /// <param name="value">The new value to set for the item.</param>
+        /// <returns>Whether the update was successful.</returns>
+        private void UpdateWithNotification(TKey key, TValue value) {
+            _dictionary[key] = value;
+            NotifyObserversOfChange();
+        }
+
+        #region ICollection<KeyValuePair<TKey,TValue>> Members
+        void ICollection<KeyValuePair<TKey, TValue>>.Add(KeyValuePair<TKey, TValue> item) {
+            TryAddWithNotification(item);
+        }
+
+        void ICollection<KeyValuePair<TKey, TValue>>.Clear() {
+            ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).Clear();
+            NotifyObserversOfChange();
+        }
+
+        bool ICollection<KeyValuePair<TKey, TValue>>.Contains(KeyValuePair<TKey, TValue> item) {
+            return ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).Contains(item);
+        }
+
+        void ICollection<KeyValuePair<TKey, TValue>>.CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex) {
+            ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).CopyTo(array, arrayIndex);
+        }
+
+        int ICollection<KeyValuePair<TKey, TValue>>.Count {
+            get { return ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).Count; }
+        }
+
+        bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly {
+            get { return ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).IsReadOnly; }
+        }
+
+        bool ICollection<KeyValuePair<TKey, TValue>>.Remove(KeyValuePair<TKey, TValue> item) {
+            TValue temp;
+            return TryRemoveWithNotification(item.Key, out temp);
+        }
+        #endregion
+
+        #region IEnumerable<KeyValuePair<TKey,TValue>> Members
+        IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator() {
+            return ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() {
+            return ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).GetEnumerator();
+        }
+        #endregion
+
+        #region IDictionary<TKey,TValue> Members
+        public void Add(TKey key, TValue value) {
+            TryAddWithNotification(key, value);
+        }
+
+        public bool ContainsKey(TKey key) {
+            return _dictionary.ContainsKey(key);
+        }
+
+        public ICollection<TKey> Keys {
+            get { return _dictionary.Keys; }
+        }
+
+        public bool Remove(TKey key) {
+            TValue temp;
+            return TryRemoveWithNotification(key, out temp);
+        }
+
+        public bool TryGetValue(TKey key, out TValue value) {
+            return _dictionary.TryGetValue(key, out value);
+        }
+
+        public ICollection<TValue> Values {
+            get { return _dictionary.Values; }
+        }
+
+        public TValue this[TKey key] {
+            get { return _dictionary[key]; }
+            set { UpdateWithNotification(key, value); }
+        }
+        #endregion
+    }
+}
\ No newline at end of file

From 1c0b461ba0af06ffa6f7137f0fe475d6629a2df1 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Wed, 22 Apr 2020 12:46:27 +0100
Subject: [PATCH 10/20] Improved prompt window. Made textbox autofocus, made it
 submit on enter keypress, made description and error collapse when empty,
 increased font size.

---
 .../Controls/Window_Prompt.xaml               | 26 +++++++++++--------
 .../Controls/Window_Prompt.xaml.cs            | 17 ++++++++++++
 .../Logic/Control_EvaluatableToolbox.xaml.cs  |  1 +
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml b/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml
index 785294e00..32c76b901 100644
--- a/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml
+++ b/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml
@@ -1,16 +1,20 @@
 <Window x:Class="Aurora.Controls.Window_Prompt"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d"
-             SizeToContent="Height"
-             Background="#181818"
-             WindowStyle="ToolWindow" Width="306.983">
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:c="clr-namespace:Aurora.Controls"
+        mc:Ignorable="d"
+        WindowStyle="ToolWindow" SizeToContent="Height" ResizeMode="NoResize"
+        Background="#181818" Width="320">
+    <Window.Resources>
+        <c:CollapseIfEmptyConverter x:Key="CollapseIfEmptyConverter" />
+    </Window.Resources>
+    
     <StackPanel>
-        <TextBlock Text="{Binding Path=Description, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Mode=OneWay}" Margin="8" TextWrapping="Wrap" />
-        <TextBlock Text="{Binding Path=ErrorMessage, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Mode=OneWay}" Foreground="Red" Margin="8,0,8,8" TextWrapping="Wrap" />
-        <TextBox Margin="8,0" Text="{Binding Path=Text, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        <TextBlock Text="{Binding Path=Description, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Mode=OneWay}" Margin="8" TextWrapping="Wrap" Visibility="{Binding Path=Description, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Converter={StaticResource CollapseIfEmptyConverter}}" />
+        <TextBlock Text="{Binding Path=ErrorMessage, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Mode=OneWay}" Foreground="Red" Margin="8,0,8,8" TextWrapping="Wrap" Visibility="{Binding Path=ErrorMessage, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Converter={StaticResource CollapseIfEmptyConverter}}" />
+        <TextBox x:Name="Input" Margin="8,0" FontSize="14" Padding="4" Text="{Binding Path=Text, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" PreviewKeyDown="TextBox_PreviewKeyDown" />
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="8">
             <Button Content="Cancel" Padding="6,2" Margin="0,0,8,0" Click="CancelButton_Click" />
             <Button Content="Okay" Padding="6,2" Click="OkayButton_Click" />
diff --git a/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml.cs b/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml.cs
index 28822f3a0..39dcb5c2b 100644
--- a/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Controls/Window_Prompt.xaml.cs
@@ -1,7 +1,9 @@
 using System;
 using System.ComponentModel;
+using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 
 namespace Aurora.Controls {
 
@@ -9,6 +11,7 @@ public partial class Window_Prompt : Window {
 
         public Window_Prompt() {
             InitializeComponent();
+            Input.Focus();
         }
 
         /// <summary>
@@ -59,5 +62,19 @@ private void OkayButton_Click(object sender, RoutedEventArgs e) {
         private void CancelButton_Click(object sender, RoutedEventArgs e) {
             DialogResult = false;
         }
+
+        private void TextBox_PreviewKeyDown(object sender, System.Windows.Input.KeyEventArgs e) {
+            if (e.Key == System.Windows.Input.Key.Enter)
+                OkayButton_Click(null, null);
+        }
+    }
+
+
+    /// <summary>
+    /// If the given string is empty, collapses the element.
+    /// </summary>
+    public class CollapseIfEmptyConverter : IValueConverter {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) => string.IsNullOrWhiteSpace(value.ToString()) ? Visibility.Collapsed : Visibility.Visible;
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
index d4af62249..fa4ca390c 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
@@ -65,6 +65,7 @@ private void EvaluatableTemplateList_Drop(object sender, DragEventArgs e) {
         private bool AskUserForName(out string name) {
             var confirmName = "";
             var wnd = new Window_Prompt {
+                Title = "Enter name",
                 Description = "Enter a name to save this evaluatable as a template."
             };
             wnd.Validate = n => {

From 6b8fc6df1961b9c1e6978f5bb03e27198675a6b2 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Wed, 22 Apr 2020 13:18:49 +0100
Subject: [PATCH 11/20] Added ability to rename and remove templates.

---
 .../Logic/Control_EvaluatableToolbox.xaml     | 14 ++++++--
 .../Logic/Control_EvaluatableToolbox.xaml.cs  | 34 ++++++++++++++-----
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
index b0a7a0c3a..6ee1cdc75 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
@@ -10,7 +10,10 @@
 
     <UserControl.Resources>
         <o:EvaluatableBackgroundSelector x:Key="EvaluatableBackgroundSelector" />
-        <o:TemplateEvaluatableBackgroundSelector x:Key="TemplateEvaluatableBackgroundSelector" />
+        <u:ValueConverterGroup x:Key="TemplateEvaluatableBackgroundSelector">
+            <o:TemplateEvaluatableTypeSelector />
+            <o:EvaluatableBackgroundSelector />
+        </u:ValueConverterGroup>
     </UserControl.Resources>
 
     <Grid>
@@ -50,8 +53,13 @@
             <ItemsControl Background="Transparent" ItemsSource="{Binding TemplateSource, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" AllowDrop="True" DragEnter="EvaluatableTemplateList_DragEnter" Drop="EvaluatableTemplateList_Drop" u:AttachedApplication.Application="{x:Null}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
-                        <Border Background="{Binding Path=Value, Converter={StaticResource TemplateEvaluatableBackgroundSelector}}" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" Cursor="SizeAll" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="EvaluatableTemplateItem_StartDrag">
-                            <TextBlock Text="{Binding Path=Key}" Margin="4" />
+                        <Border Background="{Binding Path=Value, Converter={StaticResource TemplateEvaluatableBackgroundSelector}}" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" Cursor="SizeAll" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="EvaluatableTemplateItem_StartDrag" Padding="4">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{Binding Path=Key}" Margin="0,0,12,0" />
+                                <!-- Note these buttons use MouseDown because otherwise if the user uses enter on the rename prompt window, it re-triggers a click on this button. -->
+                                <Button Content="R" ToolTip="Rename this template" VerticalAlignment="Center" Padding="6,2" Cursor="Hand" PreviewMouseDown="RenameTemplateButton_Click" />
+                                <Button Content="X" ToolTip="Remove this template" VerticalAlignment="Center" Padding="6,2" Cursor="Hand" PreviewMouseDown="DeleteTemplateButton_Click" />
+                            </StackPanel>
                         </Border>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
index fa4ca390c..ff72e5e3b 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
@@ -10,6 +10,7 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using static Aurora.Settings.Overrides.Logic.EvaluatableHelpers;
+using TemplateContext = System.Collections.Generic.KeyValuePair<string, Aurora.Settings.Overrides.Logic.IEvaluatable>;
 
 namespace Aurora.Settings.Overrides.Logic {
 
@@ -39,7 +40,7 @@ private void EvaluatableSpawnerItem_StartDrag(object sender, MouseEventArgs e, P
         #region Evaluatable Templates
         /// <summary>Handler for when the user drags an evaluatable out from their list of saved evaluatables.</summary>
         private void EvaluatableTemplateItem_StartDrag(object sender, MouseEventArgs e, Point initial) {
-            var dc = (KeyValuePair<string, IEvaluatable>)((FrameworkElement)sender).DataContext;
+            var dc = (TemplateContext)((FrameworkElement)sender).DataContext;
             DragDrop.DoDragDrop(this, dc.Value.Clone(), DragDropEffects.Move);
         }
 
@@ -62,7 +63,7 @@ private void EvaluatableTemplateList_Drop(object sender, DragEventArgs e) {
         }
 
         /// <summary>Asks the user to enter a name for an evaluatable. Returns whether successful (false = user cancel).</summary>
-        private bool AskUserForName(out string name) {
+        private bool AskUserForName(out string name, string existingName = null) {
             var confirmName = "";
             var wnd = new Window_Prompt {
                 Title = "Enter name",
@@ -75,7 +76,8 @@ private bool AskUserForName(out string name) {
                     return false;
 
                 // If an evaluatable with this name already exists, make the user confirm by clicking okay again.
-                } else if (TemplateSource.ContainsKey(n) && n != confirmName) {
+                // Note that when renaming and an existingName is provided, don't require confirm for renaming
+                } else if (TemplateSource.ContainsKey(n) && n != confirmName && (existingName == null || n != existingName)) {
                     wnd.ErrorMessage = "A template with this name already exists. Click 'Okay' again to overwrite it.";
                     confirmName = n;
                     return false;
@@ -88,16 +90,32 @@ private bool AskUserForName(out string name) {
             name = wnd.Text;
             return res;
         }
+
+        private void RenameTemplateButton_Click(object sender, MouseButtonEventArgs e) {
+            e.Handled = true;
+            var dc = (TemplateContext)((FrameworkElement)sender).DataContext;
+            if (AskUserForName(out var newName, dc.Key) && dc.Key != newName) {
+                TemplateSource.Remove(dc.Key);
+                TemplateSource[newName] = dc.Value;
+            }
+        }
+
+        private void DeleteTemplateButton_Click(object sender, MouseButtonEventArgs e) {
+            e.Handled = true;
+            var dc = (TemplateContext)((FrameworkElement)sender).DataContext;
+            if (MessageBox.Show($"Are you sure you wish to remove template '{dc.Key}'? This cannot be undone.", "Confirm delete", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+                TemplateSource.Remove(dc.Key);
+        }
         #endregion
     }
 
 
     /// <summary>
-    /// A more-specialised version of the <see cref="EvaluatableBackgroundSelector"/> that deals with selecting the relevant
-    /// background color for an evaluatable template.
+    /// A converter that extracts the type of evaluatable from a template.
     /// </summary>
-    public class TemplateEvaluatableBackgroundSelector : EvaluatableBackgroundSelector {
-        public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
-            base.Convert(value.GetType().GetGenericInterfaceTypes(typeof(IEvaluatable<>))[0], targetType, parameter, culture);
+    public class TemplateEvaluatableTypeSelector : IValueConverter {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
+            value.GetType().GetGenericInterfaceTypes(typeof(IEvaluatable<>))[0];
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();
     }
 }

From f102766de3dd24d4d32a5d6d38cde952cf8f0ad2 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Wed, 22 Apr 2020 17:43:46 +0100
Subject: [PATCH 12/20] Added icons to the toolbox to help distinguish eval
 types. Made the toolbox sort tabs by the order the tabs are defined, then
 sort evaluatables by name.

---
 .../Project-Aurora/Project-Aurora.csproj      |   1 +
 .../Properties/Resources.Designer.cs          |  10 ++++++++
 .../Project-Aurora/Properties/Resources.resx  |   3 +++
 .../Resources/icons8-font-size-30.png         | Bin 0 -> 780 bytes
 .../Overrides/Control_OverridesEditor.xaml.cs |   1 +
 .../Control_EvaluatablePresenter.xaml.cs      |   3 ++-
 .../Logic/Control_EvaluatableToolbox.xaml     |  22 +++++++++++++-----
 .../Logic/Control_EvaluatableToolbox.xaml.cs  |   2 +-
 .../Overrides/Logic/EvaluatableRegistry.cs    |   1 +
 9 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Resources/icons8-font-size-30.png

diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index 03257a47e..375783bf9 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -1746,6 +1746,7 @@
     <Content Include="RazerSdkWrapper.dll" />
     <Resource Include="Resources\betterdiscord.png" />
     <Resource Include="Resources\terraria_512x512.png" />
+    <Resource Include="Resources\icons8-font-size-30.png" />
     <Content Include="RGB.NET.Devices.Asus.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/Project-Aurora/Project-Aurora/Properties/Resources.Designer.cs b/Project-Aurora/Project-Aurora/Properties/Resources.Designer.cs
index 77274c59f..1d85f7833 100644
--- a/Project-Aurora/Project-Aurora/Properties/Resources.Designer.cs
+++ b/Project-Aurora/Project-Aurora/Properties/Resources.Designer.cs
@@ -380,6 +380,16 @@ internal static System.Drawing.Bitmap icons8_diamonds_30 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap icons8_font_size_30 {
+            get {
+                object obj = ResourceManager.GetObject("icons8_font_size_30", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/Project-Aurora/Project-Aurora/Properties/Resources.resx b/Project-Aurora/Project-Aurora/Properties/Resources.resx
index 5efed4614..91bf7ee22 100755
--- a/Project-Aurora/Project-Aurora/Properties/Resources.resx
+++ b/Project-Aurora/Project-Aurora/Properties/Resources.resx
@@ -313,4 +313,7 @@
   <data name="DiscordGSIPlugin" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Profiles\Discord\GSI\AuroraGSI.plugin.js;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="icons8_font_size_30" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-font-size-30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Resources/icons8-font-size-30.png b/Project-Aurora/Project-Aurora/Resources/icons8-font-size-30.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4ac628e3ef6e4e8029833fdf9ddf42c251ea07d
GIT binary patch
literal 780
zcmV+n1M~ceP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x0>Mc{K~zYI?Uq4k6lWC2e{W_Z&4S6YMQSt%3hJ%Yf*x#9k<4by!4ME_
zqoBp3^df~`D-`c4-cv9Ndk}Ikllf*$gl#V&cxZFTrBGW->>(k+L)zW!_dGZgb~m#T
zVFOa~KRv$pf8TH3n~!e>cC@4an`En`s!9|^(*U05ofQ%76xi7+8HVAPz!~679LHaD
z3i?j4<2aYoSXD1?<?R@FZf>p%xX`e4v0N_i+IH~L(vlB+tg62PzX8SG-rmx-gVQmK
z$T%>b#2p)V=Bb{TnAqLj-TeyqNJI`=YgI)40RCNDTiZK4Jp4MVZf0gCSFKhriO5CZ
zbD&2=f?BQi-O$j`%cjP%Hpu7mBS0Sb+4H<V2L}iL0xEA)`H^;A)M~Y7BJuz@5A*{)
zs(LAx%RM*7?0Y9zRY#NXVZ++PmRu$qm{--WtJP}Jb=`g-0QLa48;zSr9mnw}*4n>;
zy0x~?_x)vnsi~==<2Z|e>p0H-fq{X4ws?RI1wnAsb=?JEu~aH;be(H8T5G=oT;NFx
z1@L`;ISj)<M1~X3oh;Dg<YbTQy61q?B61w~G)eU}`Zj@qbd=|fG3~C%(JXKjMc=CG
z4?wYDxt_H_(>pfC90pFbfi>zx;@wafhSyc~E>IMa3h=$P_Ec9_S0QVIrjA8qR8;|f
zDwRstvI>kbW587r83k@N)ZR?OZ#>T%YpL0^PgBQPr@2+CI^N<<bqHX6ef@EZKl85G
z0LO8B95|w?uU1x8p0)$8uC7i4i@=ejCe=JZE|<F>1i{gAxx6ciq61MB-AfH&7@lkb
z8)GWg+F1Y**;^<Sp0xufxjq1E?W{4TlEgQGHQ<Wtx(kIu;XhS<0o+JyMdX*%pLv12
z&j&yC`o3SO*XzfCF;)E?sPc9)kF2$yiO7$@%TE4G>}W?HmfirYjuUD){)vD90000<
KMNUMnLSTYfU~yOg

literal 0
HcmV?d00001

diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Control_OverridesEditor.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Control_OverridesEditor.xaml.cs
index f6672428e..9bb111083 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Control_OverridesEditor.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Control_OverridesEditor.xaml.cs
@@ -161,6 +161,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 { typeof(long), "icons8-numbers-30.png" },
                 { typeof(float), "icons8-numbers-30.png" },
                 { typeof(double), "icons8-numbers-30.png" },
+                { typeof(string), "icons8-font-size-30.png" },
                 { typeof(Color), "icons8-paint-palette-30.png" },
                 { typeof(KeySequence), "icons8-keyboard-30.png" }
             }.TryGetValue((Type)value, out string val) ? val : "icons8-diamonds-30.png";
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
index f77b83ecb..8dc500663 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatablePresenter.xaml.cs
@@ -107,7 +107,8 @@ protected override void OnDragOver(DragEventArgs e) {
                 e.Effects = (e.KeyStates & DragDropKeyStates.ControlKey) > 0 ? DragDropEffects.Copy : DragDropEffects.Move;
                 // Mark the event as handled so any parent presenters don't attempt to override the effects with their own logic.
                 e.Handled = true;
-            }
+            } else
+                e.Effects = DragDropEffects.None;
         }
 
         /// <summary>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
index 6ee1cdc75..f29a07287 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
@@ -3,16 +3,22 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:o="clr-namespace:Aurora.Settings.Overrides.Logic"
+             xmlns:o="clr-namespace:Aurora.Settings.Overrides"
+             xmlns:ol="clr-namespace:Aurora.Settings.Overrides.Logic"
              xmlns:u="clr-namespace:Aurora.Utils"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
 
     <UserControl.Resources>
-        <o:EvaluatableBackgroundSelector x:Key="EvaluatableBackgroundSelector" />
+        <ol:EvaluatableBackgroundSelector x:Key="EvaluatableBackgroundSelector" />
+        <o:TypeToIconConverter x:Key="TypeToIconConverter" />
         <u:ValueConverterGroup x:Key="TemplateEvaluatableBackgroundSelector">
-            <o:TemplateEvaluatableTypeSelector />
-            <o:EvaluatableBackgroundSelector />
+            <ol:TemplateEvaluatableTypeSelector />
+            <ol:EvaluatableBackgroundSelector />
+        </u:ValueConverterGroup>
+        <u:ValueConverterGroup x:Key="TemplateEvaluatableIconConverter">
+            <ol:TemplateEvaluatableTypeSelector />
+            <o:TypeToIconConverter />
         </u:ValueConverterGroup>
     </UserControl.Resources>
 
@@ -34,8 +40,11 @@
                                     <ItemsControl ItemsSource="{Binding .}">
                                         <ItemsControl.ItemTemplate>
                                             <DataTemplate>
-                                                <Border Background="{Binding Path=ResultType, Converter={StaticResource EvaluatableBackgroundSelector}}" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="EvaluatableSpawnerItem_StartDrag">
-                                                    <TextBlock Text="{Binding Path=Metadata.Name}" Margin="4" />
+                                                <Border Background="{Binding Path=ResultType, Converter={StaticResource EvaluatableBackgroundSelector}}" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" Cursor="SizeAll" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="EvaluatableSpawnerItem_StartDrag">
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Image Source="{Binding Path=ResultType, Converter={StaticResource TypeToIconConverter}}" Width="18" Height="18" Margin="4,0,0,0" />
+                                                        <TextBlock Text="{Binding Path=Metadata.Name}" Margin="4" />
+                                                    </StackPanel>
                                                 </Border>
                                             </DataTemplate>
                                         </ItemsControl.ItemTemplate>
@@ -55,6 +64,7 @@
                     <DataTemplate>
                         <Border Background="{Binding Path=Value, Converter={StaticResource TemplateEvaluatableBackgroundSelector}}" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" Cursor="SizeAll" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="EvaluatableTemplateItem_StartDrag" Padding="4">
                             <StackPanel Orientation="Horizontal">
+                                <Image Source="{Binding Path=Value, Converter={StaticResource TemplateEvaluatableIconConverter}}" Width="18" Height="18" Margin="4,0" />
                                 <TextBlock Text="{Binding Path=Key}" Margin="0,0,12,0" />
                                 <!-- Note these buttons use MouseDown because otherwise if the user uses enter on the rename prompt window, it re-triggers a click on this button. -->
                                 <Button Content="R" ToolTip="Rename this template" VerticalAlignment="Center" Padding="6,2" Cursor="Hand" PreviewMouseDown="RenameTemplateButton_Click" />
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
index ff72e5e3b..e22b603cb 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
@@ -22,7 +22,7 @@ public Control_EvaluatableToolbox() {
 
         /// <summary>Returns a list of all detected evaluatables grouped by their category.</summary>
         public IEnumerable<IGrouping<EvaluatableCategory, EvaluatableRegistry.EvaluatableTypeContainer>> GroupedEvalutables =>
-            EvaluatableRegistry.Get().GroupBy(x => x.Metadata.Category);
+            EvaluatableRegistry.Get().GroupBy(x => x.Metadata.Category).OrderBy(x => (int)x.Key);
 
         /// <summary>Property that forwards the evaluatable template store from the global config.</summary>
         public ObservableConcurrentDictionary<string, IEvaluatable> TemplateSource => Global.Configuration.EvaluatableTemplates;
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableRegistry.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableRegistry.cs
index f74fda42a..68313e00b 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableRegistry.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/EvaluatableRegistry.cs
@@ -14,6 +14,7 @@ public static class EvaluatableRegistry {
         private static readonly IEnumerable<EvaluatableTypeContainer> allOverrideLogics = Utils.TypeUtils
             .GetTypesWithCustomAttribute<EvaluatableAttribute>()
             .Where(kvp => typeof(IEvaluatable).IsAssignableFrom(kvp.Key))
+            .OrderBy(kvp => kvp.Value.Name, StringComparer.OrdinalIgnoreCase)
             .Select(kvp => new EvaluatableTypeContainer {
                 Evaluatable = kvp.Key,
                 Metadata = kvp.Value,

From b6081f116c68d10570df51f471caf6ac60a73b92 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Thu, 23 Apr 2020 10:51:09 +0100
Subject: [PATCH 13/20] Moved the evaluatable templates onto their own tab on
 the toolbox.

---
 .../Logic/Control_EvaluatableToolbox.xaml     | 102 +++++++++---------
 .../Logic/Control_EvaluatableToolbox.xaml.cs  |  21 +++-
 2 files changed, 68 insertions(+), 55 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
index f29a07287..34e394ca6 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml
@@ -20,60 +20,58 @@
             <ol:TemplateEvaluatableTypeSelector />
             <o:TypeToIconConverter />
         </u:ValueConverterGroup>
+        <ol:TabContentTemplateSelector x:Key="TabContentTemplateSelector" />
     </UserControl.Resources>
 
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*" />
-            <ColumnDefinition Width="1*" />
-        </Grid.ColumnDefinitions>
-        
-        <!-- Main spawner -->
-        <TabControl ItemsSource="{Binding GroupedEvalutables, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TabStripPlacement="Top" Grid.Column="0">
-            <TabControl.ItemContainerStyle>
-                <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource {x:Type TabItem}}">
-                    <Setter Property="Header" Value="{Binding Key}" />
-                    <Setter Property="ContentTemplate">
-                        <Setter.Value>
+    
+    <!-- Main tab control -->
+    <TabControl ItemsSource="{Binding AvailableTabs, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TabStripPlacement="Top" AllowDrop="True" DragEnter="EvaluatableTemplateList_DragEnter" Drop="EvaluatableTemplateList_Drop" >
+        <TabControl.ItemContainerStyle>
+            <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource {x:Type TabItem}}">
+                <Setter Property="Header" Value="{Binding Key}" />
+                <Setter Property="ContentTemplateSelector" Value="{StaticResource TabContentTemplateSelector}" />
+            </Style>
+        </TabControl.ItemContainerStyle>
+        <TabControl.Resources>
+            <!-- Data template for the default evaluatables. -->
+            <DataTemplate x:Key="DefaultEvaluatableDT">
+                <ScrollViewer>
+                    <ItemsControl ItemsSource="{Binding .}">
+                        <ItemsControl.ItemTemplate>
                             <DataTemplate>
-                                <ScrollViewer>
-                                    <ItemsControl ItemsSource="{Binding .}">
-                                        <ItemsControl.ItemTemplate>
-                                            <DataTemplate>
-                                                <Border Background="{Binding Path=ResultType, Converter={StaticResource EvaluatableBackgroundSelector}}" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" Cursor="SizeAll" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="EvaluatableSpawnerItem_StartDrag">
-                                                    <StackPanel Orientation="Horizontal">
-                                                        <Image Source="{Binding Path=ResultType, Converter={StaticResource TypeToIconConverter}}" Width="18" Height="18" Margin="4,0,0,0" />
-                                                        <TextBlock Text="{Binding Path=Metadata.Name}" Margin="4" />
-                                                    </StackPanel>
-                                                </Border>
-                                            </DataTemplate>
-                                        </ItemsControl.ItemTemplate>
-                                    </ItemsControl>
-                                </ScrollViewer>
+                                <Border Background="{Binding Path=ResultType, Converter={StaticResource EvaluatableBackgroundSelector}}" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" Cursor="SizeAll" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="EvaluatableSpawnerItem_StartDrag">
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Source="{Binding Path=ResultType, Converter={StaticResource TypeToIconConverter}}" Width="18" Height="18" Margin="4,0,0,0" />
+                                        <TextBlock Text="{Binding Path=Metadata.Name}" Margin="4" />
+                                    </StackPanel>
+                                </Border>
                             </DataTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </TabControl.ItemContainerStyle>
-        </TabControl>
-        
-        <!-- User's custom templates -->
-        <ScrollViewer Grid.Column="1">
-            <ItemsControl Background="Transparent" ItemsSource="{Binding TemplateSource, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" AllowDrop="True" DragEnter="EvaluatableTemplateList_DragEnter" Drop="EvaluatableTemplateList_Drop" u:AttachedApplication.Application="{x:Null}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <Border Background="{Binding Path=Value, Converter={StaticResource TemplateEvaluatableBackgroundSelector}}" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" Cursor="SizeAll" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="EvaluatableTemplateItem_StartDrag" Padding="4">
-                            <StackPanel Orientation="Horizontal">
-                                <Image Source="{Binding Path=Value, Converter={StaticResource TemplateEvaluatableIconConverter}}" Width="18" Height="18" Margin="4,0" />
-                                <TextBlock Text="{Binding Path=Key}" Margin="0,0,12,0" />
-                                <!-- Note these buttons use MouseDown because otherwise if the user uses enter on the rename prompt window, it re-triggers a click on this button. -->
-                                <Button Content="R" ToolTip="Rename this template" VerticalAlignment="Center" Padding="6,2" Cursor="Hand" PreviewMouseDown="RenameTemplateButton_Click" />
-                                <Button Content="X" ToolTip="Remove this template" VerticalAlignment="Center" Padding="6,2" Cursor="Hand" PreviewMouseDown="DeleteTemplateButton_Click" />
-                            </StackPanel>
-                        </Border>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </ScrollViewer>
-    </Grid>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollViewer>
+            </DataTemplate>
+
+            <!-- Data template for the template evaluatables. -->
+            <DataTemplate x:Key="TemplateEvaluatableDT">
+                <StackPanel>
+                    <TextBlock Text="Drag evaluatables from the canvas onto the toolbox to save them for future use." Margin="4" />
+                    <ItemsControl ItemsSource="{Binding TemplateSource, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" u:AttachedApplication.Application="{x:Null}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Border Background="{Binding Path=Value, Converter={StaticResource TemplateEvaluatableBackgroundSelector}}" CornerRadius="4" BorderBrush="#2000" BorderThickness="1" Cursor="SizeAll" HorizontalAlignment="Left" u:DragBehaviour.StartDrag="EvaluatableTemplateItem_StartDrag" Padding="4">
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Source="{Binding Path=Value, Converter={StaticResource TemplateEvaluatableIconConverter}}" Width="18" Height="18" Margin="4,0" />
+                                        <TextBlock Text="{Binding Path=Key}" Margin="0,0,12,0" />
+                                        <!-- Note these buttons use MouseDown because otherwise if the user uses enter on the rename prompt window, it re-triggers a click on this button. -->
+                                        <Button Content="R" ToolTip="Rename this template" VerticalAlignment="Center" Padding="6,2" Cursor="Hand" PreviewMouseDown="RenameTemplateButton_Click" />
+                                        <Button Content="X" ToolTip="Remove this template" VerticalAlignment="Center" Padding="6,2" Cursor="Hand" PreviewMouseDown="DeleteTemplateButton_Click" />
+                                    </StackPanel>
+                                </Border>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </StackPanel>
+            </DataTemplate>
+        </TabControl.Resources>
+    </TabControl>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
index e22b603cb..f2b8222bd 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs
@@ -1,6 +1,7 @@
 using Aurora.Controls;
 using Aurora.Utils;
 using System;
+using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
@@ -20,9 +21,14 @@ public Control_EvaluatableToolbox() {
             InitializeComponent();
         }
 
-        /// <summary>Returns a list of all detected evaluatables grouped by their category.</summary>
-        public IEnumerable<IGrouping<EvaluatableCategory, EvaluatableRegistry.EvaluatableTypeContainer>> GroupedEvalutables =>
-            EvaluatableRegistry.Get().GroupBy(x => x.Metadata.Category).OrderBy(x => (int)x.Key);
+        /// <summary>Returns a list of all detected evaluatables grouped by their category and also a special marker for the custom templates tab.</summary>
+        public IEnumerable AvailableTabs {
+            get {
+                foreach (var group in EvaluatableRegistry.Get().GroupBy(x => x.Metadata.Category).OrderBy(x => (int)x.Key))
+                    yield return group;
+                yield return new { Key = "My Templates" };
+            }
+        }
 
         /// <summary>Property that forwards the evaluatable template store from the global config.</summary>
         public ObservableConcurrentDictionary<string, IEvaluatable> TemplateSource => Global.Configuration.EvaluatableTemplates;
@@ -110,6 +116,15 @@ private void DeleteTemplateButton_Click(object sender, MouseButtonEventArgs e) {
     }
 
 
+    /// <summary>
+    /// Data template selector for selecting the tab content (since the template evaluatables and default evaluatables require different data templates)
+    /// </summary>
+    public class TabContentTemplateSelector : DataTemplateSelector {
+        public override DataTemplate SelectTemplate(object item, DependencyObject container) =>
+            ((FrameworkElement)container).FindResource(item is IGrouping<EvaluatableCategory, EvaluatableRegistry.EvaluatableTypeContainer> ? "DefaultEvaluatableDT" : "TemplateEvaluatableDT") as DataTemplate;
+    }
+
+
     /// <summary>
     /// A converter that extracts the type of evaluatable from a template.
     /// </summary>

From 5b4c9f98fa4322be3ada7c1663ee932f28e4cce4 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Thu, 23 Apr 2020 11:24:56 +0100
Subject: [PATCH 14/20] Fixed clone issues with the If-Else evaluatable.

---
 .../Overrides/Logic/Generic/IfElseIf.cs        | 12 +++++++-----
 .../Project-Aurora/Utils/CollectionUtils.cs    | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Utils/CollectionUtils.cs

diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
index 0bffffe99..91b67efb7 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/IfElseIf.cs
@@ -1,4 +1,5 @@
 using Aurora.Profiles;
+using Aurora.Utils;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -48,12 +49,13 @@ private static ObservableCollection<Branch> CreateDefaultCases(IEvaluatable<bool
                 new Branch(null, caseFalse)
             };
 
-        public class Branch {
+        public class Branch : ICloneable {
             public IEvaluatable<bool> Condition { get; set; }
             public IEvaluatable<T> Value { get; set; }
 
-            public Branch() { }
             public Branch(IEvaluatable<bool> condition, IEvaluatable<T> value) { Condition = condition; Value = value; }
+
+            public object Clone() => new Branch(Condition?.Clone(), Value.Clone());
         }
     }
 
@@ -69,7 +71,7 @@ public IfElseBoolean(IEvaluatable<bool> condition, IEvaluatable<bool> caseTrue,
 
         /// <summary>Creates a new evaluatable using the given case tree.</summary>
         public IfElseBoolean(ObservableCollection<Branch> cases) : base(cases) { }
-        public override IEvaluatable<bool> Clone() => new IfElseBoolean(new ObservableCollection<Branch>(Cases));
+        public override IEvaluatable<bool> Clone() => new IfElseBoolean(Cases.Clone());
     }
 
 
@@ -83,7 +85,7 @@ public IfElseNumeric(IEvaluatable<bool> condition, IEvaluatable<double> caseTrue
 
         /// <summary>Creates a new evaluatable using the given case tree.</summary>
         public IfElseNumeric(ObservableCollection<Branch> cases) : base(cases) { }
-        public override IEvaluatable<double> Clone() => new IfElseNumeric(new ObservableCollection<Branch>(Cases));
+        public override IEvaluatable<double> Clone() => new IfElseNumeric(Cases.Clone());
     }
 
 
@@ -97,6 +99,6 @@ public IfElseString(IEvaluatable<bool> condition, IEvaluatable<string> caseTrue,
 
         /// <summary>Creates a new evaluatable using the given case tree.</summary>
         public IfElseString(ObservableCollection<Branch> cases) : base(cases) { }
-        public override IEvaluatable<string> Clone() => new IfElseString(new ObservableCollection<Branch>(Cases));
+        public override IEvaluatable<string> Clone() => new IfElseString(Cases.Clone());
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Utils/CollectionUtils.cs b/Project-Aurora/Project-Aurora/Utils/CollectionUtils.cs
new file mode 100644
index 000000000..caaefe759
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Utils/CollectionUtils.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace Aurora.Utils {
+
+    public static class CollectionUtils {
+
+        /// <summary>
+        /// Creates a deep clone of an observable collection by cloning all individual items in the collection also.
+        /// </summary>
+        public static ObservableCollection<T> Clone<T>(this ObservableCollection<T> source) where T : ICloneable =>
+            new ObservableCollection<T>(
+                source.Select(c => (T)c.Clone())
+            );
+    }
+
+}

From b51fbb8c4c93dcc07bc7855adf4e50e49a6fa5d5 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Thu, 23 Apr 2020 11:55:02 +0100
Subject: [PATCH 15/20] Tidied up many of the evaluatable controls.

---
 .../Project-Aurora/Project-Aurora.csproj      |  9 +---
 .../Logic/Boolean/Boolean_LogicOperators.cs   |  7 ++-
 .../Logic/Boolean/Boolean_ProcessRunning.cs   |  9 ++--
 .../Logic/Boolean/Boolean_TrueExtender.cs     | 15 ++++--
 .../Logic/Boolean/Control_BooleanNot.xaml     | 13 -----
 .../Logic/Boolean/Control_BooleanNot.xaml.cs  | 15 ------
 .../Logic/Control_OverrideDynamicValue.xaml   | 10 ++--
 .../Logic/Control_OverrideLookupTable.xaml    |  5 +-
 .../Logic/Generic/Control_Delay.xaml          |  7 ++-
 .../Logic/Number/Control_NumericMap.xaml      | 53 +++++++++----------
 .../Number/Control_NumericUnaryOpHolder.xaml  | 21 ++++----
 .../Project-Aurora/Utils/GridHelper.cs        | 49 +++++++++++++++++
 12 files changed, 123 insertions(+), 90 deletions(-)
 delete mode 100755 Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml
 delete mode 100644 Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml.cs
 create mode 100644 Project-Aurora/Project-Aurora/Utils/GridHelper.cs

diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index 375783bf9..d1139b87b 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -834,9 +834,6 @@
     <Compile Include="Settings\Overrides\Logic\Boolean\Control_BooleanGSINumeric.xaml.cs">
       <DependentUpon>Control_BooleanGSINumeric.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Settings\Overrides\Logic\Boolean\Control_BooleanNot.xaml.cs">
-      <DependentUpon>Control_BooleanNot.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Settings\Overrides\Logic\Control_EvaluatablePresenter.xaml.cs">
       <DependentUpon>Control_EvaluatablePresenter.xaml</DependentUpon>
     </Compile>
@@ -892,7 +889,9 @@
       <DependentUpon>Window_ProcessSelection.xaml</DependentUpon>
     </Compile>
     <Compile Include="Utils\AttachedApplication.cs" />
+    <Compile Include="Utils\CollectionUtils.cs" />
     <Compile Include="Utils\DragBehaviour.cs" />
+    <Compile Include="Utils\GridHelper.cs" />
     <Compile Include="Utils\ObservableConcurrentDictionary.cs" />
     <Compile Include="Utils\WindowPlacement.cs" />
     <Compile Include="Utils\Converters.cs" />
@@ -2298,10 +2297,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Settings\Overrides\Logic\Boolean\Control_BooleanNot.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Settings\Overrides\Logic\Control_EvaluatablePresenter.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
index 7565c91bc..6de6534e8 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_LogicOperators.cs
@@ -2,6 +2,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
@@ -80,8 +81,10 @@ public BooleanNot(IEvaluatable<bool> subcondition) {
         [JsonProperty]
         public IEvaluatable<bool> SubCondition { get; set; } = new BooleanConstant();
 
-        private Control_ConditionNot control;
-        public Visual GetControl() => control ?? (control = new Control_ConditionNot(this));
+        public Visual GetControl() => new StackPanel { Orientation = Orientation.Horizontal }
+            .WithChild(new TextBlock { Text = "Not", FontWeight = FontWeights.Bold, Margin = new Thickness(2, 0, 6, 0), VerticalAlignment = VerticalAlignment.Center })
+            .WithChild(new Control_EvaluatablePresenter { EvalType = typeof(bool) }
+                .WithBinding(Control_EvaluatablePresenter.ExpressionProperty, new Binding(nameof(SubCondition)) { Source = this, Mode = BindingMode.TwoWay }));
 
         public bool Evaluate(IGameState gameState) => !SubCondition.Evaluate(gameState);
         object IEvaluatable.Evaluate(IGameState gameState) => Evaluate(gameState);
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
index a47b727d6..e961cbf68 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_ProcessRunning.cs
@@ -22,7 +22,6 @@ public BooleanProcessRunning() { }
 
         public Visual GetControl() {
             var selectButton = new Button { Content = "Select", Padding = new System.Windows.Thickness(8, 0, 8, 0), Margin = new System.Windows.Thickness(8, 0, 0, 0) };
-            DockPanel.SetDock(selectButton, Dock.Right);
             selectButton.Click += (sender, e) => {
                 var wnd = new Window_ProcessSelection { ButtonLabel = "Select" };
                 if (wnd.ShowDialog() == true && !string.IsNullOrWhiteSpace(wnd.ChosenExecutableName)) {
@@ -31,10 +30,12 @@ public Visual GetControl() {
                 }
             };
 
-            return new DockPanel { LastChildFill = true }
-                .WithChild(selectButton)
+            return new StackPanel { Orientation = Orientation.Horizontal }
+                .WithChild(new Label { Content = "Is process" })
                 .WithChild(new TextBox { MinWidth = 80 }
-                    .WithBinding(TextBox.TextProperty, new Binding("ProcessName") { Source = this, Mode = BindingMode.TwoWay }));
+                    .WithBinding(TextBox.TextProperty, this, "ProcessName", BindingMode.TwoWay))
+                .WithChild(selectButton)
+                .WithChild(new Label { Content = "running" });
         }
 
         public bool Evaluate(IGameState gameState)
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
index a675b3dfb..19bfd3426 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_TrueExtender.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
@@ -26,11 +27,15 @@ public BooleanExtender() { }
         public TimeUnit TimeUnit { get; set; } = TimeUnit.Seconds;
 
         public Visual GetControl() => new StackPanel()
-            .WithChild(new Control_EvaluatablePresenter { EvalType = typeof(bool) }
-                .WithBinding(Control_EvaluatablePresenter.ExpressionProperty, new Binding("Evaluatable") { Source = this, Mode = BindingMode.TwoWay }))
-            .WithChild(new Control_TimeAndUnit()
-                .WithBinding(Control_TimeAndUnit.TimeProperty, new Binding("ExtensionTime") { Source = this, Mode = BindingMode.TwoWay })
-                .WithBinding(Control_TimeAndUnit.UnitProperty, new Binding("TimeUnit") { Source = this, Mode = BindingMode.TwoWay }));
+            .WithChild(new StackPanel { Orientation = Orientation.Horizontal }
+                .WithChild(new TextBlock { Text = "Extend", Margin = new Thickness(0, 0, 6, 0), VerticalAlignment = VerticalAlignment.Center })
+                .WithChild(new Control_EvaluatablePresenter { EvalType = typeof(bool) }
+                    .WithBinding(Control_EvaluatablePresenter.ExpressionProperty, new Binding("Evaluatable") { Source = this, Mode = BindingMode.TwoWay })))
+            .WithChild(new StackPanel { Orientation = Orientation.Horizontal }
+                .WithChild(new TextBlock { Text = "For", Margin = new Thickness(0, 0, 6, 0), VerticalAlignment = VerticalAlignment.Center })
+                .WithChild(new Control_TimeAndUnit()
+                    .WithBinding(Control_TimeAndUnit.TimeProperty, new Binding("ExtensionTime") { Source = this, Mode = BindingMode.TwoWay })
+                    .WithBinding(Control_TimeAndUnit.UnitProperty, new Binding("TimeUnit") { Source = this, Mode = BindingMode.TwoWay })));
 
         public bool Evaluate(IGameState gameState) {
             var res = Evaluatable.Evaluate(gameState);
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml
deleted file mode 100755
index 3983f37b3..000000000
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<UserControl x:Class="Aurora.Settings.Overrides.Logic.Control_ConditionNot"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-             xmlns:local="clr-namespace:Aurora.Settings.Overrides.Logic"
-             mc:Ignorable="d">
-    <Grid>
-        <TextBlock Text="!" FontSize="18" VerticalAlignment="Center" />
-        <local:Control_EvaluatablePresenter Expression="{Binding SubCondition, Mode=TwoWay}" EvalType="{x:Type sys:Boolean}" Margin="15,0,0,0" />
-    </Grid>
-</UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml.cs
deleted file mode 100644
index 31e3b953e..000000000
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanNot.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Aurora.Settings.Overrides.Logic {
-    /// <summary>
-    /// Interaction logic for Control_ConditionNot.xaml
-    /// </summary>
-    public partial class Control_ConditionNot : UserControl {
-        public Control_ConditionNot(BooleanNot context) {
-            InitializeComponent();
-            DataContext = context;
-        }
-    }
-}
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml
index ff888ea99..42a8efc57 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideDynamicValue.xaml
@@ -22,17 +22,17 @@
         <TextBlock Text="A dynamic value allows you to set the value of the selected property using another variable. For example, you can set the opacity of a layer to be the result of health divided by maxhealth, causing the layer to fade out as your character takes damage (in supported games). Not all property types can have a dynamic value created for them." Margin="8" TextWrapping="Wrap" Grid.Row="0" />
 
         <!-- Parameter list -->
-        <ScrollViewer Margin="6,0,6,6" Grid.Row="1">
+        <ScrollViewer HorizontalScrollBarVisibility="Auto" Margin="6,0,6,6" Grid.Row="1">
             <ItemsControl ItemsSource="{Binding Parameters}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
-                        <DockPanel>
-                            <TextBlock DockPanel.Dock="Left" Margin="0,10,0,0" >
+                        <Grid HorizontalAlignment="Left" u:GridHelper.Columns="Auto,Auto">
+                            <TextBlock Margin="0,10,0,0">
                                 <Run Text="{Binding Item1, Mode=OneWay}" TextDecorations="{Binding Item4, Converter={StaticResource UnderlineConv}}" Cursor="{Binding Item4, Converter={StaticResource CursorConv}}" ToolTip="{Binding Item4, Mode=OneWay}" />
                                 <Run Text="=" />
                             </TextBlock>
-                            <local:Control_EvaluatablePresenter Expression="{Binding Item3, Mode=OneWay}" EvalType="{Binding Item2}" ExpressionChanged="VariableEvaluatable_ExpressionChanged" />
-                        </DockPanel>
+                            <local:Control_EvaluatablePresenter Expression="{Binding Item3, Mode=OneWay}" EvalType="{Binding Item2}" ExpressionChanged="VariableEvaluatable_ExpressionChanged" Grid.Column="1" />
+                        </Grid>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml
index 0eaf53ca4..6a409fda0 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_OverrideLookupTable.xaml
@@ -61,7 +61,10 @@
                                     <!-- Main item content -->
                                     <controls:Control_FieldPresenter Value="{Binding Value, Mode=TwoWay}" Type="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=DataContext.Table.VarType}" Grid.Column="0" VerticalAlignment="Center" Margin="8,4,8,8" />
                                     <TextBlock Text="When" FontStyle="Italic" FontWeight="Bold" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <local:Control_EvaluatablePresenter Expression="{Binding Condition, Mode=TwoWay}" EvalType="{x:Type sys:Boolean}" Grid.Column="2" VerticalAlignment="Center" Margin="8,4,8,8" />
+
+                                    <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Grid.Column="2">
+                                        <local:Control_EvaluatablePresenter Expression="{Binding Condition, Mode=TwoWay}" EvalType="{x:Type sys:Boolean}" VerticalAlignment="Center" Margin="8,4,8,8" />
+                                    </ScrollViewer>
 
                                     <!-- Delete button -->
                                     <Button Margin="6" Grid.Column="3" VerticalAlignment="Center" ToolTip="Remove this lookup entry" Click="DeleteLookupEntry_Click">
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_Delay.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_Delay.xaml
index 4733d093c..172f7574d 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_Delay.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Generic/Control_Delay.xaml
@@ -6,9 +6,12 @@
              xmlns:l="clr-namespace:Aurora.Settings.Overrides.Logic" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              mc:Ignorable="d">
     <StackPanel>
-        <l:Control_EvaluatablePresenter Expression="{Binding Path=Source, Mode=TwoWay}" EvalType="{Binding EvalType, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" />
+        <StackPanel Orientation="Horizontal" Margin="0,0,0,6">
+            <Label FontWeight="Bold">Delay</Label>
+            <l:Control_EvaluatablePresenter Expression="{Binding Path=Source, Mode=TwoWay}" EvalType="{Binding EvalType, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" />
+        </StackPanel>
         <StackPanel Orientation="Horizontal">
-            <Label FontWeight="Bold">Delay:</Label>
+            <Label FontWeight="Bold">for</Label>
             <xctk:DoubleUpDown MinWidth="38" Value="{Binding Path=Delay, Mode=TwoWay}" />
             <Label>secs</Label>
         </StackPanel>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml
index 356bbbceb..e50e8d14c 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericMap.xaml
@@ -5,42 +5,41 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:logic="clr-namespace:Aurora.Settings.Overrides.Logic"
+             xmlns:u="clr-namespace:Aurora.Utils"
              mc:Ignorable="d" 
              d:DesignWidth="500">
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="1*" />
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <!-- Value -->
-        <Border BorderThickness="1" BorderBrush="#6000" Background="#3000" Grid.ColumnSpan="3" />
-        <TextBlock Text="Map value:" Margin="6,2" FontWeight="Bold" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding Value, Mode=TwoWay}" EvalType="{x:Type sys:Double}" Margin="6,10,6,0" Grid.ColumnSpan="3" />
+    
+    <Grid u:GridHelper.Columns="Auto,Auto,Auto" u:GridHelper.Rows="Auto,Auto,Auto,Auto">
         
+        <!-- Value -->
+        <StackPanel Grid.ColumnSpan="999" Orientation="Horizontal">
+            <TextBlock Text="Map value:" Margin="6,2" FontWeight="Bold" VerticalAlignment="Center" />
+            <logic:Control_EvaluatablePresenter Expression="{Binding Value, Mode=TwoWay}" EvalType="{x:Type sys:Double}" Margin="6,0,2,0" />
+        </StackPanel>
+
         <!-- From range -->
-        <Border BorderThickness="1,0,1,1" BorderBrush="#6000" Background="#3000" Grid.Row="1" Grid.RowSpan="2" />
         <TextBlock Text="From range:" Margin="6,2" FontWeight="Bold" Grid.Row="1" />
-        <TextBlock Text="Min:" Margin="8,18" Grid.Row="1" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding FromMin, Mode=TwoWay}" EvalType="{x:Type sys:Double}" Margin="6,28,6,0" Grid.Row="1" />
-        <TextBlock Text="Max:" Margin="8,0" Grid.Row="2" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding FromMax, Mode=TwoWay}" EvalType="{x:Type sys:Double}" Margin="6,10,6,0" Grid.Row="2" />
+        <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="0,2,0,6">
+            <TextBlock Text="Min:" Margin="8,0" VerticalAlignment="Center" />
+            <logic:Control_EvaluatablePresenter Expression="{Binding FromMin, Mode=TwoWay}" EvalType="{x:Type sys:Double}" VerticalAlignment="Center" />
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" Grid.Row="3">
+            <TextBlock Text="Max:" Margin="8,0" VerticalAlignment="Center" />
+            <logic:Control_EvaluatablePresenter Expression="{Binding FromMax, Mode=TwoWay}" EvalType="{x:Type sys:Double}" VerticalAlignment="Center" />
+        </StackPanel>
 
         <!-- Arrow -->
-        <TextBlock Text="&#x2794;" Margin="6" FontSize="18" Grid.Row="1" Grid.RowSpan="2" Grid.Column="1" VerticalAlignment="Center" />
+        <TextBlock Text="&#x2794;" Margin="6" FontSize="18" Grid.Row="2" Grid.RowSpan="2" Grid.Column="1" VerticalAlignment="Center" />
 
         <!-- To range -->
-        <Border BorderThickness="1,0,1,1" BorderBrush="#6000" Background="#3000" Grid.Row="1" Grid.RowSpan="2" Grid.Column="2" />
         <TextBlock Text="Onto range:" Margin="6,2" FontWeight="Bold" Grid.Row="1" Grid.Column="2" />
-        <TextBlock Text="Min:" Margin="8,18" Grid.Row="1" Grid.Column="2" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding ToMin, Mode=TwoWay}" EvalType="{x:Type sys:Double}" Margin="6,28,6,0" Grid.Row="1" Grid.Column="2" />
-        <TextBlock Text="Max:" Margin="8,0" Grid.Row="2" Grid.Column="2" />
-        <logic:Control_EvaluatablePresenter Expression="{Binding ToMax, Mode=TwoWay}" EvalType="{x:Type sys:Double}" Margin="6,10,6,0" Grid.Row="2" Grid.Column="2" />
+        <StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="2" Margin="0,2,0,6">
+            <TextBlock Text="Min:" Margin="8,0" VerticalAlignment="Center" />
+            <logic:Control_EvaluatablePresenter Expression="{Binding ToMin, Mode=TwoWay}" EvalType="{x:Type sys:Double}" VerticalAlignment="Center" />
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" Grid.Row="3" Grid.Column="2">
+            <TextBlock Text="Max:" Margin="8,0" VerticalAlignment="Center" />
+            <logic:Control_EvaluatablePresenter Expression="{Binding ToMax, Mode=TwoWay}" EvalType="{x:Type sys:Double}" VerticalAlignment="Center" />
+        </StackPanel>
     </Grid>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml
index a70409d17..7dddb259b 100644
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Control_NumericUnaryOpHolder.xaml
@@ -11,14 +11,14 @@
     <UserControl.Resources>
         <utils:IsNullToVisibilityConverter x:Key="NullableToVisConv" />
     </UserControl.Resources>
-    <Grid>
-        <!-- Controls -->
-        <ComboBox ItemsSource="{Binding OperatorList}" SelectedValue="{Binding SelectedOperator}" Visibility="{Binding OperatorList, Converter={StaticResource NullableToVisConv}}" SelectedValuePath="Value" DisplayMemberPath="Key" VerticalAlignment="Center" HorizontalAlignment="Left" Width="100" />
-        <TextBlock Text="{Binding StaticOperator}" TextAlignment="Right" Visibility="{Binding StaticOperator, Converter={StaticResource NullableToVisConv}}" VerticalAlignment="Center" HorizontalAlignment="Left" Width="96" />
-        <local:Control_EvaluatablePresenter Expression="{Binding Operand, Mode=TwoWay}" EvalType="{x:Type sys:Double}" Margin="119,0,19,0" />
+    
+    <StackPanel Orientation="Horizontal">
+        <!-- Operator -->
+        <ComboBox ItemsSource="{Binding OperatorList}" SelectedValue="{Binding SelectedOperator}" Visibility="{Binding OperatorList, Converter={StaticResource NullableToVisConv}}" SelectedValuePath="Value" DisplayMemberPath="Key" VerticalAlignment="Center" />
+        <TextBlock Text="{Binding StaticOperator}" Visibility="{Binding StaticOperator, Converter={StaticResource NullableToVisConv}}" VerticalAlignment="Center" />
 
         <!-- Left bracket -->
-        <Ellipse Width="30" Stroke="White" StrokeThickness="3" HorizontalAlignment="Left" Margin="102,0,0,0">
+        <Ellipse Width="30" Stroke="White" StrokeThickness="3" Margin="8,0,-8,0">
             <Ellipse.OpacityMask>
                 <LinearGradientBrush StartPoint="0,1">
                     <LinearGradientBrush.GradientStops>
@@ -28,9 +28,12 @@
                 </LinearGradientBrush>
             </Ellipse.OpacityMask>
         </Ellipse>
-        
+
+        <!-- Operand -->
+        <local:Control_EvaluatablePresenter Expression="{Binding Operand, Mode=TwoWay}" EvalType="{x:Type sys:Double}" />
+
         <!-- Right bracket -->
-        <Ellipse Width="30" Stroke="White" StrokeThickness="3" HorizontalAlignment="Right">
+        <Ellipse Width="30" Stroke="White" StrokeThickness="3" Margin="-8,0,2,0">
             <Ellipse.OpacityMask>
                 <LinearGradientBrush StartPoint="0,1">
                     <LinearGradientBrush.GradientStops>
@@ -40,5 +43,5 @@
                 </LinearGradientBrush>
             </Ellipse.OpacityMask>
         </Ellipse>
-    </Grid>
+    </StackPanel>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Utils/GridHelper.cs b/Project-Aurora/Project-Aurora/Utils/GridHelper.cs
new file mode 100644
index 000000000..74027b752
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Utils/GridHelper.cs
@@ -0,0 +1,49 @@
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Aurora.Utils {
+
+    /// <summary>
+    /// A GridHelper utility that provides "Columns" and "Rows" attached properties to the Grid control.
+    /// These properties are shorthand for adding row and column definitions.
+    /// <para>Usage: <code>&lt;Grid u:GridHelper.Columns="Auto,1*,2*,30px"&gt;</code></para>
+    /// </summary>
+    public class GridHelper {
+
+        // Converter that XAML uses to convert a string to a GridLength (e.g. "1*", "230px", "Auto", etc)
+        private static TypeConverter gridLengthConverter = TypeDescriptor.GetConverter(typeof(GridLength));
+        private static GridLength ParseGridLength(string s) => (GridLength)gridLengthConverter.ConvertFromString(s);
+
+
+        // Columns
+        public static string GetColumns(DependencyObject obj) => (string)obj.GetValue(ColumnsProperty);
+        public static void SetColumns(DependencyObject obj, string value) => obj.SetValue(ColumnsProperty, value);
+
+        public static readonly DependencyProperty ColumnsProperty =
+            DependencyProperty.RegisterAttached("Columns", typeof(string), typeof(GridHelper), new PropertyMetadata("", ColumnsChanged));
+
+        public static void ColumnsChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e) {
+            if (!(obj is Grid grid)) return;
+            grid.ColumnDefinitions.Clear();
+            foreach (var str in ((string)e.NewValue).Split(','))
+                grid.ColumnDefinitions.Add(new ColumnDefinition { Width = ParseGridLength(str) });
+        }
+
+
+        // Rows
+        public static string GetRows(DependencyObject obj) => (string)obj.GetValue(RowsProperty);
+        public static void SetRows(DependencyObject obj, string value) => obj.SetValue(RowsProperty, value);
+
+        public static readonly DependencyProperty RowsProperty =
+            DependencyProperty.RegisterAttached("Rows", typeof(string), typeof(GridHelper), new PropertyMetadata("", RowsChanged));
+
+        public static void RowsChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e) {
+            if (!(obj is Grid grid)) return;
+            grid.RowDefinitions.Clear();
+            foreach (var str in ((string)e.NewValue).Split(','))
+                grid.RowDefinitions.Add(new RowDefinition { Height = ParseGridLength(str) });
+        }
+    }
+}

From c22420e2cb6ae648d14835f63bf73799c90500c6 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Thu, 23 Apr 2020 12:13:27 +0100
Subject: [PATCH 16/20] Dimmed the evaluatable colors slightly.

---
 Project-Aurora/Project-Aurora/App.xaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/App.xaml b/Project-Aurora/Project-Aurora/App.xaml
index fc90bbd93..17822c10e 100644
--- a/Project-Aurora/Project-Aurora/App.xaml
+++ b/Project-Aurora/Project-Aurora/App.xaml
@@ -13,9 +13,9 @@
 
             <!-- Dictionary containing the colors of the evalutable presenters for each type of override type. -->
             <ResourceDictionary x:Key="OverridesTypeColors">
-                <SolidColorBrush x:Key="{x:Type s:Double}" Color="#8834DB4C" />
-                <SolidColorBrush x:Key="{x:Type s:Boolean}" Color="#883498DB" />
-                <SolidColorBrush x:Key="{x:Type s:String}" Color="#88DB3453" />
+                <SolidColorBrush x:Key="{x:Type s:Double}" Color="#5534DB4C" />
+                <SolidColorBrush x:Key="{x:Type s:Boolean}" Color="#553498DB" />
+                <SolidColorBrush x:Key="{x:Type s:String}" Color="#55DB3453" />
             </ResourceDictionary>
             <SolidColorBrush x:Key="OverridesTypeFallbackColor" Color="#88DBDBDB" />
         </ResourceDictionary>

From fdae7fd3c2de02f157b069a9491b2b28bff5b407 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Thu, 23 Apr 2020 14:04:21 +0100
Subject: [PATCH 17/20] Made gradient percent layer use the new game state
 picker. Removed some redundant code in many of the layers' code that queries
 the profile parameter.

---
 .../Control_CSGOBackgroundLayer.xaml.cs       |  6 ----
 .../CSGO/Layers/Control_CSGOBombLayer.xaml.cs |  7 ----
 .../Layers/Control_CSGOBurningLayer.xaml.cs   |  7 ----
 .../Layers/Control_CSGODeathLayer.xaml.cs     |  7 ----
 .../Layers/Control_CSGOFlashbangLayer.xaml.cs |  7 ----
 .../Control_CSGOKillsIndicatorLayer.xaml.cs   |  7 ----
 .../Control_CSGOTypingIndicatorLayer.xaml.cs  |  7 ----
 .../Control_CSGOWinningTeamLayer.xaml.cs      |  7 ----
 .../Layers/Control_Dota2AbilityLayer.xaml.cs  |  7 ----
 .../Control_Dota2BackgroundLayer.xaml.cs      |  7 ----
 ...ntrol_Dota2HeroAbilityEffectsLayer.xaml.cs |  7 ----
 .../Layers/Control_Dota2ItemLayer.xaml.cs     |  6 ----
 .../Control_Dota2KillstreakLayer.xaml.cs      |  7 ----
 .../Layers/Control_Dota2RespawnLayer.xaml.cs  |  7 ----
 ...ntrol_EliteDangerousAnimationLayer.xaml.cs |  7 ----
 ...trol_EliteDangerousBackgroundLayer.xaml.cs |  7 ----
 ...ontrol_EliteDangerousKeyBindsLayer.xaml.cs |  7 ----
 .../Control_GTA5BackgroundLayer.xaml.cs       |  7 ----
 .../Control_GTA5PoliceSirenLayer.xaml.cs      |  7 ----
 .../Layers/Control_PD2FlashbangLayer.xaml.cs  |  7 ----
 .../Control_ResidentEvil2HealthLayer.xaml.cs  |  7 ----
 .../Control_ResidentEvil2RankLayer.xaml.cs    |  7 ----
 .../Control_Witcher3BackgroundLayer.xaml.cs   |  7 ----
 .../Layers/Control_GlitchLayer.xaml.cs        |  9 ------
 .../Layers/Control_PercentGradientLayer.xaml  |  6 ++--
 .../Control_PercentGradientLayer.xaml.cs      | 32 +------------------
 .../Layers/Control_PercentLayer.xaml.cs       |  8 +----
 27 files changed, 5 insertions(+), 209 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBackgroundLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBackgroundLayer.xaml.cs
index 955bddf77..929825271 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBackgroundLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBackgroundLayer.xaml.cs
@@ -23,7 +23,6 @@ namespace Aurora.Profiles.CSGO.Layers
     public partial class Control_CSGOBackgroundLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_CSGOBackgroundLayer()
         {
@@ -55,12 +54,7 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
 
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBombLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBombLayer.xaml.cs
index 4d9ef9e4f..17f354a74 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBombLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBombLayer.xaml.cs
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.CSGO.Layers
     public partial class Control_CSGOBombLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_CSGOBombLayer()
         {
@@ -52,12 +51,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBurningLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBurningLayer.xaml.cs
index f6f0161ee..f159fad3e 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBurningLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBurningLayer.xaml.cs
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.CSGO.Layers
     public partial class Control_CSGOBurningLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_CSGOBurningLayer()
         {
@@ -49,12 +48,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGODeathLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGODeathLayer.xaml.cs
index 109f591f0..8f98ce215 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGODeathLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGODeathLayer.xaml.cs
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.CSGO.Layers
     public partial class Control_CSGODeathLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_CSGODeathLayer()
         {
@@ -51,12 +50,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOFlashbangLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOFlashbangLayer.xaml.cs
index 2fd23c5ad..3106fd29f 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOFlashbangLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOFlashbangLayer.xaml.cs
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.CSGO.Layers
     public partial class Control_CSGOFlashbangLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_CSGOFlashbangLayer()
         {
@@ -48,12 +47,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOKillsIndicatorLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOKillsIndicatorLayer.xaml.cs
index e3757dbc9..6dd0edb23 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOKillsIndicatorLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOKillsIndicatorLayer.xaml.cs
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.CSGO.Layers
     public partial class Control_CSGOKillIndicatorLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_CSGOKillIndicatorLayer()
         {
@@ -50,12 +49,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOTypingIndicatorLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOTypingIndicatorLayer.xaml.cs
index 41ea9bfc9..29a8d0aca 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOTypingIndicatorLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOTypingIndicatorLayer.xaml.cs
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.CSGO.Layers
     public partial class Control_CSGOTypingIndicatorLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_CSGOTypingIndicatorLayer()
         {
@@ -49,12 +48,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOWinningTeamLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOWinningTeamLayer.xaml.cs
index f9b004ce3..e881a4322 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOWinningTeamLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOWinningTeamLayer.xaml.cs
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.CSGO.Layers
     public partial class Control_CSGOWinningTeamLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_CSGOWinningTeamLayer()
         {
@@ -49,12 +48,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2AbilityLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2AbilityLayer.xaml.cs
index bf682ea6a..49b415a75 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2AbilityLayer.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2AbilityLayer.xaml.cs	
@@ -24,7 +24,6 @@ namespace Aurora.Profiles.Dota_2.Layers
     public partial class Control_Dota2AbilityLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_Dota2AbilityLayer()
         {
@@ -57,12 +56,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2BackgroundLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2BackgroundLayer.xaml.cs
index a4e7b04c8..13c0874dd 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2BackgroundLayer.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2BackgroundLayer.xaml.cs	
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.Dota_2.Layers
     public partial class Control_Dota2BackgroundLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_Dota2BackgroundLayer()
         {
@@ -53,12 +52,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2HeroAbilityEffectsLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2HeroAbilityEffectsLayer.xaml.cs
index 710294f08..ab5f6ddf8 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2HeroAbilityEffectsLayer.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2HeroAbilityEffectsLayer.xaml.cs	
@@ -25,7 +25,6 @@ namespace Aurora.Profiles.Dota_2.Layers
     public partial class Control_Dota2HeroAbilityEffectsLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_Dota2HeroAbilityEffectsLayer()
         {
@@ -51,12 +50,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2ItemLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2ItemLayer.xaml.cs
index a7be10517..47780150d 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2ItemLayer.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2ItemLayer.xaml.cs	
@@ -67,12 +67,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2KillstreakLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2KillstreakLayer.xaml.cs
index 80796468d..e0b2d166a 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2KillstreakLayer.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2KillstreakLayer.xaml.cs	
@@ -24,7 +24,6 @@ namespace Aurora.Profiles.Dota_2.Layers
     public partial class Control_Dota2KillstreakLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_Dota2KillstreakLayer()
         {
@@ -58,12 +57,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2RespawnLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2RespawnLayer.xaml.cs
index 5ac10d349..758fa91e1 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2RespawnLayer.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2RespawnLayer.xaml.cs	
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.Dota_2.Layers
     public partial class Control_Dota2RespawnLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_Dota2RespawnLayer()
         {
@@ -51,12 +50,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/EliteDangerous/Layers/Control_EliteDangerousAnimationLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/EliteDangerous/Layers/Control_EliteDangerousAnimationLayer.xaml.cs
index e034930ca..2d9af98b3 100644
--- a/Project-Aurora/Project-Aurora/Profiles/EliteDangerous/Layers/Control_EliteDangerousAnimationLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/EliteDangerous/Layers/Control_EliteDangerousAnimationLayer.xaml.cs
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.EliteDangerous.Layers
     public partial class Control_EliteDangerousAnimationLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_EliteDangerousAnimationLayer()
         {
@@ -48,12 +47,6 @@ public Control_EliteDangerousAnimationLayer(EliteDangerousAnimationLayerHandler
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/EliteDangerous/Layers/Control_EliteDangerousBackgroundLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/EliteDangerous/Layers/Control_EliteDangerousBackgroundLayer.xaml.cs
index cc2a02a62..98a14df14 100644
--- a/Project-Aurora/Project-Aurora/Profiles/EliteDangerous/Layers/Control_EliteDangerousBackgroundLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/EliteDangerous/Layers/Control_EliteDangerousBackgroundLayer.xaml.cs
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.EliteDangerous.Layers
     public partial class Control_EliteDangerousBackgroundLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_EliteDangerousBackgroundLayer()
         {
@@ -49,12 +48,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/EliteDangerous/Layers/Control_EliteDangerousKeyBindsLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/EliteDangerous/Layers/Control_EliteDangerousKeyBindsLayer.xaml.cs
index c959e3301..afa40723f 100644
--- a/Project-Aurora/Project-Aurora/Profiles/EliteDangerous/Layers/Control_EliteDangerousKeyBindsLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/EliteDangerous/Layers/Control_EliteDangerousKeyBindsLayer.xaml.cs
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.EliteDangerous.Layers
     public partial class Control_EliteDangerousKeyBindsLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_EliteDangerousKeyBindsLayer()
         {
@@ -61,12 +60,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/GTA5/Layers/Control_GTA5BackgroundLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/GTA5/Layers/Control_GTA5BackgroundLayer.xaml.cs
index 650585219..91deec8ee 100644
--- a/Project-Aurora/Project-Aurora/Profiles/GTA5/Layers/Control_GTA5BackgroundLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/GTA5/Layers/Control_GTA5BackgroundLayer.xaml.cs
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.GTA5.Layers
     public partial class Control_GTA5BackgroundLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_GTA5BackgroundLayer()
         {
@@ -58,12 +57,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/GTA5/Layers/Control_GTA5PoliceSirenLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/GTA5/Layers/Control_GTA5PoliceSirenLayer.xaml.cs
index db035a7b1..6106b6e14 100644
--- a/Project-Aurora/Project-Aurora/Profiles/GTA5/Layers/Control_GTA5PoliceSirenLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/GTA5/Layers/Control_GTA5PoliceSirenLayer.xaml.cs
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.GTA5.Layers
     public partial class Control_GTA5PoliceSirenLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_GTA5PoliceSirenLayer()
         {
@@ -53,12 +52,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs
index 68dad15a2..9953ebb61 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs	
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.Payday_2.Layers
     public partial class Control_PD2FlashbangLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_PD2FlashbangLayer()
         {
@@ -48,12 +47,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/Resident Evil 2/Layers/Control_ResidentEvil2HealthLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Resident Evil 2/Layers/Control_ResidentEvil2HealthLayer.xaml.cs
index c319bd5d0..9eeba61be 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Resident Evil 2/Layers/Control_ResidentEvil2HealthLayer.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Resident Evil 2/Layers/Control_ResidentEvil2HealthLayer.xaml.cs	
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.ResidentEvil2.Layers
     public partial class Control_ResidentEvil2HealthLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_ResidentEvil2HealthLayer()
         {
@@ -54,12 +53,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/Resident Evil 2/Layers/Control_ResidentEvil2RankLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Resident Evil 2/Layers/Control_ResidentEvil2RankLayer.xaml.cs
index fff9045ad..251e79355 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Resident Evil 2/Layers/Control_ResidentEvil2RankLayer.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Resident Evil 2/Layers/Control_ResidentEvil2RankLayer.xaml.cs	
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.ResidentEvil2.Layers
     public partial class Control_ResidentEvil2RankLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_ResidentEvil2RankLayer()
         {
@@ -46,12 +45,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Profiles/Witcher3/Layers/Control_Witcher3BackgroundLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Witcher3/Layers/Control_Witcher3BackgroundLayer.xaml.cs
index 9d0d83355..1da4fdadd 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Witcher3/Layers/Control_Witcher3BackgroundLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/Witcher3/Layers/Control_Witcher3BackgroundLayer.xaml.cs
@@ -22,7 +22,6 @@ namespace Aurora.Profiles.Witcher3.Layers
     public partial class Control_Witcher3BackgroundLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_Witcher3BackgroundLayer()
         {
@@ -53,12 +52,6 @@ public void SetSettings()
 
         internal void SetProfile(Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/Control_GlitchLayer.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Layers/Control_GlitchLayer.xaml.cs
index 60ec5fdc8..e700d8be1 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/Control_GlitchLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/Control_GlitchLayer.xaml.cs
@@ -21,7 +21,6 @@ namespace Aurora.Settings.Layers
     public partial class Control_GlitchLayer : UserControl
     {
         private bool settingsset = false;
-        private bool profileset = false;
 
         public Control_GlitchLayer()
         {
@@ -47,14 +46,6 @@ public void SetSettings()
 
         internal void SetProfile(Profiles.Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                profileset = true;
-            }
-            settingsset = false;
-            this.SetSettings();
         }
 
         private void KeySequence_keys_SequenceUpdated(object sender, EventArgs e)
diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentGradientLayer.xaml b/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentGradientLayer.xaml
index e417f4eae..abbae50bc 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentGradientLayer.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentGradientLayer.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aurora.Settings.Layers"
-             xmlns:System="clr-namespace:System;assembly=mscorlib" 
+             xmlns:System="clr-namespace:System;assembly=mscorlib"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:Controls="clr-namespace:Aurora.Controls"
              xmlns:ncore="http://schemas.ncore.com/wpf/xaml/colorbox"
@@ -27,14 +27,14 @@
 
     <Grid>
         <Label HorizontalAlignment="Left" Padding="0" Content="Current Value:" VerticalAlignment="Top" Margin="0,4,0,0"/>
-        <ComboBox x:Name="ComboBox_variable" HorizontalAlignment="Left" Margin="79,0,0,0" VerticalAlignment="Top" Width="188" IsEditable="True" TextBoxBase.TextChanged="ComboBox_variable_TextChanged" Height="22"/>
+        <Controls:GameStateParameterPicker x:Name="VariablePath" SelectedPath="{Binding Path=Properties._VariablePath}" PropertyType="Number" HorizontalAlignment="Left" Margin="79,0,0,0" VerticalAlignment="Top" Width="188" Height="22" />
         <Label HorizontalAlignment="Left" Padding="0" Content="Maximum Value:" VerticalAlignment="Top" Margin="0,31,0,0"/>
         <ComboBox x:Name="ComboBox_effect_type" HorizontalAlignment="Left" Margin="67,114,0,0" VerticalAlignment="Top" Width="200" SelectionChanged="ComboBox_effect_type_SelectionChanged" ItemsSource="{Binding Source={StaticResource PercentEffectType}}" ItemTemplate="{Binding Source={StaticResource PercentEffectTypeTemplate}}" />
         <Label HorizontalAlignment="Left" Margin="0,117,0,0" Padding="0" Content="Effect Type:" VerticalAlignment="Top"/>
         <Label HorizontalAlignment="Left" Margin="0,145,0,-23" Padding="0" Content="Blink threshold: " VerticalAlignment="Top"/>
         <xctk:IntegerUpDown x:Name="updown_blink_value" HorizontalAlignment="Left" Height="24" Margin="90,141,0,-27" VerticalAlignment="Top" Width="50" Value="1" Maximum="100" Minimum="0" MouseWheelActiveOnFocus="True" ValueChanged="updown_blink_value_ValueChanged"/>
         <Label HorizontalAlignment="Left" Margin="145,145,0,-23" Padding="0" Content="%" VerticalAlignment="Top" RenderTransformOrigin="0.6,0.542"/>
-        <ComboBox x:Name="ComboBox_max_variable" HorizontalAlignment="Left" Margin="92,29,0,0" VerticalAlignment="Top" Width="175" IsEditable="True" TextBoxBase.TextChanged="ComboBox_max_variable_TextChanged" Height="22"/>
+        <Controls:GameStateParameterPicker x:Name="MaxVariablePath" SelectedPath="{Binding Path=Properties._MaxVariablePath}" PropertyType="Number" HorizontalAlignment="Left" Margin="92,29,0,0" VerticalAlignment="Top" Width="175" Height="22"/>
         <CheckBox x:Name="CheckBox_threshold_reverse" Content="Reverse blink threshold" HorizontalAlignment="Left" Margin="3,166,0,0" VerticalAlignment="Top" Checked="CheckBox_threshold_reverse_Checked" Unchecked="CheckBox_threshold_reverse_Checked"/>
         <Controls:KeySequence x:Name="KeySequence_keys" Margin="272,0,0,0" RecordingTag="PercentLayer" Title="Affected Keys" SequenceUpdated="KeySequence_keys_SequenceUpdated" HorizontalAlignment="Left" Width="230"/>
         <ncore:ColorBox x:Name="gradient_editor" HorizontalAlignment="Left" Height="36" Margin="0,73,0,0" VerticalAlignment="Top" Width="267" BrushChanged="Gradient_editor_BrushChanged"/>
diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentGradientLayer.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentGradientLayer.xaml.cs
index 82bb00f71..d17fff7a4 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentGradientLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentGradientLayer.xaml.cs
@@ -39,8 +39,6 @@ public void SetSettings()
         {
             if (this.DataContext is PercentGradientLayerHandler && !settingsset)
             {
-                this.ComboBox_variable.Text = (this.DataContext as PercentGradientLayerHandler).Properties._VariablePath;
-                this.ComboBox_max_variable.Text = (this.DataContext as PercentGradientLayerHandler).Properties._MaxVariablePath;
                 this.ComboBox_effect_type.SelectedIndex = (int)(this.DataContext as PercentGradientLayerHandler).Properties._PercentType;
                 this.updown_blink_value.Value = (int)((this.DataContext as PercentGradientLayerHandler).Properties._BlinkThreshold * 100);
                 this.CheckBox_threshold_reverse.IsChecked = (this.DataContext as PercentGradientLayerHandler).Properties._BlinkDirection;
@@ -62,23 +60,7 @@ public void SetSettings()
 
         internal void SetApplication(Profiles.Application profile)
         {
-            if (profile != null && !profileset)
-            {
-                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
-
-                this.ComboBox_variable.Items.Clear();
-                foreach (var item in var_types_numerical)
-                    this.ComboBox_variable.Items.Add(item.Key);
-
-                this.ComboBox_max_variable.Items.Clear();
-                foreach (var item in var_types_numerical)
-                    this.ComboBox_max_variable.Items.Add(item.Key);
-
-                profileset = true;
-            }
-
-            settingsset = false;
-            this.SetSettings();
+            VariablePath.Application = MaxVariablePath.Application = profile;
         }
 
         private void KeySequence_keys_SequenceUpdated(object sender, EventArgs e)
@@ -100,18 +82,6 @@ private void Gradient_editor_BrushChanged(object sender, ColorBox.BrushChangedEv
                 (this.DataContext as PercentGradientLayerHandler).Properties._Gradient = new EffectsEngine.EffectBrush((sender as ColorBox.ColorBox).Brush);
         }
 
-        private void ComboBox_variable_TextChanged(object sender, RoutedEventArgs e)
-        {
-            if (IsLoaded && settingsset && this.DataContext is PercentGradientLayerHandler && sender is ComboBox)
-                (this.DataContext as PercentGradientLayerHandler).Properties._VariablePath = (sender as ComboBox).Text;
-        }
-
-        private void ComboBox_max_variable_TextChanged(object sender, RoutedEventArgs e)
-        {
-            if (IsLoaded && settingsset && this.DataContext is PercentGradientLayerHandler && sender is ComboBox)
-                (this.DataContext as PercentGradientLayerHandler).Properties._MaxVariablePath = (sender as ComboBox).Text;
-        }
-
         private void ColorPicker_progressColor_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
         {
             if (IsLoaded && settingsset && this.DataContext is PercentGradientLayerHandler && sender is Xceed.Wpf.Toolkit.ColorPicker && (sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.HasValue)
diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentLayer.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentLayer.xaml.cs
index a73cf9989..b2fb57a8e 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/Control_PercentLayer.xaml.cs
@@ -49,13 +49,7 @@ public void SetSettings()
 
         internal void SetProfile(Profiles.Application profile)
         {
-            if (profile != null && !profileset && profile.ParameterLookup != null)
-            {
-                variablePicker.Application = maxVariablePicker.Application = profile;
-                profileset = true;
-            }
-            settingsset = false;
-            this.SetSettings();
+            variablePicker.Application = maxVariablePicker.Application = profile;
         }
 
         private void KeySequence_keys_SequenceUpdated(object sender, EventArgs e)

From 9e687e60399222baf6396d47b3a9d31aeb446063 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Thu, 23 Apr 2020 14:40:56 +0100
Subject: [PATCH 18/20] Added evaluatable toolbox to animation layer control.
 But by god it's ugly. :S Animation rewrite when. Also fixed bug where it
 would not always create a new boolean evaluatable when required.

---
 .../Settings/Layers/Control_AnimationLayer.xaml            | 7 +++++--
 .../Settings/Layers/Control_AnimationLayer.xaml.cs         | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml b/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml
index d9a36358d..858d6b55e 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml
@@ -30,7 +30,7 @@
             </Grid>
         </GroupBox>
 
-        <GroupBox x:Name="triggerGroupbox" Header="Trigger" Margin="257,53,0,0" Width="333" MinHeight="299" HorizontalAlignment="Left" VerticalAlignment="Top">
+        <GroupBox x:Name="triggerGroupbox" Header="Trigger" Margin="257,53,0,0" Width="333" MinHeight="299" HorizontalAlignment="Left">
             <ScrollViewer>
                 <Grid>
                     <Grid x:Name="triggerGridLayout">
@@ -66,7 +66,10 @@
                         <Label Content="Trigger path:" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" />
                         <ComboBox x:Name="triggerPath" Grid.Row="1" Grid.Column="1"  Margin="2,4" VerticalAlignment="Center" Height="20" HorizontalAlignment="Stretch" IsEditable="True" TextBoxBase.TextChanged="triggerPath_TextChanged" />
                         <Label Content="Trigger expr:" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Right" />
-                        <logic:Control_EvaluatablePresenter x:Name="triggerEvaluatable" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" ExpressionChanged="triggerEvaluatable_ExpressionChanged" />
+                        <DockPanel Grid.Row="2" Grid.Column="1" LastChildFill="True">
+                            <logic:Control_EvaluatableToolbox DockPanel.Dock="Bottom" Height="180" />
+                            <logic:Control_EvaluatablePresenter x:Name="triggerEvaluatable" VerticalAlignment="Center" ExpressionChanged="triggerEvaluatable_ExpressionChanged" />
+                        </DockPanel>
                         <Label Content="Trigger keys:" Grid.Row="3" VerticalAlignment="Top" HorizontalAlignment="Right" />
                         <CheckBox x:Name="triggerAnyKey" Grid.Row="3" Grid.Column="1" Content="Trigger for any key" Margin="-6,6" Checked="triggerAnyKey_Checked" Unchecked="triggerAnyKey_Checked" />
                         <Controls:KeySequence x:Name="triggerKeys" Margin="0,28,0,0" Grid.Row="3" Grid.Column="1" RecordingTag="AnimationTriggerKeys" Title="Trigger keys" FreestyleEnabled="False" SequenceUpdated="triggerKeys_SequenceUpdated" />
diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml.cs
index 386fced7e..b5b0acd80 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/Control_AnimationLayer.xaml.cs
@@ -175,7 +175,7 @@ private void triggerMode_SelectionChanged(object sender, SelectionChangedEventAr
             // If the evaluatable is not the correct type or it is null, then create the default Evaluatable for it
             if (AnimationLayerHandler.IsTriggerEvaluatableNumericValueBased(selectedItem) && !typeof(IEvaluatable<double>).IsAssignableFrom(Context.Properties._EvaluatableTrigger?.GetType()))
                 Context.Properties._EvaluatableTrigger = EvaluatableDefaults.Get<double>();
-            else if (AnimationLayerHandler.IsTriggerEvaluatableBooleanValueBased(selectedItem) && typeof(IEvaluatable<bool>).IsAssignableFrom(Context.Properties._EvaluatableTrigger?.GetType()))
+            else if (AnimationLayerHandler.IsTriggerEvaluatableBooleanValueBased(selectedItem) && !typeof(IEvaluatable<bool>).IsAssignableFrom(Context.Properties._EvaluatableTrigger?.GetType()))
                 Context.Properties._EvaluatableTrigger = EvaluatableDefaults.Get<bool>();
 
             // Update the evaluatable control

From f8238e756ded4e3200f4b39ce944269dc0ad0218 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Thu, 23 Apr 2020 15:42:12 +0100
Subject: [PATCH 19/20] Fixed bug with game state picker behaving strangely
 when there are two paths sharing the first part of the name. (E.G. CPU and
 CPUUsage).

---
 .../Project-Aurora/Controls/GameStateParameterPicker.xaml.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs
index 1cef81d22..c4c8e2501 100644
--- a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs
@@ -50,10 +50,11 @@ public List<string> CurrentParameterListItems {
 
                 // Generate the string version of this working path (and cache it)
                 var _workingPath = WorkingPathStr;
+                if (_workingPath != "") _workingPath += "/"; // If not at the root directory, add / to the end of the test path. This means it doesn't get confused with things such as `CPU` and `CPUUsage`.
                 return ParameterList // With all properties in the current param lookup that are of a valid type (e.g. numbers)
                     .Where(path => path.StartsWith(_workingPath)) // Pick only the ones that start with the same working path
-                    .Select(path => path.Substring(_workingPath == "" ? 0 : _workingPath.Length + 1).Split('/').First()) // Select only the next part of the path
-                    .Distinct() // And ensure there are no duplicates (get distinct elements) so that we don't show "directories" multiple times (e.g. only once will "LocalPCInfo" be shown)
+                    .Select(path => path.Substring(_workingPath.Length).Split('/').First()) // Select only the next part of the path
+                    .Distinct() // And ensure there are no duplicates (get distinct elements) so that we don't show "directories" multiple times (e.g. only once with "LocalPCInfo" be shown)
                     .OrderBy(p => p.ToLowerInvariant()) // Order the items alphabetically (case insensitive)
                     .ToList();
             }

From 46202340102db25698a15cae395746b37ac9e58e Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Thu, 23 Apr 2020 17:27:07 +0100
Subject: [PATCH 20/20] Added folder icons to parameter picker. Thank DrMeteor
 for the idea. Also made the display name of the parameters get converted to
 space case.

---
 .../Controls/GameStateParameterPicker.xaml    |  10 +++--
 .../Controls/GameStateParameterPicker.xaml.cs |  36 ++++++++++-----
 .../Project-Aurora/Project-Aurora.csproj      |   2 +
 .../Properties/Resources.Designer.cs          |  10 +++++
 .../Project-Aurora/Properties/Resources.resx  |   3 ++
 .../Resources/icons8-folder-30.png            | Bin 0 -> 252 bytes
 .../Project-Aurora/Utils/TextUtils.cs         |  41 ++++++++++++++++++
 7 files changed, 89 insertions(+), 13 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Resources/icons8-folder-30.png
 create mode 100644 Project-Aurora/Project-Aurora/Utils/TextUtils.cs

diff --git a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml
index 6301656c0..7a260238d 100644
--- a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml
+++ b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml
@@ -9,8 +9,12 @@
              Height="22" MinWidth="60">
 
     <UserControl.Resources>
+        <BooleanToVisibilityConverter x:Key="BoolToVisConv" />
         <DataTemplate x:Key="ListItemTemplate">
-            <TextBlock Text="{Binding .}" Padding="4,1" />
+            <Grid>
+                <TextBlock Text="{Binding DisplayPath}" Padding="4,1" Margin="0,0,16,0" />
+                <Image Source="/Aurora;component/Resources/icons8-folder-30.png" Width="16" Height="16" HorizontalAlignment="Right" VerticalAlignment="Center" Visibility="{Binding IsFolder, Converter={StaticResource BoolToVisConv}}" />
+            </Grid>
         </DataTemplate>
         <l:IsStringNotNullOrWhitespaceConverter x:Key="IsStringNotNullConv" />
         <l:PropertyTypeToGridLengthConverter x:Key="PropTypeToHeightConv" />
@@ -37,8 +41,8 @@
                 </StackPanel>
 
                 <!-- List boxes (aux is for animation) -->
-                <ListBox x:Name="mainListBox" Grid.Row="1" ItemsSource="{Binding CurrentParameterListItems, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}" ItemTemplate="{StaticResource ListItemTemplate}" Width="{Binding ActualWidth, ElementName=popupContent}" HorizontalAlignment="Left" l:GameStateParameterPicker.TransformRelativeOffset="0" RenderTransform="{l:DoubleToRelativeTransformOffset}" PreviewMouseLeftButtonDown="MainListBox_PreviewMouseLeftButtonDown" />
-                <ListBox x:Name="auxillaryListbox" Grid.Row="1" ItemTemplate="{StaticResource ListItemTemplate}" Width="{Binding ActualWidth, ElementName=popupContent}" HorizontalAlignment="Left" l:GameStateParameterPicker.TransformRelativeOffset="-1" RenderTransform="{l:DoubleToRelativeTransformOffset}" />
+                <ListBox x:Name="mainListBox" Grid.Row="1" ItemsSource="{Binding CurrentParameterListItems, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type l:GameStateParameterPicker}}}" ItemTemplate="{StaticResource ListItemTemplate}" SelectedValuePath="Path" Width="{Binding ActualWidth, ElementName=popupContent}" HorizontalAlignment="Left" l:GameStateParameterPicker.TransformRelativeOffset="0" RenderTransform="{l:DoubleToRelativeTransformOffset}" PreviewMouseLeftButtonDown="MainListBox_PreviewMouseLeftButtonDown" />
+                <ListBox x:Name="auxillaryListbox" Grid.Row="1" ItemTemplate="{StaticResource ListItemTemplate}" Width="{Binding ActualWidth, ElementName=popupContent}" SelectedValuePath="Path" HorizontalAlignment="Left" l:GameStateParameterPicker.TransformRelativeOffset="-1" RenderTransform="{l:DoubleToRelativeTransformOffset}" />
 
                 <!-- Numeric input for numeric types -->
                 <DockPanel Grid.Row="2" LastChildFill="True">
diff --git a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs
index c4c8e2501..ded1e4a62 100644
--- a/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Controls/GameStateParameterPicker.xaml.cs
@@ -39,7 +39,7 @@ public GameStateParameterPicker() {
         /// <summary>
         /// Gets a list of items that should be displayed in the parameter list (based on the current "parent" variable).
         /// </summary>
-        public List<string> CurrentParameterListItems {
+        public IEnumerable<PathOption> CurrentParameterListItems {
             get {
                 // If the application or param lookup is null, we don't know the parameters so do nothing
                 if (Application?.ParameterLookup == null) return null;
@@ -51,12 +51,13 @@ public List<string> CurrentParameterListItems {
                 // Generate the string version of this working path (and cache it)
                 var _workingPath = WorkingPathStr;
                 if (_workingPath != "") _workingPath += "/"; // If not at the root directory, add / to the end of the test path. This means it doesn't get confused with things such as `CPU` and `CPUUsage`.
-                return ParameterList // With all properties in the current param lookup that are of a valid type (e.g. numbers)
-                    .Where(path => path.StartsWith(_workingPath)) // Pick only the ones that start with the same working path
-                    .Select(path => path.Substring(_workingPath.Length).Split('/').First()) // Select only the next part of the path
-                    .Distinct() // And ensure there are no duplicates (get distinct elements) so that we don't show "directories" multiple times (e.g. only once with "LocalPCInfo" be shown)
-                    .OrderBy(p => p.ToLowerInvariant()) // Order the items alphabetically (case insensitive)
-                    .ToList();
+                return from path in ParameterList // With all properties in the current param lookup that are of a valid type (e.g. numbers)
+                       where path.StartsWith(_workingPath) // Pick only the ones that start with the same working path
+                       let pathSplit = path.Substring(_workingPath.Length).Split('/') // Get a list of all remaining parts of the path (e.g. if this was A/B/C and current path was A, pathSplit would be 'B', 'C')
+                       let isFolder = pathSplit.Length > 1 // If there is more than one part of the path remaining, this must be a directory
+                       group isFolder by pathSplit[0] into g // Group by the path name so duplicates are removed
+                       orderby !g.First(), g.Key // Order the remaining (distinct) items by folders first, then order by their name
+                       select new PathOption(g.Key, g.First()); // Finally, put them in a POCO so we can bind the UI to these properties.
             }
         }
 
@@ -113,7 +114,7 @@ private static void SelectedPathDPChanged(DependencyObject sender, DependencyPro
                 picker.WorkingPath = new Stack<string>(e.NewValue.ToString().Split('/'));
                 picker.WorkingPath.Pop(); // Remove the last one, since the working path should not include the actual var name
                 picker.NotifyChanged(nameof(WorkingPath), nameof(WorkingPathStr), nameof(ParameterList), nameof(CurrentParameterListItems)); // All these things will be different now, so trigger an update of anything requiring them
-                picker.mainListBox.SelectedItem = e.NewValue.ToString().Split('/').Last(); // The selected item in the list will be the last part of the path
+                picker.mainListBox.SelectedValue = e.NewValue.ToString().Split('/').Last(); // The selected item in the list will be the last part of the path
             }
 
             // Raise an event informing subscribers
@@ -151,7 +152,7 @@ public static void ApplicationOrPropertyTypeChange(DependencyObject sender, Depe
             picker.parameterList = null;
             picker.NotifyChanged(nameof(ParameterList), nameof(CurrentParameterListItems));
 
-            if (!picker.ValidatePath(picker.SelectedPath ))
+            if (!picker.ValidatePath(picker.SelectedPath))
                 picker.SelectedPath = "";
         }
         #endregion
@@ -243,7 +244,7 @@ private void MainListBox_PreviewMouseLeftButtonDown(object sender, System.Window
                     auxillaryListbox.ItemsSource = CurrentParameterListItems;
 
                     // Add the clicked item to the working path (even if it is an end variable, not a "directory")
-                    WorkingPath.Push(item.Content.ToString());
+                    WorkingPath.Push(((PathOption)item.DataContext).Path);
 
                     var path = string.Join("/", WorkingPath.Reverse());
                     if (Application?.ParameterLookup?.IsValidParameter(path) ?? false) {
@@ -278,6 +279,21 @@ private void NotifyChanged(params string[] propNames) {
             foreach (var prop in propNames)
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(prop));
         }
+
+
+        /// <summary>
+        /// Basic POCO for holding a bit of metadata about a path option.
+        /// </summary>
+        public class PathOption {
+            public PathOption(string path, bool isFolder) {
+                Path = path;
+                IsFolder = isFolder;
+            }
+
+            public string DisplayPath => Path.CamelCaseToSpaceCase();
+            public string Path { get; }
+            public bool IsFolder { get; }
+        }
     }
 
 
diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index d1139b87b..bc0dbe3ca 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -893,6 +893,7 @@
     <Compile Include="Utils\DragBehaviour.cs" />
     <Compile Include="Utils\GridHelper.cs" />
     <Compile Include="Utils\ObservableConcurrentDictionary.cs" />
+    <Compile Include="Utils\TextUtils.cs" />
     <Compile Include="Utils\WindowPlacement.cs" />
     <Compile Include="Utils\Converters.cs" />
     <Compile Include="Utils\DesktopUtils.cs" />
@@ -1746,6 +1747,7 @@
     <Resource Include="Resources\betterdiscord.png" />
     <Resource Include="Resources\terraria_512x512.png" />
     <Resource Include="Resources\icons8-font-size-30.png" />
+    <Resource Include="Resources\icons8-folder-30.png" />
     <Content Include="RGB.NET.Devices.Asus.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/Project-Aurora/Project-Aurora/Properties/Resources.Designer.cs b/Project-Aurora/Project-Aurora/Properties/Resources.Designer.cs
index 1d85f7833..89c47dc07 100644
--- a/Project-Aurora/Project-Aurora/Properties/Resources.Designer.cs
+++ b/Project-Aurora/Project-Aurora/Properties/Resources.Designer.cs
@@ -380,6 +380,16 @@ internal static System.Drawing.Bitmap icons8_diamonds_30 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap icons8_folder_30 {
+            get {
+                object obj = ResourceManager.GetObject("icons8_folder_30", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/Project-Aurora/Project-Aurora/Properties/Resources.resx b/Project-Aurora/Project-Aurora/Properties/Resources.resx
index 91bf7ee22..0ca1e8c88 100755
--- a/Project-Aurora/Project-Aurora/Properties/Resources.resx
+++ b/Project-Aurora/Project-Aurora/Properties/Resources.resx
@@ -316,4 +316,7 @@
   <data name="icons8_font_size_30" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-font-size-30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icons8_folder_30" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-folder-30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Resources/icons8-folder-30.png b/Project-Aurora/Project-Aurora/Resources/icons8-folder-30.png
new file mode 100644
index 0000000000000000000000000000000000000000..5babdd60bf1a72ee9c7ebe815566ad0f4a51ba4b
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3Y)RhkE)4%caKYZ?lYt@|JzX3_
zJUZWA+Q@szK%n*E^VK&PB^p@;N+t$xVA`6l6da&*(^V>h!Oi2@iNy|mO$u{!8%yd-
zr|Hyh%5l)1(&^0c&|wqfhCiF$D=Hmdwd&o<gihv@mwC7tW+zIV%e}1^bntQS-tRu8
zFMMo0!>@m3opEP}gLblyu()a>LxlLZx)m><?_#`>_HEs@Tectm9oremaO3F0FVCfd
yBNAIh|K;z{e^4rK;5l9Ly~~kQoA}Fdwv0>*G-qZt+HD3pp25@A&t;ucLK6Ug6=q2Q

literal 0
HcmV?d00001

diff --git a/Project-Aurora/Project-Aurora/Utils/TextUtils.cs b/Project-Aurora/Project-Aurora/Utils/TextUtils.cs
new file mode 100644
index 000000000..5fdabbf13
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Utils/TextUtils.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Text;
+
+namespace Aurora.Utils {
+
+    public static class TextUtils {
+
+        /// <summary>
+        /// Converts a string from camel case to space case.
+        /// </summary>
+        public static string CamelCaseToSpaceCase(this string camelCase) {
+            // What the shit have I even made? Seems to work well tho.
+            if (camelCase.Length <= 2) return camelCase;
+            var sb = new StringBuilder();
+
+            // Determines if the character at the given position is uppercase
+            // If out of range or a number, keeps the case of the previous letter.
+            bool isUpper(int i) {
+                i = Math.Min(i, camelCase.Length - 1);
+                var c = camelCase[i];
+                return c >= '0' && c <= '9'
+                    ? isUpper(i - 1)
+                    : c >= 'A' && c <= 'X';
+            }
+            
+            // Iterate through all the characters in the string and insert a space at boundaries
+            // between uppercase and lowercase letters.
+            bool prevUp = isUpper(0), curUp = isUpper(1), nextUp;
+            sb.Append(camelCase[0]);
+            for (var i = 1; i < camelCase.Length; i++) {
+                nextUp = isUpper(i + 1);
+                if ((!prevUp && curUp) || (curUp && !nextUp))
+                    sb.Append(" ");
+                sb.Append(camelCase[i]);
+                prevUp = curUp;
+                curUp = nextUp;
+            }
+            return sb.ToString();
+        }
+    }
+}