diff --git a/README.md b/README.md
index d47011b..7aaf56c 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,11 @@ https://github.com/stax76/mpv.net/wiki/Scripting-(CSharp,-Python,-JavaScript,-Lu
 
 ### Changelog
 
+### 2.6 (2019-04-09)
+
+- on Win 7 controls in the conf editor were using a difficult too read too light color
+- context menu renderer changed to look like Win 10 design, except colors are still system theme colors
+
 ### 2.5 (2019-04-08)
 
 - in case the input conf don't contain a menu definition mpv.net creates the default menu instead no menu like before
diff --git a/mpv.net/Menu.cs b/mpv.net/Menu.cs
index 16f4d07..a49f798 100644
--- a/mpv.net/Menu.cs
+++ b/mpv.net/Menu.cs
@@ -244,7 +244,6 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
     protected override void OnRenderMenuItemBackground(ToolStripItemRenderEventArgs e)
     {
         e.Item.ForeColor = Color.Black;
-
         var r = new Rectangle(Point.Empty, e.Item.Size);
         var g = e.Graphics;
 
@@ -258,20 +257,10 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
             else
             {
                 g.SmoothingMode = SmoothingMode.AntiAlias;
-
                 var r2 = new Rectangle(r.X + 2, r.Y, r.Width - 4, r.Height - 1);
-
-                using (Pen pen = new Pen(ColorBorder))
-                {
-                    g.DrawRectangle(pen, r2);
-                }
-
                 r2.Inflate(-1, -1);
-
-                using (SolidBrush b = new SolidBrush(ColorBottom))
-                {
+                using (SolidBrush b = new SolidBrush(ColorChecked))
                     g.FillRectangle(b, r2);
-                }
             }
         }
     }
@@ -311,13 +300,20 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
 
     protected override void OnRenderArrow(ToolStripArrowRenderEventArgs e)
     {
-        var value = e.Direction == ArrowDirection.Down ? 0x36 : 0x34;
-        var s = Convert.ToChar(value).ToString();
-        var font = new Font("Marlett", e.Item.Font.Size - 2);
-        var size = e.Graphics.MeasureString(s, font);
-        var x = Convert.ToInt32(e.Item.Width - size.Width);
-        var y = Convert.ToInt32((e.Item.Height - size.Height) / 2.0) + 1;
-        e.Graphics.DrawString(s, font, Brushes.Black, x, y);
+        if (e.Direction == ArrowDirection.Down) throw new NotImplementedException();
+        float x1 = e.Item.Width - e.Item.Height * 0.6f;
+        float y1 = e.Item.Height * 0.25f;
+        float x2 = x1 + e.Item.Height * 0.25f;
+        float y2 = e.Item.Height / 2f;
+        float x3 = x1;
+        float y3 = e.Item.Height * 0.75f;
+        e.Graphics.SmoothingMode = SmoothingMode.HighQuality;
+
+        using (Pen p = new Pen(Brushes.Black, Control.DefaultFont.Height / 20f))
+        {
+            e.Graphics.DrawLine(p, x1, y1, x2, y2);
+            e.Graphics.DrawLine(p, x2, y2, x3, y3);
+        }
     }
 
     protected override void OnRenderItemCheck(ToolStripItemImageRenderEventArgs e)
diff --git a/mpv.net/Misc.cs b/mpv.net/Misc.cs
index 2169413..1005a46 100644
--- a/mpv.net/Misc.cs
+++ b/mpv.net/Misc.cs
@@ -28,16 +28,6 @@ namespace mpvnet
         int IComparer<string>.Compare(string x, string y) => IComparerOfString_Compare(x, y);
     }
 
-    public class OSVersion
-    {
-        public static float Windows7 { get; } = 6.1f;
-        public static float Windows8 { get; } = 6.2f;
-        public static float Windows81 { get; } = 6.3f;
-        public static float Windows10 { get; } = 10f;
-
-        public static float Current => Environment.OSVersion.Version.Major + Environment.OSVersion.Version.Minor / 10f;
-    }
-
     public class FileAssociation
     {
         static string ExePath = Application.ExecutablePath;
diff --git a/mpv.net/Properties/AssemblyInfo.cs b/mpv.net/Properties/AssemblyInfo.cs
index dc01127..3afbdcc 100644
--- a/mpv.net/Properties/AssemblyInfo.cs
+++ b/mpv.net/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.0.0")]
-[assembly: AssemblyFileVersion("2.5.0.0")]
+[assembly: AssemblyVersion("2.6.0.0")]
+[assembly: AssemblyFileVersion("2.6.0.0")]
diff --git a/mpv.net/Resources/input.conf.txt b/mpv.net/Resources/input.conf.txt
index 710034e..9cc4dd3 100644
--- a/mpv.net/Resources/input.conf.txt
+++ b/mpv.net/Resources/input.conf.txt
@@ -34,7 +34,7 @@
  Space       cycle pause            #menu: Play/Pause
  s           stop                   #menu: Stop
  _           ignore                 #menu: -
- f           cycle fullscreen       #menu: Toggle Fullscreen
+ Enter       cycle fullscreen       #menu: Toggle Fullscreen
  
  F11         playlist-prev          #menu: Navigate > Previous
  F12         playlist-next          #menu: Navigate > Next
@@ -152,7 +152,6 @@
  Q quit-watch-later #menu: Exit Watch Later
  > playlist-next
  < playlist-prev
- Enter cycle pause
  Power quit
  Play      cycle pause
  Pause     cycle pause
diff --git a/mpvConfEdit/App.xaml b/mpvConfEdit/App.xaml
index a548bad..20b4da0 100644
--- a/mpvConfEdit/App.xaml
+++ b/mpvConfEdit/App.xaml
@@ -1,7 +1,7 @@
-<Application x:Class="DynamicGUI.App"
+<Application x:Class="mpvConfEdit.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:DynamicGUI"
+             xmlns:Controls="clr-namespace:Controls"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <Style TargetType="TextBox">
@@ -19,7 +19,7 @@
                                 <Setter Property="BorderBrush" TargetName="border" Value="#FF7EB4EA"/>
                             </Trigger>
                             <Trigger Property="IsFocused" Value="true">
-                                <Setter Property="BorderBrush" TargetName="border" Value="{x:Static SystemParameters.WindowGlassBrush}"/>
+                                <Setter Property="BorderBrush" TargetName="border" Value="{x:Static Controls:Controls.ThemeBrush}"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
diff --git a/mpvConfEdit/App.xaml.cs b/mpvConfEdit/App.xaml.cs
index a0a8e44..913ca88 100644
--- a/mpvConfEdit/App.xaml.cs
+++ b/mpvConfEdit/App.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace DynamicGUI
+namespace mpvConfEdit
 {
     public partial class App : Application
     {
diff --git a/mpvConfEdit/Controls.cs b/mpvConfEdit/Controls.cs
new file mode 100644
index 0000000..a29229e
--- /dev/null
+++ b/mpvConfEdit/Controls.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Controls
+{
+    class Controls
+    {
+        public static Brush ThemeBrush {
+            get {
+                if (Environment.OSVersion.Version.Major < 10)
+                    return new SolidColorBrush(Colors.DarkSlateGray);
+                else
+                    return SystemParameters.WindowGlassBrush;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/mpvConfEdit/DynamicGUI/OptionSettingControl.xaml b/mpvConfEdit/DynamicGUI/OptionSettingControl.xaml
index 752bb66..ad030a6 100644
--- a/mpvConfEdit/DynamicGUI/OptionSettingControl.xaml
+++ b/mpvConfEdit/DynamicGUI/OptionSettingControl.xaml
@@ -8,7 +8,7 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid Margin="20,0">
         <StackPanel>
-            <TextBox x:Name="TitleTextBox" FontSize="24" Margin="0,10" BorderThickness="0" IsReadOnly="True" Foreground="{x:Static SystemParameters.WindowGlassBrush}"></TextBox>
+            <TextBox x:Name="TitleTextBox" FontSize="24" Margin="0,10" BorderThickness="0" IsReadOnly="True"></TextBox>
             <ItemsControl x:Name="ItemsControl">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
diff --git a/mpvConfEdit/DynamicGUI/OptionSettingControl.xaml.cs b/mpvConfEdit/DynamicGUI/OptionSettingControl.xaml.cs
index 0560de3..48cf1b6 100644
--- a/mpvConfEdit/DynamicGUI/OptionSettingControl.xaml.cs
+++ b/mpvConfEdit/DynamicGUI/OptionSettingControl.xaml.cs
@@ -15,7 +15,6 @@ namespace DynamicGUI
             HelpTextBox.Text = optionSetting.Help;
             ItemsControl.ItemsSource = optionSetting.Options;
             Link.SetURL(optionSetting.HelpURL);
-
             if (string.IsNullOrEmpty(optionSetting.HelpURL))
                 LinkTextBlock.Visibility = Visibility.Collapsed;
         }
diff --git a/mpvConfEdit/DynamicGUI/StringSettingControl.xaml b/mpvConfEdit/DynamicGUI/StringSettingControl.xaml
index 5562488..07b6d74 100644
--- a/mpvConfEdit/DynamicGUI/StringSettingControl.xaml
+++ b/mpvConfEdit/DynamicGUI/StringSettingControl.xaml
@@ -9,7 +9,7 @@
              d:DesignWidth="800" >
     <Grid Margin="20,0">
         <StackPanel>
-            <TextBox x:Name="TitleTextBox" FontSize="24" Margin="0,10" BorderThickness="0" IsReadOnly="True" Foreground="{x:Static SystemParameters.WindowGlassBrush}"></TextBox>
+            <TextBox x:Name="TitleTextBox" FontSize="24" Margin="0,10" BorderThickness="0" IsReadOnly="True"></TextBox>
             <Grid Margin="0,0,0,10">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
diff --git a/mpvConfEdit/DynamicGUI/StringSettingControl.xaml.cs b/mpvConfEdit/DynamicGUI/StringSettingControl.xaml.cs
index 3677170..24db9cc 100644
--- a/mpvConfEdit/DynamicGUI/StringSettingControl.xaml.cs
+++ b/mpvConfEdit/DynamicGUI/StringSettingControl.xaml.cs
@@ -19,7 +19,6 @@ namespace DynamicGUI
             if (!StringSetting.IsFolder)
                 Button.Visibility = Visibility.Hidden;
             Link.SetURL(StringSetting.HelpURL);
-
             if (string.IsNullOrEmpty(stringSetting.HelpURL))
                 LinkTextBlock.Visibility = Visibility.Collapsed;
         }
diff --git a/mpvConfEdit/MainWindow.xaml b/mpvConfEdit/MainWindow.xaml
index d7d135a..3298510 100644
--- a/mpvConfEdit/MainWindow.xaml
+++ b/mpvConfEdit/MainWindow.xaml
@@ -19,7 +19,7 @@
             <StackPanel x:Name="MainStackPanel"></StackPanel>
         </ScrollViewer>
         <StackPanel Margin="20,0,0,0" Grid.Row="1">
-            <ListBox x:Name="FilterListBox" ItemsSource="{Binding FilterStrings}" BorderThickness="0" SelectionChanged="ListBox_SelectionChanged" Foreground="{x:Static SystemParameters.WindowGlassBrush}">
+            <ListBox x:Name="FilterListBox" ItemsSource="{Binding FilterStrings}" BorderThickness="0" SelectionChanged="ListBox_SelectionChanged" Foreground="{x:Static Controls:Controls.ThemeBrush}">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -28,10 +28,10 @@
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>
-            <TextBlock x:Name="OpenSettingsTextBlock" Margin="0,30,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static SystemParameters.WindowGlassBrush}" MouseUp="OpenSettingsTextBlock_MouseUp">Open settings folder</TextBlock>
-            <TextBlock x:Name="ShowManualTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static SystemParameters.WindowGlassBrush}" MouseUp="ShowManualTextBlock_MouseUp">Show mpv manual</TextBlock>
-            <TextBlock x:Name="SupportTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static SystemParameters.WindowGlassBrush}" MouseUp="SupportTextBlock_MouseUp">Show support forum</TextBlock>
-            <TextBlock x:Name="ApplyTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static SystemParameters.WindowGlassBrush}" MouseUp="ApplyTextBlock_MouseUp">Write config to mpv.conf</TextBlock>
+            <TextBlock x:Name="OpenSettingsTextBlock" Margin="0,30,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static Controls:Controls.ThemeBrush}" MouseUp="OpenSettingsTextBlock_MouseUp">Open config folder</TextBlock>
+            <TextBlock x:Name="ShowManualTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static Controls:Controls.ThemeBrush}" MouseUp="ShowManualTextBlock_MouseUp">Show mpv manual</TextBlock>
+            <TextBlock x:Name="SupportTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static Controls:Controls.ThemeBrush}" MouseUp="SupportTextBlock_MouseUp">Show support forum</TextBlock>
+            <TextBlock x:Name="ApplyTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static Controls:Controls.ThemeBrush}" MouseUp="ApplyTextBlock_MouseUp">Write config to mpv.conf</TextBlock>
         </StackPanel>        
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/mpvConfEdit/MainWindow.xaml.cs b/mpvConfEdit/MainWindow.xaml.cs
index 5425680..9ce68fd 100644
--- a/mpvConfEdit/MainWindow.xaml.cs
+++ b/mpvConfEdit/MainWindow.xaml.cs
@@ -8,7 +8,6 @@ using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-
 using DynamicGUI;
 
 namespace mpvConfEdit
@@ -45,10 +44,14 @@ namespace mpvConfEdit
                 switch (setting)
                 {
                     case StringSetting s:
-                        MainStackPanel.Children.Add(new StringSettingControl(s));
+                        var sc = new StringSettingControl(s);
+                        sc.TitleTextBox.Foreground = Controls.Controls.ThemeBrush;
+                        MainStackPanel.Children.Add(sc);
                         break;
                     case OptionSetting s:
-                        MainStackPanel.Children.Add(new OptionSettingControl(s));
+                        var oc = new OptionSettingControl(s);
+                        oc.TitleTextBox.Foreground = Controls.Controls.ThemeBrush;
+                        MainStackPanel.Children.Add(oc);
                         break;
                 }
             }
diff --git a/mpvConfEdit/Properties/AssemblyInfo.cs b/mpvConfEdit/Properties/AssemblyInfo.cs
index 2e8362c..9f29518 100644
--- a/mpvConfEdit/Properties/AssemblyInfo.cs
+++ b/mpvConfEdit/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
diff --git a/mpvConfEdit/SearchTextBoxUserControl.xaml b/mpvConfEdit/SearchTextBoxUserControl.xaml
index 48a4a32..5435326 100644
--- a/mpvConfEdit/SearchTextBoxUserControl.xaml
+++ b/mpvConfEdit/SearchTextBoxUserControl.xaml
@@ -1,8 +1,8 @@
 <UserControl x:Class="Controls.SearchTextBoxUserControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid x:Name="SearchTextBoxUserControl1" Background="White">
diff --git a/mpvConfEdit/app.manifest b/mpvConfEdit/app.manifest
new file mode 100644
index 0000000..09c7e05
--- /dev/null
+++ b/mpvConfEdit/app.manifest
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!--
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+</assembly>
\ No newline at end of file
diff --git a/mpvConfEdit/mpvConfEdit.csproj b/mpvConfEdit/mpvConfEdit.csproj
index 16a563e..28b8980 100644
--- a/mpvConfEdit/mpvConfEdit.csproj
+++ b/mpvConfEdit/mpvConfEdit.csproj
@@ -44,6 +44,9 @@
   <PropertyGroup>
     <ApplicationIcon>mpv.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -66,6 +69,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Controls.cs" />
     <Compile Include="DynamicGUI\DynamicGUI.cs" />
     <Compile Include="DynamicGUI\OptionSettingControl.xaml.cs">
       <DependentUpon>OptionSettingControl.xaml</DependentUpon>
@@ -120,6 +124,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/mpvInputEdit/App.xaml b/mpvInputEdit/App.xaml
index 1adb6d1..03b0b30 100644
--- a/mpvInputEdit/App.xaml
+++ b/mpvInputEdit/App.xaml
@@ -1,7 +1,7 @@
 <Application x:Class="mpvInputEdit.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:mpvInputEdit"
+             xmlns:Controls="clr-namespace:Controls"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <Style TargetType="TextBox">
@@ -19,7 +19,7 @@
                                 <Setter Property="BorderBrush" TargetName="border" Value="#FF7EB4EA"/>
                             </Trigger>
                             <Trigger Property="IsFocused" Value="true">
-                                <Setter Property="BorderBrush" TargetName="border" Value="{x:Static SystemParameters.WindowGlassBrush}"/>
+                                <Setter Property="BorderBrush" TargetName="border" Value="{x:Static Controls:Controls.ThemeBrush}"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
diff --git a/mpvInputEdit/Controls.cs b/mpvInputEdit/Controls.cs
new file mode 100644
index 0000000..a29229e
--- /dev/null
+++ b/mpvInputEdit/Controls.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Controls
+{
+    class Controls
+    {
+        public static Brush ThemeBrush {
+            get {
+                if (Environment.OSVersion.Version.Major < 10)
+                    return new SolidColorBrush(Colors.DarkSlateGray);
+                else
+                    return SystemParameters.WindowGlassBrush;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/mpvInputEdit/MainWindow.xaml.cs b/mpvInputEdit/MainWindow.xaml.cs
index d81d9c1..69a88d4 100644
--- a/mpvInputEdit/MainWindow.xaml.cs
+++ b/mpvInputEdit/MainWindow.xaml.cs
@@ -45,7 +45,8 @@ namespace mpvInputEdit
                     return item.Input.ToLower().Replace("ctrl+", "").Replace("shift+", "").Replace("alt+", "").Contains(searchText);
                 else
                     return item.Input.ToLower().Contains(searchText);
-            } else if (searchText.StartsWith("m ") || searchText.StartsWith("m:"))
+            }
+            else if (searchText.StartsWith("m ") || searchText.StartsWith("m:"))
                 return item.Menu.ToLower().Contains(searchText.Substring(2).Trim());
             else if (searchText.StartsWith("c ") || searchText.StartsWith("c:"))
                 return item.Command.ToLower().Contains(searchText.Substring(2).Trim());
@@ -86,7 +87,7 @@ namespace mpvInputEdit
                 Directory.CreateDirectory(backupDir);
 
             if (File.Exists(App.InputConfPath))
-                File.Copy(App.InputConfPath, backupDir + "input conf " + DateTime.Now.ToString("yyyy-MM-dd HH-mm") + ".conf");
+                File.Copy(App.InputConfPath, backupDir + "input conf " + DateTime.Now.ToString("yyyy-MM-dd HH-mm") + ".conf", true);
 
             string text = "\r\n" + Properties.Settings.Default.input_conf_help + "\r\n\r\n";
 
diff --git a/mpvInputEdit/Properties/AssemblyInfo.cs b/mpvInputEdit/Properties/AssemblyInfo.cs
index a36ae33..ec92cab 100644
--- a/mpvInputEdit/Properties/AssemblyInfo.cs
+++ b/mpvInputEdit/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("mpv(.net) input edit")]
-[assembly: AssemblyDescription("mpv(.net) key bindings editor")]
+[assembly: AssemblyDescription("mpv(.net) key and mouse bindings editor")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("mpv(.net) input edit")]
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
diff --git a/mpvInputEdit/app.manifest b/mpvInputEdit/app.manifest
new file mode 100644
index 0000000..09c7e05
--- /dev/null
+++ b/mpvInputEdit/app.manifest
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!--
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+</assembly>
\ No newline at end of file
diff --git a/mpvInputEdit/mpvInputEdit.csproj b/mpvInputEdit/mpvInputEdit.csproj
index f3a77b0..79cd487 100644
--- a/mpvInputEdit/mpvInputEdit.csproj
+++ b/mpvInputEdit/mpvInputEdit.csproj
@@ -38,6 +38,9 @@
   <PropertyGroup>
     <ApplicationIcon>mpv.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -60,6 +63,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Controls.cs" />
     <Compile Include="SearchTextBoxUserControl.xaml.cs">
       <DependentUpon>SearchTextBoxUserControl.xaml</DependentUpon>
     </Compile>
@@ -106,6 +110,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>