diff --git a/ZuneModdingHelper/App.xaml b/ZuneModdingHelper/App.xaml
index ad25e4d..566bb15 100644
--- a/ZuneModdingHelper/App.xaml
+++ b/ZuneModdingHelper/App.xaml
@@ -6,13 +6,9 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <!-- 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.Magenta.xaml" />-->
-
                 <ResourceDictionary Source="Themes/Generic.xaml"/>
+                <ResourceDictionary Source="Themes/Zune.xaml"/>
+                <ResourceDictionary Source="/PresentationFramework.Aero2;component/themes/aero2.normalcolor.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
             <FontFamily x:Key="ZMHIcons">Assets/ZMH_Icons.ttf#ZMHIcons</FontFamily>
diff --git a/ZuneModdingHelper/Themes/Zune.xaml b/ZuneModdingHelper/Themes/Zune.xaml
new file mode 100644
index 0000000..6bc1b63
--- /dev/null
+++ b/ZuneModdingHelper/Themes/Zune.xaml
@@ -0,0 +1,165 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    
+    <Style x:Key="ActionButtonStyle" TargetType="Button">
+        <Style.Resources>
+            <!-- Border -->
+            <SolidColorBrush x:Key="NormalBorderBrush" Color="#33000000"/>
+            <SolidColorBrush x:Key="HoverBorderBrush" Color="#3D000000"/>
+            <SolidColorBrush x:Key="PressedBorderBrush" Color="#33000000"/>
+            <SolidColorBrush x:Key="DisabledBorderBrush" Color="#14000000"/>
+
+            <!-- Background -->
+            <LinearGradientBrush x:Key="NormalBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+                <GradientStop Color="#F7F7F7" Offset="0"/>
+                <GradientStop Color="#DFDFDF" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="HoverBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+                <GradientStop Color="#EAEAEA" Offset="0"/>
+                <GradientStop Color="#D4D4D4" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="PressedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+                <GradientStop Color="#F7F7F7" Offset="0"/>
+                <GradientStop Color="#DFDFDF" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="DisabledBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+                <GradientStop Color="#66F7F7F7" Offset="0"/>
+                <GradientStop Color="#57DFDFDF" Offset="1"/>
+            </LinearGradientBrush>
+        </Style.Resources>
+
+        <Setter Property="FontFamily" Value="segoe zuc"/>
+        <Setter Property="FontWeight" Value="ExtraBlack"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="Border" BorderThickness="1.5"
+                            Background="{StaticResource NormalBackgroundBrush}"
+                            BorderBrush="{StaticResource NormalBorderBrush}"
+                            Padding="8,2" CornerRadius="4">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="MouseOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background)" Storyboard.TargetName="Border">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource HoverBackgroundBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.BorderBrush)" Storyboard.TargetName="Border">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource HoverBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background)" Storyboard.TargetName="Border">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PressedBackgroundBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.BorderBrush)" Storyboard.TargetName="Border">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PressedBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background)" Storyboard.TargetName="Border">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource DisabledBackgroundBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.BorderBrush)" Storyboard.TargetName="Border">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource DisabledBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ActionButtonPinkStyle" TargetType="Button">
+        <Style.Resources>
+            <!-- Border -->
+            <SolidColorBrush x:Key="NormalBorderBrush" Color="#80FFFFFF"/>
+            <SolidColorBrush x:Key="HoverBorderBrush" Color="#B3FFFFFF"/>
+            <SolidColorBrush x:Key="PressedBorderBrush" Color="#66FFFFFF"/>
+            <SolidColorBrush x:Key="DisabledBorderBrush" Color="#00FFFFFF"/>
+
+            <!-- Background -->
+            <LinearGradientBrush x:Key="NormalBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+                <GradientStop Color="#EC008C" Offset="0"/>
+                <GradientStop Color="#BE0071" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="HoverBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+                <GradientStop Color="#F000A3" Offset="0"/>
+                <GradientStop Color="#CB0088" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="PressedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+                <GradientStop Color="#D4007E" Offset="0"/>
+                <GradientStop Color="#AB0065" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="DisabledBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+                <GradientStop Color="#66EC008C" Offset="0"/>
+                <GradientStop Color="#66BE0071" Offset="1"/>
+            </LinearGradientBrush>
+        </Style.Resources>
+
+        <Setter Property="FontFamily" Value="segoe zuc"/>
+        <Setter Property="FontWeight" Value="ExtraBlack"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="Border" BorderThickness="1.5"
+                            TextBlock.Foreground="White"
+                            Background="{StaticResource NormalBackgroundBrush}"
+                            BorderBrush="{StaticResource NormalBorderBrush}"
+                            Padding="8,2" CornerRadius="4">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="MouseOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background)" Storyboard.TargetName="Border">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource HoverBackgroundBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.BorderBrush)" Storyboard.TargetName="Border">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource HoverBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background)" Storyboard.TargetName="Border">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PressedBackgroundBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.BorderBrush)" Storyboard.TargetName="Border">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PressedBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background)" Storyboard.TargetName="Border">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource DisabledBackgroundBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.BorderBrush)" Storyboard.TargetName="Border">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource DisabledBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    
+</ResourceDictionary>
\ No newline at end of file