diff --git a/ZuneModdingHelper/Themes/Zune.Dark.xaml b/ZuneModdingHelper/Themes/Zune.Dark.xaml
index 165f36a..56513f9 100644
--- a/ZuneModdingHelper/Themes/Zune.Dark.xaml
+++ b/ZuneModdingHelper/Themes/Zune.Dark.xaml
@@ -1,46 +1,52 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-	<LinearGradientBrush x:Key="NormalCheckBoxBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-		<GradientStop Color="#000000" Offset="0"/>
-		<GradientStop Color="#303030" Offset="1"/>
-	</LinearGradientBrush>
-	<SolidColorBrush x:Key="NormalCheckBoxBorderBrush" Color="#4B4B4B" />
-	<SolidColorBrush x:Key="NormalCheckBoxCheckBrush" Color="#BABABA" />
+    <LinearGradientBrush x:Key="NormalCheckBoxBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+        <GradientStop Color="#000000" Offset="0"/>
+        <GradientStop Color="#303030" Offset="1"/>
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="NormalCheckBoxBorderBrush" Color="#4B4B4B" />
+    <SolidColorBrush x:Key="NormalCheckBoxCheckBrush" Color="#BABABA" />
 
-	<LinearGradientBrush x:Key="HoverCheckBoxBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-		<GradientStop Color="#000000" Offset="0"/>
-		<GradientStop Color="#303030" Offset="1"/>
-	</LinearGradientBrush>
-	<SolidColorBrush x:Key="HoverCheckBoxBorderBrush" Color="#696969" />
-	<SolidColorBrush x:Key="HoverCheckBoxCheckBrush" Color="#FFFFFF" />
+    <LinearGradientBrush x:Key="HoverCheckBoxBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+        <GradientStop Color="#000000" Offset="0"/>
+        <GradientStop Color="#303030" Offset="1"/>
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="HoverCheckBoxBorderBrush" Color="#696969" />
+    <SolidColorBrush x:Key="HoverCheckBoxCheckBrush" Color="#FFFFFF" />
 
-	<SolidColorBrush x:Key="DisabledCheckBoxBackgroundBrush" Color="#FFE6E6E6" />
-	<SolidColorBrush x:Key="DisabledCheckBoxBorderBrush" Color="#FFBCBCBC" />
-	<SolidColorBrush x:Key="DisabledCheckBoxCheckBrush" Color="#FF707070" />
+    <SolidColorBrush x:Key="DisabledCheckBoxBackgroundBrush" Color="#FFE6E6E6" />
+    <SolidColorBrush x:Key="DisabledCheckBoxBorderBrush" Color="#FFBCBCBC" />
+    <SolidColorBrush x:Key="DisabledCheckBoxCheckBrush" Color="#FF707070" />
 
-	<Style TargetType="CheckBox" BasedOn="{StaticResource ZuneCheckBoxStyle}">
-		<Setter Property="Foreground" Value="White"/>
-	</Style>
+    <Style TargetType="CheckBox" BasedOn="{StaticResource ZuneCheckBoxStyle}">
+        <Setter Property="Foreground" Value="White"/>
+    </Style>
 
-	<SolidColorBrush x:Key="NormalScrollBrush" Color="#474747" />
-	<SolidColorBrush x:Key="NormalScrollButtonBrush" Color="#B4B4B4" />
-	<SolidColorBrush x:Key="HoverScrollBrush" Color="#FFFFFF" />
-	<SolidColorBrush x:Key="HoverScrollButtonBrush" Color="#FFFFFF" />
-	<SolidColorBrush x:Key="PressedScrollButtonBrush" Color="#A7A7A7" />
-	<SolidColorBrush x:Key="DisabledScrollButtonBrush" Color="#555555" /> <!-- TODO: Get actual color -->
+    <SolidColorBrush x:Key="NormalScrollBrush" Color="#474747" />
+    <SolidColorBrush x:Key="NormalScrollButtonBrush" Color="#B4B4B4" />
+    <SolidColorBrush x:Key="HoverScrollBrush" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="HoverScrollButtonBrush" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="PressedScrollButtonBrush" Color="#A7A7A7" />
+    <SolidColorBrush x:Key="DisabledScrollButtonBrush" Color="#555555" /> <!-- TODO: Get actual color -->
 
-	<!-- AbstractUI -->
-	<Style x:Key="AbstractUICollectionSubtitleStyle" TargetType="TextBlock">
-		<Setter Property="FontSize" Value="18"/>
-		<Setter Property="FontWeight" Value="Light"/>
-		<Setter Property="Opacity" Value="0.5"/>
-	</Style>
-	<Style x:Key="AbstractDataListGridItemBorderStyle" TargetType="Border">
-		<Setter Property="BorderBrush" Value="#2EFFFFFF"/>
-		<Setter Property="BorderThickness" Value="1"/>
-		<Setter Property="Background" Value="#0BFFFFFF"/>
-	</Style>
-	<SolidColorBrush x:Key="AbstractDataListGridForegroundBrush" Color="White" />
-	
+    <SolidColorBrush x:Key="NormalTextBoxBackgroundBrush" Color="#0BFFFFFF" />
+    <SolidColorBrush x:Key="NormalTextBoxForegroundBrush" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="NormalTextBoxBorderBrush" Color="#2EFFFFFF" />
+    <SolidColorBrush x:Key="HoverTextBoxBorderBrush" Color="#2EFFFFFF" />
+    <SolidColorBrush x:Key="FocusedTextBoxBorderBrush" Color="{StaticResource ZunePinkAlt}" />
+
+    <!-- AbstractUI -->
+    <Style x:Key="AbstractUICollectionSubtitleStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="18"/>
+        <Setter Property="FontWeight" Value="Light"/>
+        <Setter Property="Opacity" Value="0.5"/>
+    </Style>
+    <Style x:Key="AbstractDataListGridItemBorderStyle" TargetType="Border">
+        <Setter Property="BorderBrush" Value="#2EFFFFFF"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Background" Value="#0BFFFFFF"/>
+    </Style>
+    <SolidColorBrush x:Key="AbstractDataListGridForegroundBrush" Color="White" />
+    
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ZuneModdingHelper/Themes/Zune.xaml b/ZuneModdingHelper/Themes/Zune.xaml
index 39ed30f..b65875f 100644
--- a/ZuneModdingHelper/Themes/Zune.xaml
+++ b/ZuneModdingHelper/Themes/Zune.xaml
@@ -715,8 +715,9 @@
     
     <Style x:Key="ZuneTextBoxBaseStyle" TargetType="{x:Type TextBoxBase}">
         <Setter Property="Background" Value="{DynamicResource NormalTextBoxBackgroundBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource NormalTextBoxBorderBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource NormalTextBoxForegroundBrush}"/>
+        <Setter Property="CaretBrush" Value="{DynamicResource NormalTextBoxForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource NormalTextBoxBorderBrush}"/>
         <Setter Property="BorderThickness" Value="1.5"/>
         <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
@@ -744,10 +745,10 @@
                             <Setter TargetName="border" Property="Opacity" Value="0.56"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource HoverTextBoxBorderBrush}" />
+                            <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource HoverTextBoxBorderBrush}" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocused" Value="true">
-                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource FocusedTextBoxBorderBrush}" />
+                            <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource FocusedTextBoxBorderBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>