diff --git a/Wabbajack/App.xaml b/Wabbajack/App.xaml
index 17c85ac3..0c70ed88 100644
--- a/Wabbajack/App.xaml
+++ b/Wabbajack/App.xaml
@@ -12,6 +12,7 @@
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
                 <ResourceDictionary Source="Themes\Styles.xaml" />
+                <ResourceDictionary Source="Themes\CustomControls.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Wabbajack/Themes/CustomControls.xaml b/Wabbajack/Themes/CustomControls.xaml
new file mode 100644
index 00000000..1ba0c9d0
--- /dev/null
+++ b/Wabbajack/Themes/CustomControls.xaml
@@ -0,0 +1,118 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:Wabbajack">
+    <Style TargetType="local:AttentionBorder">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:AttentionBorder">
+                    <Border BorderThickness="1">
+                        <Border.Style>
+                            <Style TargetType="Border">
+                                <Setter Property="Background" Value="{StaticResource WindowBackgroundBrush}" />
+                                <Setter Property="BorderBrush" Value="{StaticResource DarkerSecondaryBrush}" />
+                                <Style.Triggers>
+                                    <MultiDataTrigger>
+                                        <MultiDataTrigger.Conditions>
+                                            <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
+                                            <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="False" />
+                                            <Condition Binding="{Binding Failure, RelativeSource={RelativeSource AncestorType={x:Type local:AttentionBorder}}}" Value="False" />
+                                        </MultiDataTrigger.Conditions>
+                                        <MultiDataTrigger.EnterActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        AutoReverse="True"
+                                                        RepeatBehavior="Forever"
+                                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
+                                                        To="{StaticResource Secondary}"
+                                                        Duration="0:0:1.5" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        AutoReverse="True"
+                                                        RepeatBehavior="Forever"
+                                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
+                                                        To="{StaticResource SecondaryBackground}"
+                                                        Duration="0:0:1.5" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </MultiDataTrigger.EnterActions>
+                                        <MultiDataTrigger.ExitActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
+                                                        To="{StaticResource DarkerSecondary}"
+                                                        Duration="0:0:0.1" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
+                                                        To="{StaticResource WindowBackgroundColor}"
+                                                        Duration="0:0:0.1" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </MultiDataTrigger.ExitActions>
+                                    </MultiDataTrigger>
+                                    <MultiDataTrigger>
+                                        <MultiDataTrigger.Conditions>
+                                            <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
+                                            <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="False" />
+                                            <Condition Binding="{Binding Failure, RelativeSource={RelativeSource AncestorType={x:Type local:AttentionBorder}}}" Value="True" />
+                                        </MultiDataTrigger.Conditions>
+                                        <MultiDataTrigger.EnterActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        AutoReverse="True"
+                                                        RepeatBehavior="Forever"
+                                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
+                                                        To="#ff0026"
+                                                        Duration="0:0:1.5" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        AutoReverse="True"
+                                                        RepeatBehavior="Forever"
+                                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
+                                                        To="#540914"
+                                                        Duration="0:0:1.5" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </MultiDataTrigger.EnterActions>
+                                        <MultiDataTrigger.ExitActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
+                                                        To="#700d1c"
+                                                        Duration="0:0:0.1" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
+                                                        To="#1c0307"
+                                                        Duration="0:0:0.1" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </MultiDataTrigger.ExitActions>
+                                    </MultiDataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Border.Style>
+                        <ContentPresenter Content="{TemplateBinding Content}" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Wabbajack/Views/Common/AttentionBorder.xaml.cs b/Wabbajack/Views/Common/AttentionBorder.cs
similarity index 65%
rename from Wabbajack/Views/Common/AttentionBorder.xaml.cs
rename to Wabbajack/Views/Common/AttentionBorder.cs
index c43909ab..5cfdb343 100644
--- a/Wabbajack/Views/Common/AttentionBorder.xaml.cs
+++ b/Wabbajack/Views/Common/AttentionBorder.cs
@@ -20,14 +20,6 @@ namespace Wabbajack
     /// </summary>
     public partial class AttentionBorder : UserControl
     {
-        public object DisplayContent
-        {
-            get => (object)GetValue(DisplayContentProperty);
-            set => SetValue(DisplayContentProperty, value);
-        }
-        public static readonly DependencyProperty DisplayContentProperty = DependencyProperty.Register(nameof(DisplayContent), typeof(object), typeof(AttentionBorder),
-             new FrameworkPropertyMetadata(default(object)));
-
         public bool Failure
         {
             get => (bool)GetValue(FailureProperty);
@@ -35,10 +27,5 @@ namespace Wabbajack
         }
         public static readonly DependencyProperty FailureProperty = DependencyProperty.Register(nameof(Failure), typeof(bool), typeof(AttentionBorder),
              new FrameworkPropertyMetadata(default(bool)));
-
-        public AttentionBorder()
-        {
-            InitializeComponent();
-        }
     }
 }
diff --git a/Wabbajack/Views/Common/AttentionBorder.xaml b/Wabbajack/Views/Common/AttentionBorder.xaml
deleted file mode 100644
index b1ba1137..00000000
--- a/Wabbajack/Views/Common/AttentionBorder.xaml
+++ /dev/null
@@ -1,116 +0,0 @@
-<UserControl
-    x:Class="Wabbajack.AttentionBorder"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:Wabbajack"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    <Border BorderThickness="1">
-        <Border.Style>
-            <Style TargetType="Border">
-                <Setter Property="Background" Value="{StaticResource WindowBackgroundBrush}" />
-                <Setter Property="BorderBrush" Value="{StaticResource DarkerSecondaryBrush}" />
-                <Style.Triggers>
-                    <MultiDataTrigger>
-                        <MultiDataTrigger.Conditions>
-                            <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                            <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="False" />
-                            <Condition Binding="{Binding Failure, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" Value="False" />
-                        </MultiDataTrigger.Conditions>
-                        <MultiDataTrigger.EnterActions>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        AutoReverse="True"
-                                        RepeatBehavior="Forever"
-                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
-                                        To="{StaticResource Secondary}"
-                                        Duration="0:0:1.5" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        AutoReverse="True"
-                                        RepeatBehavior="Forever"
-                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
-                                        To="{StaticResource SecondaryBackground}"
-                                        Duration="0:0:1.5" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </MultiDataTrigger.EnterActions>
-                        <MultiDataTrigger.ExitActions>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
-                                        To="{StaticResource DarkerSecondary}"
-                                        Duration="0:0:0.1" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
-                                        To="{StaticResource WindowBackgroundColor}"
-                                        Duration="0:0:0.1" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </MultiDataTrigger.ExitActions>
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                        <MultiDataTrigger.Conditions>
-                            <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                            <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="False" />
-                            <Condition Binding="{Binding Failure, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" Value="True" />
-                        </MultiDataTrigger.Conditions>
-                        <MultiDataTrigger.EnterActions>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        AutoReverse="True"
-                                        RepeatBehavior="Forever"
-                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
-                                        To="#ff0026"
-                                        Duration="0:0:1.5" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        AutoReverse="True"
-                                        RepeatBehavior="Forever"
-                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
-                                        To="#540914"
-                                        Duration="0:0:1.5" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </MultiDataTrigger.EnterActions>
-                        <MultiDataTrigger.ExitActions>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
-                                        To="#700d1c"
-                                        Duration="0:0:0.1" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
-                                        To="#1c0307"
-                                        Duration="0:0:0.1" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </MultiDataTrigger.ExitActions>
-                    </MultiDataTrigger>
-                </Style.Triggers>
-            </Style>
-        </Border.Style>
-        <ContentPresenter Content="{Binding DisplayContent, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" />
-    </Border>
-</UserControl>
diff --git a/Wabbajack/Views/Compilers/CompilationCompleteView.xaml b/Wabbajack/Views/Compilers/CompilationCompleteView.xaml
index 3c69841f..947c5bd9 100644
--- a/Wabbajack/Views/Compilers/CompilationCompleteView.xaml
+++ b/Wabbajack/Views/Compilers/CompilationCompleteView.xaml
@@ -10,102 +10,101 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <local:AttentionBorder ClipToBounds="True" Failure="{Binding Completed.Failed}">
-        <local:AttentionBorder.DisplayContent>
-            <Grid Margin="5">
+        <Grid Margin="5">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="3*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                Grid.Row="0"
+                Grid.Column="0"
+                Grid.ColumnSpan="3"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Bottom"
+                FontFamily="Lucida Sans"
+                FontSize="22"
+                FontWeight="Black">
+                <TextBlock.Effect>
+                    <DropShadowEffect BlurRadius="25" Opacity="0.5" />
+                </TextBlock.Effect>
+                <TextBlock.Style>
+                    <Style TargetType="TextBlock">
+                        <Setter Property="Text" Value="Compilation Complete" />
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding Completed.Failed}" Value="True">
+                                <Setter Property="Text" Value="Compilation Failed" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Style>
+            </TextBlock>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="0"
+                VerticalAlignment="Center">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="3*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <TextBlock
+                <Button
                     Grid.Row="0"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="3"
+                    Width="55"
+                    Height="55"
+                    Command="{Binding BackCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconMaterial
+                        Width="28"
+                        Height="28"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="ArrowLeft" />
+                </Button>
+                <TextBlock
+                    Grid.Row="1"
+                    Margin="0,10,0,0"
                     HorizontalAlignment="Center"
-                    VerticalAlignment="Bottom"
-                    FontFamily="Lucida Sans"
-                    FontSize="22"
-                    FontWeight="Black">
-                    <TextBlock.Effect>
-                        <DropShadowEffect BlurRadius="25" Opacity="0.5" />
-                    </TextBlock.Effect>
-                    <TextBlock.Style>
-                        <Style TargetType="TextBlock">
-                            <Setter Property="Text" Value="Compilation Complete" />
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding Completed.Failed}" Value="True">
-                                    <Setter Property="Text" Value="Compilation Failed" />
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBlock.Style>
-                </TextBlock>
-                <Grid
+                    Text="Main Menu" />
+            </Grid>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="1"
+                VerticalAlignment="Center"
+                Visibility="{Binding CompilerSupportsAfterCompileNavigation, Converter={StaticResource bool2VisibilityConverter}}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Button
+                    Width="55"
+                    Height="55"
+                    Command="{Binding GoToModlistCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconMaterial
+                        Width="25"
+                        Height="25"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="FolderMove" />
+                </Button>
+                <TextBlock
                     Grid.Row="1"
-                    Grid.Column="0"
-                    VerticalAlignment="Center">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Button
-                        Grid.Row="0"
-                        Width="55"
-                        Height="55"
-                        Command="{Binding BackCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconMaterial
-                            Width="28"
-                            Height="28"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="ArrowLeft" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Main Menu" />
-                </Grid>
-                <Grid
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    VerticalAlignment="Center"
-                    Visibility="{Binding CompilerSupportsAfterCompileNavigation, Converter={StaticResource bool2VisibilityConverter}}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Button
-                        Width="55"
-                        Height="55"
-                        Command="{Binding GoToModlistCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconMaterial
-                            Width="25"
-                            Height="25"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="FolderMove" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Go To Modlist" />
-                </Grid>
-                <Grid
-                    Grid.Row="1"
-                    Grid.Column="2"
-                    VerticalAlignment="Center"
-                    Background="Transparent">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <!--<Button
+                    Margin="0,10,0,0"
+                    HorizontalAlignment="Center"
+                    Text="Go To Modlist" />
+            </Grid>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="2"
+                VerticalAlignment="Center"
+                Background="Transparent">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <!--<Button
                                 Width="55"
                                 Height="55"
                                 Background="{StaticResource PrimaryVariantBrush}"
@@ -127,24 +126,23 @@
                                     <BlurEffect Radius="15" />
                                 </Button.Effect>
                             </Button>-->
-                    <Button
-                        Width="55"
-                        Height="55"
-                        Command="{Binding CloseWhenCompleteCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconMaterial
-                            Width="30"
-                            Height="30"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="Check" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Close" />
-                </Grid>
+                <Button
+                    Width="55"
+                    Height="55"
+                    Command="{Binding CloseWhenCompleteCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconMaterial
+                        Width="30"
+                        Height="30"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="Check" />
+                </Button>
+                <TextBlock
+                    Grid.Row="1"
+                    Margin="0,10,0,0"
+                    HorizontalAlignment="Center"
+                    Text="Close" />
             </Grid>
-        </local:AttentionBorder.DisplayContent>
+        </Grid>
     </local:AttentionBorder>
 </UserControl>
diff --git a/Wabbajack/Views/Compilers/CompilerView.xaml b/Wabbajack/Views/Compilers/CompilerView.xaml
index 131801f0..821b1ccf 100644
--- a/Wabbajack/Views/Compilers/CompilerView.xaml
+++ b/Wabbajack/Views/Compilers/CompilerView.xaml
@@ -299,13 +299,11 @@
             <local:CpuView
                 x:Name="CpuView"
                 Grid.Column="2"
-                ViewModel="{Binding}"/>
+                ViewModel="{Binding}" />
             <local:AttentionBorder x:Name="UserInterventionsControl" Grid.Column="2">
-                <local:AttentionBorder.DisplayContent>
-                    <Grid>
-                        <local:ConfirmationInterventionView DataContext="{Binding ActiveGlobalUserIntervention}" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type common:ConfirmationIntervention}}" />
-                    </Grid>
-                </local:AttentionBorder.DisplayContent>
+                <Grid>
+                    <local:ConfirmationInterventionView DataContext="{Binding ActiveGlobalUserIntervention}" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type common:ConfirmationIntervention}}" />
+                </Grid>
             </local:AttentionBorder>
             <local:CompilationCompleteView x:Name="CompilationComplete" Grid.Column="2" />
         </Grid>
diff --git a/Wabbajack/Views/Installers/InstallationCompleteView.xaml b/Wabbajack/Views/Installers/InstallationCompleteView.xaml
index 26edba90..32d1e61c 100644
--- a/Wabbajack/Views/Installers/InstallationCompleteView.xaml
+++ b/Wabbajack/Views/Installers/InstallationCompleteView.xaml
@@ -10,146 +10,144 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <local:AttentionBorder ClipToBounds="True" Failure="{Binding Completed.Failed}">
-        <local:AttentionBorder.DisplayContent>
-            <Grid Margin="5">
+        <Grid Margin="5">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="3*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                Grid.Row="0"
+                Grid.Column="0"
+                Grid.ColumnSpan="4"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Bottom"
+                FontFamily="Lucida Sans"
+                FontSize="22"
+                FontWeight="Black">
+                <TextBlock.Effect>
+                    <DropShadowEffect BlurRadius="25" Opacity="0.5" />
+                </TextBlock.Effect>
+                <TextBlock.Style>
+                    <Style TargetType="TextBlock">
+                        <Setter Property="Text" Value="Installation Complete" />
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding Completed.Failed}" Value="True">
+                                <Setter Property="Text" Value="Installation Failed" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Style>
+            </TextBlock>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="0"
+                VerticalAlignment="Center">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="3*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <TextBlock
+                <Button
                     Grid.Row="0"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="4"
+                    Width="50"
+                    Height="50"
+                    Command="{Binding BackCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconMaterial
+                        Width="25"
+                        Height="25"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="ArrowLeft" />
+                </Button>
+                <TextBlock
+                    Grid.Row="1"
+                    Margin="0,10,0,0"
                     HorizontalAlignment="Center"
-                    VerticalAlignment="Bottom"
-                    FontFamily="Lucida Sans"
-                    FontSize="22"
-                    FontWeight="Black">
-                    <TextBlock.Effect>
-                        <DropShadowEffect BlurRadius="25" Opacity="0.5" />
-                    </TextBlock.Effect>
-                    <TextBlock.Style>
-                        <Style TargetType="TextBlock">
-                            <Setter Property="Text" Value="Installation Complete" />
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding Completed.Failed}" Value="True">
-                                    <Setter Property="Text" Value="Installation Failed" />
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBlock.Style>
-                </TextBlock>
-                <Grid
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    VerticalAlignment="Center">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Button
-                        Grid.Row="0"
-                        Width="50"
-                        Height="50"
-                        Command="{Binding BackCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconMaterial
-                            Width="25"
-                            Height="25"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="ArrowLeft" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Main Menu" />
-                </Grid>
-                <Grid
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    VerticalAlignment="Center"
-                    Visibility="{Binding InstallerSupportsAfterInstallNavigation, Converter={StaticResource bool2VisibilityConverter}}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Button
-                        Width="50"
-                        Height="50"
-                        Command="{Binding GoToInstallCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconMaterial
-                            Width="23"
-                            Height="23"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="FolderMove" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Install Folder" />
-                </Grid>
-                <Grid
-                    Grid.Row="1"
-                    Grid.Column="2"
-                    VerticalAlignment="Center"
-                    Background="Transparent">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Button
-                        Width="50"
-                        Height="50"
-                        Command="{Binding OpenReadmeCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconFontAwesome
-                            Width="25"
-                            Height="25"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="ReadmeBrands" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Readme" />
-                </Grid>
-                <Grid
-                    Grid.Row="1"
-                    Grid.Column="3"
-                    VerticalAlignment="Center"
-                    Background="Transparent">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Button
-                        Width="50"
-                        Height="50"
-                        Command="{Binding CloseWhenCompleteCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconMaterial
-                            Width="25"
-                            Height="25"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="Check" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Close" />
-                </Grid>
+                    Text="Main Menu" />
             </Grid>
-        </local:AttentionBorder.DisplayContent>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="1"
+                VerticalAlignment="Center"
+                Visibility="{Binding InstallerSupportsAfterInstallNavigation, Converter={StaticResource bool2VisibilityConverter}}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Button
+                    Width="50"
+                    Height="50"
+                    Command="{Binding GoToInstallCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconMaterial
+                        Width="23"
+                        Height="23"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="FolderMove" />
+                </Button>
+                <TextBlock
+                    Grid.Row="1"
+                    Margin="0,10,0,0"
+                    HorizontalAlignment="Center"
+                    Text="Install Folder" />
+            </Grid>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="2"
+                VerticalAlignment="Center"
+                Background="Transparent">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Button
+                    Width="50"
+                    Height="50"
+                    Command="{Binding OpenReadmeCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconFontAwesome
+                        Width="25"
+                        Height="25"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="ReadmeBrands" />
+                </Button>
+                <TextBlock
+                    Grid.Row="1"
+                    Margin="0,10,0,0"
+                    HorizontalAlignment="Center"
+                    Text="Readme" />
+            </Grid>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="3"
+                VerticalAlignment="Center"
+                Background="Transparent">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Button
+                    Width="50"
+                    Height="50"
+                    Command="{Binding CloseWhenCompleteCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconMaterial
+                        Width="25"
+                        Height="25"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="Check" />
+                </Button>
+                <TextBlock
+                    Grid.Row="1"
+                    Margin="0,10,0,0"
+                    HorizontalAlignment="Center"
+                    Text="Close" />
+            </Grid>
+        </Grid>
     </local:AttentionBorder>
 </UserControl>
diff --git a/Wabbajack/Views/Installers/InstallationView.xaml b/Wabbajack/Views/Installers/InstallationView.xaml
index f3f11ee4..7616daa3 100644
--- a/Wabbajack/Views/Installers/InstallationView.xaml
+++ b/Wabbajack/Views/Installers/InstallationView.xaml
@@ -430,12 +430,10 @@
                 ViewModel="{Binding}"
                 Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsNotNullVisibilityConverter}, ConverterParameter=False}" />
             <local:AttentionBorder Grid.Column="2" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsNotNullVisibilityConverter}}">
-                <local:AttentionBorder.DisplayContent>
-                    <Grid>
-                        <local:ConfirmationInterventionView DataContext="{Binding ActiveGlobalUserIntervention}" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type common:ConfirmationIntervention}}" />
-                        <local:ConfirmUpdateOfExistingInstallView Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type lib:ConfirmUpdateOfExistingInstall}}" />
-                    </Grid>
-                </local:AttentionBorder.DisplayContent>
+                <Grid>
+                    <local:ConfirmationInterventionView DataContext="{Binding ActiveGlobalUserIntervention}" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type common:ConfirmationIntervention}}" />
+                    <local:ConfirmUpdateOfExistingInstallView Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type lib:ConfirmUpdateOfExistingInstall}}" />
+                </Grid>
             </local:AttentionBorder>
             <local:InstallationCompleteView Grid.Column="2" Visibility="{Binding Completed, Converter={StaticResource IsNotNullVisibilityConverter}, FallbackValue=Collapsed}" />
         </Grid>
diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj
index bec54fb2..d20916db 100644
--- a/Wabbajack/Wabbajack.csproj
+++ b/Wabbajack/Wabbajack.csproj
@@ -174,6 +174,7 @@
     </ApplicationDefinition>
     <Compile Include="Extensions\DynamicDataExt.cs" />
     <Compile Include="View Models\Settings\AuthorFilesVM.cs" />
+    <Compile Include="Views\Common\AttentionBorder.cs" />
     <Compile Include="Views\ModListTileView.xaml.cs">
       <DependentUpon>ModListTileView.xaml</DependentUpon>
     </Compile>
@@ -202,9 +203,6 @@
     <Compile Include="Views\Settings\SettingsView.xaml.cs">
       <DependentUpon>SettingsView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Common\AttentionBorder.xaml.cs">
-      <DependentUpon>AttentionBorder.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Converters\IsTypeVisibilityConverter.cs" />
     <Compile Include="Views\Common\UnderMaintenanceOverlay.xaml.cs">
       <DependentUpon>UnderMaintenanceOverlay.xaml</DependentUpon>
@@ -308,6 +306,10 @@
     <Compile Include="Views\WebBrowserView.xaml.cs">
       <DependentUpon>WebBrowserView.xaml</DependentUpon>
     </Compile>
+    <Page Include="Themes\CustomControls.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\ModListTileView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -329,10 +331,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\Common\AttentionBorder.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Views\Common\UnderMaintenanceOverlay.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>