diff --git a/src/Misc/MainForm.cs b/src/Misc/MainForm.cs
index 53ec93b..c64b8a7 100644
--- a/src/Misc/MainForm.cs
+++ b/src/Misc/MainForm.cs
@@ -6,6 +6,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Threading;
 using System.Windows.Forms;
 using System.Windows.Forms.Integration;
 
@@ -13,7 +14,6 @@ using WpfControls = System.Windows.Controls;
 
 using static mpvnet.Native;
 using static mpvnet.Global;
-using System.Threading;
 
 namespace mpvnet
 {
diff --git a/src/WPF/InputWindow.xaml b/src/WPF/InputWindow.xaml
index b2587ac..a1856fd 100644
--- a/src/WPF/InputWindow.xaml
+++ b/src/WPF/InputWindow.xaml
@@ -38,7 +38,39 @@
             <Setter Property="Cursor" Value="Hand" />
         </Style>
 
-        <Style TargetType="Button" />
+        <Style TargetType="Button">
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+            <Setter Property="Padding" Value="1"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Border x:Name="border"
+                                BorderBrush="{DynamicResource PrimaryTextBrush}"
+                                BorderThickness="0"
+                                Background="{DynamicResource RegionBrush}">
+
+                            <ContentPresenter HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"
+                                          TextElement.FontWeight="Normal">
+                            </ContentPresenter>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" TargetName="border" Value="{DynamicResource HighlightBrush}"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="BorderBrush" TargetName="border" Value="#2C628B"/>
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter Property="Opacity" TargetName="border" Value="0.25"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
     </Window.Resources>
 
     <Grid>
diff --git a/src/WPF/LearnWindow.xaml b/src/WPF/LearnWindow.xaml
index 9acf887..e1dd6a2 100644
--- a/src/WPF/LearnWindow.xaml
+++ b/src/WPF/LearnWindow.xaml
@@ -7,8 +7,9 @@
     mc:Ignorable="d"
     
     Title="Learn Input"
-    Height="200"
-    Width="400"
+    Height="150"
+    Width="350"
+    FontSize="16"
     WindowStartupLocation="CenterOwner"
     ResizeMode="NoResize"
     Loaded="Window_Loaded"
@@ -33,12 +34,11 @@
 
         <TextBlock
             x:Name="MenuTextBlock"
+            Margin="0,10,0,0"
             Grid.ColumnSpan="2"
             VerticalAlignment="Center"
             HorizontalAlignment="Center"
-            FontSize="16"
-            >
-        </TextBlock>
+            />
 
         <TextBlock
             x:Name="KeyTextBlock"
@@ -46,10 +46,9 @@
             Grid.ColumnSpan="2"
             VerticalAlignment="Top"
             HorizontalAlignment="Center"
-            FontSize="16"
             />
         
-        <Button x:Name="ConfirmButton" Grid.Row="2" Click="ConfirmButton_Click">Confirm</Button>
-        <Button x:Name="ClearButton" Grid.Row="2" Click="ClearButton_Click" Grid.Column="1">Clear</Button>
+        <Button x:Name="ConfirmButton" Grid.Row="2" Margin="10,0,10,10" Click="ConfirmButton_Click">Confirm</Button>
+        <Button x:Name="ClearButton" Grid.Row="2" Margin="0,0,10,10" Click="ClearButton_Click" Grid.Column="1">Clear</Button>
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/src/WPF/Resources.xaml b/src/WPF/Resources.xaml
index 373b7f1..130a427 100644
--- a/src/WPF/Resources.xaml
+++ b/src/WPF/Resources.xaml
@@ -26,7 +26,7 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" TargetName="border" Value="{DynamicResource RegionBrush}"/>
+                            <Setter Property="Background" TargetName="border" Value="{DynamicResource HighlightBrush}"/>
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
                             <Setter Property="BorderBrush" TargetName="border" Value="#2C628B"/>
diff --git a/src/WPF/SetupWindow.xaml b/src/WPF/SetupWindow.xaml
index a95f334..19709f3 100644
--- a/src/WPF/SetupWindow.xaml
+++ b/src/WPF/SetupWindow.xaml
@@ -34,7 +34,7 @@
             </Border>
             <ControlTemplate.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" TargetName="border" Value="{DynamicResource RegionBrush}"/>
+                    <Setter Property="Background" TargetName="border" Value="{DynamicResource HighlightBrush}"/>
                 </Trigger>
                 <Trigger Property="IsPressed" Value="True">
                     <Setter Property="BorderBrush" TargetName="border" Value="#2C628B"/>