diff --git a/ZuneModCore/Mods/FeaturesOverrideMod.cs b/ZuneModCore/Mods/FeaturesOverrideMod.cs
index 53925ed..5418349 100644
--- a/ZuneModCore/Mods/FeaturesOverrideMod.cs
+++ b/ZuneModCore/Mods/FeaturesOverrideMod.cs
@@ -63,9 +63,9 @@ namespace ZuneModCore.Mods
 
         public override Task<bool> Apply()
         {
-            return Task.FromResult(true);
+            // TODO: Use user choices from AbstractUI
             foreach (AbstractUIElement uiElem in OptionsUI.Items)
-                if (uiElem is AbstractBooleanUIElement boolElem && boolElem.State)
+                if (uiElem is AbstractBooleanUIElement boolElem)// && boolElem.State)
                     SetFeatureOverride(boolElem.Id, true);
 
             return Task.FromResult(true);
diff --git a/ZuneModCore/Mods/WebservicesMod.cs b/ZuneModCore/Mods/WebservicesMod.cs
index 063f48d..ba3314b 100644
--- a/ZuneModCore/Mods/WebservicesMod.cs
+++ b/ZuneModCore/Mods/WebservicesMod.cs
@@ -31,12 +31,12 @@ namespace ZuneModCore.Mods
 
         public override IReadOnlyList<Type>? DependentMods => null;
 
-        public override async Task<bool> Apply()
+        public override Task<bool> Apply()
         {
             // Open ZuneServices.dll
             FileInfo zsDllInfo = new(Path.Combine(ZuneInstallDir, "ZuneService.dll"));
             if (!zsDllInfo.Exists)
-                return false;
+                return Task.FromResult(true);
             using FileStream zsDll = zsDllInfo.Open(FileMode.Open);
             using BinaryWriter zsDllWriter = new(zsDll);
             using BinaryReader zsDllReader = new(zsDll);
@@ -45,7 +45,7 @@ namespace ZuneModCore.Mods
             zsDllReader.BaseStream.Position = 0x12C824;
             var versionBytes = zsDllReader.ReadBytes(ZUNE_4_8_VERSION_BYTES.Length * 2);
             if (versionBytes[0] != '4' || versionBytes[2] != '.' || versionBytes[4] != '8')
-                return false;
+                return Task.FromResult(true);
 
             // Patch ZuneServices.dll to use zunes.tk instead of zune.net
             zsDllReader.BaseStream.Position = ZUNESERVICES_ENDPOINTS_BLOCK_OFFSET;
@@ -53,7 +53,7 @@ namespace ZuneModCore.Mods
             endpointBlock = endpointBlock.Replace("zune.net", "zunes.tk");
             byte[] endpointBytes = System.Text.Encoding.Unicode.GetBytes(endpointBlock);
             if (endpointBytes.Length != ZUNESERVICES_ENDPOINTS_BLOCK_LENGTH)
-                return false;
+                return Task.FromResult(false);
             zsDllWriter.Seek(ZUNESERVICES_ENDPOINTS_BLOCK_OFFSET, SeekOrigin.Begin);
             zsDllWriter.Write(endpointBytes);
 
@@ -69,7 +69,7 @@ namespace ZuneModCore.Mods
             SetFeatureOverride("Social", true);
             SetFeatureOverride("Videos", true);
 
-            return true;
+            return Task.FromResult(true);
         }
 
         public override Task<bool> Reset()
diff --git a/ZuneModdingHelper/AbstractUI/Controls/AbstractBooleanUIElementPresenter.cs b/ZuneModdingHelper/AbstractUI/Controls/AbstractBooleanUIElementPresenter.cs
deleted file mode 100644
index cd24bc5..0000000
--- a/ZuneModdingHelper/AbstractUI/Controls/AbstractBooleanUIElementPresenter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using OwlCore.AbstractUI.Models;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace ZuneModdingHelper.AbstractUI.Controls
-{
-    /// <summary>
-    /// A control that displays an <see cref="AbstractBooleanUIElement"/>.
-    /// </summary>
-    public sealed partial class AbstractBooleanUIElementPresenter : Control
-    {
-        static AbstractBooleanUIElementPresenter()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(AbstractBooleanUIElementPresenter), new FrameworkPropertyMetadata(typeof(AbstractBooleanUIElementPresenter)));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Controls/AbstractButtonPresenter.cs b/ZuneModdingHelper/AbstractUI/Controls/AbstractButtonPresenter.cs
deleted file mode 100644
index f85f23a..0000000
--- a/ZuneModdingHelper/AbstractUI/Controls/AbstractButtonPresenter.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using OwlCore.AbstractUI.Models;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace ZuneModdingHelper.AbstractUI.Controls
-{
-    /// <summary>
-    /// A control that displays an <see cref="AbstractButton"/>.
-    /// </summary>
-    public sealed partial class AbstractButtonPresenter : Control
-    {
-        /// <summary>
-        /// Creates a new instance of <see cref="AbstractButtonPresenter"/>.
-        /// </summary>
-        public AbstractButtonPresenter()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(AbstractButtonPresenter), new FrameworkPropertyMetadata(typeof(AbstractButtonPresenter)));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Controls/AbstractDataListPresenter.cs b/ZuneModdingHelper/AbstractUI/Controls/AbstractDataListPresenter.cs
deleted file mode 100644
index e45ed4d..0000000
--- a/ZuneModdingHelper/AbstractUI/Controls/AbstractDataListPresenter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using OwlCore.AbstractUI.Models;
-
-namespace ZuneModdingHelper.AbstractUI.Controls
-{
-    /// <summary>
-    /// A control that displays an <see cref="AbstractDataList"/>.
-    /// </summary>
-    public sealed partial class AbstractDataListPresenter : Control
-    {
-        static AbstractDataListPresenter()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(AbstractDataListPresenter), new FrameworkPropertyMetadata(typeof(AbstractDataListPresenter)));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Controls/AbstractMultiChoicePresenter.cs b/ZuneModdingHelper/AbstractUI/Controls/AbstractMultiChoicePresenter.cs
deleted file mode 100644
index cb3b4d8..0000000
--- a/ZuneModdingHelper/AbstractUI/Controls/AbstractMultiChoicePresenter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using OwlCore.AbstractUI.Models;
-
-namespace ZuneModdingHelper.AbstractUI.Controls
-{
-    /// <summary>
-    /// A control that displays an <see cref="AbstractMultiChoiceUIElement"/>.
-    /// </summary>
-    public sealed partial class AbstractMultiChoicePresenter : Control
-    {
-        static AbstractMultiChoicePresenter()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(AbstractMultiChoicePresenter), new FrameworkPropertyMetadata(typeof(AbstractMultiChoicePresenter)));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Controls/AbstractMutableDataListPresenter.cs b/ZuneModdingHelper/AbstractUI/Controls/AbstractMutableDataListPresenter.cs
deleted file mode 100644
index d8a308c..0000000
--- a/ZuneModdingHelper/AbstractUI/Controls/AbstractMutableDataListPresenter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using OwlCore.AbstractUI.Models;
-
-namespace ZuneModdingHelper.AbstractUI.Controls
-{
-    /// <summary>
-    /// A control that displays an <see cref="AbstractMutableDataList"/>.
-    /// </summary>
-    public sealed partial class AbstractMutableDataListPresenter : Control
-    {
-        static AbstractMutableDataListPresenter()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(AbstractMutableDataListPresenter), new FrameworkPropertyMetadata(typeof(AbstractMutableDataListPresenter)));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Controls/AbstractProgessUIElementPresenter.cs b/ZuneModdingHelper/AbstractUI/Controls/AbstractProgessUIElementPresenter.cs
deleted file mode 100644
index 09d97f3..0000000
--- a/ZuneModdingHelper/AbstractUI/Controls/AbstractProgessUIElementPresenter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using OwlCore.AbstractUI.Models;
-
-namespace ZuneModdingHelper.AbstractUI.Controls
-{
-    /// <summary>
-    /// A control that displays an <see cref="AbstractProgressUIElement"/>.
-    /// </summary>
-    public sealed partial class AbstractProgessUIElementPresenter : Control
-    {
-        static AbstractProgessUIElementPresenter()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(AbstractProgessUIElementPresenter), new FrameworkPropertyMetadata(typeof(AbstractProgessUIElementPresenter)));
-        }
-    }
-}
diff --git a/ZuneModdingHelper/AbstractUI/Controls/AbstractRichTextBlockPresenter.cs b/ZuneModdingHelper/AbstractUI/Controls/AbstractRichTextBlockPresenter.cs
deleted file mode 100644
index 13f7d18..0000000
--- a/ZuneModdingHelper/AbstractUI/Controls/AbstractRichTextBlockPresenter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using OwlCore.AbstractUI.Models;
-
-namespace ZuneModdingHelper.AbstractUI.Controls
-{
-    /// <summary>
-    /// A control that displays an <see cref="AbstractTextBox"/>.
-    /// </summary>
-    public sealed partial class AbstractRichTextBlockPresenter : Control
-    {
-        static AbstractRichTextBlockPresenter()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(AbstractRichTextBlockPresenter), new FrameworkPropertyMetadata(typeof(AbstractRichTextBlockPresenter)));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Controls/AbstractTextBoxPresenter.cs b/ZuneModdingHelper/AbstractUI/Controls/AbstractTextBoxPresenter.cs
deleted file mode 100644
index adf0d62..0000000
--- a/ZuneModdingHelper/AbstractUI/Controls/AbstractTextBoxPresenter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using OwlCore.AbstractUI.Models;
-
-namespace ZuneModdingHelper.AbstractUI.Controls
-{
-    /// <summary>
-    /// A control that displays an <see cref="AbstractTextBox"/>.
-    /// </summary>
-    public sealed partial class AbstractTextBoxPresenter : Control
-    {
-        static AbstractTextBoxPresenter()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(AbstractTextBoxPresenter), new FrameworkPropertyMetadata(typeof(AbstractTextBoxPresenter)));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Controls/AbstractUIGroupItemTemplateSelector.cs b/ZuneModdingHelper/AbstractUI/Controls/AbstractUIGroupItemTemplateSelector.cs
deleted file mode 100644
index f24f985..0000000
--- a/ZuneModdingHelper/AbstractUI/Controls/AbstractUIGroupItemTemplateSelector.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using OwlCore.AbstractUI.ViewModels;
-using Microsoft.Toolkit.Diagnostics;
-using OwlCore.AbstractUI.Models;
-
-namespace ZuneModdingHelper.AbstractUI.Controls
-{
-    /// <summary>
-    /// The template selector used to display Abstract UI elements. Use this to define your own custom styles for each control. You may specify the existing, default styles for those you don't want to override.
-    /// </summary>
-    public class AbstractUIGroupItemTemplateSelector : DataTemplateSelector
-    {
-        /// <summary>
-        /// Creates a new instance of <see cref="AbstractUIGroupItemTemplateSelector"/>.
-        /// </summary>
-        public AbstractUIGroupItemTemplateSelector()
-        {
-            object textBoxTemplate = new Themes.AbstractTextBoxStyle()["DefaultAbstractTextBoxTemplate"];
-            if (textBoxTemplate == null)
-                ThrowHelper.ThrowArgumentNullException<DataTemplate>(nameof(textBoxTemplate));
-
-            object dataListTemplate = new Themes.AbstractDataListStyle()["DefaultAbstractDataListTemplate"];
-            if (dataListTemplate == null)
-                ThrowHelper.ThrowArgumentNullException<DataTemplate>(nameof(dataListTemplate));
-
-            object mutableDataListTemplate = new Themes.AbstractMutableDataListStyle()["DefaultAbstractMutableDataListTemplate"];
-            if (mutableDataListTemplate == null)
-                ThrowHelper.ThrowArgumentNullException<DataTemplate>(nameof(mutableDataListTemplate));
-
-            object buttonTemplate = new Themes.AbstractButtonStyle()["DefaultAbstractButtonTemplate"];
-            if (buttonTemplate == null)
-                ThrowHelper.ThrowArgumentNullException<DataTemplate>(nameof(buttonTemplate));
-
-            object multiChoiceTemplate = new Themes.AbstractMultiChoiceUIElementStyle()["DefaultAbstractMultipleChoiceTemplate"];
-            if (multiChoiceTemplate == null)
-                ThrowHelper.ThrowArgumentNullException<DataTemplate>(nameof(multiChoiceTemplate));
-
-            object booleanTemplate = new Themes.AbstractBooleanUIElementStyle()["DefaultAbstractBooleanUIElementTemplate"];
-            if (booleanTemplate == null)
-                ThrowHelper.ThrowArgumentNullException<DataTemplate>(nameof(booleanTemplate));
-
-            object progressTemplate = new Themes.AbstractProgressUIElementStyle()["DefaultAbstractProgressUIElementTemplate"];
-            if (progressTemplate == null)
-                ThrowHelper.ThrowArgumentNullException<DataTemplate>(nameof(progressTemplate));
-
-            TextBoxTemplate = (DataTemplate)textBoxTemplate;
-            DataListTemplate = (DataTemplate)dataListTemplate;
-            ButtonTemplate = (DataTemplate)buttonTemplate;
-            MutableDataListTemplate = (DataTemplate)mutableDataListTemplate;
-            MultiChoiceTemplate = (DataTemplate)multiChoiceTemplate;
-            BooleanTemplate = (DataTemplate)booleanTemplate;
-            ProgressTemplate = (DataTemplate)progressTemplate;
-        }
-
-        /// <summary>
-        /// The data template used to display an <see cref="AbstractTextBox"/>.
-        /// </summary>
-        public DataTemplate TextBoxTemplate { get; set; }
-
-        /// <summary>
-        /// The data template used to display an <see cref="AbstractDataList"/>.
-        /// </summary>
-        public DataTemplate DataListTemplate { get; set; }
-
-        /// <summary>
-        /// The data template used to display an <see cref="AbstractMutableDataList"/>.
-        /// </summary>
-        public DataTemplate MutableDataListTemplate { get; set; }
-
-        /// <summary>
-        /// The data template used to display an <see cref="AbstractButton"/>.
-        /// </summary>
-        public DataTemplate ButtonTemplate { get; set; }
-
-        /// <summary>
-        /// The data template used to display an <see cref="AbstractBooleanUIElement"/>.
-        /// </summary>
-        public DataTemplate BooleanTemplate { get; set; }
-
-        /// <summary>
-        /// The data template used to display an <see cref="AbstractProgressUIElement"/>.
-        /// </summary>
-        public DataTemplate ProgressTemplate { get; set; }
-
-        /// <summary>
-        /// The data template used to display an <see cref="AbstractMultiChoiceUIElement"/>.
-        /// </summary>
-        public DataTemplate MultiChoiceTemplate { get; set; }
-
-        /// <inheritdoc />
-        public override DataTemplate SelectTemplate(object item, DependencyObject container)
-        {
-            System.Diagnostics.Debug.WriteLine($"{item.GetType()} template selecting for {nameof(AbstractUIGroupItemTemplateSelector)}");
-
-            return item switch
-            {
-                AbstractTextBoxViewModel _ => TextBoxTemplate,
-                AbstractDataListViewModel _ => DataListTemplate,
-                AbstractButtonViewModel _ => ButtonTemplate,
-                AbstractMutableDataListViewModel _ => MutableDataListTemplate,
-                AbstractMultiChoiceUIElementViewModel _ => MultiChoiceTemplate,
-                AbstractBooleanViewModel _ => BooleanTemplate,
-                AbstractProgressUIElement _ => ProgressTemplate,
-                _ => base.SelectTemplate(item, container)
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Controls/AbstractUIGroupPresenter.xaml.cs b/ZuneModdingHelper/AbstractUI/Controls/AbstractUIGroupPresenter.xaml.cs
deleted file mode 100644
index d81b34a..0000000
--- a/ZuneModdingHelper/AbstractUI/Controls/AbstractUIGroupPresenter.xaml.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using OwlCore.AbstractUI.ViewModels;
-using OwlCore.AbstractUI.Models;
-
-namespace ZuneModdingHelper.AbstractUI.Controls
-{
-    /// <summary>
-    /// Displays a group of abstract UI elements.
-    /// </summary>
-    public sealed partial class AbstractUIGroupPresenter : Control
-    {
-        private bool _dataContextBeingSet;
-
-        /// <summary>
-        /// Backing property for <see cref="ViewModel"/>.
-        /// </summary>
-        public static readonly DependencyProperty ViewModelProperty =
-            DependencyProperty.Register(nameof(ViewModel), typeof(AbstractUIElementGroupViewModel), typeof(AbstractUIGroupPresenter), new PropertyMetadata(null, (d, e) => ((AbstractUIGroupPresenter)d).OnViewModelChanged()));
-
-        /// <summary>
-        /// Backing property for <see cref="TemplateSelector"/>.
-        /// </summary>
-        public static readonly DependencyProperty TemplateSelectorProperty =
-            DependencyProperty.Register(nameof(TemplateSelector), typeof(DataTemplateSelector), typeof(AbstractUIGroupPresenter), new PropertyMetadata(null));
-
-        /// <summary>
-        /// The ViewModel for this UserControl.
-        /// </summary>
-        public AbstractUIElementGroupViewModel? ViewModel
-        {
-            get => (AbstractUIElementGroupViewModel)GetValue(ViewModelProperty);
-            set => SetValue(ViewModelProperty, value);
-        }
-
-        /// <summary>
-        /// The template selector used to display Abstract UI elements. Use this to define your own custom styles for each control. You may specify the existing, default styles for those you don't want to override.
-        /// </summary>
-        public DataTemplateSelector? TemplateSelector
-        {
-            get => (DataTemplateSelector)GetValue(TemplateSelectorProperty);
-            set => SetValue(TemplateSelectorProperty, value);
-        }
-
-        /// <summary>
-        /// Creates a new instance of <see cref="AbstractUIGroupPresenter"/>.
-        /// </summary>
-        public AbstractUIGroupPresenter()
-        {
-            AttachEvents();
-        }
-
-        static AbstractUIGroupPresenter()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(AbstractUIGroupPresenter), new FrameworkPropertyMetadata(typeof(AbstractUIGroupPresenter)));
-        }
-
-        private void AttachEvents()
-        {
-            Loaded += OnLoaded;
-
-            DataContextChanged += OnDataContextChanged;
-        }
-
-        private void DetachEvents()
-        {
-            DataContextChanged -= OnDataContextChanged;
-        }
-
-        private void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (_dataContextBeingSet)
-                return;
-
-            _dataContextBeingSet = true;
-
-            if (DataContext is AbstractUIElementGroup elementGroup)
-                ViewModel = new AbstractUIElementGroupViewModel(elementGroup);
-
-            if (DataContext is AbstractUIElementGroupViewModel elementGroupViewModel)
-                ViewModel = elementGroupViewModel;
-
-            _dataContextBeingSet = false;
-        }
-
-        private void OnLoaded(object sender, RoutedEventArgs e)
-        {
-            Loaded -= OnLoaded;
-            Unloaded += OnUnloaded;
-        }
-
-        private void OnUnloaded(object sender, RoutedEventArgs e)
-        {
-            Unloaded -= OnUnloaded;
-
-            DetachEvents();
-        }
-
-        /// <summary>
-        /// Raised when the <see cref="ViewModel"/> changes.
-        /// </summary>
-        public void OnViewModelChanged()
-        {
-            if (_dataContextBeingSet)
-                return;
-
-            _dataContextBeingSet = true;
-            DataContext = ViewModel;
-            _dataContextBeingSet = false;
-
-            if (GetTemplateChild("GroupItemsControl") is ItemsControl ic)
-            {
-                ic.ItemsSource = ViewModel.Items;
-            }
-        }
-    }
-}
diff --git a/ZuneModdingHelper/AbstractUI/Controls/CustomControl1.cs b/ZuneModdingHelper/AbstractUI/Controls/CustomControl1.cs
deleted file mode 100644
index 519f2da..0000000
--- a/ZuneModdingHelper/AbstractUI/Controls/CustomControl1.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace ZuneModdingHelper.AbstractUI.Controls
-{
-    /// <summary>
-    /// Follow steps 1a or 1b and then 2 to use this custom control in a XAML file.
-    ///
-    /// Step 1a) Using this custom control in a XAML file that exists in the current project.
-    /// Add this XmlNamespace attribute to the root element of the markup file where it is 
-    /// to be used:
-    ///
-    ///     xmlns:MyNamespace="clr-namespace:ZuneModdingHelper.AbstractUI.Controls"
-    ///
-    ///
-    /// Step 1b) Using this custom control in a XAML file that exists in a different project.
-    /// Add this XmlNamespace attribute to the root element of the markup file where it is 
-    /// to be used:
-    ///
-    ///     xmlns:MyNamespace="clr-namespace:ZuneModdingHelper.AbstractUI.Controls;assembly=ZuneModdingHelper.AbstractUI.Controls"
-    ///
-    /// You will also need to add a project reference from the project where the XAML file lives
-    /// to this project and Rebuild to avoid compilation errors:
-    ///
-    ///     Right click on the target project in the Solution Explorer and
-    ///     "Add Reference"->"Projects"->[Browse to and select this project]
-    ///
-    ///
-    /// Step 2)
-    /// Go ahead and use your control in the XAML file.
-    ///
-    ///     <MyNamespace:CustomControl1/>
-    ///
-    /// </summary>
-    public class CustomControl1 : Control
-    {
-        static CustomControl1()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(CustomControl1), new FrameworkPropertyMetadata(typeof(CustomControl1)));
-        }
-    }
-}
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractBooleanUIElementStyle.xaml b/ZuneModdingHelper/AbstractUI/Themes/AbstractBooleanUIElementStyle.xaml
deleted file mode 100644
index aa93dfc..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractBooleanUIElementStyle.xaml
+++ /dev/null
@@ -1,53 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:Class="ZuneModdingHelper.AbstractUI.Themes.AbstractBooleanUIElementStyle"
-    xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore"
-    xmlns:controls="clr-namespace:ZuneModdingHelper.AbstractUI.Controls"
-    xmlns:b="http://schemas.microsoft.com/xaml/behaviors">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/AbstractUI/Themes/AbstractUIResources.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style TargetType="{x:Type controls:AbstractButtonPresenter}">
-        <Style.Setters>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type controls:AbstractButtonPresenter}">
-                        <ContentControl ContentTemplate="{StaticResource DefaultAbstractBooleanUIElementTemplate}"
-                                        HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <DataTemplate x:Key="DefaultAbstractBooleanUIElementTemplate" DataType="{x:Type abstractUI:AbstractBooleanViewModel}">
-        <StackPanel>
-            <TextBlock Text="{Binding Title}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTip="{Binding TooltipText}" />
-
-            <TextBlock Text="{Binding Subtitle}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}"
-                       FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}"
-                       Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}"/>
-            <!--Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Subtitle), Mode=OneWay}"/>-->
-
-            <CheckBox ToolTip="{Binding TooltipText, Mode=OneWay}" Content="{Binding Label, Mode=OneWay}" IsChecked="{Binding IsToggled, Mode=TwoWay}">
-                <b:Interaction.Triggers>
-                    <b:EventTrigger EventName="Toggled">
-                        <b:InvokeCommandAction Command="{Binding ToggledCommand}" />
-                    </b:EventTrigger>
-                </b:Interaction.Triggers>
-            </CheckBox>
-            
-            <!--<ToggleSwitch ToolTip="{Binding TooltipText, Mode=OneWay}" OffContent="{Binding Label, Mode=OneWay}" OnContent="{Binding Label, Mode=OneWay}" IsOn="{Binding IsToggled, Mode=TwoWay}">
-                <b:Interaction.Triggers>
-                    <b:EventTrigger EventName="Toggled">
-                        <b:InvokeCommandAction Command="{Binding ToggledCommand}" />
-                    </b:EventTrigger>
-                </b:Interaction.Triggers>
-            </ToggleSwitch>-->
-        </StackPanel>
-    </DataTemplate>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractBooleanUIElementStyle.xaml.cs b/ZuneModdingHelper/AbstractUI/Themes/AbstractBooleanUIElementStyle.xaml.cs
deleted file mode 100644
index 186e470..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractBooleanUIElementStyle.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace ZuneModdingHelper.AbstractUI.Themes
-{
-    public sealed partial class AbstractBooleanUIElementStyle : ResourceDictionary
-    {
-        public AbstractBooleanUIElementStyle()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractButtonStyle.xaml b/ZuneModdingHelper/AbstractUI/Themes/AbstractButtonStyle.xaml
deleted file mode 100644
index 8c53466..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractButtonStyle.xaml
+++ /dev/null
@@ -1,64 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:Class="ZuneModdingHelper.AbstractUI.Themes.AbstractButtonStyle"
-    xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore"
-    xmlns:controls="clr-namespace:ZuneModdingHelper.AbstractUI.Controls"
-    xmlns:local="clr-namespace:ZuneModdingHelper.AbstractUI.Themes">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/AbstractUI/Themes/AbstractUIResources.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <local:AbstractButtonTemplateSelector x:Key="ButtonStyleSelector">
-        <local:AbstractButtonTemplateSelector.GenericStyle>
-            <Style TargetType="{x:Type Button}"/>
-        </local:AbstractButtonTemplateSelector.GenericStyle>
-        <local:AbstractButtonTemplateSelector.ConfirmStyle>
-            <Style TargetType="{x:Type Button}">
-                <!--<Style.Setters>
-                    <Setter Property="Background" Value="{ThemeResource SystemControlHighlightAccentBrush}"/>
-                </Style.Setters>-->
-            </Style>
-        </local:AbstractButtonTemplateSelector.ConfirmStyle>
-        <local:AbstractButtonTemplateSelector.DeleteStyle>
-            <Style TargetType="{x:Type Button}">
-                <Style.Setters>
-                    <Setter Property="Background" Value="Red"/>
-                </Style.Setters>
-            </Style>
-        </local:AbstractButtonTemplateSelector.DeleteStyle>
-    </local:AbstractButtonTemplateSelector>
-
-    <Style TargetType="{x:Type controls:AbstractButtonPresenter}">
-        <Style.Setters>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type controls:AbstractButtonPresenter}">
-                        <ContentControl ContentTemplate="{StaticResource DefaultAbstractButtonTemplate}"
-                                        HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <DataTemplate x:Key="DefaultAbstractButtonTemplate" DataType="{x:Type abstractUI:AbstractButtonViewModel}">
-        <StackPanel>
-            <TextBlock Text="{Binding Title, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTip="{Binding TooltipText, Mode=OneWay}" />
-
-            <TextBlock Text="{Binding Subtitle, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}"
-                       FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}"
-                       Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}"/>
-            <!--Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Subtitle), Mode=OneWay}"/>-->
-
-            <Button Style="{Binding Type, Converter={StaticResource ButtonStyleSelector}, Mode=OneWay}" Command="{Binding ClickCommand}">
-                <StackPanel Orientation="Horizontal"><!--Spacing="8">-->
-                    <!--<FontIcon Glyph="{Binding IconCode}" FontFamily="Segoe MDL2 Assets" Grid.Column="0" FontSize="16"/>-->
-                    <TextBlock Text="{Binding Text}" Grid.Column="1"/>
-                </StackPanel>
-            </Button>
-        </StackPanel>
-    </DataTemplate>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractButtonStyle.xaml.cs b/ZuneModdingHelper/AbstractUI/Themes/AbstractButtonStyle.xaml.cs
deleted file mode 100644
index 7131405..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractButtonStyle.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace ZuneModdingHelper.AbstractUI.Themes
-{
-    public sealed partial class AbstractButtonStyle : ResourceDictionary
-    {
-        public AbstractButtonStyle()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractButtonTemplateSelector.cs b/ZuneModdingHelper/AbstractUI/Themes/AbstractButtonTemplateSelector.cs
deleted file mode 100644
index b18194f..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractButtonTemplateSelector.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using OwlCore.AbstractUI.Models;
-using OwlCore.AbstractUI.ViewModels;
-using Microsoft.Toolkit.Diagnostics;
-using ZuneModdingHelper.AbstractUI.Controls;
-using System.Windows.Data;
-using System.Globalization;
-
-namespace ZuneModdingHelper.AbstractUI.Themes
-{
-    /// <summary>
-    /// Selects the template that is used for an <see cref="AbstractButton"/> based on the <see cref="AbstractButton.Type"/>.
-    /// </summary>
-    public class AbstractButtonTemplateSelector : IValueConverter
-    {
-        /// <summary>
-        /// The data template used to a display an <see cref="AbstractButton"/> with a generic style.
-        /// </summary>
-        public Style? GenericStyle { get; set; }
-
-        /// <summary>
-        /// The data template used to a display an <see cref="AbstractButton"/> with a confirmation style.
-        /// </summary>
-        public Style? ConfirmStyle { get; set; }
-
-        /// <summary>
-        /// The data template used to a display an <see cref="AbstractButton"/> with a deletion style.
-        /// </summary>
-        public Style? DeleteStyle { get; set; }
-
-        /// <inheritdoc />
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            var type = AbstractButtonType.Generic;
-
-            if (value is AbstractButtonType vType)
-                type = vType;
-            if (value is AbstractButtonViewModel buttonViewModel)
-                type = buttonViewModel.Type;
-            else if (value is AbstractButton button)
-                type = button.Type;
-
-            return type switch
-            {
-                AbstractButtonType.Generic => GenericStyle ?? ThrowHelper.ThrowArgumentNullException<Style>(),
-                AbstractButtonType.Confirm => ConfirmStyle ?? GenericStyle ?? ThrowHelper.ThrowArgumentNullException<Style>(),
-                AbstractButtonType.Cancel => DeleteStyle ?? GenericStyle ?? ThrowHelper.ThrowArgumentNullException<Style>(),
-                _ => throw new NotImplementedException(),
-            };
-        }
-
-        /// <inheritdoc/>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
-            Convert(value, targetType, parameter, culture.Name);
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) =>
-            Convert(value, targetType, parameter, culture.Name);
-    }
-}
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractDataListStyle.xaml b/ZuneModdingHelper/AbstractUI/Themes/AbstractDataListStyle.xaml
deleted file mode 100644
index d6eaf88..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractDataListStyle.xaml
+++ /dev/null
@@ -1,125 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:Class="ZuneModdingHelper.AbstractUI.Themes.AbstractDataListStyle"
-    xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore"
-    xmlns:controls="clr-namespace:ZuneModdingHelper.AbstractUI.Controls"
-    xmlns:themes="clr-namespace:ZuneModdingHelper.AbstractUI.Themes">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/AbstractUI/Themes/AbstractUIResources.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style TargetType="{x:Type controls:AbstractDataListPresenter}">
-        <Style.Setters>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type controls:AbstractDataListPresenter}">
-                        <ContentControl ContentTemplate="{StaticResource DefaultAbstractDataListTemplate}"
-                                        HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <DataTemplate x:Key="DefaultAbstractDataListTemplate" DataType="{x:Type abstractUI:AbstractDataListViewModel}">
-        <StackPanel>
-            <TextBlock Text="{Binding Title}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTip="{Binding TooltipText}" />
-
-            <TextBlock Text="{Binding Subtitle}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}"
-                       FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}"
-                       Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}"/>
-            <!--Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Subtitle)}"/>-->
-
-            <ListView x:Name="PrimaryListView" Visibility="{Binding IsList}"  ItemsSource="{Binding Items}" Margin="10">
-                <!--<ListView.ItemContainerStyle>
-                    <Style TargetType="{x:Type ListViewItem}">
-                        <Setter Property="Template">
-                            <Setter.Value>
-                                <ControlTemplate TargetType="{x:Type ListViewItem}">
-                                    <ListViewItemPresenter />
-                                </ControlTemplate>
-                            </Setter.Value>
-                        </Setter>
-                    </Style>
-                </ListView.ItemContainerStyle>-->
-                <ListView.ItemTemplate>
-                    <DataTemplate DataType="{x:Type abstractUI:AbstractUIMetadataViewModel}">
-                        <Grid ToolTip="{Binding TooltipText}" Height="60">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-
-                            <Border Grid.RowSpan="2" Margin="0,0,5,0"
-                                    Height="60" Width="60">
-                                <!--<FontIcon Glyph="{Binding IconCode}" FontFamily="Segoe MDL2 Assets" FontSize="34" />-->
-                            </Border>
-
-                            <Image Grid.RowSpan="2" Margin="0,0,5,0"
-                                   x:Name="Thumbnail"
-                                   Height="60" Width="60"
-                                   Source="{Binding ImageSource, Mode=OneWay}" />
-
-                            <TextBlock Grid.Column="1" Text="{Binding Title}" FontSize="22" VerticalAlignment="Center"/>
-                            <!--Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Title)}"/>-->
-
-                            <TextBlock x:Name="SubtitleTextBlock" Grid.Column="1" Grid.Row="1"
-                                       VerticalAlignment="Center"
-                                       
-                                       Text="{Binding Subtitle}"
-                                       FontSize="16" FontWeight="Light" Opacity="0.75" />
-                            <!--Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Subtitle)}"-->
-                        </Grid>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
-
-            <ListView ItemsSource="{Binding Items}" Visibility="{Binding IsGrid}">
-                <ListView.ItemContainerStyle>
-                    <Style TargetType="{x:Type ListViewItem}">
-                        <Setter Property="Template">
-                            <Setter.Value>
-                                <ControlTemplate TargetType="{x:Type ListViewItem}">
-                                    <Grid x:Name="ContentBorder">
-                                        <ContentPresenter x:Name="ContentPresenter" />
-                                    </Grid>
-                                </ControlTemplate>
-                            </Setter.Value>
-                        </Setter>
-                    </Style>
-                </ListView.ItemContainerStyle>
-                <ListView.ItemTemplate>
-                    <DataTemplate DataType="{x:Type abstractUI:AbstractUIMetadataViewModel}">
-                        <Grid ToolTip="{Binding TooltipText}" Width="150" Margin="15">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-
-                            <Border BorderBrush="White" BorderThickness="1" Height="150" Width="150">
-                                <Grid>
-                                    <!--<FontIcon Glyph="{Binding IconCode}" FontFamily="Segoe MDL2 Assets" FontSize="34" />-->
-                                    <Image Source="{Binding ImageSource, Mode=OneWay}" />
-                                </Grid>
-                            </Border>
-
-                            <TextBlock Text="{Binding Title}" FontSize="18" Grid.Row="1" />
-
-                            <TextBlock x:Name="SubtitleTextBlock" Grid.Row="2"
-                                       Text="{Binding Subtitle}"
-                                       FontSize="14" FontWeight="Light" Opacity="0.5" />
-                        </Grid>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
-        </StackPanel>
-    </DataTemplate>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractDataListStyle.xaml.cs b/ZuneModdingHelper/AbstractUI/Themes/AbstractDataListStyle.xaml.cs
deleted file mode 100644
index b9ec1b2..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractDataListStyle.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace ZuneModdingHelper.AbstractUI.Themes
-{
-    public sealed partial class AbstractDataListStyle : ResourceDictionary
-    {
-        public AbstractDataListStyle()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractDataListTypeTemplateSelector.cs b/ZuneModdingHelper/AbstractUI/Themes/AbstractDataListTypeTemplateSelector.cs
deleted file mode 100644
index 4fb66d0..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractDataListTypeTemplateSelector.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using OwlCore.AbstractUI.ViewModels;
-using Microsoft.Toolkit.Diagnostics;
-using OwlCore.AbstractUI.Models;
-
-namespace ZuneModdingHelper.AbstractUI.Themes
-{
-    /// <summary>
-    /// Selects the template that is used for an <see cref="AbstractDataList"/> based on the <see cref="AbstractDataList.PreferredDisplayMode"/>.
-    /// </summary>
-    public class AbstractDataListTypeTemplateSelector : DataTemplateSelector
-    {
-        /// <summary>
-        /// The data template used to display an <see cref="AbstractTextBox"/>.
-        /// </summary>
-        public DataTemplate? GridTemplate { get; set; }
-
-        /// <summary>
-        /// The data template used to display an <see cref="AbstractDataList"/>.
-        /// </summary>
-        public DataTemplate? ListTemplate { get; set; }
-
-
-
-        /// <inheritdoc />
-        public override DataTemplate SelectTemplate(object item, DependencyObject container)
-        {
-            if (item is AbstractMutableDataListViewModel mutableViewModel)
-            {
-                return mutableViewModel.PreferredDisplayMode switch
-                {
-                    AbstractDataListPreferredDisplayMode.Grid => GridTemplate ?? ThrowHelper.ThrowArgumentNullException<DataTemplate>(),
-                    AbstractDataListPreferredDisplayMode.List => ListTemplate ?? ThrowHelper.ThrowArgumentNullException<DataTemplate>(),
-                    _ => throw new NotImplementedException(),
-                };
-            }
-
-            if (item is AbstractDataListViewModel viewModel)
-            {
-                return viewModel.PreferredDisplayMode switch
-                {
-                    AbstractDataListPreferredDisplayMode.Grid => GridTemplate ?? ThrowHelper.ThrowArgumentNullException<DataTemplate>(),
-                    AbstractDataListPreferredDisplayMode.List => ListTemplate ?? ThrowHelper.ThrowArgumentNullException<DataTemplate>(),
-                    _ => throw new NotImplementedException(),
-                };
-            }
-
-            return base.SelectTemplate(item, container);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractMultiChoiceTypeTemplateSelector.cs b/ZuneModdingHelper/AbstractUI/Themes/AbstractMultiChoiceTypeTemplateSelector.cs
deleted file mode 100644
index 2623949..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractMultiChoiceTypeTemplateSelector.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using OwlCore.AbstractUI.ViewModels;
-using Microsoft.Toolkit.Diagnostics;
-using OwlCore.AbstractUI.Models;
-
-namespace ZuneModdingHelper.AbstractUI.Themes
-{
-    /// <summary>
-    /// Selects the template that is used for an <see cref="AbstractDataList"/> based on the <see cref="AbstractDataList.PreferredDisplayMode"/>.
-    /// </summary>
-    public class AbstractMultiChoiceTypeTemplateSelector : DataTemplateSelector
-    {
-        /// <summary>
-        /// The data template used to display an <see cref="AbstractTextBox"/>.
-        /// </summary>
-        public DataTemplate? ComboBoxTemplate { get; set; }
-
-        /// <summary>
-        /// The data template used to display an <see cref="AbstractDataList"/>.
-        /// </summary>
-        public DataTemplate? RadioButtonTemplate { get; set; }
-
-        /// <inheritdoc />
-        public override DataTemplate SelectTemplate(object item, DependencyObject container)
-        {
-            if (item is AbstractMultiChoiceUIElementViewModel viewModel)
-            {
-                return viewModel.PreferredDisplayMode switch
-                {
-                    AbstractMultiChoicePreferredDisplayMode.Dropdown => ComboBoxTemplate ?? ThrowHelper.ThrowArgumentNullException<DataTemplate>(),
-                    AbstractMultiChoicePreferredDisplayMode.RadioButtons => RadioButtonTemplate ?? ThrowHelper.ThrowArgumentNullException<DataTemplate>(),
-                    _ => throw new NotImplementedException(),
-                };
-            }
-
-            return base.SelectTemplate(item, container);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml b/ZuneModdingHelper/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml
deleted file mode 100644
index 7945454..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml
+++ /dev/null
@@ -1,76 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:Class="ZuneModdingHelper.AbstractUI.Themes.AbstractMultiChoiceUIElementStyle"
-    xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore"
-    xmlns:controls="clr-namespace:ZuneModdingHelper.AbstractUI.Controls"
-    xmlns:themes="clr-namespace:ZuneModdingHelper.AbstractUI.Themes"
-    xmlns:b="http://schemas.microsoft.com/xaml/behaviors">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/AbstractUI/Themes/AbstractUIResources.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style TargetType="{x:Type controls:AbstractMultiChoicePresenter}">
-        <Style.Setters>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type controls:AbstractMultiChoicePresenter}">
-                        <ContentControl ContentTemplate="{StaticResource DefaultAbstractMultipleChoiceTemplate}"
-                                        HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <DataTemplate x:Key="DefaultAbstractMultipleChoiceComboBoxTemplate" DataType="{x:Type abstractUI:AbstractMultiChoiceUIElementViewModel}">
-        <ComboBox ItemsSource="{Binding Items}" SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}">
-            <ComboBox.ItemTemplate>
-                <DataTemplate DataType="{x:Type abstractUI:AbstractMultiChoiceItemViewModel}">
-                    <TextBlock Text="{Binding Title}" />
-                </DataTemplate>
-            </ComboBox.ItemTemplate>
-            <b:Interaction.Triggers>
-                <b:EventTrigger EventName="SelectionChanged">
-                    <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" />
-                </b:EventTrigger>
-            </b:Interaction.Triggers>
-        </ComboBox>
-    </DataTemplate>
-
-    <DataTemplate x:Key="DefaultAbstractMultipleChoiceRadioButtonTemplate" DataType="{x:Type abstractUI:AbstractMultiChoiceUIElementViewModel}">
-        <ItemsControl ItemsSource="{Binding Items}">
-            <ItemsControl.ItemTemplate>
-                <DataTemplate DataType="{x:Type abstractUI:AbstractMultiChoiceItemViewModel}">
-                    <RadioButton Command="{Binding ItemSelectedCommand}" Content="{Binding Title}" GroupName="{Binding GroupId}" IsChecked="{Binding IsSelected, Mode=TwoWay}" />
-                </DataTemplate>
-            </ItemsControl.ItemTemplate>
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel Orientation="Vertical"  />
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-        </ItemsControl>
-    </DataTemplate>
-
-    <DataTemplate x:Key="DefaultAbstractMultipleChoiceTemplate" DataType="{x:Type abstractUI:AbstractMultiChoiceUIElementViewModel}">
-        <StackPanel>
-            <TextBlock Text="{Binding Title}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTip="{Binding TooltipText}" />
-
-            <TextBlock Text="{Binding Subtitle}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}"
-                       FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}"
-                       Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}"/>
-            <!--Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Subtitle)}"/>-->
-
-            <ContentControl Content="{Binding}" Margin="0,5,0,0">
-                <ContentControl.ContentTemplateSelector>
-                    <themes:AbstractMultiChoiceTypeTemplateSelector ComboBoxTemplate="{StaticResource DefaultAbstractMultipleChoiceComboBoxTemplate}"
-                                                                    RadioButtonTemplate="{StaticResource DefaultAbstractMultipleChoiceRadioButtonTemplate}"/>
-                </ContentControl.ContentTemplateSelector>
-            </ContentControl>
-
-        </StackPanel>
-    </DataTemplate>
-
-</ResourceDictionary>
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml.cs b/ZuneModdingHelper/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml.cs
deleted file mode 100644
index 4e5cc35..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace ZuneModdingHelper.AbstractUI.Themes
-{
-    public sealed partial class AbstractMultiChoiceUIElementStyle : ResourceDictionary
-    {
-        public AbstractMultiChoiceUIElementStyle()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractMutableDataListStyle.xaml b/ZuneModdingHelper/AbstractUI/Themes/AbstractMutableDataListStyle.xaml
deleted file mode 100644
index 2cb0822..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractMutableDataListStyle.xaml
+++ /dev/null
@@ -1,192 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:Class="ZuneModdingHelper.AbstractUI.Themes.AbstractMutableDataListStyle"
-    xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore"
-    xmlns:themes="clr-namespace:ZuneModdingHelper.AbstractUI.Themes"
-    xmlns:controls="clr-namespace:ZuneModdingHelper.AbstractUI.Controls"
-    xmlns:b="http://schemas.microsoft.com/xaml/behaviors">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/AbstractUI/Themes/AbstractUIResources.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style TargetType="{x:Type controls:AbstractMutableDataListPresenter}">
-        <Style.Setters>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type controls:AbstractMutableDataListPresenter}">
-                        <ContentControl ContentTemplate="{StaticResource DefaultAbstractMutableDataListTemplate}"
-                                        HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <!-- Binding is used in this file, in places where Binding is failing -->
-
-    <DataTemplate x:Key="DefaultAbstractMutableDataListListTemplate" DataType="{x:Type abstractUI:AbstractMutableDataListViewModel}">
-        <ListView x:Name="PrimaryListView" ItemsSource="{Binding Items}" Margin="10">
-            <b:Interaction.Triggers>
-                <b:EventTrigger EventName="ItemClick">
-                    <b:InvokeCommandAction Command="{Binding RequestNewItemCommand}" />
-                </b:EventTrigger>
-            </b:Interaction.Triggers>
-            <ListView.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel />
-                </ItemsPanelTemplate>
-            </ListView.ItemsPanel>
-            <ListView.ItemContainerStyle>
-                <Style TargetType="{x:Type ListViewItem}">
-                    <Setter Property="Background" Value="Transparent" />
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="{x:Type ListViewItem}">
-                                <ContentPresenter />
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </ListView.ItemContainerStyle>
-            <ListView.ItemTemplate>
-                <DataTemplate DataType="{x:Type abstractUI:AbstractMutableDataListItemViewModel}">
-                    <Grid ToolTip="{Binding TooltipText, Mode=OneWay}" Height="60">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-
-                        <Button Grid.RowSpan="2" Content="&#xE8BB;" FontFamily="Segoe MDL2 Assets" FontSize="16" 
-                                    Height="40" Width="40" Margin="0,0,5,0" Background="Transparent"
-                                    Visibility="{Binding CollapsedIfIsAddItem}">
-                            <b:Interaction.Triggers>
-                                <b:EventTrigger EventName="Click">
-                                    <b:InvokeCommandAction Command="{Binding RequestRemoveCommand}" CommandParameter="{Binding}" />
-                                </b:EventTrigger>
-                            </b:Interaction.Triggers>
-                        </Button>
-
-                        <Button Grid.RowSpan="2" Content="&#xE710;" FontFamily="Segoe MDL2 Assets" FontSize="18" 
-                                Height="40" Width="40" Margin="0,0,5,0" Background="Transparent"
-                                Visibility="{Binding VisibleIfIsAddItem}">
-                            <b:Interaction.Triggers>
-                                <b:EventTrigger EventName="Click">
-                                    <b:InvokeCommandAction Command="{Binding RequestAddCommand}" />
-                                </b:EventTrigger>
-                            </b:Interaction.Triggers>
-                        </Button>
-
-                        <!--<Border Grid.Column="1" Grid.RowSpan="2" Margin="0,0,5,0" Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(IconCode)}"
-                                    Height="65" Width="60">
-                            <FontIcon Glyph="{Binding IconCode, Mode=OneWay}" FontFamily="Segoe MDL2 Assets" FontSize="42" />
-                        </Border>-->
-
-                        <!--<Image Grid.Column="1" Grid.RowSpan="2" Margin="0,0,5,0" Visibility="{Binding convertvis:BoolToVisibilityConverter.Convert(ImageSourceIsValid)}"
-                                   x:Name="Thumbnail"
-                                   MaxHeight="60" MaxWidth="60"
-                                   Source="{Binding ImageSource, Mode=OneWay}" />-->
-
-                        <TextBlock Grid.Column="2" Text="{Binding Title, Mode=OneWay}" FontSize="20" VerticalAlignment="Center"/>
-                        <!--Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Title), Mode=OneWay}"/>-->
-
-                        <TextBlock x:Name="SubtitleTextBlock" Grid.Column="2" Grid.Row="1"
-                                       VerticalAlignment="Center"
-                                       Text="{Binding Subtitle, Mode=OneWay}"
-                                       FontSize="16" FontWeight="Light" Opacity="0.75" />
-                        <!--Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Subtitle), Mode=OneWay}"/>-->
-                    </Grid>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
-    </DataTemplate>
-
-    <DataTemplate x:Key="DefaultAbstractMutableDataListGridTemplate" DataType="{x:Type abstractUI:AbstractMutableDataListViewModel}">
-        <ListView ItemsSource="{Binding Items}">
-            <b:Interaction.Triggers>
-                <b:EventTrigger EventName="ItemClick">
-                    <b:InvokeCommandAction Command="{Binding RequestNewItemCommand}" />
-                </b:EventTrigger>
-            </b:Interaction.Triggers>
-            <ListView.ItemContainerStyle>
-                <Style TargetType="{x:Type ListViewItem}">
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="{x:Type ListViewItem}">
-                                <Grid x:Name="ContentBorder">
-                                    <ContentPresenter x:Name="ContentPresenter" />
-                                </Grid>
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </ListView.ItemContainerStyle>
-            <ListView.ItemTemplate>
-                <DataTemplate DataType="{x:Type abstractUI:AbstractMutableDataListItemViewModel}">
-                    <Grid ToolTip="{Binding TooltipText, Mode=OneWay}" Width="150" Margin="15">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <Border BorderBrush="White" BorderThickness="1" Height="150" Width="150" Grid.ColumnSpan="2">
-                            <Grid>
-                                <!--<FontIcon Glyph="{Binding IconCode}" FontFamily="Segoe MDL2 Assets" FontSize="34" />
-                                <FontIcon Visibility="{Binding VisibleIfIsAddItem}" Glyph="&#xE710;" FontFamily="Segoe MDL2 Assets" FontSize="34" />-->
-                                <Image Source="{Binding ImageSource, Mode=OneWay}" />
-                            </Grid>
-                        </Border>
-
-                        <TextBlock Text="{Binding Title, Mode=OneWay}" FontSize="16" Grid.Row="1" TextTrimming="CharacterEllipsis" />
-
-                        <Button Grid.Column="2" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Right" VerticalAlignment="Top"
-                                    Content="&#xE8BB;" FontFamily="Segoe MDL2 Assets" FontSize="14" 
-                                    Margin="5,-1,0,0" Background="Transparent"
-                                    Visibility="{Binding CollapsedIfIsAddItem}">
-                            <b:Interaction.Triggers>
-                                <b:EventTrigger EventName="Click">
-                                    <b:InvokeCommandAction Command="{Binding RequestRemoveCommand}" />
-                                </b:EventTrigger>
-                            </b:Interaction.Triggers>
-                        </Button>
-
-                        <TextBlock x:Name="SubtitleTextBlock" Grid.Row="2"  Grid.ColumnSpan="2"
-                                       Text="{Binding Subtitle}"
-                                       FontSize="12" FontWeight="Light" Opacity="0.5" TextTrimming="CharacterEllipsis" />
-                    </Grid>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
-    </DataTemplate>
-
-    <DataTemplate x:Key="DefaultAbstractMutableDataListTemplate" DataType="{x:Type abstractUI:AbstractMutableDataListViewModel}">
-        <StackPanel>
-            <TextBlock Text="{Binding Title, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTip="{Binding TooltipText, Mode=OneWay}" />
-
-            <TextBlock Text="{Binding Subtitle, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}"
-                       FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}"
-                       Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}"
-                       Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Subtitle), Mode=OneWay}"/>
-
-            <ContentControl Content="{Binding}">
-                <ContentControl.ContentTemplateSelector>
-                    <themes:AbstractDataListTypeTemplateSelector ListTemplate="{StaticResource DefaultAbstractMutableDataListListTemplate}"
-                                                                 GridTemplate="{StaticResource DefaultAbstractMutableDataListGridTemplate}"/>
-                </ContentControl.ContentTemplateSelector>
-            </ContentControl>
-        </StackPanel>
-    </DataTemplate>
-
-</ResourceDictionary>
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractMutableDataListStyle.xaml.cs b/ZuneModdingHelper/AbstractUI/Themes/AbstractMutableDataListStyle.xaml.cs
deleted file mode 100644
index 7e0678f..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractMutableDataListStyle.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace ZuneModdingHelper.AbstractUI.Themes
-{
-    public sealed partial class AbstractMutableDataListStyle : ResourceDictionary
-    {
-        public AbstractMutableDataListStyle()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml b/ZuneModdingHelper/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml
deleted file mode 100644
index b13daa1..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml
+++ /dev/null
@@ -1,38 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:Class="ZuneModdingHelper.AbstractUI.Themes.AbstractProgressUIElementStyle"
-    xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore"
-    xmlns:controls="clr-namespace:ZuneModdingHelper.AbstractUI.Controls">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/AbstractUI/Themes/AbstractUIResources.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style TargetType="{x:Type controls:AbstractProgessUIElementPresenter}">
-        <Style.Setters>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type controls:AbstractButtonPresenter}">
-                        <ContentControl ContentTemplate="{StaticResource DefaultAbstractBooleanUIElementTemplate}"
-                                        HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <DataTemplate x:Key="DefaultAbstractProgressUIElementTemplate" DataType="{x:Type abstractUI:AbstractProgressUIElementViewModel}">
-        <StackPanel>
-            <TextBlock Text="{Binding Title, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTip="{Binding TooltipText, Mode=OneWay}" />
-
-            <TextBlock Text="{Binding Subtitle, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}"
-                       FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}"
-                       Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}"/>
-            <!--Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Subtitle), Mode=OneWay}"/>-->
-
-            <ProgressBar Value="{Binding Value, Mode=OneWay}" Minimum="{Binding Minimum, Mode=OneWay}" Maximum="{Binding Maximum, Mode=OneWay}" IsIndeterminate="{Binding IsIndeterminate, Mode=OneWay}"/>
-        </StackPanel>
-    </DataTemplate>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml.cs b/ZuneModdingHelper/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml.cs
deleted file mode 100644
index ee96451..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace ZuneModdingHelper.AbstractUI.Themes
-{
-    public sealed partial class AbstractProgressUIElementStyle : ResourceDictionary
-    {
-        public AbstractProgressUIElementStyle()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml b/ZuneModdingHelper/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml
deleted file mode 100644
index 3def781..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml
+++ /dev/null
@@ -1,39 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:Class="ZuneModdingHelper.AbstractUI.Themes.AbstractRichTextBlockStyle"
-    xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore"
-    xmlns:controls="clr-namespace:ZuneModdingHelper.AbstractUI.Controls">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/AbstractUI/Themes/AbstractUIResources.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style TargetType="{x:Type controls:AbstractRichTextBlockPresenter}">
-        <Style.Setters>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type controls:AbstractTextBoxPresenter}">
-                        <ContentControl ContentTemplate="{StaticResource DefaultAbstractRichTextBlockTemplate}"
-                                        HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <DataTemplate x:Key="DefaultAbstractRichTextBlockTemplate" DataType="{x:Type abstractUI:AbstractRichTextBlockViewModel}">
-        <StackPanel>
-            <TextBlock Text="{Binding Title, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTip="{Binding TooltipText, Mode=OneWay}" />
-
-            <TextBlock Text="{Binding Subtitle, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}"
-                       FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}"
-                       Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}"/>
-            <!--Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Subtitle), Mode=OneWay}"/>-->
-
-            <!-- Disabled until we can resolve the namespace conflicts caused by the Windows Community Toolkit v7 prerelease4 -->
-            <!--<controls:MarkdownTextBlock Text="{Binding RichText}"/>-->
-        </StackPanel>
-    </DataTemplate>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml.cs b/ZuneModdingHelper/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml.cs
deleted file mode 100644
index 07df333..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace ZuneModdingHelper.AbstractUI.Themes
-{
-    public sealed partial class AbstractRichTextBlockStyle : ResourceDictionary
-    {
-        public AbstractRichTextBlockStyle()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractTextBoxStyle.xaml b/ZuneModdingHelper/AbstractUI/Themes/AbstractTextBoxStyle.xaml
deleted file mode 100644
index 80d3ba0..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractTextBoxStyle.xaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:Class="ZuneModdingHelper.AbstractUI.Themes.AbstractTextBoxStyle"
-    xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore"
-    xmlns:controls="clr-namespace:ZuneModdingHelper.AbstractUI.Controls"
-    xmlns:b="http://schemas.microsoft.com/xaml/behaviors">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/AbstractUI/Themes/AbstractUIResources.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style TargetType="{x:Type controls:AbstractTextBoxPresenter}">
-        <Style.Setters>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type controls:AbstractTextBoxPresenter}">
-                        <ContentControl ContentTemplate="{StaticResource DefaultAbstractTextBoxTemplate}"
-                                        HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <DataTemplate x:Key="DefaultAbstractTextBoxTemplate" DataType="{x:Type abstractUI:AbstractTextBoxViewModel}">
-        <StackPanel>
-            <TextBlock Text="{Binding Title, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTip="{Binding TooltipText, Mode=OneWay}" />
-
-            <TextBlock Text="{Binding Subtitle, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}"
-                       FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}"
-                       Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}"/>
-            <!--Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Subtitle), Mode=OneWay}"/>-->
-
-            <TextBox Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                     Margin="0,5,0,0"
-                     
-                     ToolTip="{Binding TooltipText, Mode=OneWay}">
-                <!--PlaceholderText="{Binding PlaceholderText, Mode=OneWay}"-->
-                <b:Interaction.Triggers>
-                    <b:EventTrigger EventName="TextChanging">
-                        <b:InvokeCommandAction Command="{Binding ValueChangedCommand}" />
-                    </b:EventTrigger>
-                </b:Interaction.Triggers>
-            </TextBox>
-        </StackPanel>
-    </DataTemplate>
-    
-</ResourceDictionary>
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractTextBoxStyle.xaml.cs b/ZuneModdingHelper/AbstractUI/Themes/AbstractTextBoxStyle.xaml.cs
deleted file mode 100644
index ddf4b15..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractTextBoxStyle.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace ZuneModdingHelper.AbstractUI.Themes
-{
-    public sealed partial class AbstractTextBoxStyle : ResourceDictionary
-    {
-        public AbstractTextBoxStyle()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml b/ZuneModdingHelper/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml
deleted file mode 100644
index 76c7021..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml
+++ /dev/null
@@ -1,97 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:Class="ZuneModdingHelper.AbstractUI.Themes.AbstractUIGroupPresenterStyle"
-    xmlns:controls="clr-namespace:ZuneModdingHelper.AbstractUI.Controls"
-    xmlns:abstractUIVm="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore"
-    xmlns:themes="clr-namespace:ZuneModdingHelper.AbstractUI.Themes">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/AbstractUI/Themes/AbstractUIResources.xaml"/>
-        <themes:AbstractBooleanUIElementStyle />
-        <themes:AbstractButtonStyle />
-        <themes:AbstractDataListStyle />
-        <themes:AbstractMultiChoiceUIElementStyle />
-        <themes:AbstractMutableDataListStyle />
-        <themes:AbstractProgressUIElementStyle />
-        <themes:AbstractRichTextBlockStyle />
-        <themes:AbstractTextBoxStyle />
-    </ResourceDictionary.MergedDictionaries>
-
-    <controls:AbstractUIGroupItemTemplateSelector x:Key="GroupTemplateSelector">
-        <controls:AbstractUIGroupItemTemplateSelector.BooleanTemplate>
-            <DataTemplate DataType="{x:Type abstractUIVm:AbstractBooleanViewModel}">
-                <controls:AbstractBooleanUIElementPresenter />
-            </DataTemplate>
-        </controls:AbstractUIGroupItemTemplateSelector.BooleanTemplate>
-
-        <controls:AbstractUIGroupItemTemplateSelector.ButtonTemplate>
-            <DataTemplate DataType="{x:Type abstractUIVm:AbstractButtonViewModel}">
-                <controls:AbstractButtonPresenter />
-            </DataTemplate>
-        </controls:AbstractUIGroupItemTemplateSelector.ButtonTemplate>
-
-        <controls:AbstractUIGroupItemTemplateSelector.DataListTemplate>
-            <DataTemplate DataType="{x:Type abstractUIVm:AbstractDataListViewModel}">
-                <controls:AbstractDataListPresenter />
-            </DataTemplate>
-        </controls:AbstractUIGroupItemTemplateSelector.DataListTemplate>
-
-        <controls:AbstractUIGroupItemTemplateSelector.MultiChoiceTemplate>
-            <DataTemplate DataType="{x:Type abstractUIVm:AbstractMultiChoiceUIElementViewModel}">
-                <controls:AbstractMultiChoicePresenter />
-            </DataTemplate>
-        </controls:AbstractUIGroupItemTemplateSelector.MultiChoiceTemplate>
-
-        <controls:AbstractUIGroupItemTemplateSelector.ProgressTemplate>
-            <DataTemplate DataType="{x:Type abstractUIVm:AbstractProgressUIElementViewModel}">
-                <controls:AbstractProgessUIElementPresenter />
-            </DataTemplate>
-        </controls:AbstractUIGroupItemTemplateSelector.ProgressTemplate>
-
-        <controls:AbstractUIGroupItemTemplateSelector.MutableDataListTemplate>
-            <DataTemplate DataType="{x:Type abstractUIVm:AbstractMutableDataListViewModel}">
-                <controls:AbstractMutableDataListPresenter />
-            </DataTemplate>
-        </controls:AbstractUIGroupItemTemplateSelector.MutableDataListTemplate>
-
-        <controls:AbstractUIGroupItemTemplateSelector.TextBoxTemplate>
-            <DataTemplate DataType="{x:Type abstractUIVm:AbstractTextBoxViewModel}">
-                <controls:AbstractTextBoxPresenter />
-            </DataTemplate>
-        </controls:AbstractUIGroupItemTemplateSelector.TextBoxTemplate>
-    </controls:AbstractUIGroupItemTemplateSelector>
-
-    <Style TargetType="{x:Type controls:AbstractUIGroupPresenter}" x:Key="DefaultAbstractUIGroupPresenterStyle">
-        <Style.Setters>
-            <Setter Property="Background" Value="Red"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type controls:AbstractUIGroupPresenter}">
-                        <ContentControl Background="{TemplateBinding Background}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
-                            <ContentControl.ContentTemplate>
-                                <DataTemplate DataType="{x:Type abstractUIVm:AbstractUIElementGroupViewModel}">
-                                    <StackPanel Margin="10,20">
-
-                                        <TextBlock Text="{Binding Title}" FontSize="30" ToolTip="{Binding TooltipText}" />
-                                        <!--Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Title), Mode=OneWay}"/>-->
-
-                                        <TextBlock Text="{Binding Subtitle}" FontSize="18" FontWeight="Light" Opacity="0.5"/>
-                                        <!--Visibility="{Binding convertvis:NotNullOrEmptyToVisibilityConverter.Convert(Subtitle), Mode=OneWay}"/>-->
-
-                                        <ItemsControl ItemsSource="{Binding Items}"
-                                                      Margin="0,20,0,0"
-                                                      ItemTemplateSelector="{StaticResource GroupTemplateSelector}"
-                                                      x:Name="GroupItemsControl"/>
-                                    </StackPanel>
-                                </DataTemplate>
-                            </ContentControl.ContentTemplate>
-                        </ContentControl>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-    
-</ResourceDictionary>
-    
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml.cs b/ZuneModdingHelper/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml.cs
deleted file mode 100644
index b3945b8..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace ZuneModdingHelper.AbstractUI.Themes
-{
-    public sealed partial class AbstractUIGroupPresenterStyle : ResourceDictionary
-    {
-        public AbstractUIGroupPresenterStyle()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/ZuneModdingHelper/AbstractUI/Themes/AbstractUIResources.xaml b/ZuneModdingHelper/AbstractUI/Themes/AbstractUIResources.xaml
deleted file mode 100644
index 9c2dcc0..0000000
--- a/ZuneModdingHelper/AbstractUI/Themes/AbstractUIResources.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime">
-
-    <system:Double x:Key="DefaultAbstractUITitleFontSize">24</system:Double>
-
-    <system:Double x:Key="DefaultAbstractUISubtitleFontSize">16</system:Double>
-    <FontWeight x:Key="DefaultAbstractUISubtitleFontWeight">Light</FontWeight>
-    <system:Double x:Key="DefaultAbstractUISubtitleOpacity">0.5</system:Double>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/ZuneModdingHelper/AbstractUIGroupDialog.xaml b/ZuneModdingHelper/AbstractUIGroupDialog.xaml
index c40bee8..8eac160 100644
--- a/ZuneModdingHelper/AbstractUIGroupDialog.xaml
+++ b/ZuneModdingHelper/AbstractUIGroupDialog.xaml
@@ -4,25 +4,15 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ZuneModdingHelper"
-        xmlns:absui="clr-namespace:ZuneModdingHelper.AbstractUI.Controls"
         mc:Ignorable="d"
         Title="Options" Height="450" Width="800"
         WindowStyle="ToolWindow">
-    <Window.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Window.Resources>
-    
+
     <Grid x:Name="OptionsUIGrid" Grid.RowSpan="2">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <absui:AbstractUIGroupPresenter x:Name="OptionsUIPresenter" x:FieldModifier="public" Style="{StaticResource DefaultAbstractUIGroupPresenterStyle}"
-                                        ViewModel="{Binding}" TemplateSelector="{StaticResource GroupTemplateSelector}"/>
         <Border Grid.Row="1" Background="#F0F0F0" BorderBrush="#DFDFDF" BorderThickness="0,1,0,0">
             <Button x:Name="OptionsUINextButton" Content="Done" Click="OptionsUINextButton_Click"
                     Margin="8" Padding="2" MinWidth="75"  HorizontalAlignment="Right"/>
diff --git a/ZuneModdingHelper/App.xaml b/ZuneModdingHelper/App.xaml
index 9cf658b..07cdf76 100644
--- a/ZuneModdingHelper/App.xaml
+++ b/ZuneModdingHelper/App.xaml
@@ -2,20 +2,15 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:ZuneModdingHelper"
-             xmlns:themes="clr-namespace:ZuneModdingHelper.AbstractUI.Themes"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <!--<ResourceDictionary Source="Controls/MarqueeTextBlock/MarqueeTextBlock.xaml"/>
-                <ResourceDictionary Source="Controls/ToggleContentButton/ToggleContentButton.xaml"/>-->
-                <themes:AbstractBooleanUIElementStyle />
-                <themes:AbstractButtonStyle />
-                <themes:AbstractDataListStyle />
-                <themes:AbstractMultiChoiceUIElementStyle />
-                <themes:AbstractMutableDataListStyle />
-                <themes:AbstractRichTextBlockStyle />
-                <themes:AbstractTextBoxStyle />
+                <!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
+                <!-- Theme setting -->
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/ZuneModdingHelper/MainWindow.xaml b/ZuneModdingHelper/MainWindow.xaml
index 85f0d1d..2341667 100644
--- a/ZuneModdingHelper/MainWindow.xaml
+++ b/ZuneModdingHelper/MainWindow.xaml
@@ -1,11 +1,11 @@
-<Window x:Class="ZuneModdingHelper.MainWindow"
+<mah:MetroWindow x:Class="ZuneModdingHelper.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ZuneModdingHelper"
         xmlns:core="clr-namespace:ZuneModCore;assembly=ZuneModCore"
-        xmlns:absui="clr-namespace:ZuneModdingHelper.AbstractUI.Controls"
+        xmlns:mah="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
         mc:Ignorable="d"
         Title="Zune Modding Helper" Height="450" Width="800"
         Loaded="Window_Loaded"
@@ -20,21 +20,22 @@
                   ScrollViewer.HorizontalScrollBarVisibility="Disabled">
             <ListView.ItemTemplate>
                 <DataTemplate DataType="{x:Type core:Mod}">
-                    <Border Padding="8" Margin="8" Background="White">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
+                    <Grid Margin="8">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
 
-                            <TextBlock Text="{Binding Title}" FontWeight="SemiBold" FontSize="16" TextTrimming="CharacterEllipsis"/>
-                            <TextBlock Text="{Binding Description}" Grid.Row="1" FontSize="12" TextWrapping="Wrap"/>
-                        </Grid>
+                        <TextBlock Text="{Binding Title}" FontWeight="SemiBold" FontSize="16" TextTrimming="CharacterEllipsis"/>
+                        <TextBlock Text="{Binding Description}" Grid.Row="1" FontSize="12" TextWrapping="Wrap"/>
+                    </Grid>
+                    <!--<Border Padding="8" Margin="8" Background="White">
+                        
 
                         <Border.Effect>
                             <DropShadowEffect BlurRadius="8" ShadowDepth="2" Direction="-90" Opacity="0.25"/>
                         </Border.Effect>
-                    </Border>
+                    </Border>-->
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
@@ -56,4 +57,4 @@
                     VerticalAlignment="Center" HorizontalAlignment="Center" Padding="4" Margin="4"/>
         </Grid>
     </Grid>
-</Window>
+</mah:MetroWindow>
diff --git a/ZuneModdingHelper/MainWindow.xaml.cs b/ZuneModdingHelper/MainWindow.xaml.cs
index 45a11f9..5eef30f 100644
--- a/ZuneModdingHelper/MainWindow.xaml.cs
+++ b/ZuneModdingHelper/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
-using OwlCore.AbstractUI.ViewModels;
+using MahApps.Metro.Controls;
+using OwlCore.AbstractUI.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,7 +21,7 @@ namespace ZuneModdingHelper
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class MainWindow : Window
+    public partial class MainWindow : MetroWindow
     {
         public MainWindow()
         {
@@ -36,18 +37,27 @@ namespace ZuneModdingHelper
         private async void InstallModsButton_Click(object sender, RoutedEventArgs e)
         {
             Mod.ZuneInstallDir = ZuneInstallDirBox.Text;
-            foreach (Mod mod in ModList.SelectedItems.Cast<Mod>())
+            var selectedMods = ModList.SelectedItems.Cast<Mod>();
+
+            double progTotal = selectedMods.Count() * 2;
+            double progCompleted = 0;
+            double progPercent = 0;
+
+            foreach (Mod mod in selectedMods)
             {
                 await mod.Init();
+                progPercent = ++progCompleted / progTotal;
 
-                if (mod.OptionsUI != null)
-                {
-                    var optionsDialog = new AbstractUIGroupDialog();
-                    optionsDialog.OptionsUIPresenter.ViewModel = new AbstractUIElementGroupViewModel(mod.OptionsUI);
-                    optionsDialog.ShowDialog();
-                }
+                // TODO: Implement AbstractUI display for options
+                //if (mod.OptionsUI != null)
+                //{
+                //    var optionsDialog = new AbstractUIGroupDialog();
+                //    optionsDialog.OptionsUIPresenter.ViewModel = new AbstractUIElementGroupViewModel(mod.OptionsUI);
+                //    optionsDialog.ShowDialog();
+                //}
 
                 await mod.Apply();
+                progPercent = ++progCompleted / progTotal;
             }
         }
     }
diff --git a/ZuneModdingHelper/Themes/Generic.xaml b/ZuneModdingHelper/Themes/Generic.xaml
deleted file mode 100644
index 2231597..0000000
--- a/ZuneModdingHelper/Themes/Generic.xaml
+++ /dev/null
@@ -1,32 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:ZuneModdingHelper.AbstractUI.Controls"
-    xmlns:themes="clr-namespace:ZuneModdingHelper.AbstractUI.Themes">
-
-    <ResourceDictionary.MergedDictionaries>
-        <!--<ResourceDictionary Source="Controls/MarqueeTextBlock/MarqueeTextBlock.xaml"/>
-        <ResourceDictionary Source="Controls/ToggleContentButton/ToggleContentButton.xaml"/>-->
-        <themes:AbstractBooleanUIElementStyle />
-        <themes:AbstractButtonStyle />
-        <themes:AbstractDataListStyle />
-        <themes:AbstractMultiChoiceUIElementStyle />
-        <themes:AbstractMutableDataListStyle />
-        <themes:AbstractRichTextBlockStyle />
-        <themes:AbstractTextBoxStyle />
-    </ResourceDictionary.MergedDictionaries>
-    
-
-    <Style TargetType="{x:Type local:CustomControl1}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:CustomControl1}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
diff --git a/ZuneModdingHelper/ZuneModdingHelper.csproj b/ZuneModdingHelper/ZuneModdingHelper.csproj
index b3c31f0..08ecde3 100644
--- a/ZuneModdingHelper/ZuneModdingHelper.csproj
+++ b/ZuneModdingHelper/ZuneModdingHelper.csproj
@@ -12,23 +12,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="MahApps.Metro" Version="2.4.5" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
     <PackageReference Include="OwlCore" Version="0.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="AbstractUI\Themes\AbstractBooleanUIElementStyle - Copy.xaml.cs">
-      <DependentUpon>AbstractBooleanUIElementStyle.xaml.cs</DependentUpon>
-    </Compile>
-    <Compile Update="AbstractUI\Themes\AbstractButtonStyle - Copy.xaml.cs">
-      <DependentUpon>AbstractButtonStyle.xaml.cs</DependentUpon>
-    </Compile>
-    <Compile Update="AbstractUI\Themes\AbstractDataListStyle - Copy.xaml.cs">
-      <DependentUpon>AbstractDataListStyle.xaml.cs</DependentUpon>
-    </Compile>
-    <Compile Update="AbstractUI\Themes\AbstractMultiChoiceUIElementStyle - Copy.xaml.cs">
-      <DependentUpon>AbstractMultiChoiceUIElementStyle.xaml.cs</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
 </Project>
diff --git a/ZuneModdingHelper/app.manifest b/ZuneModdingHelper/app.manifest
index d72e750..cef4bf7 100644
--- a/ZuneModdingHelper/app.manifest
+++ b/ZuneModdingHelper/app.manifest
@@ -40,7 +40,7 @@
       <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
 
       <!-- Windows 10 -->
-      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
 
     </application>
   </compatibility>
@@ -58,8 +58,7 @@
   -->
 
   <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
-  <!--
-  <dependency>
+  <!--<dependency>
     <dependentAssembly>
       <assemblyIdentity
           type="win32"
@@ -70,7 +69,6 @@
           language="*"
         />
     </dependentAssembly>
-  </dependency>
-  -->
+  </dependency>-->
 
 </assembly>