3.6.1

-
2019-05-23 00:51:15 +02:00 · 2019-05-13 03:29:12 +02:00 · 2019-05-13 03:23:33 +02:00 · 2019-05-13 03:22:31 +02:00 · 2019-05-13 03:20:44 +02:00 · 2019-05-13 03:19:17 +02:00
121 changed files with 4504 additions and 7320 deletions
--- a/CSScriptAddon/CSScriptAddon.vb
+++ b/CSScriptAddon/CSScriptAddon.vb
@@ -1,29 +0,0 @@
-Imports System.ComponentModel.Composition
-Imports System.IO
-Imports System.Windows.Forms
-
-Imports mpvnet
-
-Imports CSScriptLibrary
-
-<Export(GetType(IAddon))>
-Public Class CSScriptAddon
-    Implements IAddon
-
-    Sub New()
-        Dim scriptDir = mp.mpvConfFolderPath + "scripts"
-        If Not Directory.Exists(scriptDir) Then Return
-        Dim csFiles = Directory.GetFiles(scriptDir, "*.cs").ToList
-        csFiles.AddRange(Directory.GetFiles(Application.StartupPath + "\\Scripts", "*.cs"))
-        If csFiles.Count = 0 Then Return
-        CSScriptLibrary.CSScript.EvaluatorConfig.Engine = EvaluatorEngine.CodeDom
-
-        For Each i In csFiles
-            Try
-                CSScriptLibrary.CSScript.Evaluator.LoadCode(File.ReadAllText(i))
-            Catch ex As Exception
-                MainForm.Instance.ShowMsgBox(ex.ToString(), MessageBoxIcon.Error)
-            End Try
-        Next
-    End Sub
-End Class
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,10 +1,21 @@
 MIT License

-Copyright (c) 2017 stax76
+Copyright (c) 2017-2019 Frank Skare (stax76)

-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and ssociated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and ssociated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:

-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/README.md
+++ b/README.md
@@ -1,10 +1,30 @@
 # mpv.net

-mpv.net is a libmpv based media player for Windows, it looks and works like mpv and also shares the same settings as mpv and therefore the mpv documentation applies.
+mpv.net is a modern media player for Windows that looks and works just like [mpv](https://mpv.io).

-mpv and mpv.net have a learning curve.
+#### Based on libmpv

-mpv manual: <https://mpv.io/manual/master/>
+mpv.net is based on libmpv which offers a straightforward C API that was designed from the ground up to make mpv usable as a library and facilitate easy integration into other applications.
+
+#### CLI options
+
+mpv.net has the same [CLI options](https://mpv.io/manual/master/#options) as mpv.
+
+#### High quality video output
+
+mpv/libmpv has an OpenGL based video output that is capable of many features loved by videophiles, such as video scaling with popular high quality algorithms, color management, frame timing, interpolation, HDR, and more.
+
+#### On Screen Controller
+
+mpv.net uses the OSC of mpv/libmpv offering play controls with a modern flat design.
+
+#### GPU video decoding
+
+mpv/libmpv leverages the FFmpeg hwaccel APIs to support DXVA2 video decoding acceleration.
+
+#### Active development
+
+mpv.net is under active development. Want a feature? Post a [patch](https://github.com/stax76/mpv.net/pulls) or [request it](https://github.com/stax76/mpv.net/issues)!

 Table of contents
 -----------------
@@ -14,81 +34,193 @@ Table of contents
 - [Context Menu](#context-menu)
 - [Settings](#settings)
 - [Scripting](#scripting)
+- [Add-ons](#add-ons)
+- [Architecture](#architecture)
 - [Support](#support)
+- [Links](#links)
+- [Download](#download)
 - [Changelog](#changelog)

 ### Features

- Customizable context menu defined in the same file as the keybindings
- Addon API for .NET languages
- Scripting API for Python, C#, Lua, JavaScript and PowerShell
- mpv's OSC, IPC, conf files and more
+- Customizable context menu defined in the same file as the key bindings ([Screenshot](#context-menu-screenshot))
+- Searchable config dialog ([Screenshot](#config-editor-screenshot))
+- Searchable input (key/mouse) binding editor ([Screenshot](#input-editor-screenshot))
+- Searchable command palette to quickly launch commands and look for keys ([Screenshot](#command-palette-screenshot))
+- Modern UI with dark mode ([Screenshot](#config-editor-screenshot))
+- Addon/extension API for .NET languages
+- Scripting API for Python, C#, Lua, JavaScript and PowerShell ([wiki](https://github.com/stax76/mpv.net/wiki/Scripting))
+- mpv's OSC, IPC and conf files
+- Support of the same [CLI options](https://mpv.io/manual/master/#options) as mpv
+- DXVA2 video decoding acceleration
+- OpenGL based video output capable of features loved by videophiles, such as video scaling with popular high quality algorithms, color management, frame timing, interpolation, HDR, and more
+- Search feature powered by [Everything](https://www.voidtools.com) to find and play media ([Screenshot](#media-search-screenshot))

 ### Screenshots

-![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshots/mpvnet.png)
+#### Main Window Screenshot

-![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshots/mpvConfEdit.png)
+![Main Window](https://raw.githubusercontent.com/stax76/mpv.net/master/img/Main.png)

-![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshots/mpvInputEdit.png)
+#### Context Menu Screenshot
+
+Context menu defined in the input.conf file with dark mode support.
+
+![Context Menu](https://raw.githubusercontent.com/stax76/mpv.net/master/img/Menu.png)
+
+#### Config Editor Screenshot
+
+A searchable config editor as alternative to edit the mpv.conf file manually.
+
+![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/ConfEditor.png)
+
+#### Input Editor Screenshot
+
+A searchable key and mouse binding editor.
+
+![Input Editor](https://raw.githubusercontent.com/stax76/mpv.net/master/img/InputEditor.png)
+
+#### Command Palette Screenshot
+
+Forgot where a command in the menu is located or what shortcut key it has?
+Just press Ctrl+Shift+P and find it easily in the searchable command palette.
+
+![Command Palette](https://raw.githubusercontent.com/stax76/mpv.net/master/img/CommandPalette.png)
+
+#### Media Search Screenshot
+
+Media search feature powered by [Everything](https://www.voidtools.com) to find and play media.
+
+![Media Search](https://raw.githubusercontent.com/stax76/mpv.net/master/img/MediaSearch.png)

 ### Context Menu

-The context menu can be customized via input.conf file located at:
-```
-C:\Users\username\AppData\Roaming\mpv\input.conf
+The context menu can be customized via input.conf file located in the config directory:
+
+```Text
+C:\Users\%username%\AppData\Roaming\mpv\input.conf
 ```
+
 if it's missing mpv.net generates it with the following defaults:

-<https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt>
+<https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt>
+
+input.conf defines mpv's key and mouse bindings and mpv.net uses comments to define the context menu.

 ### Settings

-mpv.net shares the settings with mpv, settings can be edited in a settings dialog or in a config file called mpv.conf located at:
-```
-C:\Users\user\AppData\Roaming\mpv\mpv.conf
-```
-if it's missing mpv.net generates it with the following defaults:
+mpv.net is able to share the settings with mpv and mpv.net uses the same logic to decide from where the settings are loaded. The default location is:

-<https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpv.conf.txt>
+```Text
+C:\Users\%username%\AppData\Roaming\mpv\mpv.conf
+```
+
+If a directory named portable_config next to the mpvnet.exe exists, all config will be loaded from this directory only.
+
+```Text
+<startup>\portable_config\mpv.conf
+```
+
+In case there isn't any config folder mpv.net asks where to create it. If no mpv.conf file exists mpv.net generates it with the following defaults:
+
+<https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpvConf.txt>
+
+Config files located in the same directory as mpvnet.exe are loaded with lower priority. Some config files are loaded only once, which means that e.g. of 2 input.conf files located in two config directories, only the one from the directory with higher priority will be loaded.

 ### Scripting

-Scripting is supported for Python, C#, Lua, JavaScript and PowerShell
+[Scripting wiki page](https://github.com/stax76/mpv.net/wiki/Scripting)

-https://github.com/stax76/mpv.net/wiki/Scripting-(CSharp,-Python,-JavaScript,-Lua,-PowerShell)
+### Add-ons
+
+[Add-on wiki page](https://github.com/stax76/mpv.net/wiki/Addons)
+
+### Architecture
+
+mpv.net is written in C# 7.0 and runs on the .NET framework 4.7 or higher.
+
+The Add-on implementation is based on the Managed Extensibility Framework,
+the entire application code is accessible for add-ons and Python scripts.
+
+Python scripting is implemented with IronPython which uses Python 2.7.
+
+The main/video window is WinForms based, other windows are WPF based.
+
+The config editor adds it's controls dynamically and uses TOML to define it's
+content, there are only two simple types, StringSetting and OptionSetting.
+
+mpv.net was started 2017 and consists of about 9000 lines of code.
+
+Third party components are:
+
+- [libmpv](https://mpv.io/)
+- [MediaInfo](https://mediaarea.net/en/MediaInfo)
+- [Tommy (TOML parser)](https://github.com/dezhidki/Tommy)
+- [IronPython](https://ironpython.net/)
+- [CS-Script](http://www.csscript.net/)

 ### Support

-<https://forum.doom9.org/showthread.php?t=174841>
+[Support thread in Doom9 forum](https://forum.doom9.org/showthread.php?t=174841)

-<https://forum.videohelp.com/threads/392514-mpv-net-a-extendable-media-player-for-windows>
+[Support thread in VideoHelp forum](https://forum.videohelp.com/threads/392514-mpv-net-a-extendable-media-player-for-windows)

-<https://github.com/stax76/mpv.net/issues>
+[Issue tracker to report bugs and request features](https://github.com/stax76/mpv.net/issues)
+
+### Links
+
+mpv manual: <https://mpv.io/manual/master/>
+
+mpv wiki: <https://github.com/mpv-player/mpv/wiki>
+
+mpv.net wiki: <https://github.com/stax76/mpv.net/wiki>
+
+mpv apps: <https://github.com/mpv-player/mpv/wiki/Applications-using-mpv>
+
+mpv user scripts: <https://github.com/mpv-player/mpv/wiki/User-Scripts>
+
+mpv default key bindings: <https://github.com/mpv-player/mpv/blob/master/etc/input.conf>
+
+mpv.net default key bindings: <https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt>
+
+mpv download: <https://mpv.io/installation/>
+
+mpv.net download: <https://github.com/stax76/mpv.net/releases>
+
+mpv bugs and requests: <https://mpv.io/bug-reports/>
+
+mpv.net bugs and requests: <https://github.com/stax76/mpv.net/issues>
+
+### Download
+
+<https://github.com/stax76/mpv.net/releases>

 ### Changelog

-### 2.2
+### 3.6.1

- messages boxes had always the info icon even if a different icon (error, warning, question) was intended
- instead of silently do nothing on unknown commands there is now a error message listing available commands and showing the location of the default bindings, this helps when commands are removed or renamed
- there was a problem fixed that made the cursor hidden when it should be visible
- dragging a youtube URL on mpv.net would break certain input related features
- there is now an installer with file extension registration (limited on Win 10) available
- WM_APPCOMMAND media keys were not working in the input (shortcut) editor and there were no defaults for prev and next defined
+- there was a bug causing an exception if both the input editor and config editor
+  is opened, as soon as one is opened, the other can't be opened

-### 2.1 (2019-03-30)
+### 3.6

- new input editor added, default key binding is here: <https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt#L89>
+- playing files from rar archives caused an exception
+- there was a bug that caused underscores beeing removed from input like MBTN_LEFT_DBL
+- the search clear button in the input editor had a render issue in dark mode
+- new search feature added to search and play media files, requires
+  [Everything](https://www.voidtools.com) to be installed. [Default Binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L29)

-### 2.0 (2019-03-28)
+### 3.5

- setting track-auto-selection added to settings editor (<https://mpv.io/manual/master/#options-track-auto-selection>)
- setting loop-playlist added to settings editor (<https://mpv.io/manual/master/#options-loop-playlist>)
- setting audio-file-auto added to settings editor (<https://mpv.io/manual/master/#options-audio-file-auto>)
- setting video-sync added to settings editor (<https://mpv.io/manual/master/#options-video-sync>)
- command execute-mpv-command added to menu: Tools > Enter a mpv command for execution
- added youtube-dl.exe, please note this will only work when a certain Visual C++ runtime is installed
- added drag & drop support to drag & drop a youtube URL on mpv.net
- added support to open a youtube URL from command line
- added support for opening a URL from the menu: Open > Open URL
+- when the main windows gets activated and the clipboard content starts with http
+  mpv.net will ask to play the URL, previously this was restricted to YouTube URLs
+- Python script errors show line and column whenever it is supported by IronPython
+- if conf files exist in the startup directory mpv.net will use the startup
+  directory as config directory instead of creating default conf files in appdata
+- renamed commands are handled now by migration code instead of being broken
+
+### 3.4
+
+- new feature added to manage file associations from within the app. It can be found in the menu at: Tools > Manage... [Default Binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L149)
+- new zip download option added
+- new x86 download option added
--- a/addons/CSScriptAddon/CSScriptAddon.vb
+++ b/addons/CSScriptAddon/CSScriptAddon.vb
@@ -0,0 +1,35 @@
+Imports System.ComponentModel.Composition
+Imports System.IO
+Imports System.Windows.Forms
+
+Imports mpvnet
+
+Imports CSScriptLibrary
+
+<Export(GetType(IAddon))>
+Public Class CSScriptAddon
+    Implements IAddon
+
+    Sub New()
+        Dim scriptFiles As New List(Of String)
+
+        If Directory.Exists(mp.MpvConfFolder + "scripts") Then
+            scriptFiles.AddRange(Directory.GetFiles(mp.MpvConfFolder + "scripts", "*.cs"))
+        End If
+
+        If Directory.Exists(Application.StartupPath + "\scripts") Then
+            scriptFiles.AddRange(Directory.GetFiles(Application.StartupPath + "\scripts", "*.cs"))
+        End If
+
+        If scriptFiles.Count = 0 Then Return
+        CSScriptLibrary.CSScript.EvaluatorConfig.Engine = EvaluatorEngine.CodeDom
+
+        For Each i In scriptFiles
+            Try
+                CSScriptLibrary.CSScript.Evaluator.LoadCode(File.ReadAllText(i))
+            Catch ex As Exception
+                Msg.ShowException(ex)
+            End Try
+        Next
+    End Sub
+End Class
--- a/addons/CSScriptAddon/CSScriptAddon.vbproj
+++ b/addons/CSScriptAddon/CSScriptAddon.vbproj
@@ -47,6 +47,48 @@
  <PropertyGroup>
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>..\..\mpv.net\bin\x86\Addons\CSScriptAddon\</OutputPath>
+    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>..\mpv.net\bin\x86\Addons\CSScriptAddon\</OutputPath>
+    <Optimize>true</Optimize>
+    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>..\..\mpv.net\bin\x64\Addons\CSScriptAddon\</OutputPath>
+    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>..\mpv.net\bin\x64\Addons\CSScriptAddon\</OutputPath>
+    <Optimize>true</Optimize>
+    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
  <ItemGroup>
    <Reference Include="CSScriptLibrary, Version=3.27.5.0, Culture=neutral, PublicKeyToken=70fcc3d18c749033, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -114,7 +156,7 @@
    <Content Include="CSScriptLibrary.dll" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\mpv.net\mpv.net.csproj">
+    <ProjectReference Include="..\..\mpv.net\mpv.net.csproj">
      <Project>{1751f378-8edf-4b62-be6d-304c7c287089}</Project>
      <Name>mpv.net</Name>
      <Private>False</Private>
--- a/addons/CSScriptAddon/CSScriptLibrary.dll
+++ b/addons/CSScriptAddon/CSScriptLibrary.dll
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
--- a/Project/Application.myapp
+++ b/Project/Application.myapp
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
--- a/addons/CSScriptAddon/My
+++ b/addons/CSScriptAddon/My
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
--- a/addons/RatingAddon/Properties/AssemblyInfo.cs
+++ b/addons/RatingAddon/Properties/AssemblyInfo.cs
--- a/addons/RatingAddon/RatingAddon.cs
+++ b/addons/RatingAddon/RatingAddon.cs
@@ -10,7 +10,7 @@ namespace RatingAddon
    [Export(typeof(IAddon))]
    public class RatingAddon : IAddon
    {
-        private Dictionary<string, int> Dic = new Dictionary<string, int>();
+        Dictionary<string, int> Dic = new Dictionary<string, int>();

        public RatingAddon()
        {
@@ -18,7 +18,7 @@ namespace RatingAddon
            mp.Shutdown += mpv_Shutdown;
        }

-        private void mpv_Shutdown()
+        void mpv_Shutdown()
        {
            foreach (var i in Dic)
            {
@@ -44,7 +44,7 @@ namespace RatingAddon
            }            
        }

-        private void mpv_ClientMessage(string[] args)
+        void mpv_ClientMessage(string[] args)
        {
            int rating;

--- a/addons/RatingAddon/RatingAddon.csproj
+++ b/addons/RatingAddon/RatingAddon.csproj
@@ -32,7 +32,7 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\mpv.net\bin\x86\Debug\</OutputPath>
+    <OutputPath>..\..\mpv.net\bin\x86\Addons\RatingAddon\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <DebugType>full</DebugType>
    <PlatformTarget>x86</PlatformTarget>
@@ -40,7 +40,7 @@
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\mpv.net\bin\x86\Release\</OutputPath>
+    <OutputPath>..\mpv.net\bin\x86\Addons\RatingAddon\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <Optimize>true</Optimize>
    <DebugType>pdbonly</DebugType>
@@ -50,7 +50,7 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\mpv.net\bin\x64\Debug\</OutputPath>
+    <OutputPath>..\..\mpv.net\bin\x64\Addons\RatingAddon\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <DebugType>full</DebugType>
    <PlatformTarget>x64</PlatformTarget>
@@ -58,7 +58,7 @@
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>..\mpv.net\bin\x64\Release\</OutputPath>
+    <OutputPath>..\mpv.net\bin\x64\Addons\RatingAddon\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <Optimize>true</Optimize>
    <DebugType>pdbonly</DebugType>
@@ -82,7 +82,7 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\mpv.net\mpv.net.csproj">
+    <ProjectReference Include="..\..\mpv.net\mpv.net.csproj">
      <Project>{1751f378-8edf-4b62-be6d-304c7c287089}</Project>
      <Name>mpv.net</Name>
      <Private>False</Private>
--- a/addons/TestAddon/Properties/AssemblyInfo.cs
+++ b/addons/TestAddon/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("TestAddon")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("TestAddon")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("06f854b0-00f9-4b53-94d9-0be65a7c55d8")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// 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.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/addons/TestAddon/TestAddon.cs
+++ b/addons/TestAddon/TestAddon.cs
@@ -0,0 +1,27 @@
+using System.ComponentModel.Composition;
+
+using mpvnet;
+
+namespace TestAddon
+{
+    [Export(typeof(IAddon))]
+    public class TestAddon : IAddon
+    {
+        // do some init work in constructor
+        public TestAddon()
+        {
+            // Observe changes of the fullscreen property.
+            // You can find a list of available mpv properties
+            // in mpv.net's wiki on github or use mpv --list-properties.
+            // You can test properties in mpv.net in the menu at:
+            // Tools > Execute mpv command
+            // where you can enter: show-text ${fullscreen}
+            mp.observe_property_bool("fullscreen", OnFullscreenChange);
+        }
+
+        void OnFullscreenChange(bool val)
+        {
+            mp.commandv("show-text", "fullscreen: " + val.ToString());
+        }
+    }
+}
--- a/addons/TestAddon/TestAddon.csproj
+++ b/addons/TestAddon/TestAddon.csproj
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TestAddon</RootNamespace>
+    <AssemblyName>TestAddon</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TestAddon.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\mpv.net\mpv.net.csproj">
+      <Project>{1751f378-8edf-4b62-be6d-304c7c287089}</Project>
+      <Name>mpv.net</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
--- a/build-setup.bat
+++ b/build-setup.bat
@@ -1,2 +0,0 @@
-"C:\Program Files (x86)\Inno Setup 6\ISCC.exe" setup\mpvnet.iss
-pause
--- a/img/CommandPalette.png
+++ b/img/CommandPalette.png
--- a/img/ConfEditor.png
+++ b/img/ConfEditor.png
--- a/img/InputEditor.png
+++ b/img/InputEditor.png
--- a/img/Main.png
+++ b/img/Main.png
--- a/img/MediaSearch.png
+++ b/img/MediaSearch.png
--- a/img/Menu.png
+++ b/img/Menu.png
--- a/img/mpvnet.pdn
+++ b/img/mpvnet.pdn
--- a/img/mpvnet.png
+++ b/img/mpvnet.png
--- a/mpv.net.sln
+++ b/mpv.net.sln
@@ -1,13 +1,15 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.8
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mpv.net", "mpv.net\mpv.net.csproj", "{1751F378-8EDF-4B62-BE6D-304C7C287089}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RatingAddon", "RatingAddon\RatingAddon.csproj", "{55C88710-539D-4402-84C8-31694841C731}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CSScriptAddon", "addons\CSScriptAddon\CSScriptAddon.vbproj", "{71808A87-8B1C-4DF8-957C-D79C3B164CCA}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CSScriptAddon", "CSScriptAddon\CSScriptAddon.vbproj", "{71808A87-8B1C-4DF8-957C-D79C3B164CCA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RatingAddon", "addons\RatingAddon\RatingAddon.csproj", "{55C88710-539D-4402-84C8-31694841C731}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAddon", "addons\TestAddon\TestAddon.csproj", "{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,6 +33,18 @@ Global
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x64.Build.0 = Release|x64
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.ActiveCfg = Release|x86
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.Build.0 = Release|x86
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.ActiveCfg = Debug|x64
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.Build.0 = Debug|x64
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.ActiveCfg = Debug|x86
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.Build.0 = Debug|x86
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.ActiveCfg = Release|x64
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.Build.0 = Release|x64
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.ActiveCfg = Release|x86
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.Build.0 = Release|x86
 		{55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{55C88710-539D-4402-84C8-31694841C731}.Debug|x64.ActiveCfg = Debug|x64
@@ -43,18 +57,18 @@ Global
 		{55C88710-539D-4402-84C8-31694841C731}.Release|x64.Build.0 = Release|x64
 		{55C88710-539D-4402-84C8-31694841C731}.Release|x86.ActiveCfg = Release|x86
 		{55C88710-539D-4402-84C8-31694841C731}.Release|x86.Build.0 = Release|x86
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.Build.0 = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.Build.0 = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.ActiveCfg = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.Build.0 = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.ActiveCfg = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.Build.0 = Release|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x64.Build.0 = Debug|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|x64.ActiveCfg = Release|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|x64.Build.0 = Release|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|x86.ActiveCfg = Release|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/mpv.net/Addon.cs
+++ b/mpv.net/Addon.cs
@@ -12,7 +12,7 @@ namespace mpvnet
        [ImportMany]
        public IEnumerable<IAddon> Addons = null;

-        private readonly CompositionContainer CompositionContainer;
+        readonly CompositionContainer CompositionContainer;

        public Addon()
        {
@@ -26,7 +26,7 @@ namespace mpvnet
                    foreach (string i in Directory.GetDirectories(dir))
                        catalog.Catalogs.Add(new DirectoryCatalog(i, "*Addon.dll"));

-                dir = mp.mpvConfFolderPath + "\\Addons";
+                dir = mp.MpvConfFolder + "\\Addons";

                if (Directory.Exists(dir))
                    foreach (string i in Directory.GetDirectories(dir))
@@ -38,9 +38,9 @@ namespace mpvnet
                    CompositionContainer.ComposeParts(this);
                }
            }
-            catch (Exception e)
+            catch (Exception ex)
            {
-                MainForm.Instance.ShowMsgBox(e.ToString(), MessageBoxIcon.Error);
+                Msg.ShowException(ex);
            }
        }
    }
--- a/mpv.net/Command.cs
+++ b/mpv.net/Command.cs
@@ -2,8 +2,10 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
+using System.Windows.Interop;

 namespace mpvnet
 {
@@ -12,7 +14,7 @@ namespace mpvnet
        public string Name { get; set; }
        public Action<string[]> Action { get; set; }

-        private static List<Command> commands;
+        static List<Command> commands;

        public static List<Command> Commands
        {
@@ -24,7 +26,7 @@ namespace mpvnet
                    Type type = typeof(Command);
                    MethodInfo[] methods = type.GetMethods(System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);

-                    foreach (var i in methods)
+                    foreach (MethodInfo i in methods)
                    {
                        ParameterInfo[] parameters = i.GetParameters();

@@ -42,128 +44,132 @@ namespace mpvnet
        public static void open_files(string[] args)
        {
            MainForm.Instance.Invoke(new Action(() => {
-                using (var d = new OpenFileDialog())
-                {
-                    d.Multiselect = true;
-                    d.Filter = Misc.GetFilter(Misc.FileTypes);
-
+                using (var d = new OpenFileDialog() { Multiselect = true })
                    if (d.ShowDialog() == DialogResult.OK)
                        mp.LoadFiles(d.FileNames);
-                }
            }));
        }

-        public static void open_config_folder(string[] args)
+        public static void open_conf_folder(string[] args)
        {
-            Process.Start(mp.mpvConfFolderPath);
+            Process.Start(mp.MpvConfFolder);
        }

        public static void show_input_editor(string[] args)
        {
-            Process.Start(Application.StartupPath + "\\mpvInputEdit.exe");
+            MainForm.Instance.Invoke(new Action(() => {
+                InputWindow w = new InputWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
        }

        public static void show_conf_editor(string[] args)
        {
-            Process.Start(Application.StartupPath + "\\mpvConfEdit.exe");
+            MainForm.Instance.Invoke(new Action(() => {
+                ConfWindow w = new ConfWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
+        }
+
+        public static void show_about(string[] args)
+        {
+            MainForm.Instance.Invoke(new Action(() => {
+                AboutWindow w = new AboutWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
+        }
+
+        public static void show_command_palette(string[] args)
+        {
+            MainForm.Instance.Invoke(new Action(() => {
+                var w = new CommandPaletteWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
+        }
+
+        public static void show_media_search(string[] args)
+        {
+            MainForm.Instance.Invoke(new Action(() => {
+                var w = new EverythingWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
        }

        public static void show_history(string[] args)
        {
-            var fp = mp.mpvConfFolderPath + "history.txt";
+            var fp = mp.MpvConfFolder + "history.txt";

            if (File.Exists(fp))
                Process.Start(fp);
            else
-                if (MainForm.Instance.ShowMsgBox("Create history.txt file in config folder?\n\nmpv.net will write the date, time and filename of opened files to it.", MessageBoxIcon.Question) == DialogResult.OK)
+                if (Msg.ShowQuestion("Create history.txt file in config folder?",
+                    "mpv.net will write the date, time and filename of opened files to it.") == MsgResult.OK)
                    File.WriteAllText(fp, "");
        }

-        public static void shell_execute(string[] args)
-        {
-            Process.Start(args[0]);
-        }
-
-        public static void set_setting(string[] args)
-        {
-            bool changed = false;
-            var lines = File.ReadAllLines(mp.mpvConfPath);
-
-            for (int i = 0; i < lines.Length; i++)
-            {
-                if (lines[i].Contains("=") &&
-                    lines[i].Substring(0, lines[i].IndexOf("=")).Trim("# ".ToCharArray()) == args[0])
-                {
-                    lines[i] = args[0] + " = " + args[1];
-                    changed = true;
-                }
-            }
-
-            if (changed)
-                File.WriteAllText(mp.mpvConfPath, String.Join(Environment.NewLine, lines));
-            else
-                File.WriteAllText(mp.mpvConfPath, File.ReadAllText(mp.mpvConfPath) + Environment.NewLine + args[0] + " = " + args[1]);
-
-            MainForm.Instance.ShowMsgBox("Please restart mpv.net", MessageBoxIcon.Information);
-        }
+        public static void shell_execute(string[] args) => Process.Start(args[0]);

        public static void show_info(string[] args)
        {
            try
            {
-                var fileInfo = new FileInfo(mp.get_property_string("path"));
+                string performer, title, album, genre, date, duration, text = "";
+                long fileSize = 0;
+                string path = mp.get_property_string("path");
+                int width = mp.get_property_int("video-params/w");
+                int height = mp.get_property_int("video-params/h");

-                using (var mediaInfo = new MediaInfo(fileInfo.FullName))
+                if (File.Exists(path))
                {
-                    string width = mediaInfo.GetInfo(MediaInfoStreamKind.Video, "Width");
+                    fileSize = new FileInfo(path).Length;

-                    if (width == "")
+                    if (App.AudioTypes.Contains(Path.GetExtension(path).ToLower().TrimStart('.')))
                    {
-                        string performer = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Performer");
-                        string title = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Title");
-                        string album = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Album");
-                        string genre = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Genre");
-                        string date = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Recorded_Date");
-                        string duration = mediaInfo.GetInfo(MediaInfoStreamKind.Audio, "Duration/String");
+                        using (MediaInfo mediaInfo = new MediaInfo(path))
+                        {
+                            performer = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Performer");
+                            title = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Title");
+                            album = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Album");
+                            genre = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Genre");
+                            date = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Recorded_Date");
+                            duration = mediaInfo.GetInfo(MediaInfoStreamKind.Audio, "Duration/String");

-                        string text = "";
+                            if (performer != "") text += "Artist: " + performer + "\n";
+                            if (title != "") text += "Title: " + title + "\n";
+                            if (album != "") text += "Album: " + album + "\n";
+                            if (genre != "") text += "Genre: " + genre + "\n";
+                            if (date != "") text += "Year: " + date + "\n";
+                            if (duration != "") text += "Length: " + duration + "\n";

-                        if (performer != "") text += "Artist: " + performer + "\n";
-                        if (title != "") text += "Title: " + title + "\n";
-                        if (album != "") text += "Album: " + album + "\n";
-                        if (genre != "") text += "Genre: " + genre + "\n";
-                        if (date != "") text += "Year: " + date + "\n";
-                        if (duration != "") text += "Length: " + duration + "\n";
-
-                        mp.commandv("show-text", text, "5000");
+                            mp.commandv("show-text", text, "5000");
+                            return;
+                        }
                    }
-                    else
-                    {
-                        string height = mediaInfo.GetInfo(MediaInfoStreamKind.Video, "Height");
-                        TimeSpan position = TimeSpan.FromSeconds(mp.get_property_number("time-pos"));
-                        TimeSpan duration = TimeSpan.FromSeconds(mp.get_property_number("duration"));
-                        string bitrate = mediaInfo.GetInfo(MediaInfoStreamKind.Video, "BitRate");
-
-                        if (bitrate == "")
-                            bitrate = "0";
-
-                        var bitrate2 = Convert.ToDouble(bitrate) / 1000.0 / 1000.0;
-                        var videoCodec = mp.get_property_string("video-format").ToUpper();
-                        var filename = fileInfo.Name;
-
-                        var text =
-                            FormatTime(position.TotalMinutes) + ":" +
-                            FormatTime(position.Seconds) + " / " +
-                            FormatTime(duration.TotalMinutes) + ":" +
-                            FormatTime(duration.Seconds) + "\n" +
-                            Convert.ToInt32(fileInfo.Length / 1024 / 1024).ToString() +
-                            $" MB - {width} x {height}\n{videoCodec} - {bitrate2.ToString("f1")} Mb/s" + "\n" + filename;
-
-                        mp.commandv("show-text", text, "5000");
-                    }
-
-                    string FormatTime(double value) => ((int)value).ToString("00");
                }
+
+                TimeSpan position = TimeSpan.FromSeconds(mp.get_property_number("time-pos"));
+                TimeSpan duration2 = TimeSpan.FromSeconds(mp.get_property_number("duration"));
+                string videoCodec = mp.get_property_string("video-format").ToUpper();
+
+                text = Path.GetFileName(path) + "\n" +
+                    FormatTime(position.TotalMinutes) + ":" +
+                    FormatTime(position.Seconds) + " / " +
+                    FormatTime(duration2.TotalMinutes) + ":" +
+                    FormatTime(duration2.Seconds) + "\n" +
+                    $"{width} x {height}\n";
+
+                if (fileSize > 0)
+                    text += Convert.ToInt32(fileSize / 1024.0 / 1024.0).ToString() + " MB\n";
+
+                text += $"{videoCodec}\n";
+
+                mp.commandv("show-text", text, "5000");
+                string FormatTime(double value) => ((int)value).ToString("00");
            }
            catch (Exception)
            {
@@ -173,8 +179,9 @@ namespace mpvnet
        public static void execute_mpv_command(string[] args)
        {
            MainForm.Instance.Invoke(new Action(() => {
-                string command = Microsoft.VisualBasic.Interaction.InputBox("Enter a mpv command to be executed.");
+                string command = Microsoft.VisualBasic.Interaction.InputBox("Enter a mpv command to be executed.", "Execute Command", RegistryHelp.GetString("HKCU\\Software\\" + Application.ProductName, "RecentExecutedCommand"));
                if (string.IsNullOrEmpty(command)) return;
+                RegistryHelp.SetObject("HKCU\\Software\\" + Application.ProductName, "RecentExecutedCommand", command);
                mp.command_string(command, false);
            }));
        }
@@ -184,8 +191,85 @@ namespace mpvnet
            MainForm.Instance.Invoke(new Action(() => {
                string command = Microsoft.VisualBasic.Interaction.InputBox("Enter URL to be opened.");
                if (string.IsNullOrEmpty(command)) return;
-                mp.LoadURL(command);
+                mp.LoadFiles(command);
            }));
        }
+
+        public static void load_sub(string[] args)
+        {
+            MainForm.Instance.Invoke(new Action(() => {
+                using (var d = new OpenFileDialog())
+                {
+                    d.InitialDirectory = Path.GetDirectoryName(mp.get_property_string("path", false));
+                    d.Multiselect = true;
+
+                    if (d.ShowDialog() == DialogResult.OK)
+                        foreach (string i in d.FileNames)
+                            mp.commandv("sub-add", i);
+                }
+            }));
+        }
+
+        public static void load_audio(string[] args)
+        {
+            MainForm.Instance.Invoke(new Action(() => {
+                using (var d = new OpenFileDialog())
+                {
+                    d.InitialDirectory = Path.GetDirectoryName(mp.get_property_string("path", false));
+                    d.Multiselect = true;
+
+                    if (d.ShowDialog() == DialogResult.OK)
+                        foreach (string i in d.FileNames)
+                            mp.commandv("audio-add", i);
+                }
+            }));
+        }
+
+        public static void cycle_audio(string[] args)
+        {
+            string filePath = mp.get_property_string("path", false);
+            if (!File.Exists(filePath)) return;
+
+            using (MediaInfo mi = new MediaInfo(filePath))
+            {
+                MediaTrack[] audTracks = mp.MediaTracks.Where(track => track.Type == "a").ToArray();
+                if (audTracks.Length < 2) return;
+                int aid = mp.get_property_int("aid");
+                aid += 1;
+                if (aid > audTracks.Length) aid = 1;
+                mp.commandv("set", "aid", aid.ToString());
+                mp.commandv("show-text", audTracks[aid - 1].Text.Substring(3), "5000");
+            }
+        }
+
+        public static void manage_file_associations(string[] args)
+        {
+            using (var td = new TaskDialog<string>())
+            {
+                td.MainInstruction = "Choose an option.";
+                td.MainIcon = MsgIcon.Shield;
+
+                td.AddCommandLink("Register video file extensions", "video");
+                td.AddCommandLink("Register audio file extensions", "audio");
+                td.AddCommandLink("Unregister file extensions",     "unreg");
+
+                string result = td.Show();
+
+                if (!string.IsNullOrEmpty(result))
+                {
+                    using (var proc = new Process())
+                    {
+                        proc.StartInfo.FileName = Application.ExecutablePath;
+                        proc.StartInfo.Arguments = "--reg-file-assoc " + result;
+                        proc.StartInfo.Verb = "runas";
+                        try {
+                            proc.Start();
+                        }
+                        catch (Exception)
+                        { }
+                    }
+                }
+            }
+        }
    }
 }
--- a/mpv.net/Controls/SearchTextBoxUserControl.xaml
+++ b/mpv.net/Controls/SearchTextBoxUserControl.xaml
@@ -0,0 +1,13 @@
+<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"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid x:Name="SearchTextBoxUserControl1" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+        <TextBlock x:Name="HintTextBlock" Margin="5,2" Text="Find a setting" Foreground="LightSteelBlue" VerticalAlignment="Center" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
+        <TextBox Name="SearchTextBox" Height="25" Padding="1,2,0,0" BorderThickness="2" Background="Transparent" TextChanged="SearchTextBox_TextChanged" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" CaretBrush="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
+        <Button x:Name="SearchClearButton" Background="Transparent" HorizontalAlignment="Right" Margin="2,0,4,0" FontSize="10" Width="17" Height="17" Visibility="Hidden" Click="SearchClearButton_Click" FontFamily="Marlett" Foreground="{Binding Path=Foreground2, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">r</Button>
+    </Grid>
+</UserControl>
--- a/mpv.net/Controls/SearchTextBoxUserControl.xaml.cs
+++ b/mpv.net/Controls/SearchTextBoxUserControl.xaml.cs
@@ -13,6 +13,16 @@ namespace Controls

        public string Text { get => SearchTextBox.Text; set => SearchTextBox.Text = value; }

+        private string _HintText;
+
+        public string HintText {
+            get => _HintText;
+            set {
+                _HintText = value;
+                UpdateControls();
+            }
+        }
+
        private void SearchClearButton_Click(object sender, RoutedEventArgs e)
        {
            SearchTextBox.Text = "";
@@ -21,7 +31,12 @@ namespace Controls

        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
        {
-            SearchTextBlock.Text = SearchTextBox.Text == "" ? "Search" : "";
+            UpdateControls();
+        }
+
+        void UpdateControls()
+        {
+            HintTextBlock.Text = SearchTextBox.Text == "" ? HintText : "";

            if (SearchTextBox.Text == "")
                SearchClearButton.Visibility = Visibility.Hidden;
--- a/mpvConfEdit/DynamicGUI/DynamicGUI.cs
+++ b/mpvConfEdit/DynamicGUI/DynamicGUI.cs
@@ -4,16 +4,17 @@ using System.Diagnostics;
 using System.IO;
 using System.Windows.Documents;
 using System.Windows.Navigation;
+
 using Tommy;

 namespace DynamicGUI
 {
    public class Settings
    {
-        public static List<SettingBase> LoadSettings(string filepath)
+        public static List<SettingBase> LoadSettings(string content)
        {
            TomlTable table;
-            using (StreamReader reader = new StreamReader(File.OpenRead(filepath)))
+            using (StringReader reader = new StringReader(content))
                table = TOML.Parse(reader);
            List<SettingBase> settingsList = new List<SettingBase>(); 

@@ -27,6 +28,7 @@ namespace DynamicGUI
                    baseSetting = optionSetting;
                    optionSetting.Default = setting["default"];
                    optionSetting.Value = optionSetting.Default;
+                    optionSetting.StartValue = optionSetting.Default;

                    foreach (TomlTable option in setting["options"])
                    {
@@ -54,7 +56,6 @@ namespace DynamicGUI
                baseSetting.Filter = setting["filter"];
                if (setting.HasKey("help")) baseSetting.Help = setting["help"];
                if (setting.HasKey("helpurl")) baseSetting.HelpURL = setting["helpurl"];
-                if (setting.HasKey("alias")) baseSetting.Alias = setting["alias"];
                if (setting.HasKey("width")) baseSetting.Width = setting["width"];
                settingsList.Add(baseSetting);
            }
@@ -65,8 +66,10 @@ namespace DynamicGUI
    public abstract class SettingBase
    {
        public string Name { get; set; }
-        public string Alias { get; set; }
+        public string Value { get; set; }
+        public string StartValue { get; set; }
        public string Help { get; set; }
+        public string Default { get; set; }
        public string HelpURL { get; set; }
        public string Filter { get; set; }
        public int Width { get; set; }
@@ -74,15 +77,11 @@ namespace DynamicGUI

    public class StringSetting : SettingBase
    {
-        public string Default { get; set; }
-        public string Value { get; set; }
        public bool IsFolder { get; set; }
    }

    public class OptionSetting : SettingBase
    {
-        public string Default { get; set; }
-        public string Value { get; set; }
        public List<OptionSettingOption> Options = new List<OptionSettingOption>();
    }

--- a/mpvConfEdit/DynamicGUI/OptionSettingControl.xaml
+++ b/mpvConfEdit/DynamicGUI/OptionSettingControl.xaml
@@ -8,18 +8,18 @@
             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" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
            <ItemsControl x:Name="ItemsControl">
                <ItemsControl.ItemTemplate>
                    <DataTemplate>
                        <WrapPanel Orientation="Vertical">
-                            <RadioButton x:Name="RadioButton" VerticalContentAlignment="Center" IsChecked="{Binding IsChecked}" GroupName="{Binding OptionSetting.Name}" Content="{Binding Text}" FontSize="16" FontWeight="Normal" VerticalAlignment="Top"></RadioButton>
-                            <TextBox x:Name="ItemHelpTextBox" TextWrapping="WrapWithOverflow" Text="{Binding Help}" Margin="10,0,0,0" BorderThickness="0" IsReadOnly="True" Padding="7,0,0,0" MinHeight="0"></TextBox>
+                            <RadioButton x:Name="RadioButton" VerticalContentAlignment="Center" IsChecked="{Binding IsChecked}" GroupName="{Binding OptionSetting.Name}" Content="{Binding Text}" FontSize="16" FontWeight="Normal" VerticalAlignment="Top" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></RadioButton>
+                            <TextBox x:Name="ItemHelpTextBox" TextWrapping="WrapWithOverflow" Text="{Binding Help}" Margin="10,0,0,0" BorderThickness="0" IsReadOnly="True" Padding="7,0,0,0" MinHeight="0" Foreground="{Binding Path=Foreground2, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
                        </WrapPanel>
                    </DataTemplate>
                </ItemsControl.ItemTemplate>
            </ItemsControl>
-            <TextBox x:Name="HelpTextBox" TextWrapping="WrapWithOverflow" BorderThickness="0" IsReadOnly="True" Margin="0,10,0,0"></TextBox>
+            <TextBox x:Name="HelpTextBox" TextWrapping="WrapWithOverflow" BorderThickness="0" IsReadOnly="True" Margin="0,10,0,0" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"></TextBox>
            <TextBlock x:Name="LinkTextBlock" Margin="0,10">
                <local:HyperlinkEx x:Name="Link"></local:HyperlinkEx>
            </TextBlock>
--- 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;
        }
--- a/mpvConfEdit/DynamicGUI/StringSettingControl.xaml
+++ b/mpvConfEdit/DynamicGUI/StringSettingControl.xaml
@@ -9,16 +9,16 @@
             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" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
            <Grid Margin="0,0,0,10">
                <Grid.ColumnDefinitions>
                    <ColumnDefinition Width="Auto" />
                    <ColumnDefinition Width="Auto" />
                </Grid.ColumnDefinitions>
-                <TextBox x:Name="ValueTextBox" Text="{Binding Path=Text, ElementName=StringSettingControl1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="150" HorizontalAlignment="Left" Height="20"/>
+                <TextBox x:Name="ValueTextBox" Text="{Binding Path=Text, ElementName=StringSettingControl1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="150" HorizontalAlignment="Left" Height="20" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"/>
                <Button x:Name="Button" Height="20" Grid.Column="1" Visibility="{Binding Path=Text, ElementName=StringSettingControl1}" Margin="5,0,0,0" Width="20" Click="Button_Click">...</Button>
            </Grid>
-            <TextBox x:Name="HelpTextBox" TextWrapping="WrapWithOverflow" Margin="0,0,0,10" BorderThickness="0" IsReadOnly="True"></TextBox>
+            <TextBox x:Name="HelpTextBox" TextWrapping="WrapWithOverflow" Margin="0,0,0,10" BorderThickness="0" IsReadOnly="True" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
            <TextBlock x:Name="LinkTextBlock" Margin="0,10">
                <local:HyperlinkEx x:Name="Link"></local:HyperlinkEx>
            </TextBlock>
--- 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;
        }
--- a/mpvConfEdit/DynamicGUI/Tommy.cs
+++ b/mpvConfEdit/DynamicGUI/Tommy.cs
--- a/mpv.net/License.txt
+++ b/mpv.net/License.txt
@@ -1,10 +0,0 @@
-MIT License
-
-Copyright (c) 2017 stax76
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and ssociated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/mpv.net/MainForm.Designer.cs
+++ b/mpv.net/MainForm.Designer.cs
@@ -45,7 +45,7 @@
            this.AutoScaleDimensions = new System.Drawing.SizeF(288F, 288F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
            this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(1012, 615);
+            this.ClientSize = new System.Drawing.Size(606, 368);
            this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
--- a/mpv.net/MainForm.cs
+++ b/mpv.net/MainForm.cs
@@ -6,19 +6,32 @@ using System.Threading;
 using System.Windows.Forms;
 using System.Linq;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Diagnostics;

 namespace mpvnet
 {
    public partial class MainForm : Form
    {
        public static MainForm Instance { get; set; }
-        public static IntPtr Hwnd;
+        public static IntPtr Hwnd { get; set; }

-        private Point LastCursorPosChanged;
-        private int LastCursorChangedTickCount;
-        private bool IgnoreDpiChanged = true;
+        public new ContextMenuStripEx ContextMenu { get; set; }

-        public ContextMenuStripEx CMS;
+        Point  LastCursorPosChanged;
+        int    LastCursorChangedTickCount;
+        bool   IgnoreDpiChanged = true;
+        List<string> RecentFiles;
+
+        public string MpvNetDarkMode { get; set; } = "always";
+        public bool   MpvFullscreen  { get; set; }
+        public float  MpvAutofit { get; set; } = 0.50f;
+        public int    MpvScreen  { get; set; } = -1;
+        public string MpvSid     { get; set; } = "";
+        public string MpvAid     { get; set; } = "";
+        public string MpvVid     { get; set; } = "";
+        public int    MpvEdition { get; set; }

        public MainForm()
        {
@@ -26,31 +39,167 @@ namespace mpvnet

            try
            {
+                AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
                Application.ThreadException += Application_ThreadException;
+                Msg.SupportURL = "https://github.com/stax76/mpv.net#support";
                Instance = this;
+                WPF.WPF.Init();
+                System.Windows.Application.Current.ShutdownMode = System.Windows.ShutdownMode.OnExplicitShutdown;
                Hwnd = Handle;
+                MinimumSize = new Size(FontHeight * 16, FontHeight * 9);
                Text += " " + Application.ProductVersion;

-                if (mp.mpvConf.ContainsKey("screen"))
-                    SetScreen(Convert.ToInt32(mp.mpvConf["screen"]));
-                else
-                    SetScreen(Screen.PrimaryScreen);
+                object recent = RegistryHelp.GetObject("HKCU\\Software\\" + Application.ProductName, "Recent");

-                ChangeFullscreen((mp.mpvConf.ContainsKey("fullscreen") && mp.mpvConf["fullscreen"] == "yes") ||
-                                 (mp.mpvConf.ContainsKey("fs") && mp.mpvConf["fs"] == "yes"));
+                if (recent is string[] r)
+                    RecentFiles = new List<string>(r);
+                else
+                    RecentFiles = new List<string>();
+
+                foreach (var i in mp.mpvConf)
+                    ProcessMpvProperty(i.Key, i.Value);
+
+                foreach (var i in mp.mpvNetConf)
+                    ProcessMpvNetProperty(i.Key, i.Value);

                ProcessCommandLineEarly();
+
+                if (MpvScreen == -1) MpvScreen = Array.IndexOf(Screen.AllScreens, Screen.PrimaryScreen);
+                SetScreen(MpvScreen);
+
+                ChangeFullscreen(MpvFullscreen);
            }
-            catch (Exception e)
+            catch (Exception ex)
            {
-                MainForm.Instance.ShowMsgBox(e.ToString(), MessageBoxIcon.Error);
+                Msg.ShowException(ex);
            }
        }

+        void ContextMenu_Opening(object sender, CancelEventArgs e)
+        {
+            lock (mp.MediaTracks)
+            {
+                MenuItem trackMenuItem = FindMenuItem("Track");
+
+                if (trackMenuItem != null)
+                {
+                    trackMenuItem.DropDownItems.Clear();
+
+                    MediaTrack[] audTracks = mp.MediaTracks.Where(track => track.Type == "a").ToArray();
+                    MediaTrack[] subTracks = mp.MediaTracks.Where(track => track.Type == "s").ToArray();
+                    MediaTrack[] vidTracks = mp.MediaTracks.Where(track => track.Type == "v").ToArray();
+                    MediaTrack[] ediTracks = mp.MediaTracks.Where(track => track.Type == "e").ToArray();
+
+                    foreach (MediaTrack track in vidTracks)
+                    {
+                        MenuItem mi = new MenuItem(track.Text);
+                        mi.Action = () => { mp.commandv("set", "vid", track.ID.ToString()); };
+                        mi.Checked = MpvVid == track.ID.ToString();
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
+
+                    if (vidTracks.Length > 0)
+                        trackMenuItem.DropDownItems.Add(new ToolStripSeparator());
+
+                    foreach (MediaTrack track in audTracks)
+                    {
+                        MenuItem mi = new MenuItem(track.Text);
+                        mi.Action = () => { mp.commandv("set", "aid", track.ID.ToString()); };
+                        mi.Checked = MpvAid == track.ID.ToString();
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
+
+                    if (subTracks.Length > 0)
+                        trackMenuItem.DropDownItems.Add(new ToolStripSeparator());
+
+                    foreach (MediaTrack track in subTracks)
+                    {
+                        MenuItem mi = new MenuItem(track.Text);
+                        mi.Action = () => { mp.commandv("set", "sid", track.ID.ToString()); };
+                        mi.Checked = MpvSid == track.ID.ToString();
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
+
+                    if (subTracks.Length > 0)
+                    {
+                        MenuItem mi = new MenuItem("S: No subtitles");
+                        mi.Action = () => { mp.commandv("set", "sid", "no"); };
+                        mi.Checked = MpvSid == "no";
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
+
+                    if (ediTracks.Length > 0)
+                        trackMenuItem.DropDownItems.Add(new ToolStripSeparator());
+
+                    foreach (MediaTrack track in ediTracks)
+                    {
+                        MenuItem mi = new MenuItem(track.Text);
+                        mi.Action = () => { mp.commandv("set", "edition", track.ID.ToString()); };
+                        mi.Checked = MpvEdition == track.ID;
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
+                }
+            }
+
+            lock (mp.Chapters)
+            {
+                MenuItem chaptersMenuItem = FindMenuItem("Chapters");
+
+                if (chaptersMenuItem != null)
+                {
+                    chaptersMenuItem.DropDownItems.Clear();
+
+                    foreach (var i in mp.Chapters)
+                    {
+                        MenuItem mi = new MenuItem(i.Key);
+                        mi.ShortcutKeyDisplayString = TimeSpan.FromSeconds(i.Value).ToString().Substring(0, 8) + "     ";
+                        mi.Action = () => { mp.commandv("seek", i.Value.ToString(CultureInfo.InvariantCulture), "absolute"); };
+                        chaptersMenuItem.DropDownItems.Add(mi);
+                    }
+                }
+            }
+
+            MenuItem recent = FindMenuItem("Recent");
+
+            if (recent != null)
+            {
+                recent.DropDownItems.Clear();
+
+                foreach (string path in RecentFiles)
+                    MenuItem.Add(recent.DropDownItems, path, () => mp.LoadFiles(path));
+
+                recent.DropDownItems.Add(new ToolStripSeparator());
+                MenuItem mi = new MenuItem("Clear List");
+                mi.Action = () => RecentFiles.Clear();
+                recent.DropDownItems.Add(mi);
+            }
+        }
+
+        public MenuItem FindMenuItem(string text) => FindMenuItem(text, ContextMenu.Items);
+
+        MenuItem FindMenuItem(string text, ToolStripItemCollection items)
+        {
+            foreach (var item in items)
+            {
+                if (item is MenuItem mi)
+                {
+                    if (mi.Text.StartsWith(text) && mi.Text.Trim() == text)
+                        return mi;
+                    if (mi.DropDownItems.Count > 0)
+                    {
+                        MenuItem val = FindMenuItem(text, mi.DropDownItems);
+                        if (val != null) return val;
+                    }
+                }
+            }
+            return null;
+        }
+
        protected void SetScreen(int targetIndex)
        {
            Screen[] screens = Screen.AllScreens;
-            if (targetIndex < 0 || targetIndex > screens.Length - 1) return;
+            if (targetIndex < 0) targetIndex = 0;
+            if (targetIndex > screens.Length - 1) targetIndex = screens.Length - 1;
            SetScreen(screens[Array.IndexOf(screens, screens[targetIndex])]);
        }

@@ -66,7 +215,7 @@ namespace mpvnet
        {
            if (IsFullscreen || mp.VideoSize.Width == 0) return;
            Screen screen = Screen.FromControl(this);
-            int height = Convert.ToInt32(screen.Bounds.Height * 0.6);
+            int height = Convert.ToInt32(screen.Bounds.Height * MpvAutofit);
            int width = Convert.ToInt32(height * mp.VideoSize.Width / (double)mp.VideoSize.Height);
            Point middlePos = new Point(Left + Width / 2, Top + Height / 2);
            var rect = new Native.RECT(new Rectangle(screen.Bounds.X, screen.Bounds.Y, width, height));
@@ -81,6 +230,7 @@ namespace mpvnet
            if (IsFullscreen || mp.VideoSize.Width == 0) return;
            Screen screen = Screen.FromControl(this);
            int height = ClientSize.Height;
+            if (height > screen.Bounds.Height * 0.9) height = Convert.ToInt32(screen.Bounds.Height * MpvAutofit);
            int width = Convert.ToInt32(height * mp.VideoSize.Width / (double)mp.VideoSize.Height);
            Point middlePos = new Point(Left + Width / 2, Top + Height / 2);
            var rect = new Native.RECT(new Rectangle(screen.Bounds.X, screen.Bounds.Y, width, height));
@@ -88,15 +238,9 @@ namespace mpvnet
            int left = middlePos.X - rect.Width / 2;
            int top = middlePos.Y - rect.Height / 2;
            Screen[] screens = Screen.AllScreens;
-
-            if (left < screens[0].Bounds.Left)
-                left = screens[0].Bounds.Left;
-
+            if (left < screens[0].Bounds.Left) left = screens[0].Bounds.Left;
            int maxLeft = screens[0].Bounds.Left + screens.Select((sc) => sc.Bounds.Width).Sum() - rect.Width - SystemInformation.CaptionHeight;
-
-            if (left > maxLeft)
-                left = maxLeft;
-
+            if (left > maxLeft) left = maxLeft;
            Native.SetWindowPos(Handle, IntPtr.Zero /* HWND_TOP */, left, top, rect.Width, rect.Height, 4 /* SWP_NOZORDER */);
        }

@@ -112,11 +256,8 @@ namespace mpvnet
                    {
                        string left = i.Substring(2, i.IndexOf("=") - 2);
                        string right = i.Substring(left.Length + 3);
-                        
-                        if (left == "screen")
-                            SetScreen(Convert.ToInt32(right));
-
-                        ChangeFullscreen((left == "fs" || left == "fullscreen") && right == "yes");
+                        ProcessMpvProperty(left, right);
+                        ProcessMpvNetProperty(left, right);
                    }
                    else
                    {
@@ -126,7 +267,7 @@ namespace mpvnet
                        {
                            case "fs":
                            case "fullscreen":
-                                ChangeFullscreen(true);
+                                MpvFullscreen = true;
                                break;
                        }
                    }
@@ -134,86 +275,110 @@ namespace mpvnet
            }
        }

+        void ProcessMpvProperty(string name, string value)
+        {
+            switch (name)
+            {
+                case "autofit":
+                    if (value.Length == 3 && value.EndsWith("%"))
+                        if (int.TryParse(value.Substring(0, 2), out int result))
+                            MpvAutofit = result / 100f;
+                    break;
+                case "fs":
+                case "fullscreen":
+                    MpvFullscreen = value == "yes";
+                    break;
+                case "screen":
+                    MpvScreen = Convert.ToInt32(value);
+                    break;
+            }
+        }
+
+        void ProcessMpvNetProperty(string name, string value)
+        {
+            switch (name)
+            {
+                case "dark-mode":
+                    MpvNetDarkMode = value;
+                    break;
+            }
+        }
+
        public void BuildMenu()
        {
-            foreach (var i in File.ReadAllText(mp.InputConfPath).Split("\r\n".ToCharArray(), StringSplitOptions.RemoveEmptyEntries))
-            {
-                if (!i.Contains("#menu:")) continue;
-                var left = i.Substring(0, i.IndexOf("#menu:")).Trim();
-                if (left.StartsWith("#")) continue;
-                var cmd = left.Substring(left.IndexOf(" ") + 1).Trim();
-                var menu = i.Substring(i.IndexOf("#menu:") + "#menu:".Length).Trim();
-                var key = left.Substring(0, left.IndexOf(" "));
-                if (key == "_") key = "";
-                if (menu.Contains(";")) key = menu.Substring(0, menu.IndexOf(";")).Trim();
-                var path = menu.Substring(menu.IndexOf(";") + 1).Trim().Replace("&", "&&");
-                if (path == "" || cmd == "") continue;
+            string content = File.ReadAllText(mp.InputConfPath);
+            var items = CommandItem.GetItems(content);

-                var menuItem = CMS.Add(path, () => {
-                    try
-                    {
-                        mp.command_string(cmd);
-                    }
-                    catch (Exception e)
-                    {
-                        MainForm.Instance.ShowMsgBox(e.ToString(), MessageBoxIcon.Error);
+            if (!content.Contains("#menu:"))
+            {
+                var defaultItems = CommandItem.GetItems(Properties.Resources.inputConf);
+                foreach (CommandItem item in items)
+                    foreach (CommandItem defaultItem in defaultItems)
+                        if (item.Command == defaultItem.Command)
+                            defaultItem.Input = item.Input;
+                items = defaultItems;
+            }
+
+            foreach (CommandItem item in items)
+            {
+                if (string.IsNullOrEmpty(item.Path))
+                    continue;
+                string path = item.Path.Replace("&", "&&");
+                MenuItem menuItem = ContextMenu.Add(path, () => {
+                    try {
+                        mp.command_string(item.Command);
+                    } catch (Exception ex) {
+                        Msg.ShowException(ex);
                    }
                });
-                
                if (menuItem != null)
-                    menuItem.ShortcutKeyDisplayString = key.Replace("_","") + "   ";
+                    menuItem.ShortcutKeyDisplayString = item.Input + "    ";
            }
        }

-        private void CMS_Opened(object sender, EventArgs e)
+        void ContextMenu_Opened(object sender, EventArgs e) => CursorHelp.Show();
+
+        private void Mp_FileLoaded()
        {
-            CursorHelp.Show();
+            string path = mp.get_property_string("path");
+            BeginInvoke(new Action(() => {
+                if (File.Exists(path) || path.StartsWith("http"))
+                    Text = Path.GetFileName(path) + " - mpv.net " + Application.ProductVersion;
+                else
+                    Text = "mpv.net " + Application.ProductVersion;
+            }));
+            if (RecentFiles.Contains(path)) RecentFiles.Remove(path);
+            RecentFiles.Insert(0, path);
+            if (RecentFiles.Count > 15) RecentFiles.RemoveAt(15);
        }

-        private string LastHistory;
+        void Mp_Idle() => BeginInvoke(new Action(() => { Text = "mpv.net " + Application.ProductVersion; }));

-        private void mp_PlaybackRestart()
+        void CM_Popup(object sender, EventArgs e) => CursorHelp.Show();
+
+        void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
        {
-            var filename = mp.get_property_string("filename");
-            BeginInvoke(new Action(() => { Text = filename + " - mpv.net " + Application.ProductVersion; }));
-            var historyFilepath = mp.mpvConfFolderPath + "history.txt";
-
-            if (LastHistory != filename && File.Exists(historyFilepath))
-            {
-                File.AppendAllText(historyFilepath, DateTime.Now.ToString() + " " +
-                    Path.GetFileNameWithoutExtension(filename) + "\r\n");
-                LastHistory = filename;
-            }
+            Msg.ShowException(e.Exception);
        }

-        private void Mp_Idle()
+        void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
        {
-            BeginInvoke(new Action(() => { Text = "mpv.net " + Application.ProductVersion; }));
+           Msg.ShowError(e.ExceptionObject.ToString());
        }

-        private void CM_Popup(object sender, EventArgs e)
-        {
-            CursorHelp.Show();
-        }
-
-        private void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
-        {
-            ShowMsgBox(e.Exception.ToString(), MessageBoxIcon.Error);
-        }
-
-        private void mp_VideoSizeChanged()
+        void mp_VideoSizeChanged()
        {
            BeginInvoke(new Action(() => SetFormPositionAndSizeKeepHeight()));
        }

-        private void mp_Shutdown()
+        void mp_Shutdown()
        {
            BeginInvoke(new Action(() => Close()));  
        }

        public bool IsFullscreen => WindowState == FormWindowState.Maximized;

-        void mp_ChangeFullscreen(bool value)
+        void mpPropChangeFullscreen(bool value)
        {
            BeginInvoke(new Action(() => ChangeFullscreen(value)));
        }
@@ -238,12 +403,16 @@ namespace mpvnet

        protected override void WndProc(ref Message m)
        {
+            //Debug.WriteLine(m);
+
            switch (m.Msg)
            {
                case 0x0201: // WM_LBUTTONDOWN
                case 0x0202: // WM_LBUTTONUP
                case 0x0100: // WM_KEYDOWN
                case 0x0101: // WM_KEYUP
+                case 0x0104: // WM_SYSKEYDOWN
+                case 0x0105: // WM_SYSKEYUP
                case 0x020A: // WM_MOUSEWHEEL
                    if (mp.MpvWindowHandle != IntPtr.Zero)
                        Native.SendMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
@@ -252,14 +421,6 @@ namespace mpvnet
                    if (mp.MpvWindowHandle != IntPtr.Zero)
                        Native.PostMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
                    break;
-                case 0x0104: // WM_SYSKEYDOWN:
-                    if (mp.MpvWindowHandle != IntPtr.Zero)
-                        Native.SendMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
-                    break;
-                case 0x0105: // WM_SYSKEYUP:
-                    if (mp.MpvWindowHandle != IntPtr.Zero)
-                        Native.SendMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
-                    break;
                case 0x203: // Native.WM.LBUTTONDBLCLK
                    if (!IsMouseInOSC())
                        mp.command_string("cycle fullscreen");
@@ -288,7 +449,6 @@ namespace mpvnet
                    m.Result = new IntPtr(1);
                    return;
            }
-
            base.WndProc(ref m);
        }

@@ -301,12 +461,11 @@ namespace mpvnet

        protected override void OnDragDrop(DragEventArgs e)
        {
+            base.OnDragDrop(e);
            if (e.Data.GetDataPresent(DataFormats.FileDrop))
                mp.LoadFiles(e.Data.GetData(DataFormats.FileDrop) as String[]);
            if (e.Data.GetDataPresent(DataFormats.Text))
-                mp.LoadURL(e.Data.GetData(DataFormats.Text).ToString());
-            
-            base.OnDragDrop(e);
+                mp.LoadFiles(e.Data.GetData(DataFormats.Text).ToString());
        }

        protected override void OnMouseDown(MouseEventArgs e)
@@ -322,11 +481,7 @@ namespace mpvnet
                Native.PostMessage(Handle, 0xA1 /* WM_NCLBUTTONDOWN */, HTCAPTION, IntPtr.Zero);
            }

-            var sb = Screen.FromControl(this).Bounds;
-            var p1 = new Point(sb.Width, 0);
-            var p2 = PointToScreen(e.Location);
-
-            if (Math.Abs(p1.X - p2.X) < 10 && Math.Abs(p1.Y - p2.Y) < 10)
+            if (Width - e.Location.X < 10 && e.Location.Y < 10)
                mp.commandv("quit");
        }

@@ -339,12 +494,9 @@ namespace mpvnet
                CursorHelp.Show();
        }

-        bool IsMouseInOSC()
-        {
-            return PointToClient(Control.MousePosition).Y > ClientSize.Height * 0.9;
-        }
+        bool IsMouseInOSC() => PointToClient(Control.MousePosition).Y > ClientSize.Height * 0.9;

-        private void Timer_Tick(object sender, EventArgs e)
+        void Timer_Tick(object sender, EventArgs e)
        {
            if (CursorHelp.IsPosDifferent(LastCursorPosChanged))
            {
@@ -353,46 +505,58 @@ namespace mpvnet
            }
            else if (Environment.TickCount - LastCursorChangedTickCount > 1500 &&
                !IsMouseInOSC() && ClientRectangle.Contains(PointToClient(MousePosition)) &&
-                Form.ActiveForm == this && !CMS.Visible)
+                Form.ActiveForm == this && !ContextMenu.Visible)
            {
                CursorHelp.Hide();
            }
        }

-        public DialogResult ShowMsgBox(string message, MessageBoxIcon icon)
-        {
-            var buttons = MessageBoxButtons.OK;
-            if (icon == MessageBoxIcon.Question) buttons = MessageBoxButtons.OKCancel;
-            var fn = new Func<DialogResult>(() => MessageBox.Show(message, Application.ProductName, buttons, icon));
-            return (DialogResult)Invoke(fn);
-        }
-
        protected override void OnLoad(EventArgs e)
        {
            base.OnLoad(e);
            mp.Init();
-            mp.observe_property_bool("fullscreen", mp_ChangeFullscreen);
+            mp.observe_property_bool("fullscreen", mpPropChangeFullscreen);
+            mp.observe_property_bool("ontop", mpPropChangeOnTop);
+            mp.observe_property_string("sid", mpPropChangeSid);
+            mp.observe_property_string("aid", mpPropChangeAid);
+            mp.observe_property_string("vid", mpPropChangeVid);
+            mp.observe_property_int("edition", mpPropChangeEdition);
            mp.Shutdown += mp_Shutdown;
            mp.VideoSizeChanged += mp_VideoSizeChanged;
-            mp.PlaybackRestart += mp_PlaybackRestart;
+            mp.FileLoaded += Mp_FileLoaded;
            mp.Idle += Mp_Idle;
        }

+        void mpPropChangeOnTop(bool value) => BeginInvoke(new Action(() => TopMost = value));
+
+        void mpPropChangeAid(string value) => MpvAid = value;
+
+        void mpPropChangeSid(string value) => MpvSid = value;
+
+        void mpPropChangeVid(string value) => MpvVid = value;
+
+        void mpPropChangeEdition(int value) => MpvEdition = value;
+
        protected override void OnShown(EventArgs e)
        {
            base.OnShown(e);
-            CMS = new ContextMenuStripEx(components);
-            CMS.Opened += CMS_Opened;
-            ContextMenuStrip = CMS;
+            if ((MpvNetDarkMode == "system" && Sys.IsDarkTheme) || MpvNetDarkMode == "always")
+                ToolStripRendererEx.ColorTheme = Color.Black;
+            ContextMenu = new ContextMenuStripEx(components);
+            ContextMenu.Opened += ContextMenu_Opened;
+            ContextMenu.Opening += ContextMenu_Opening;
            BuildMenu();
+            ContextMenuStrip = ContextMenu;
            IgnoreDpiChanged = false;
+            CheckURL();
        }

        protected override void OnFormClosed(FormClosedEventArgs e)
        {
            base.OnFormClosed(e);
+            RegistryHelp.SetObject("HKCU\\Software\\" + Application.ProductName, "Recent", RecentFiles.ToArray());
            mp.commandv("quit");
-            mp.AutoResetEvent.WaitOne(3000); 
+            mp.AutoResetEvent.WaitOne(3000);
        }

        protected override void OnLostFocus(EventArgs e)
@@ -400,5 +564,24 @@ namespace mpvnet
            base.OnLostFocus(e);
            CursorHelp.Show();
        }
+
+        protected override void OnActivated(EventArgs e)
+        {
+            base.OnActivated(e);
+            CheckURL();
+        }
+
+        void CheckURL()
+        {
+            string clipboard = Clipboard.GetText();
+
+            if (clipboard.StartsWith("http") && RegistryHelp.GetString("HKCU\\Software\\" + Application.ProductName, "LastURL") != clipboard && Visible)
+            {
+                RegistryHelp.SetObject("HKCU\\Software\\" + Application.ProductName, "LastURL", clipboard);
+
+                if (Msg.ShowQuestion("Play URL?", clipboard) == MsgResult.OK)
+                    mp.LoadFiles(clipboard);
+            }
+        }
    }
 }
--- a/mpv.net/MainForm.resx
+++ b/mpv.net/MainForm.resx
--- a/mpv.net/MediaInfo.cs
+++ b/mpv.net/MediaInfo.cs
@@ -3,8 +3,8 @@ using System.Runtime.InteropServices;

 public class MediaInfo : IDisposable
 {
-    private IntPtr Handle;
-    private static bool Loaded;
+    IntPtr Handle;
+    static bool Loaded;

    public MediaInfo(string sourcepath)
    {
@@ -25,7 +25,24 @@ public class MediaInfo : IDisposable
        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, streamKind, 0, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
    }

-    private bool Disposed;
+    public int GetCount(MediaInfoStreamKind streamKind) => MediaInfo_Count_Get(Handle, streamKind, -1);
+
+    public string GetVideo(int streamNumber, string parameter)
+    {
+        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Video, streamNumber, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
+    }
+
+    public string GetAudio(int streamNumber, string parameter)
+    {
+        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Audio, streamNumber, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
+    }
+
+    public string GetText(int streamNumber, string parameter)
+    {
+        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Text, streamNumber, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
+    }
+
+    bool Disposed;

    public void Dispose()
    {
@@ -37,28 +54,35 @@ public class MediaInfo : IDisposable
        }
    }

-    ~MediaInfo()
-    {
-        Dispose();
-    }
+    ~MediaInfo() { Dispose(); }

    [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
-    private static extern IntPtr LoadLibrary(string path);
+    static extern IntPtr LoadLibrary(string path);

    [DllImport("MediaInfo.dll")]
-    private static extern IntPtr MediaInfo_New();
+    static extern IntPtr MediaInfo_New();

    [DllImport("MediaInfo.dll")]
-    private static extern void MediaInfo_Delete(IntPtr Handle);
+    static extern void MediaInfo_Delete(IntPtr handle);

    [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
-    private static extern int MediaInfo_Open(IntPtr Handle, string FileName);
+    static extern int MediaInfo_Open(IntPtr handle, string fileName);

    [DllImport("MediaInfo.dll")]
-    private static extern int MediaInfo_Close(IntPtr Handle);
+    static extern int MediaInfo_Close(IntPtr handle);

    [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
-    private static extern IntPtr MediaInfo_Get(IntPtr Handle, MediaInfoStreamKind StreamKind, int StreamNumber, string Parameter, MediaInfoInfoKind KindOfInfo, MediaInfoInfoKind KindOfSearch);
+    static extern IntPtr MediaInfo_Get(IntPtr handle,
+                                       MediaInfoStreamKind streamKind,
+                                       int streamNumber,
+                                       string parameter,
+                                       MediaInfoInfoKind kindOfInfo,
+                                       MediaInfoInfoKind kindOfSearch);
+
+    [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
+    static extern int MediaInfo_Count_Get(IntPtr handle,
+                                          MediaInfoStreamKind streamKind,
+                                          int streamNumber);
 }

 public enum MediaInfoStreamKind
@@ -67,8 +91,10 @@ public enum MediaInfoStreamKind
    Video,
    Audio,
    Text,
-    Chapters,
-    Image
+    Other,
+    Image,
+    Menu,
+    Max,
 }

 public enum MediaInfoInfoKind
--- a/mpv.net/Menu.cs
+++ b/mpv.net/Menu.cs
@@ -23,76 +23,61 @@ public class ContextMenuStripEx : ContextMenuStrip
        Renderer = new ToolStripRendererEx();
    }

-    public ActionMenuItem Add(string path)
+    public MenuItem Add(string path)
    {
        return Add(path, null);
    }

-    public ActionMenuItem Add(string path, Action action)
+    public MenuItem Add(string path, Action action, bool enabled = true)
    {
-        return Add(path, action, true);
-    }
-
-    public ActionMenuItem Add(string path, Action action, bool enabled)
-    {
-        var ret = ActionMenuItem.Add(Items, path, action);
-        if (ret == null)
-            return null;
+        MenuItem ret = MenuItem.Add(Items, path, action);
+        if (ret == null) return null;
        ret.Enabled = enabled;
        return ret;
    }
-
-    public ActionMenuItem Add(string path, Action action, Func<bool> enabledFunc)
-    {
-        var ret = ActionMenuItem.Add(Items, path, action);
-        return ret;
-    }
 }

-public class ActionMenuItem : MenuItemEx
+public class MenuItem : ToolStripMenuItem
 {
-    private Action Action;
+    public Action Action { get; set; }

-    public ActionMenuItem()
+    public MenuItem()
    {
    }

-    public ActionMenuItem(string text, Action action)
+    public MenuItem(string text) : base(text)
    {
-        this.Text = text;
-        this.Action = action;
+    }
+
+    public MenuItem(string text, Action action) : base(text)
+    {
+        Action = action;
    }

    protected override void OnClick(EventArgs e)
    {
        Application.DoEvents();
-        if (Action != null)
-            Action();
+        Action?.Invoke();
        base.OnClick(e);
    }

-    public static ActionMenuItem Add<T>(ToolStripItemCollection items, string path, Action<T> action, T value)
+    public static MenuItem Add(ToolStripItemCollection items, string path, Action action)
    {
-        return Add(items, path, () => action(value));
-    }
+        string[] a = path.Split(new[] { " > ", " | " }, StringSplitOptions.RemoveEmptyEntries);
+        var itemsCollection = items;

-    public static ActionMenuItem Add(ToolStripItemCollection items, string path, Action action)
-    {
-        var a = path.Split(new[] { " > ", " | " }, StringSplitOptions.RemoveEmptyEntries);
-        var l = items;
-
-        for (var x = 0; x <= a.Length - 1; x++)
+        for (int x = 0; x < a.Length; x++)
        {
-            var found = false;
+            bool found = false;

-            foreach (var i in l.OfType<ToolStripMenuItem>())
+            foreach (var i in itemsCollection.OfType<ToolStripMenuItem>())
            {
                if (x < a.Length - 1)
                {
-                    if (i.Text == a[x] + " ")
+                    if (i.Text == a[x] + "    ")
                    {
                        found = true;
-                        l = i.DropDownItems;
+                        itemsCollection = i.DropDownItems;
                    }
                }
            }
@@ -102,54 +87,38 @@ public class ActionMenuItem : MenuItemEx
                if (x == a.Length - 1)
                {
                    if (a[x] == "-")
-                        l.Add(new ToolStripSeparator());
+                        itemsCollection.Add(new ToolStripSeparator());
                    else
                    {
-                        ActionMenuItem item = new ActionMenuItem(a[x] + " ", action);
-                        l.Add(item);
-                        l = item.DropDownItems;
+                        MenuItem item = new MenuItem(a[x] + "    ", action);
+                        itemsCollection.Add(item);
+                        itemsCollection = item.DropDownItems;
                        return item;
                    }
                }
                else
                {
-                    ActionMenuItem item = new ActionMenuItem();
-                    item.Text = a[x] + " ";
-                    l.Add(item);
-                    l = item.DropDownItems;
+                    MenuItem item = new MenuItem();
+                    item.Text = a[x] + "    ";
+                    itemsCollection.Add(item);
+                    itemsCollection = item.DropDownItems;
                }
            }
        }
        return null;
    }
-}
-
-public class MenuItemEx : ToolStripMenuItem
-{
-    public static bool UseTooltips { get; set; }
-
-    public MenuItemEx()
-    {
-    }
-
-    public MenuItemEx(string text) : base(text)
-    {
-    }

    public override Size GetPreferredSize(Size constrainingSize)
    {
-        var ret = base.GetPreferredSize(constrainingSize);
-        ret.Height = Convert.ToInt32(Font.Height * 1.4);
-        return ret;
+        Size size = base.GetPreferredSize(constrainingSize);
+        size.Height = Convert.ToInt32(Font.Height * 1.4);
+        return size;
    }

    public void CloseAll(object item)
    {
        if (item is ToolStripItem)
-        {
-            var d = (ToolStripItem)item;
-            CloseAll(d.Owner);
-        }
+            CloseAll(((ToolStripItem)item).Owner);

        if (item is ToolStripDropDown)
        {
@@ -158,20 +127,16 @@ public class MenuItemEx : ToolStripMenuItem
            CloseAll(d.OwnerItem);
        }
    }
-
-    protected override void OnClick(EventArgs e)
-    {
-        Application.DoEvents();
-        base.OnClick(e);
-    }
 }

 public class ToolStripRendererEx : ToolStripSystemRenderer
 {
+    public static Color ColorForeground { get; set; } = Color.Black;
+    public static Color ColorTheme { get; set; } = Color.Empty;
    public static Color ColorChecked { get; set; }
    public static Color ColorBorder { get; set; }
    public static Color ColorTop { get; set; }
-    public static Color ColorBottom { get; set; }
+    public static Color ColorSelection { get; set; }
    public static Color ColorBackground { get; set; }

    public static Color ColorToolStrip1 { get; set; }
@@ -179,24 +144,37 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
    public static Color ColorToolStrip3 { get; set; }
    public static Color ColorToolStrip4 { get; set; }

-    private int TextOffset;
+    int TextOffset;

    public ToolStripRendererEx()
    {
        var argb = Convert.ToInt32(Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\DWM", "ColorizationColor", 0));
+
        if (argb == 0)
            argb = Color.LightBlue.ToArgb();
-        InitColors(Color.FromArgb(argb));
+        if (ColorTheme == Color.Empty)
+            InitColors(Color.FromArgb(argb));
+        else
+            InitColors(ColorTheme);
    }

    public static void InitColors(Color c)
    {
        ColorBorder = HSLColor.Convert(c).ToColorSetLuminosity(100);
-        ColorChecked = HSLColor.Convert(c).ToColorSetLuminosity(200);
-        ColorBottom = HSLColor.Convert(c).ToColorSetLuminosity(220);
-        ColorBackground = HSLColor.Convert(c).ToColorSetLuminosity(230);
+        ColorChecked = HSLColor.Convert(c).ToColorSetLuminosity(160);
+        ColorSelection = HSLColor.Convert(c).ToColorSetLuminosity(180);
+        ColorBackground = HSLColor.Convert(c).ToColorSetLuminosity(210);
        ColorTop = HSLColor.Convert(c).ToColorSetLuminosity(240);

+        if (ColorTheme == Color.Black)
+        {
+            ColorBorder = Color.White;
+            ColorBackground = Color.FromArgb(50, 50, 50);
+            ColorSelection = Color.FromArgb(80, 80, 80);
+            ColorForeground = Color.White;
+            ColorChecked = Color.FromArgb(90, 90, 90);
+        }
+
        ColorToolStrip1 = ControlPaint.LightLight(ControlPaint.LightLight(ControlPaint.Light(ColorBorder, 1)));
        ColorToolStrip2 = ControlPaint.LightLight(ControlPaint.LightLight(ControlPaint.Light(ColorBorder, 0.7f)));
        ColorToolStrip3 = ControlPaint.LightLight(ControlPaint.LightLight(ControlPaint.Light(ColorBorder, 0.1f)));
@@ -205,7 +183,10 @@ public class ToolStripRendererEx : ToolStripSystemRenderer

    protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e)
    {
-        ControlPaint.DrawBorder(e.Graphics, e.AffectedBounds, Color.FromArgb(160, 175, 195), ButtonBorderStyle.Solid);
+        Rectangle r = e.AffectedBounds;
+        r.Inflate(-1, -1);
+        ControlPaint.DrawBorder(e.Graphics, r, ColorBackground, ButtonBorderStyle.Solid);
+        ControlPaint.DrawBorder(e.Graphics, e.AffectedBounds, ColorBorder, ButtonBorderStyle.Solid);
    }

    protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e)
@@ -222,6 +203,7 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
            else
                TextOffset = Convert.ToInt32(e.Item.Height * 0.2);

+            e.TextColor = ColorForeground;
            e.TextRectangle = new Rectangle(TextOffset, Convert.ToInt32((e.Item.Height - rect.Height) / 2.0), rect.Width, rect.Height);
        }

@@ -235,118 +217,88 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
            Rectangle r = new Rectangle(-1, -1, e.AffectedBounds.Width, e.AffectedBounds.Height);

            using (SolidBrush b = new SolidBrush(ColorToolStrip2))
-            {
                e.Graphics.FillRectangle(b, r);
-            }
        }
    }

    protected override void OnRenderMenuItemBackground(ToolStripItemRenderEventArgs e)
    {
-        e.Item.ForeColor = Color.Black;
-
-        var r = new Rectangle(Point.Empty, e.Item.Size);
-        var g = e.Graphics;
+        Rectangle rect = new Rectangle(Point.Empty, e.Item.Size);

        if (!(e.Item.Owner is MenuStrip))
-            g.Clear(ColorBackground);
+            e.Graphics.Clear(ColorBackground);

        if (e.Item.Selected && e.Item.Enabled)
        {
-            if (e.Item.Owner is MenuStrip)
-                DrawButton(e);
-            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))
-                {
-                    g.FillRectangle(b, r2);
-                }
-            }
+            e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
+            rect = new Rectangle(rect.X + 2, rect.Y, rect.Width - 4, rect.Height - 1);
+            rect.Inflate(-1, -1);
+            using (SolidBrush b = new SolidBrush(ColorSelection))
+                e.Graphics.FillRectangle(b, rect);
        }
    }

-    public void DrawButton(ToolStripItemRenderEventArgs e)
-    {
-        var gx = e.Graphics;
-        var rect = new Rectangle(Point.Empty, e.Item.Size);
-        var rect2 = new Rectangle(rect.X, rect.Y, rect.Width - 1, rect.Height - 1);
-
-        using (Pen pen = new Pen(ColorBorder))
-            gx.DrawRectangle(pen, rect2);
-
-        rect2.Inflate(-1, -1);
-        var tsb = e.Item as ToolStripButton;
-
-        if (tsb != null && tsb.Checked)
-            using (SolidBrush brush = new SolidBrush(ColorChecked))
-                gx.FillRectangle(brush, rect2);
-        else
-            using (SolidBrush brush = new SolidBrush(ColorBottom))
-                gx.FillRectangle(brush, rect2);
-    }
-
-    protected override void OnRenderDropDownButtonBackground(ToolStripItemRenderEventArgs e)
-    {
-        if (e.Item.Selected)
-            DrawButton(e);
-    }
-
-    protected override void OnRenderButtonBackground(ToolStripItemRenderEventArgs e)
-    {
-        var button = (ToolStripButton)e.Item;
-        if (e.Item.Selected || button.Checked)
-            DrawButton(e);
-    }
-
    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 (Brush b = new SolidBrush(ColorForeground))
+        {
+            using (Pen p = new Pen(b, 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)
    {
-        int x = Convert.ToInt32(e.ImageRectangle.Height * 0.2);
-        e.Graphics.DrawImage(e.Image, new Point(x, x));
+        if (e.Item.GetType() != typeof(MenuItem))
+            return;
+
+        MenuItem item = e.Item as MenuItem;
+
+        e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
+
+        if (!item.Checked)
+            return;
+
+        Rectangle rect = new Rectangle(Point.Empty, e.Item.Size);
+        rect = new Rectangle(rect.X + 2, rect.Y, rect.Height - 1, rect.Height - 1);
+        rect.Inflate(-1, -1);
+
+        using (Brush brush = new SolidBrush(ColorChecked))
+            e.Graphics.FillRectangle(brush, rect);
+
+        float ellipseWidth = rect.Height / 3f;
+
+        RectangleF rectF = new RectangleF(rect.X + rect.Height / 2f - ellipseWidth / 2f,
+                                          rect.Y + rect.Height / 2f - ellipseWidth / 2f,
+                                          ellipseWidth,
+                                          ellipseWidth);
+
+        using (Brush brush = new SolidBrush(ColorForeground))
+            e.Graphics.FillEllipse(brush, rectF);
    }

    protected override void OnRenderSeparator(ToolStripSeparatorRenderEventArgs e)
    {
-        if (e.Item.IsOnDropDown)
-        {
-            e.Graphics.Clear(ColorBackground);
-            int right = e.Item.Width - Convert.ToInt32(TextOffset / 5.0);
-            int top = e.Item.Height / 2;
-            top -= 1;
-            using (Pen p = new Pen(Color.Gray))
-                e.Graphics.DrawLine(p, new Point(TextOffset, top), new Point(right, top));
-        }
-        else if (e.Vertical)
-        {
-            var bounds = e.Item.Bounds;
-            using (Pen p = new Pen(SystemColors.ControlDarkDark))
-                e.Graphics.DrawLine(p, 
-                    Convert.ToInt32(bounds.Width / 2.0),
-                    Convert.ToInt32(bounds.Height * 0.15), 
-                    Convert.ToInt32(bounds.Width / 2.0),
-                    Convert.ToInt32(bounds.Height * 0.85));
-        }
+        e.Graphics.Clear(ColorBackground);
+        int top = e.Item.Height / 2;
+        top -= 1;
+        int offset = Convert.ToInt32(e.Item.Font.Height * 0.7);
+        using (Pen p = new Pen(ColorBorder))
+            e.Graphics.DrawLine(p,
+                new Point(offset, top),
+                new Point(e.Item.Width - offset, top));
    }
 }

@@ -364,31 +316,28 @@ public struct HSLColor
        Luminosity = l;
    }

-    private double hue;
+    double _Hue;

-    public int Hue
-    {
-        get => System.Convert.ToInt32(hue * 240);       
-        set => hue = CheckRange(value / 240.0);
+    public int Hue {
+        get => System.Convert.ToInt32(_Hue * 240);
+        set => _Hue = CheckRange(value / 240.0);
    }

-    private double saturation;
+    double _Saturation;

-    public int Saturation
-    {
-        get => System.Convert.ToInt32(saturation * 240);
-        set => saturation = CheckRange(value / 240.0);
+    public int Saturation {
+        get => System.Convert.ToInt32(_Saturation * 240);
+        set => _Saturation = CheckRange(value / 240.0);
    }

-    private double luminosity;
+    double _Luminosity;

-    public int Luminosity
-    {
-        get => System.Convert.ToInt32(luminosity * 240);
-        set => luminosity = CheckRange(value / 240.0);
+    public int Luminosity {
+        get => System.Convert.ToInt32(_Luminosity * 240);
+        set => _Luminosity = CheckRange(value / 240.0);
    }

-    private double CheckRange(double value)
+    double CheckRange(double value)
    {
        if (value < 0)
            value = 0;
@@ -413,31 +362,31 @@ public struct HSLColor
    {
        double r = 0, g = 0, b = 0;

-        if (luminosity != 0)
+        if (_Luminosity != 0)
        {
-            if (saturation == 0)
+            if (_Saturation == 0)
            {
-                b = luminosity;
-                g = luminosity;
-                r = luminosity;
+                b = _Luminosity;
+                g = _Luminosity;
+                r = _Luminosity;
            }
            else
            {
                double temp2 = GetTemp2(this);
-                double temp1 = 2.0 * luminosity - temp2;
-                r = GetColorComponent(temp1, temp2, hue + 1.0 / 3.0);
-                g = GetColorComponent(temp1, temp2, hue);
-                b = GetColorComponent(temp1, temp2, hue - 1.0 / 3.0);
+                double temp1 = 2.0 * _Luminosity - temp2;
+                r = GetColorComponent(temp1, temp2, _Hue + 1.0 / 3.0);
+                g = GetColorComponent(temp1, temp2, _Hue);
+                b = GetColorComponent(temp1, temp2, _Hue - 1.0 / 3.0);
            }
        }

        return Color.FromArgb(
            System.Convert.ToInt32(255 * r),
-            System.Convert.ToInt32(255 * g), 
+            System.Convert.ToInt32(255 * g),
            System.Convert.ToInt32(255 * b));
    }

-    private static double GetColorComponent(double temp1, double temp2, double temp3)
+    static double GetColorComponent(double temp1, double temp2, double temp3)
    {
        temp3 = MoveIntoRange(temp3);

@@ -451,7 +400,7 @@ public struct HSLColor
            return temp1;
    }

-    private static double MoveIntoRange(double temp3)
+    static double MoveIntoRange(double temp3)
    {
        if (temp3 < 0)
            temp3 += 1;
@@ -460,14 +409,14 @@ public struct HSLColor
        return temp3;
    }

-    private static double GetTemp2(HSLColor hslColor)
+    static double GetTemp2(HSLColor hslColor)
    {
        double temp2;

-        if (hslColor.luminosity < 0.5)
-            temp2 = hslColor.luminosity * (1.0 + hslColor.saturation);
+        if (hslColor._Luminosity < 0.5)
+            temp2 = hslColor._Luminosity * (1.0 + hslColor._Saturation);
        else
-            temp2 = hslColor.luminosity + hslColor.saturation - (hslColor.luminosity * hslColor.saturation);
+            temp2 = hslColor._Luminosity + hslColor._Saturation - (hslColor._Luminosity * hslColor._Saturation);

        return temp2;
    }
@@ -475,17 +424,17 @@ public struct HSLColor
    public static HSLColor Convert(Color c)
    {
        HSLColor r = new HSLColor();
-        r.hue = c.GetHue() / 360.0;
-        r.luminosity = c.GetBrightness();
-        r.saturation = c.GetSaturation();
+        r._Hue = c.GetHue() / 360.0;
+        r._Luminosity = c.GetBrightness();
+        r._Saturation = c.GetSaturation();
        return r;
    }

    public void SetRGB(int red, int green, int blue)
    {
        HSLColor hc = HSLColor.Convert(Color.FromArgb(red, green, blue));
-        hue = hc.hue;
-        saturation = hc.saturation;
-        luminosity = hc.luminosity;
+        _Hue = hc._Hue;
+        _Saturation = hc._Saturation;
+        _Luminosity = hc._Luminosity;
    }
 }
--- a/mpv.net/Misc.cs
+++ b/mpv.net/Misc.cs
@@ -1,17 +1,56 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
 using System.Windows.Forms;

+using Microsoft.Win32;
+
 namespace mpvnet
 {
-    public class Misc
+    public class App
    {
-        public static readonly string[] FileTypes = "264 265 3gp aac ac3 avc avi avs bmp divx dts dtshd dtshr dtsma eac3 evo flac flv h264 h265 hevc hvc jpg jpeg m2t m2ts m2v m4a m4v mka mkv mlp mov mp2 mp3 mp4 mpa mpeg mpg mpv mts ogg ogm opus pcm png pva raw rmvb thd thd+ac3 true-hd truehd ts vdr vob vpy w64 wav webm wmv y4m".Split(' ');
+        public static string[] VideoTypes { get; } = "mkv mp4 mpg avi mov webm vob wmv flv avs 264 h264 asf webm mpeg mpv y4m avc hevc 265 h265 m2v m2ts vpy mts m4v".Split(" ".ToCharArray());
+        public static string[] AudioTypes { get; } = "mp3 mp2 ac3 ogg opus flac wav w64 m4a dts dtsma dtshr dtshd eac3 thd thd+ac3 mka aac mpa".Split(" ".ToCharArray());

-        public static string GetFilter(IEnumerable<string> values) => "*." + 
-            String.Join(";*.", values) + "|*." + String.Join(";*.", values) + "|All Files|*.*";
+        public static bool IsDarkMode { 
+            get {
+                string darkMode = MainForm.Instance.MpvNetDarkMode;
+                return (darkMode == "system" && Sys.IsDarkTheme) || darkMode == "always";
+            }
+        }
+    }
+
+    public class Sys
+    {
+        public static bool IsDarkTheme {
+            get {
+                object value = Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", 1);
+                if (value is null) value = 1;
+                return (int)value == 0;
+            }
+        }
+
+        public static bool IsDirectoryWritable(string dirPath)
+        {
+            try
+            {
+                using (FileStream fs = File.Create(Path.Combine(dirPath,
+                    Path.GetRandomFileName()), 1, FileOptions.DeleteOnClose))
+                { }
+                return true;
+            }
+            catch
+            { }
+            return false;
+        }
    }

    public class StringLogicalComparer : IComparer, IComparer<string>
@@ -25,13 +64,233 @@ namespace mpvnet
        int IComparer<string>.Compare(string x, string y) => IComparerOfString_Compare(x, y);
    }

-    public class OSVersion
+    public class FileAssociation
    {
-        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;
+        static string ExePath = Application.ExecutablePath;
+        static string ExeFilename = Path.GetFileName(Application.ExecutablePath);
+        static string ExeFilenameNoExt = Path.GetFileNameWithoutExtension(Application.ExecutablePath);
+        static string[] Types;

-        public static float Current => Environment.OSVersion.Version.Major + Environment.OSVersion.Version.Minor / 10f;
+        public static void Register(string[] types)
+        {
+            Types = types;
+
+            RegistryHelp.SetObject(@"HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\" + ExeFilename, null, ExePath);
+            RegistryHelp.SetObject($"HKCR\\Applications\\{ExeFilename}", "FriendlyAppName", "mpv.net media player");
+            RegistryHelp.SetObject($"HKCR\\Applications\\{ExeFilename}\\shell\\open\\command", null, $"\"{ExePath}\" \"%1\"");
+            RegistryHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv\Capabilities", "ApplicationDescription", "mpv.net media player");
+            RegistryHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv\Capabilities", "ApplicationName", "mpv.net");
+            RegistryHelp.SetObject($"HKCR\\SystemFileAssociations\\video\\OpenWithList\\{ExeFilename}", null, "");
+            RegistryHelp.SetObject($"HKCR\\SystemFileAssociations\\audio\\OpenWithList\\{ExeFilename}", null, "");
+
+            foreach (string ext in Types)
+            {
+                RegistryHelp.SetObject($"HKCR\\Applications\\{ExeFilename}\\SupportedTypes", "." + ext, "");
+                RegistryHelp.SetObject($"HKCR\\" + "." + ext, null, ExeFilenameNoExt + "." + ext);
+                RegistryHelp.SetObject($"HKCR\\" + "." + ext + "\\OpenWithProgIDs", ExeFilenameNoExt + "." + ext, "");
+                if (App.VideoTypes.Contains(ext))
+                    RegistryHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "video");
+                if (App.AudioTypes.Contains(ext))
+                    RegistryHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "audio");
+                RegistryHelp.SetObject($"HKCR\\" + ExeFilenameNoExt + "." + ext + "\\shell\\open", null, "Play with " +  Application.ProductName);
+                RegistryHelp.SetObject($"HKCR\\" + ExeFilenameNoExt + "." + ext + "\\shell\\open\\command", null, $"\"{ExePath}\" \"%1\"");
+                RegistryHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv.net\Capabilities\FileAssociations", "." + ext, ExeFilenameNoExt + "." + ext);
+            }
+        }
+
+        public static void Unregister()
+        {
+            RegistryHelp.RemoveKey(@"HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\" + ExeFilename);
+            RegistryHelp.RemoveKey($"HKCR\\Applications\\{ExeFilename}");
+            RegistryHelp.RemoveKey(@"HKLM\SOFTWARE\Clients\Media\mpv.net");
+            RegistryHelp.RemoveKey($"HKCR\\SystemFileAssociations\\video\\OpenWithList\\{ExeFilename}");
+            RegistryHelp.RemoveKey($"HKCR\\SystemFileAssociations\\audio\\OpenWithList\\{ExeFilename}");
+
+            foreach (string id in Registry.ClassesRoot.GetSubKeyNames())
+            {
+                if (id.StartsWith(ExeFilenameNoExt + "."))
+                    Registry.ClassesRoot.DeleteSubKeyTree(id);
+
+                RegistryHelp.RemoveValue($"HKCR\\Software\\Classes\\" + id + "\\OpenWithProgIDs", ExeFilenameNoExt + id);
+                RegistryHelp.RemoveValue($"HKLM\\Software\\Classes\\" + id + "\\OpenWithProgIDs", ExeFilenameNoExt + id);
+            }
+        }
+    }
+
+    public class RegistryHelp
+    {
+        public static void SetObject(string path, string name, object value)
+        {
+            using (RegistryKey rk = GetRootKey(path).CreateSubKey(path.Substring(5), RegistryKeyPermissionCheck.ReadWriteSubTree))
+                rk.SetValue(name, value);
+        }
+
+        public static string GetString(string path, string name)
+        {
+            object val = GetObject(path, name);
+            if (val == null || !(val is string)) return "";
+            return val.ToString();
+        }
+
+        public static object GetObject(string path, string name)
+        {
+            using (RegistryKey rk = GetRootKey(path).OpenSubKey(path.Substring(5)))
+                if (rk != null)
+                    return rk.GetValue(name, "");
+                else
+                    return null;
+        }
+
+        public static void RemoveKey(string path)
+        {
+            GetRootKey(path).DeleteSubKeyTree(path.Substring(5), false);
+        }
+
+        public static void RemoveValue(string path, string name)
+        {
+            using (RegistryKey rk = GetRootKey(path).OpenSubKey(path.Substring(5), true))
+                if (!(rk is null))
+                    rk.DeleteValue(name, false);
+        }
+
+        static RegistryKey GetRootKey(string path)
+        {
+            switch (path.Substring(0, 4))
+            {
+                case "HKLM": return Registry.LocalMachine;
+                case "HKCU": return Registry.CurrentUser;
+                case "HKCR": return Registry.ClassesRoot;
+                default: throw new Exception();
+            }
+        }
+    }
+
+    public class MediaTrack
+    {
+        public string Text { get; set; }
+        public string Type { get; set; }
+        public int    ID   { get; set; }
+    }
+
+    public class CommandItem : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public string Path { get; set; } = "";
+        public string Command { get; set; } = "";
+
+        public CommandItem() { }
+
+        public CommandItem(SerializationInfo info, StreamingContext context) { }
+
+        private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        private string _Input = "";
+
+        public string Input {
+            get => _Input;
+            set {
+                _Input = value;
+                NotifyPropertyChanged();
+            }
+        }
+
+        public static ObservableCollection<CommandItem> GetItems(string content)
+        {
+            var items = new ObservableCollection<CommandItem>();
+
+            if (!string.IsNullOrEmpty(content))
+            {
+                foreach (string line in content.Split('\r', '\n'))
+                {
+                    string val = line.Trim();
+                    if (val.StartsWith("#")) continue;
+                    if (!val.Contains(" ")) continue;
+                    CommandItem item = new CommandItem();
+                    item.Input = val.Substring(0, val.IndexOf(" "));
+                    if (item.Input == "_") item.Input = "";
+                    val = val.Substring(val.IndexOf(" ") + 1);
+
+                    if (val.Contains("#menu:"))
+                    {
+                        item.Path = val.Substring(val.IndexOf("#menu:") + 6).Trim();
+                        val = val.Substring(0, val.IndexOf("#menu:"));
+                        if (item.Path.Contains(";"))
+                            item.Path = item.Path.Substring(item.Path.IndexOf(";") + 1).Trim();
+                    }
+
+                    item.Command = val.Trim();
+                    if (item.Command == "")
+                        continue;
+                    if (item.Command.ToLower() == "ignore")
+                        item.Command = "";
+                    MigrateCommands(item);
+                    items.Add(item);
+                }
+            }
+            return items;
+        }
+
+        private static ObservableCollection<CommandItem> _Items;
+
+        public static ObservableCollection<CommandItem> Items {
+            get {
+                if (_Items is null)
+                    _Items = GetItems(File.ReadAllText(mp.InputConfPath));
+                return _Items;
+            }
+        }
+
+        public static void MigrateCommands(CommandItem item)
+        {
+            switch (item.Command)
+            {
+                case "script-message mpv.net show-prefs":
+                    item.Command = "script-message mpv.net show-conf-editor";
+                    break;
+                case "script-message mpv.net show-keys":
+                    item.Command = "script-message mpv.net show-input-editor";
+                    break;
+                case "script-message mpv.net history":
+                    item.Command = "script-message mpv.net show-history";
+                    break;
+                case "script-message mpv.net open-config-folder":
+                    item.Command = "script-message open-conf-folder";
+                    break;
+            }
+        }
+    }
+
+    public class CursorHelp
+    {
+        static bool IsVisible = true;
+
+        public static void Show()
+        {
+            if (!IsVisible)
+            {
+                Cursor.Show();
+                IsVisible = true;
+            }
+        }
+
+        public static void Hide()
+        {
+            if (IsVisible)
+            {
+                Cursor.Hide();
+                IsVisible = false;
+            }
+        }
+
+        public static bool IsPosDifferent(Point screenPos)
+        {
+            return
+                Math.Abs(screenPos.X - Control.MousePosition.X) > 10 ||
+                Math.Abs(screenPos.Y - Control.MousePosition.Y) > 10;
+        }
    }
 }
--- a/mpv.net/Native.cs
+++ b/mpv.net/Native.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Drawing;
-using System.IO;
 using System.Runtime.InteropServices;
-using System.Text;

 namespace mpvnet
 {
@@ -14,11 +12,11 @@ namespace mpvnet
        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
        public static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string lclassName, string windowTitle);

-        [DllImport("user32.dll", CharSet = CharSet.Auto)]
-        public static extern string SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
+        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+        public static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);

-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern bool PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        public static extern IntPtr PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);

        [DllImport("user32.dll")]
        public static extern void ReleaseCapture();
@@ -26,12 +24,23 @@ namespace mpvnet
        [DllImport("user32.dll")]
        public static extern bool AdjustWindowRect(ref RECT lpRect, uint dwStyle, bool bMenu);

-        [DllImport("user32.dll")]
-        public static extern IntPtr GetWindowLongPtrW(IntPtr hWnd, int nIndex);
-
        [DllImport("user32.dll", SetLastError = true)]
        public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags);

+        [DllImport("user32.dll", EntryPoint = "GetWindowLong")]
+        private static extern IntPtr GetWindowLong32(IntPtr hWnd, int nIndex);
+
+        [DllImport("user32.dll", EntryPoint = "GetWindowLongPtr")]
+        private static extern IntPtr GetWindowLong64(IntPtr hWnd, int nIndex);
+
+        public static IntPtr GetWindowLongPtr(IntPtr hWnd, int nIndex)
+        {
+            if (IntPtr.Size == 8)
+                return GetWindowLong64(hWnd, nIndex);
+            else
+                return GetWindowLong32(hWnd, nIndex);
+        }
+
        [StructLayout(LayoutKind.Sequential)]
        public struct RECT
        {
--- a/mpv.net/NativeHelp.cs
+++ b/mpv.net/NativeHelp.cs
@@ -32,7 +32,7 @@ namespace mpvnet

        public static void AddWindowBorders(IntPtr hwnd, ref Native.RECT rc)
        {
-            Native.AdjustWindowRect(ref rc, (uint)Native.GetWindowLongPtrW(hwnd, -16 /* GWL_STYLE */), false);
+            Native.AdjustWindowRect(ref rc, (uint)Native.GetWindowLongPtr(hwnd, -16 /* GWL_STYLE */), false);
        }
    }
 }
--- a/mpv.net/PowerShellScript.cs
+++ b/mpv.net/PowerShellScript.cs
@@ -4,7 +4,6 @@ using System.Threading;
 using System.Management.Automation.Runspaces;
 using System.Reflection;
 using System.Threading.Tasks;
-using System.Windows.Forms;

 namespace mpvnet
 {
@@ -47,12 +46,12 @@ Using namespace System;
                                    throw new Exception();
                            }
                        }
-                        catch
+                        catch (Exception ex2)
                        {
-                            MainForm.Instance.ShowMsgBox("PowerShell Setup Problem\n\nEnsure you have at least PowerShell 5.1 installed.", MessageBoxIcon.Error);
+                            Msg.ShowError("PowerShell Setup Problem\n\nEnsure you have at least PowerShell 5.1 installed.", ex2.ToString());
                            return null;
                        }
-                        MainForm.Instance.ShowMsgBox(ex.ToString(), MessageBoxIcon.Error);
+                        Msg.ShowException(ex);
                    }
                }
            }
--- a/mpv.net/Program.cs
+++ b/mpv.net/Program.cs
@@ -8,9 +8,26 @@ namespace mpvnet
        [STAThread]
        static void Main()
        {
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new MainForm());
+            try
+            {
+                string[] args = Environment.GetCommandLineArgs();
+
+                if (args.Length == 3 && args[1] == "--reg-file-assoc")
+                {
+                    if (args[2] == "audio") FileAssociation.Register(App.AudioTypes);
+                    if (args[2] == "video") FileAssociation.Register(App.VideoTypes);
+                    if (args[2] == "unreg") FileAssociation.Unregister();
+                    return;
+                }
+
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+                Application.Run(new MainForm());
+            }
+            catch (Exception ex)
+            {
+                Msg.ShowException(ex);
+            }
        }
    }
 }
--- a/mpv.net/Properties/AssemblyInfo.cs
+++ b/mpv.net/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("mpv.net")]
-[assembly: AssemblyDescription("libmpv based media player")]
+[assembly: AssemblyDescription("A lightweight media player")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("mpv.net")]
-[assembly: AssemblyCopyright("Copyright © stax76")]
+[assembly: AssemblyCopyright("Copyright © 2017-2019 stax76")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -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.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("3.6.1.0")]
+[assembly: AssemblyFileVersion("3.6.1.0")]
--- a/mpv.net/Properties/Resources.Designer.cs
+++ b/mpv.net/Properties/Resources.Designer.cs
@@ -60,38 +60,33 @@ namespace mpvnet.Properties {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to  # mpv.net key bindings, mouse bindings and context menu configuration
-        /// 
-        /// o           script-message mpv.net open-files #menu: O  ; Open Files...
-        /// _           ignore                 #menu: _             ; -
-        /// Space       cycle pause            #menu: Space, Enter  ; Play/Pause
-        /// Enter       cycle pause
-        /// s           stop                   #menu: S             ; Stop
-        /// _           ignore                 #menu: _             ; -
-        /// f           cycle fullscreen       #menu: F             ; Toggle Fullscreen
-        /// [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string input_conf {
+        internal static string inputConf {
            get {
-                return ResourceManager.GetString("input_conf", resourceCulture);
+                return ResourceManager.GetString("inputConf", resourceCulture);
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to input-ar-delay = 500
-        ///input-ar-rate = 20
-        ///volume = 50
-        ///hwdec = yes
-        ///vo = direct3d
-        ///keep-open = yes
-        ///keep-open-pause = no
-        ///osd-playing-msg = &apos;${filename}&apos;
-        ///screenshot-directory = ~~desktop/.
-        /// </summary>
-        internal static string mpv_conf {
+        internal static string inputConfHeader {
            get {
-                return ResourceManager.GetString("mpv_conf", resourceCulture);
+                return ResourceManager.GetString("inputConfHeader", resourceCulture);
+            }
+        }
+        
+        internal static string mpvConf {
+            get {
+                return ResourceManager.GetString("mpvConf", resourceCulture);
+            }
+        }
+        
+        internal static string mpvConfToml {
+            get {
+                return ResourceManager.GetString("mpvConfToml", resourceCulture);
+            }
+        }
+        
+        internal static string mpvNetConfToml {
+            get {
+                return ResourceManager.GetString("mpvNetConfToml", resourceCulture);
            }
        }
    }
--- a/mpv.net/Properties/Resources.resx
+++ b/mpv.net/Properties/Resources.resx
@@ -118,10 +118,19 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="input_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\input.conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  <data name="inputConf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\inputConf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
  </data>
-  <data name="mpv_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\mpv.conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="inputConfHeader" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\inputConfHeader.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="mpvConf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mpvConf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="mpvConfToml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mpvConfToml.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="mpvNetConfToml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mpvNetConfToml.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
  </data>
 </root>
--- a/mpv.net/PythonScript.cs
+++ b/mpv.net/PythonScript.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Reflection;
-using System.Windows.Forms;
-using IronPython.Hosting;
+
+using Microsoft.Scripting;
 using Microsoft.Scripting.Hosting;

-using PyRT = IronPython.Runtime;
+using IronPython.Hosting;
+using IronPython.Runtime;
+using IronPython.Runtime.Operations;

 namespace mpvnet
 {
@@ -22,35 +24,36 @@ namespace mpvnet
                scope.ImportModule("clr");
                engine.Execute("import clr", scope);
                engine.Execute("clr.AddReference(\"mpvnet\")", scope);
+                engine.Execute("import mpvnet", scope);
                engine.Execute("from mpvnet import *", scope);
                engine.Execute(code, scope);
            }
            catch (Exception ex)
            {
-                MainForm.Instance.ShowMsgBox(ex.ToString(), MessageBoxIcon.Error);
+                if (ex is SyntaxErrorException e)
+                    Msg.ShowError($"{e.Line}, {e.Column}: " + ex.Message);
+                else
+                    Msg.ShowException(ex);
            }
        }
    }

    public class PythonEventObject
    {
-        public PyRT.PythonFunction PythonFunction { get; set; }
+        public PythonFunction PythonFunction { get; set; }
        public EventInfo EventInfo { get; set; }
        public Delegate Delegate { get; set; }

-        public void Invoke()
-        {
-            PyRT.Operations.PythonCalls.Call(PythonFunction);
-        }
+        public void Invoke() => PythonCalls.Call(PythonFunction);

        public void InvokeEndFileEventMode(EndFileEventMode arg)
        {
-            PyRT.Operations.PythonCalls.Call(PythonFunction, new[] { arg });
+            PythonCalls.Call(PythonFunction, new[] { arg });
        }

        public void InvokeStrings(string[] arg)
        {
-            PyRT.Operations.PythonCalls.Call(PythonFunction, new[] { arg });
+            PythonCalls.Call(PythonFunction, new[] { arg });
        }
    }
 }
--- a/mpv.net/Resources/input.conf.txt
+++ b/mpv.net/Resources/input.conf.txt
@@ -1,126 +0,0 @@
- o           script-message mpv.net open-files #menu: Open > Open Files...
- u           script-message mpv.net open-url   #menu: Open > Open URL...
- _           ignore                 #menu: -
- Space       cycle pause            #menu: Play/Pause
- s           stop                   #menu: Stop
- _           ignore                 #menu: -
- f           cycle fullscreen       #menu: Toggle Fullscreen
- 
- F11         playlist-prev          #menu: Navigate > Previous
- F12         playlist-next          #menu: Navigate > Next
- _           ignore                 #menu: Navigate > -
- PGUP        add chapter  1         #menu: Navigate > Next Chapter
- PGDWN       add chapter -1         #menu: Navigate > Previous Chapter
- 
- .           frame-step             #menu: Seek > Next Frame
- ,           frame-back-step        #menu: Seek > Previous Frame
- _           ignore                 #menu: Seek > -
- Right       no-osd seek  7         #menu: Seek > 7 sec forward
- Left        no-osd seek -7         #menu: Seek > 7 sec backward
- _           ignore                 #menu: Seek > -
- Up          no-osd seek  40        #menu: Seek > 40 sec forward
- Down        no-osd seek -40        #menu: Seek > 40 sec backward
- _           ignore                 #menu: Seek > -
- Ctrl+Right  no-osd seek  300       #menu: Seek > 5 min forward
- Ctrl+Left   no-osd seek -300       #menu: Seek > 5 min backward
- Ctrl++      add video-zoom  0.1    #menu: Pan & Scan > Increase Size
- Ctrl+-      add video-zoom -0.1    #menu: Pan & Scan > Decrease Size
- _           ignore                 #menu: Pan & Scan > -
- Ctrl+KP4    add video-pan-x -0.01  #menu: Pan & Scan > Move Left
- Ctrl+KP6    add video-pan-x  0.01  #menu: Pan & Scan > Move Right
- _           ignore                 #menu: Pan & Scan > -
- Ctrl+KP8    add video-pan-y -0.01  #menu: Pan & Scan > Move Up
- Ctrl+KP2    add video-pan-y  0.01  #menu: Pan & Scan > Move Down
- _           ignore                 #menu: Pan & Scan > -
- w           add panscan -0.1       #menu: Pan & Scan > Decrease Height
- W           add panscan +0.1       #menu: Pan & Scan > Increase Height
- _           ignore                 #menu: Pan & Scan > -
- Ctrl+BS     set video-zoom 0 ; set video-pan-x 0 ; set video-pan-y 0 #menu: Pan & Scan > Reset
- Ctrl+1      add contrast -1        #menu: Video > Decrease Contrast
- Ctrl+2      add contrast 1         #menu: Video > Increase Contrast
- _           ignore                 #menu: Video > -
- Ctrl+3      add brightness -1      #menu: Video > Decrease Brightness
- Ctrl+4      add brightness 1       #menu: Video > Increase Brightness
- _           ignore                 #menu: Video > -
- Ctrl+5      add gamma -1           #menu: Video > Decrease Gamma
- Ctrl+6      add gamma 1            #menu: Video > Increase Gamma
- _           ignore                 #menu: Video > -
- Ctrl+7      add saturation -1      #menu: Video > Decrease Saturation
- Ctrl+8      add saturation 1       #menu: Video > Increase Saturation
- _           ignore                 #menu: Video > -
- Ctrl+s      async screenshot       #menu: Video > Take Screenshot
- d           cycle deinterlace      #menu: Video > Toggle Deinterlace
- a           cycle-values video-aspect "16:9" "4:3" "2.35:1" "-1" #menu: Video > Cycle Aspect Ratio
- KP7         cycle audio            #menu: Audio > Cycle/Next
- _           ignore                 #menu: Audio > -
- KP6         add audio-delay  0.100 #menu: Audio > Delay +0.1
- KP9         add audio-delay -0.100 #menu: Audio > Delay -0.1
- KP8         cycle sub              #menu: Subtitle > Cycle/Next
- v           cycle sub-visibility   #menu: Subtitle > Toggle Visibility
- _           ignore                 #menu: Subtitle > -
- z           add sub-delay -0.1     #menu: Subtitle > Delay -0.1
- Z           add sub-delay +0.1     #menu: Subtitle > Delay +0.1
- _           ignore                 #menu: Subtitle > -
- r           add sub-pos -1         #menu: Subtitle > Move Up
- R           add sub-pos +1         #menu: Subtitle > Move Down
- _           ignore                 #menu: Subtitle > -
- _           add sub-scale -0.1     #menu: Subtitle > Decrease Subtitle Font Size
- _           add sub-scale +0.1     #menu: Subtitle > Increase Subtitle Font Size
- +           add volume  10         #menu: Volume > Up
- -           add volume -10         #menu: Volume > Down
- _           ignore                 #menu: Volume > -
- m           cycle mute             #menu: Volume > Mute
- [           multiply speed 0.9     #menu: Speed > -10%
- ]           multiply speed 1.1     #menu: Speed > +10%
- _           ignore                 #menu: Speed > -
- {           multiply speed 0.5     #menu: Speed > Half
- }           multiply speed 2.0     #menu: Speed > Double
- _           ignore                 #menu: Speed > -
- BS          set speed 1            #menu: Speed > Reset
- KP0 script-message rate-file 0     #menu: Addons > Rating > 0stars
- KP1 script-message rate-file 1     #menu: Addons > Rating > 1stars
- KP2 script-message rate-file 2     #menu: Addons > Rating > 2stars
- KP3 script-message rate-file 3     #menu: Addons > Rating > 3stars
- KP4 script-message rate-file 4     #menu: Addons > Rating > 4stars
- KP5 script-message rate-file 5     #menu: Addons > Rating > 5stars
- _ script-message mpv.net set-setting hwdec yes  #menu: Settings > Hardware Decoding > Enable
- _ script-message mpv.net set-setting hwdec no   #menu: Settings > Hardware Decoding > Disable
- e script-message mpv.net show-conf-editor       #menu: Settings > Show Config Editor
- Ctrl+i script-message mpv.net show-input-editor #menu: Settings > Show Input Editor
- c script-message mpv.net open-config-folder     #menu: Settings > Open Config Folder
- i script-message mpv.net show-info              #menu: Tools > Info
- t script-binding stats/display-stats            #menu: Tools > Show Statistics
- T script-binding stats/display-stats-toggle     #menu: Tools > Toggle Statistics
- _ ignore                                        #menu: Tools > -
- h script-message mpv.net show-history                #menu: Tools > Show History
- l ab-loop                                       #menu: Tools > Set/clear A-B loop points
- L cycle-values loop-file "inf" "no"             #menu: Tools > Toggle Infinite Looping
- Del script-binding osc/visibility               #menu: Tools > Toggle OSC Visibility
- Ctrl+h cycle-values hwdec "auto" "no"           #menu: Tools > Cycle Hardware Decoding
- F8 show-text ${playlist}   5000                 #menu: Tools > Show Playlist
- F9 show-text ${track-list} 5000                 #menu: Tools > Show Audio/Video/Subtitle List
- _ script-message mpv.net execute-mpv-command    #menu: Tools > Execute mpv command...
- _ script-message mpv.net shell-execute https://mpv.io/manual/stable/ #menu: Help > Show mpv manual
- _ script-message mpv.net shell-execute https://github.com/mpv-player/mpv/blob/master/etc/input.conf #menu: Help > Show mpv default keys
- _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt #menu: Help > Show mpv.net default keys
- _ script-message mpv.net shell-execute https://github.com/stax76/mpvnet #menu: Help > Show mpv.net web site
- _ ignore                                       #menu: -
- Esc quit                                       #menu: Exit
- Q quit-watch-later                             #menu: Exit Watch Later
- > playlist-next
- < playlist-prev
- Enter cycle pause
- Power quit
- Play      cycle pause
- Pause     cycle pause
- PlayPause cycle pause
- Stop stop
- Forward seek  60
- Rewind  seek -60
- Mute cycle mute
- Volume_Up   add volume 10
- Volume_Down add volume -10
- Wheel_Up    add volume  10
- Wheel_Down  add volume -10
- Prev playlist-prev
- Next playlist-next
--- a/mpv.net/Resources/inputConf.txt
+++ b/mpv.net/Resources/inputConf.txt
@@ -0,0 +1,180 @@
+
+ # This file defines the input (keys and mouse) bindings of mpv and mpv.net
+ # and it also defines the context menu of mpv.net. mpv.net has an input
+ # editor and an config editor as alternative to editing conf text files.
+ # The input and config editor can be found in mpv.net's context menu at:
+
+ # Settings > Show Config Editor
+ # Settings > Show Input Editor
+
+ # The defaults of this file can be found at:
+
+ # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt
+
+ # the defaults of mpv can be found at:
+
+ # https://github.com/mpv-player/mpv/blob/master/etc/input.conf
+
+ # mpv.net's defaults of mpv.conf contain: 'input-default-bindings = no'
+ # which disables mpv's input defaults. Every line in this file begins with a
+ # space character to make it easier to do a text search, so if you want to know
+ # if 'o' has already a binding you can make a text search on ' o '.
+
+ # mpv input commands: https://github.com/stax76/mpv.net/wiki/mpv-input-commands
+
+ # mpv input keys:     https://github.com/stax76/mpv.net/wiki/mpv-input-keys
+
+ o           script-message mpv.net open-files #menu: Open > Open Files...
+ u           script-message mpv.net open-url   #menu: Open > Open URL...
+ Ctrl+S      script-message mpv.net show-media-search #menu: Open > Show media search...
+ _           ignore                            #menu: Open > -
+ Alt+a       script-message mpv.net load-audio #menu: Open > Load external audio files...
+ Alt+s       script-message mpv.net load-sub   #menu: Open > Load external subtitle files...
+ _           ignore                            #menu: Open > -
+ _           ignore                            #menu: Open > Recent
+
+ _           ignore                 #menu: -
+ Space       cycle pause            #menu: Play/Pause
+ s           stop                   #menu: Stop
+ _           ignore                 #menu: -
+ Enter       cycle fullscreen       #menu: Toggle Fullscreen
+ 
+ F11         playlist-prev          #menu: Navigate > Previous File
+ F12         playlist-next          #menu: Navigate > Next File
+ _           ignore                 #menu: Navigate > -
+ PGUP        add chapter  1         #menu: Navigate > Next Chapter
+ PGDWN       add chapter -1         #menu: Navigate > Previous Chapter
+ _           ignore                 #menu: Navigate > -
+ .           frame-step             #menu: Navigate > Jump Next Frame
+ ,           frame-back-step        #menu: Navigate > Jump Previous Frame
+ _           ignore                 #menu: Navigate > -
+ Right       no-osd seek  7         #menu: Navigate > Jump 7 sec forward
+ Left        no-osd seek -7         #menu: Navigate > Jump 7 sec backward
+ _           ignore                 #menu: Navigate > -
+ Up          no-osd seek  40        #menu: Navigate > Jump 40 sec forward
+ Down        no-osd seek -40        #menu: Navigate > Jump 40 sec backward
+ _           ignore                 #menu: Navigate > -
+ Ctrl+Right  no-osd seek  300       #menu: Navigate > Jump 5 min forward
+ Ctrl+Left   no-osd seek -300       #menu: Navigate > Jump 5 min backward
+ _           ignore                 #menu: Navigate > -
+ _           ignore                 #menu: Navigate > Chapters
+
+ Ctrl++      add video-zoom  0.1    #menu: Pan & Scan > Increase Size
+ Ctrl+-      add video-zoom -0.1    #menu: Pan & Scan > Decrease Size
+ _           ignore                 #menu: Pan & Scan > -
+ Ctrl+KP4    add video-pan-x -0.01  #menu: Pan & Scan > Move Left
+ Ctrl+KP6    add video-pan-x  0.01  #menu: Pan & Scan > Move Right
+ _           ignore                 #menu: Pan & Scan > -
+ Ctrl+KP8    add video-pan-y -0.01  #menu: Pan & Scan > Move Up
+ Ctrl+KP2    add video-pan-y  0.01  #menu: Pan & Scan > Move Down
+ _           ignore                 #menu: Pan & Scan > -
+ w           add panscan -0.1       #menu: Pan & Scan > Decrease Height
+ W           add panscan  0.1       #menu: Pan & Scan > Increase Height
+ _           ignore                 #menu: Pan & Scan > -
+ Ctrl+BS     set video-zoom 0; set video-pan-x 0; set video-pan-y 0 #menu: Pan & Scan > Reset
+
+ Ctrl+1      add contrast -1        #menu: Video > Decrease Contrast
+ Ctrl+2      add contrast           #menu: Video > Increase Contrast
+ _           ignore                 #menu: Video > -
+ Ctrl+3      add brightness -1      #menu: Video > Decrease Brightness
+ Ctrl+4      add brightness  1      #menu: Video > Increase Brightness
+ _           ignore                 #menu: Video > -
+ Ctrl+5      add gamma -1           #menu: Video > Decrease Gamma
+ Ctrl+6      add gamma  1           #menu: Video > Increase Gamma
+ _           ignore                 #menu: Video > -
+ Ctrl+7      add saturation -1      #menu: Video > Decrease Saturation
+ Ctrl+8      add saturation  1      #menu: Video > Increase Saturation
+ _           ignore                 #menu: Video > -
+ Ctrl+s      async screenshot       #menu: Video > Take Screenshot
+ d           cycle deinterlace      #menu: Video > Toggle Deinterlace
+ a           cycle-values video-aspect "16:9" "4:3" "2.35:1" "-1" #menu: Video > Cycle Aspect Ratio
+
+ KP7         script-message mpv.net cycle-audio #menu: Audio > Cycle/Next
+ _           ignore                 #menu: Audio > -
+ KP6         add audio-delay  0.1   #menu: Audio > Delay +0.1
+ KP9         add audio-delay -0.1   #menu: Audio > Delay -0.1
+
+ KP8         cycle sub              #menu: Subtitle > Cycle/Next
+ v           cycle sub-visibility   #menu: Subtitle > Toggle Visibility
+ _           ignore                 #menu: Subtitle > -
+ z           add sub-delay -0.1     #menu: Subtitle > Delay -0.1
+ Z           add sub-delay  0.1     #menu: Subtitle > Delay +0.1
+ _           ignore                 #menu: Subtitle > -
+ r           add sub-pos -1         #menu: Subtitle > Move Up
+ R           add sub-pos +1         #menu: Subtitle > Move Down
+ _           ignore                 #menu: Subtitle > -
+ _           add sub-scale -0.1     #menu: Subtitle > Decrease Subtitle Font Size
+ _           add sub-scale  0.1     #menu: Subtitle > Increase Subtitle Font Size
+
+ _           ignore                 #menu: Track
+
+ +           add volume  10         #menu: Volume > Up
+ -           add volume -10         #menu: Volume > Down
+ _           ignore                 #menu: Volume > -
+ m           cycle mute             #menu: Volume > Mute
+
+ [           multiply speed 1/1.1   #menu: Speed > -10%
+ ]           multiply speed 1.1     #menu: Speed > +10%
+ _           ignore                 #menu: Speed > -
+ {           multiply speed 0.5     #menu: Speed > Half
+ }           multiply speed 2.0     #menu: Speed > Double
+ _           ignore                 #menu: Speed > -
+ BS          set speed 1            #menu: Speed > Reset
+
+ KP0 script-message rate-file 0     #menu: Extensions > Rating > 0stars
+ KP1 script-message rate-file 1     #menu: Extensions > Rating > 1stars
+ KP2 script-message rate-file 2     #menu: Extensions > Rating > 2stars
+ KP3 script-message rate-file 3     #menu: Extensions > Rating > 3stars
+ KP4 script-message rate-file 4     #menu: Extensions > Rating > 4stars
+ KP5 script-message rate-file 5     #menu: Extensions > Rating > 5stars
+
+ Ctrl+t set ontop yes                             #menu: View > On Top > Enable
+ Ctrl+T set ontop no                              #menu: View > On Top > Disable
+ i      script-message mpv.net show-info          #menu: View > File Info
+ t      script-binding stats/display-stats        #menu: View > Show Statistics
+ T      script-binding stats/display-stats-toggle #menu: View > Toggle Statistics
+ Del    script-binding osc/visibility             #menu: View > Toggle OSC Visibility
+ F8     show-text ${playlist}   5000              #menu: View > Show Playlist
+ F9     show-text ${track-list} 5000              #menu: View > Show Audio/Video/Subtitle List
+
+ Ctrl+c script-message mpv.net show-conf-editor   #menu: Settings > Show Config Editor
+ Ctrl+i script-message mpv.net show-input-editor  #menu: Settings > Show Input Editor
+ Ctrl+f script-message mpv.net open-conf-folder   #menu: Settings > Open Config Folder
+
+ Ctrl+P script-message mpv.net show-command-palette #menu: Tools > Command Palette
+ h      script-message mpv.net show-history         #menu: Tools > Show History
+ l      ab-loop                                     #menu: Tools > Set/clear A-B loop points
+ L      cycle-values loop-file "inf" "no"           #menu: Tools > Toggle infinite file looping
+ Ctrl+h cycle-values hwdec "auto" "no"              #menu: Tools > Cycle Hardware Decoding
+ _ script-message mpv.net execute-mpv-command       #menu: Tools > Execute mpv command...
+ _ script-message mpv.net manage-file-associations  #menu: Tools > Manage File Associations...
+
+ _ script-message mpv.net shell-execute https://mpv.io/manual/stable/ #menu: Help > Show mpv manual
+ _ script-message mpv.net shell-execute https://github.com/mpv-player/mpv/blob/master/etc/input.conf #menu: Help > Show mpv default keys
+ _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt #menu: Help > Show mpv.net default keys
+ _ script-message mpv.net shell-execute https://mpv-net.github.io/mpv.net-web-site/ #menu: Help > Show mpv.net web site
+ _ ignore                                         #menu: Help > -
+ _ script-message mpv.net show-about              #menu: Help > About mpv.net
+
+ _ ignore           #menu: -
+ Esc quit           #menu: Exit
+ Q quit-watch-later #menu: Exit Watch Later
+
+ > playlist-next
+ < playlist-prev
+ Power quit
+ Play      cycle pause
+ Pause     cycle pause
+ PlayPause cycle pause
+ Stop stop
+ Forward seek  60
+ Rewind  seek -60
+ Mute cycle mute
+ Volume_Up   add volume  10
+ Volume_Down add volume -10
+ Wheel_Up    add volume  10
+ Wheel_Down  add volume -10
+ Prev playlist-prev
+ Next playlist-next
+
+ MBTN_LEFT_DBL cycle fullscreen
--- a/mpv.net/Resources/inputConfHeader.txt
+++ b/mpv.net/Resources/inputConfHeader.txt
@@ -0,0 +1,25 @@
+
+ # This file defines the input (keys and mouse) bindings of mpv and mpv.net
+ # and it also defines the context menu of mpv.net. mpv.net has an input
+ # editor and an config editor as alternatives to editing conf text files.
+ # The input and config editor can be found in mpv.net's context menu at:
+
+ # Settings > Show Config Editor
+ # Settings > Show Input Editor
+
+ # The defaults of this file can be found at:
+
+ # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt
+
+ # the defaults of mpv can be found at:
+
+ # https://github.com/mpv-player/mpv/blob/master/etc/inputConf
+
+ # mpv.net's defaults of mpv.conf contain: 'input-default-bindings = no'
+ # which disables mpv's input defaults. Every line in this file begins with a
+ # space character to make it easier to do a text search, so if you want to know
+ # if 'o' has already a binding you can make a text search on ' o '.
+
+ # mpv input commands: https://github.com/stax76/mpv.net/wiki/mpv-input-commands
+
+ # mpv input keys:     https://github.com/stax76/mpv.net/wiki/mpv-input-keys
--- a/mpv.net/Resources/mpv.conf.txt
+++ b/mpv.net/Resources/mpv.conf.txt
@@ -1,13 +1,14 @@
-# mpv manual: https://mpv.io/manual/master/
-# mpv.net mpv.conf defaults: https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpv.conf.txt
+
+# mpv manual: https://mpv.io/manual/master/
+
+# mpv.net mpv.conf defaults: https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpvConf.txt

 input-ar-delay = 500
 input-ar-rate = 20
 volume = 50
 hwdec = yes
-vo = direct3d
 keep-open = yes
 keep-open-pause = no
 osd-playing-msg = ${filename}
 screenshot-directory = ~~desktop/
-input-default-bindings = no
+input-default-bindings = no
--- a/mpv.net/Resources/mpvConfToml.txt
+++ b/mpv.net/Resources/mpvConfToml.txt
@@ -19,6 +19,28 @@ options = [{ name = "no",           help = "always use software decoding (Defaul
           { name = "crystalhd",    help = "copies video back to system RAM (Any platform supported by hardware)" },
           { name = "rkmpp",        help = "requires --vo=gpu (some RockChip devices only)" }]

+[[settings]]
+name = "gpu-api"
+default = "auto"
+filter = "Video"
+help = "--gpu-api=<type> Controls which type of graphics APIs will be accepted."
+options = [{ name = "auto",   help = "Use any available API (Default)" },
+           { name = "opengl", help = "Allow only OpenGL (requires OpenGL 2.1+ or GLES 2.0+)" },
+           { name = "vulkan", help = "Allow only Vulkan (requires a valid/working --spirv-compiler)" },
+           { name = "d3d11",  help = "Allow only --gpu-context=d3d11" }]
+
+[[settings]]
+name = "gpu-context"
+default = "auto"
+filter = "Video"
+help = "--gpu-context=<sys> The value auto (the default) selects the GPU context. You can also pass help to get a complete list of compiled in backends (sorted by autoprobe order)."
+options = [{ name = "auto",      help = "auto-select (Default)" },
+           { name = "win",       help = "Win32/WGL" },
+           { name = "winvk",     help = "VK_KHR_win32_surface" },
+           { name = "angle",     help = "Direct3D11 through the OpenGL ES translation layer ANGLE. This supports almost everything the win backend does (if the ANGLE build is new enough)." },
+           { name = "dxinterop", help = "(experimental) Win32, using WGL for rendering and Direct3D 9Ex for presentation. Works on Nvidia and AMD. Newer Intel chips with the latest drivers may also work." },
+           { name = "d3d11",     help = "Win32, with native Direct3D 11 rendering." }]
+
 [[settings]]
 name = "vo"
 default = "gpu"
@@ -28,18 +50,134 @@ help = "--gpu=<mode> Video output drivers to be used. Default = gpu.\n\nFor more
 options = [{ name = "gpu",      help = "General purpose, customizable, GPU-accelerated video output driver. It supports extended scaling methods, dithering, color management, custom shaders, HDR, and more. (Default)" },
           { name = "direct3d", help = "Video output driver that uses the Direct3D interface" }]

+[[settings]]
+name = "video-sync"
+default = "audio"
+filter = "Video"
+help = "--video-sync=<audio|...> How the player synchronizes audio and video.\n\nFor more information visit:"
+helpurl = "https://mpv.io/manual/master/#options-video-sync"
+options = [{ name = "audio" },
+           { name = "display-resample" },
+           { name = "display-resample-vdrop" },
+           { name = "display-resample-desync" },
+           { name = "display-vdrop" },
+           { name = "display-adrop" },
+           { name = "display-desync" },
+           { name = "desync" }]
+
+[[settings]]
+name = "scale"
+default = "bilinear"
+filter = "Video"
+help = "--scale=<filter> The GPU renderer filter function to use when upscaling video. There are some more filters, but most are not as useful. For a complete list, pass help as value, e.g.: mpv --scale=help"
+options = [{ name = "bilinear",         help = "Bilinear hardware texture filtering (fastest, very low quality). This is the default for compatibility reasons." },
+           { name = "spline36",         help = "Mid quality and speed. This is the default when using gpu-hq." },
+           { name = "lanczos",          help = "Lanczos scaling. Provides mid quality and speed. Generally worse than spline36, but it results in a slightly sharper image which is good for some content types. The number of taps can be controlled with  scale-radius, but is best left unchanged. (This filter is an alias for sinc-windowed sinc)" },
+           { name = "ewa_lanczos",      help = "Elliptic weighted average Lanczos scaling. Also known as Jinc. Relatively slow, but very good quality. The radius can be controlled with scale-radius. Increasing the radius makes the filter sharper but adds more ringing. (This filter is an alias for jinc-windowed jinc)" },
+           { name = "ewa_lanczossharp", help = "A slightly sharpened version of ewa_lanczos, preconfigured to use an ideal radius and parameter. If your hardware can run it, this is probably what you should use by default." },
+           { name = "mitchell",         help = "Mitchell-Netravali. The B and C parameters can be set with  --scale-param1 and --scale-param2. This filter is very good at downscaling (see --dscale)." },
+           { name = "oversample",       help = "A version of nearest neighbour that (naively) oversamples pixels, so that pixels overlapping edges get linearly interpolated instead of rounded. This essentially removes the small imperfections and judder artifacts caused by nearest-neighbour interpolation, in exchange for adding some blur. This filter is good at temporal interpolation, and also known as \"smoothmotion\" (see --tscale)." },
+           { name = "linear",           help = "A --tscale filter." }]
+
+[[settings]]
+name = "cscale"
+default = "bilinear"
+filter = "Video"
+help = "--cscale=<filter> As --scale, but for interpolating chroma information. If the image is not subsampled, this option is ignored entirely."
+options = [{ name = "bilinear",         help = "Bilinear hardware texture filtering (fastest, very low quality). This is the default for compatibility reasons." },
+           { name = "spline36",         help = "Mid quality and speed. This is the default when using gpu-hq." },
+           { name = "lanczos",          help = "Lanczos scaling. Provides mid quality and speed. Generally worse than spline36, but it results in a slightly sharper image which is good for some content types. The number of taps can be controlled with  scale-radius, but is best left unchanged. (This filter is an alias for sinc-windowed sinc)" },
+           { name = "ewa_lanczos",      help = "Elliptic weighted average Lanczos scaling. Also known as Jinc. Relatively slow, but very good quality. The radius can be controlled with scale-radius. Increasing the radius makes the filter sharper but adds more ringing. (This filter is an alias for jinc-windowed jinc)" },
+           { name = "ewa_lanczossharp", help = "A slightly sharpened version of ewa_lanczos, preconfigured to use an ideal radius and parameter. If your hardware can run it, this is probably what you should use by default." },
+           { name = "mitchell",         help = "Mitchell-Netravali. The B and C parameters can be set with  --scale-param1 and --scale-param2. This filter is very good at downscaling (see --dscale)." },
+           { name = "oversample",       help = "A version of nearest neighbour that (naively) oversamples pixels, so that pixels overlapping edges get linearly interpolated instead of rounded. This essentially removes the small imperfections and judder artifacts caused by nearest-neighbour interpolation, in exchange for adding some blur. This filter is good at temporal interpolation, and also known as \"smoothmotion\" (see --tscale)." },
+           { name = "linear",           help = "A --tscale filter." }]
+
+[[settings]]
+name = "dscale"
+default = "bilinear"
+filter = "Video"
+help = "--dscale=<filter> Like --scale, but apply these filters on downscaling instead. If this option is unset, the filter implied by --scale will be applied."
+options = [{ name = "bilinear",         help = "Bilinear hardware texture filtering (fastest, very low quality). This is the default for compatibility reasons." },
+           { name = "spline36",         help = "Mid quality and speed. This is the default when using gpu-hq." },
+           { name = "lanczos",          help = "Lanczos scaling. Provides mid quality and speed. Generally worse than spline36, but it results in a slightly sharper image which is good for some content types. The number of taps can be controlled with  scale-radius, but is best left unchanged. (This filter is an alias for sinc-windowed sinc)" },
+           { name = "ewa_lanczos",      help = "Elliptic weighted average Lanczos scaling. Also known as Jinc. Relatively slow, but very good quality. The radius can be controlled with scale-radius. Increasing the radius makes the filter sharper but adds more ringing. (This filter is an alias for jinc-windowed jinc)" },
+           { name = "ewa_lanczossharp", help = "A slightly sharpened version of ewa_lanczos, preconfigured to use an ideal radius and parameter. If your hardware can run it, this is probably what you should use by default." },
+           { name = "mitchell",         help = "Mitchell-Netravali. The B and C parameters can be set with  --scale-param1 and --scale-param2. This filter is very good at downscaling (see --dscale)." },
+           { name = "oversample",       help = "A version of nearest neighbour that (naively) oversamples pixels, so that pixels overlapping edges get linearly interpolated instead of rounded. This essentially removes the small imperfections and judder artifacts caused by nearest-neighbour interpolation, in exchange for adding some blur. This filter is good at temporal interpolation, and also known as \"smoothmotion\" (see --tscale)." },
+           { name = "linear",           help = "A --tscale filter." }]
+
+[[settings]]
+name = "dither-depth"
+default = "no"
+filter = "Video"
+help = "--dither-depth=<N|no|auto> Set dither target depth to N. Default: no. Note that the depth of the connected video display device cannot be detected. Often, LCD panels will do dithering on their own, which conflicts with this option and leads to ugly output."
+options = [{ name = "no",   help = "Disable any dithering done by mpv." },
+           { name = "auto", help = "Automatic selection. If output bit depth cannot be detected, 8 bits per component are assumed." },
+           { name = "8",    help = "Dither to 8 bit output." }]
+
+[[settings]]
+name = "correct-downscaling"
+default = "no"
+filter = "Video"
+help = "--correct-downscaling When using convolution based filters, extend the filter size when downscaling. Increases quality, but reduces performance while downscaling.\n\nThis will perform slightly sub-optimally for anamorphic video (but still better than without it) since it will extend the size to match only the milder of the scale factors between the axes."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "sigmoid-upscaling"
+default = "no"
+filter = "Video"
+help = "--sigmoid-upscaling When upscaling, use a sigmoidal color transform to avoid emphasizing ringing artifacts. This also implies --linear-scaling."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "deband"
+default = "no"
+filter = "Video"
+help = "--deband Enable the debanding algorithm. This greatly reduces the amount of visible banding, blocking and other quantization artifacts, at the expense of very slightly blurring some of the finest details. In practice, it's virtually always an improvement - the only reason to disable it would be for performance."
+options = [{ name = "yes" },
+           { name = "no" }]
+
 [[settings]]
 name = "volume"
 default = "100"
 filter = "Audio"
 help = "--volume=<integer> Set the startup volume. 0 means silence, 100 means no volume reduction or amplification. Negative values can be passed for compatibility, but are treated as 0. Since mpv 0.18.1, this always controls the internal mixer (aka \"softvol\"). Default: 100"

+[[settings]]
+name = "alang"
+default = ""
+filter = "Audio"
+help = "--alang=<languagecode[,languagecode,...]> Specify a priority list of audio languages to use. Different container formats employ different language codes. DVDs use ISO 639-1 two-letter language codes, Matroska, MPEG-TS and NUT use ISO 639-2 three-letter language codes, while OGM uses a free-form identifier. See also --aid.\n\nExamples\n\nmpv dvd://1 --alang=hu,en chooses the Hungarian language track on a DVD and falls back on English if Hungarian is not available.\n\nmpv --alang=jpn example.mkv plays a Matroska file with Japanese audio."
+
+[[settings]]
+name = "audio-file-auto"
+default = "no"
+filter = "Audio"
+help = "--audio-file-auto=<no|exact|fuzzy|all>, --no-audio-file-auto Load additional audio files matching the video filename. The parameter specifies how external audio files are matched."
+options = [{ name = "no",    help = "Don't automatically load external audio files (default)." },
+           { name = "exact", help = "Load the media filename with audio file extension." },
+           { name = "fuzzy", help = "Load all audio files containing media filename." },
+           { name = "all",   help = "Load all audio files in the current and --audio-file-paths directories." }]
+
 [[settings]]
 name = "slang"
 default = ""
 filter = "Subtitle"
 help = "--slang=<languagecode[,languagecode,...]> Specify a priority list of subtitle languages to use. Different container formats employ different language codes. DVDs use ISO 639-1 two letter language codes, Matroska uses ISO 639-2 three letter language codes while OGM uses a free-form identifier. See also --sid."

+[[settings]]
+name = "sub-auto"
+default = "exact"
+filter = "Subtitle"
+help = "--sub-auto=<no|exact|fuzzy|all>, --no-sub-auto Load additional subtitle files matching the video filename. The parameter specifies how external subtitle files are matched. exact is enabled by default."
+options = [{ name = "no",    help = "Don't automatically load external subtitle files." },
+           { name = "exact", help = "Load the media filename with subtitle file extension (Default)." },
+           { name = "fuzzy", help = "Load all subs containing media filename." },
+           { name = "all",   help = "Load all subs in the current and --sub-file-paths directories." }]
+
 [[settings]]
 name = "screen"
 default = ""
@@ -51,18 +189,31 @@ name = "osd-playing-msg"
 default = ""
 width = 300
 filter = "Screen"
-help = "--osd-playing-msg=<value> Show a message on OSD when playback starts. The string is expanded for properties, e.g. --osd-playing-msg='file: ${filename}' will show the message file: followed by a space and the currently played filename.\n\nFor more information visit:"
+help = "--osd-playing-msg=<value> Show a message on OSD when playback starts. The string is expanded for properties, e.g. --osd-playing-msg='file: ${filename}' will show the message file: followed by a space and the currently played filename. For more information visit:"
 helpurl = "https://mpv.io/manual/master/#property-expansion"

 [[settings]]
 name = "fullscreen"
-alias = "fs"
 default = "no"
 filter = "Screen"
 help = "--fullscreen=<yes|no>, fs=<yes|no> Start the player in fullscreen mode. Default: no."
 options = [{ name = "yes" },
           { name = "no" }]

+[[settings]]
+name = "screenshot-directory"
+default = ""
+width = 500
+folder = true
+filter = "Screen"
+help = "--screenshot-directory=<value> Store screenshots in this directory. This path is joined with the filename generated by --screenshot-template. If the template filename is already absolute, the directory is ignored.\n\nIf the directory does not exist, it is created on the first screenshot. If it is not a directory, an error is generated when trying to write a screenshot.\n\nThis option is not set by default, and thus will write screenshots to the directory from which mpv was started. In pseudo-gui mode (see PSEUDO GUI MODE), this is set to the desktop."
+
+[[settings]]
+name = "autofit"
+default = "50%"
+filter = "Screen"
+help = "--autofit=<percent value> Set the initial window size in percent. Please note that this setting is only partly implemented in mpv.net, accepted are only integer values with percent sign added. Default: 50%."
+
 [[settings]]
 name = "keep-open-pause"
 default = "yes"
@@ -82,7 +233,6 @@ options = [{ name = "yes",    help = "Don't terminate if the current file is the

 [[settings]]
 name = "loop-file"
-alias = "loop"
 default = ""
 filter = "Playback"
 help = "--loop-file=<N|inf|no>, loop=<N|inf|no> Loop a single file N times. inf means forever, no means normal playback. For compatibility, --loop-file and --loop-file=yes are also accepted, and are the same as --loop-file=inf.\n\nThe difference to --loop-playlist is that this doesn't loop the playlist, just the file itself. If the playlist contains only a single file, the difference between the two option is that this option performs a seek on loop, instead of reloading the file.\n\n--loop is an alias for this option."
@@ -95,14 +245,6 @@ help = "--save-position-on-quit=<yes|no> Always save the current playback positi
 options = [{ name = "yes" },
           { name = "no" }]

-[[settings]]
-name = "screenshot-directory"
-default = ""
-width = 500
-folder = true
-filter = "Screen"
-help = "--screenshot-directory=<value> Store screenshots in this directory. This path is joined with the filename generated by --screenshot-template. If the template filename is already absolute, the directory is ignored.\n\nIf the directory does not exist, it is created on the first screenshot. If it is not a directory, an error is generated when trying to write a screenshot.\n\nThis option is not set by default, and thus will write screenshots to the directory from which mpv was started. In pseudo-gui mode (see PSEUDO GUI MODE), this is set to the desktop."
-
 [[settings]]
 name = "input-ar-delay"
 default = ""
@@ -115,12 +257,6 @@ default = ""
 filter = "Input"
 help = "--input-ar-rate=<integer> Number of key presses to generate per second on autorepeat."

-[[settings]]
-name = "alang"
-default = ""
-filter = "Audio"
-help = "--alang=<languagecode[,languagecode,...]> Specify a priority list of audio languages to use. Different container formats employ different language codes. DVDs use ISO 639-1 two-letter language codes, Matroska, MPEG-TS and NUT use ISO 639-2 three-letter language codes, while OGM uses a free-form identifier. See also --aid.\n\nExamples\n\nmpv dvd://1 --alang=hu,en chooses the Hungarian language track on a DVD and falls back on English if Hungarian is not available.\n\nmpv --alang=jpn example.mkv plays a Matroska file with Japanese audio."
-
 [[settings]]
 name = "hr-seek"
 default = "absolute"
@@ -143,39 +279,4 @@ options = [{ name = "yes" },
 name = "loop-playlist"
 default = ""
 filter = "Playback"
-help = "--loop-playlist=<N|inf|force|no>, --loop-playlist Loops playback N times. A value of 1 plays it one time (default), 2 two times, etc. inf means forever. no is the same as 1 and disables looping. If several files are specified on command line, the entire playlist is looped. --loop-playlist is the same as  --loop-playlist=inf.\n\nThe force mode is like inf, but does not skip playlist entries which have been marked as failing. This means the player might waste CPU time trying to loop a file that doesn't exist. But it might be useful for playing webradios under very bad network conditions."
-
-[[settings]]
-name = "video-sync"
-default = "audio"
-filter = "Video"
-help = "--video-sync=<audio|...> How the player synchronizes audio and video.\n\nFor more information visit:"
-helpurl = "https://mpv.io/manual/master/#options-video-sync"
-options = [{ name = "audio" },
-           { name = "display-resample" },
-           { name = "display-resample-vdrop" },
-           { name = "display-resample-desync" },
-           { name = "display-vdrop" },
-           { name = "display-adrop" },
-           { name = "display-desync" },
-           { name = "desync" }]
-
-[[settings]]
-name = "audio-file-auto"
-default = "no"
-filter = "Audio"
-help = "--audio-file-auto=<no|exact|fuzzy|all>, --no-audio-file-auto Load additional audio files matching the video filename. The parameter specifies how external audio files are matched."
-options = [{ name = "no",    help = "Don't automatically load external audio files (default)." },
-           { name = "exact", help = "Load the media filename with audio file extension." },
-           { name = "fuzzy", help = "Load all audio files containing media filename." },
-           { name = "all",   help = "Load all audio files in the current and --audio-file-paths directories." }]
-
-[[settings]]
-name = "sub-auto"
-default = "exact"
-filter = "Subtitle"
-help = "--sub-auto=<no|exact|fuzzy|all>, --no-sub-auto Load additional subtitle files matching the video filename. The parameter specifies how external subtitle files are matched. exact is enabled by default."
-options = [{ name = "no",    help = "Don't automatically load external subtitle files." },
-           { name = "exact", help = "Load the media filename with subtitle file extension (Default)." },
-           { name = "fuzzy", help = "Load all subs containing media filename." },
-           { name = "all",   help = "Load all subs in the current and --sub-file-paths directories." }]
+help = "--loop-playlist=<N|inf|force|no>, --loop-playlist Loops playback N times. A value of 1 plays it one time (default), 2 two times, etc. inf means forever. no is the same as 1 and disables looping. If several files are specified on command line, the entire playlist is looped. --loop-playlist is the same as  --loop-playlist=inf.\n\nThe force mode is like inf, but does not skip playlist entries which have been marked as failing. This means the player might waste CPU time trying to loop a file that doesn't exist. But it might be useful for playing webradios under very bad network conditions."
--- a/mpv.net/Resources/mpvNetConfToml.txt
+++ b/mpv.net/Resources/mpvNetConfToml.txt
@@ -0,0 +1,8 @@
+[[settings]]
+name = "dark-mode"
+default = "always"
+filter = "mpv.net"
+help = "Enables a dark theme."
+options = [{ name = "always" },
+           { name = "system" , help = "Available on Windows 10 or higher" },
+		   { name = "never" }]
--- a/mpv.net/TaskDialog.cs
+++ b/mpv.net/TaskDialog.cs
@@ -0,0 +1,656 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Windows.Forms;
+
+public class Msg
+{
+    private static string ShownMessages;
+
+    public static string SupportURL { get; set; }
+
+    public static void Show(string mainInstruction, string content = null)
+    {
+        Msg.Show(mainInstruction, content, MsgIcon.Info, MsgButtons.Ok, MsgResult.None);
+    }
+
+    public static void ShowError(string mainInstruction, string content = null)
+    {
+        try
+        {
+            using (TaskDialog<string> td = new TaskDialog<string>())
+            {
+                td.AllowCancel = false;
+
+                if (string.IsNullOrEmpty(content))
+                {
+                    if (mainInstruction.Length < 80)
+                        td.MainInstruction = mainInstruction;
+                    else
+                        td.Content = mainInstruction;
+                }
+                else
+                {
+                    td.MainInstruction = mainInstruction;
+                    td.Content = content;
+                }
+
+                td.MainIcon = MsgIcon.Error;
+                td.Footer = "[Copy Message](copymsg)";
+
+                if (!string.IsNullOrEmpty(Msg.SupportURL))
+                    td.Footer += $"   [Contact Support]({SupportURL})";
+
+                td.Show();
+            }
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+                Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+
+    public static void ShowException(Exception e)
+    {
+        try
+        {
+            using (TaskDialog<string> td = new TaskDialog<string>())
+            {
+                td.MainInstruction = e.GetType().Name;
+                td.Content = e.Message;
+                td.MainIcon = MsgIcon.Error;
+                td.ExpandedInformation = e.ToString();
+                td.Footer = "[Copy Message](copymsg)";
+
+                if (!string.IsNullOrEmpty(Msg.SupportURL))
+                    td.Footer += $"   [Contact Support]({SupportURL})";
+
+                td.Show();
+            }
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+                Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+
+    public static void ShowWarning(string mainInstruction,
+                                   string content = null,
+                                   bool onlyOnce = false)
+    {
+        if (onlyOnce && Msg.ShownMessages != null &&
+            Msg.ShownMessages.Contains(mainInstruction + content))
+            return;
+
+        Msg.Show(mainInstruction, content, MsgIcon.Warning, MsgButtons.Ok, MsgResult.None);
+        if (!onlyOnce) return;
+        Msg.ShownMessages += mainInstruction + content;
+    }
+
+    public static MsgResult ShowQuestion(string mainInstruction,
+                                         MsgButtons buttons = MsgButtons.OkCancel)
+    {
+        return Msg.Show(mainInstruction, null, MsgIcon.None, buttons, MsgResult.None);
+    }
+
+    public static MsgResult ShowQuestion(string mainInstruction,
+                                         string content,
+                                         MsgButtons buttons = MsgButtons.OkCancel)
+    {
+        return Msg.Show(mainInstruction, content, MsgIcon.None, buttons, MsgResult.None);
+    }
+
+    public static MsgResult Show(string mainInstruction,
+                                 string content,
+                                 MsgIcon icon,
+                                 MsgButtons buttons,
+                                 MsgResult defaultButton = MsgResult.None)
+    {
+        try
+        {
+            using (TaskDialog<MsgResult> td = new TaskDialog<MsgResult>())
+            {
+                td.AllowCancel = false;
+                td.DefaultButton = defaultButton;
+                td.MainIcon = icon;
+
+                if (content == null)
+                {
+                    if (mainInstruction.Length < 80)
+                        td.MainInstruction = mainInstruction;
+                    else
+                        td.Content = mainInstruction;
+                }
+                else
+                {
+                    td.MainInstruction = mainInstruction;
+                    td.Content = content;
+                }
+                if (buttons == MsgButtons.OkCancel)
+                {
+                    td.AddButton("OK", MsgResult.OK);
+                    td.AddButton("Cancel", MsgResult.Cancel);
+                }
+                else
+                    td.CommonButtons = buttons;
+                return td.Show();
+            }
+        }
+        catch (Exception ex)
+        {
+            return (MsgResult)MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+                Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+}
+
+public class TaskDialog<T> : TaskDialogNative, IDisposable
+{
+    private Dictionary<int, T> IdValueDic;
+    private Dictionary<int, string> IdTextDic;
+    private List<int> CommandLinkShieldList;
+    private IntPtr ButtonArray;
+    private IntPtr RadioButtonArray;
+    private List<TaskDialogNative.TASKDIALOG_BUTTON> Buttons;
+    private List<TaskDialogNative.TASKDIALOG_BUTTON> RadioButtons;
+    private TaskDialogNative.TASKDIALOGCONFIG Config;
+    const int TDE_CONTENT = 0;
+    const int TDE_EXPANDED_INFORMATION = 1;
+    const int TDE_FOOTER = 2;
+    const int TDE_MAIN_INSTRUCTION = 3;
+    const int TDN_CREATED = 0;
+    const int TDN_NAVIGATED = 1;
+    const int TDN_BUTTON_CLICKED = 2;
+    const int TDN_HYPERLINK_CLICKED = 3;
+    const int TDN_TIMER = 4;
+    const int TDN_DESTROYED = 5;
+    const int TDN_RADIO_BUTTON_CLICKED = 6;
+    const int TDN_DIALOG_CONSTRUCTED = 7;
+    const int TDN_VERIFICATION_CLICKED = 8;
+    const int TDN_HELP = 9;
+    const int TDN_EXPANDO_BUTTON_CLICKED = 10;
+    const int TDM_NAVIGATE_PAGE = 1125;
+    const int TDM_CLICK_BUTTON = 1126;
+    const int TDM_SET_MARQUEE_PROGRESS_BAR = 1127;
+    const int TDM_SET_PROGRESS_BAR_STATE = 1128;
+    const int TDM_SET_PROGRESS_BAR_RANGE = 1129;
+    const int TDM_SET_PROGRESS_BAR_POS = 1130;
+    const int TDM_SET_PROGRESS_BAR_MARQUEE = 1131;
+    const int TDM_SET_ELEMENT_TEXT = 1132;
+    const int TDM_CLICK_RADIO_BUTTON = 1134;
+    const int TDM_ENABLE_BUTTON = 1135;
+    const int TDM_ENABLE_RADIO_BUTTON = 1136;
+    const int TDM_CLICK_VERIFICATION = 1137;
+    const int TDM_UPDATE_ELEMENT_TEXT = 1138;
+    const int TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE = 1139;
+    const int TDM_UPDATE_ICON = 1140;
+    private T SelectedValueValue;
+    private string SelectedTextValue;
+    private int TimeoutValue;
+    private int ExitTickCount;
+    private bool disposed;
+
+    public TaskDialog()
+    {
+        IdValueDic = new Dictionary<int, T>();
+        IdTextDic = new Dictionary<int, string>();
+        CommandLinkShieldList = new List<int>();
+        Buttons = new List<TaskDialogNative.TASKDIALOG_BUTTON>();
+        RadioButtons = new List<TaskDialogNative.TASKDIALOG_BUTTON>();
+        _SelectedID = -1;
+        Config = new TaskDialogNative.TASKDIALOGCONFIG();
+        Config.cbSize = (uint)Marshal.SizeOf(Config);
+        Config.hwndParent = GetHandle();
+        Config.hInstance = IntPtr.Zero;
+        Config.dwFlags = TaskDialogNative.TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION;
+        Config.dwCommonButtons = MsgButtons.None;
+        Config.MainIcon = new TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION(0);
+        Config.FooterIcon = new TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION(0);
+        Config.cxWidth = 0U;
+        Config.cButtons = 0U;
+        Config.cRadioButtons = 0U;
+        Config.pButtons = IntPtr.Zero;
+        Config.pRadioButtons = IntPtr.Zero;
+        Config.nDefaultButton = 0;
+        Config.nDefaultRadioButton = 0;
+        Config.pszWindowTitle = ((AssemblyProductAttribute)Assembly.GetEntryAssembly().GetCustomAttributes(typeof(AssemblyProductAttribute), true)[0]).Product;
+        Config.pszMainInstruction = "";
+        Config.pszContent = "";
+        Config.pfCallback = new PFTASKDIALOGCALLBACK(this.DialogProc);
+    }
+
+    public IntPtr GetHandle()
+    {
+        StringBuilder lpszFileName = new StringBuilder(260);
+        IntPtr foregroundWindow = TaskDialogNative.GetForegroundWindow();
+        TaskDialogNative.GetWindowModuleFileName(foregroundWindow, lpszFileName, 260U);
+
+        if (Path.GetFileName(lpszFileName.ToString().Replace(".vshost", "")) ==
+            Path.GetFileName(Assembly.GetEntryAssembly().Location))
+            return foregroundWindow;
+
+        return IntPtr.Zero;
+    }
+
+    public bool AllowCancel {
+        set {
+            if (value)
+                Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION;
+            else
+                Config.dwFlags ^= TaskDialogNative.TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION;
+        }
+    }
+
+    public string MainInstruction {
+        get => Config.pszMainInstruction;
+        set => Config.pszMainInstruction = value;
+    }
+
+    public string Content {
+        get => Config.pszContent;
+        set => Config.pszContent = ExpandMarkdownMarkup(value);
+    }
+
+    public string ExpandedInformation {
+        get => Config.pszExpandedInformation;
+        set => Config.pszExpandedInformation = ExpandMarkdownMarkup(value);
+    }
+
+    public string VerificationText {
+        get => Config.pszVerificationText;
+        set => Config.pszVerificationText = value;
+    }
+
+    public MsgResult DefaultButton {
+        get => (MsgResult)Config.nDefaultButton;
+        set => Config.nDefaultButton = (int)value;
+    }
+
+    public string Footer {
+        get => Config.pszFooter;
+        set => Config.pszFooter = ExpandMarkdownMarkup(value);
+    }
+
+    public MsgIcon MainIcon {
+        set => Config.MainIcon = new TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION((int)value);
+    }
+
+    private int _SelectedID;
+
+    public int SelectedID {
+        get => _SelectedID;
+        set {
+            foreach (var i in IdValueDic)
+                if (i.Key == value) _SelectedID = value;
+        }
+    }
+
+    public T SelectedValue {
+        get {
+            if (IdValueDic.ContainsKey(SelectedID))
+                return IdValueDic[SelectedID];
+            return SelectedValueValue;
+        }
+        set => SelectedValueValue = value;
+    }
+
+    public string SelectedText {
+        get {
+            if (IdTextDic.ContainsKey(SelectedID))
+                return IdTextDic[SelectedID];
+            return SelectedTextValue;
+        }
+        set => SelectedTextValue = value;
+    }
+
+    public bool CheckBoxChecked {
+        get => (Config.dwFlags & TaskDialogNative.TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED) == TaskDialogNative.TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED;
+        set {
+            if (value)
+                Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED;
+            else
+                Config.dwFlags ^= TaskDialogNative.TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED;
+        }
+    }
+
+    public MsgButtons CommonButtons {
+        get => Config.dwCommonButtons;
+        set => Config.dwCommonButtons = value;
+    }
+
+    public int Timeout {
+        get => Convert.ToInt32(TimeoutValue / 1000.0);
+        set {
+            TimeoutValue = value * 1000;
+            Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_CALLBACK_TIMER;
+        }
+    }
+
+    public void AddButton(string text, T value)
+    {
+        int n = 1000 + IdValueDic.Count + 1;
+        IdValueDic[n] = value;
+        Buttons.Add(new TaskDialogNative.TASKDIALOG_BUTTON(n, text));
+    }
+
+    public string ExpandMarkdownMarkup(string value)
+    {
+        if (value.Contains("["))
+        {
+            Regex regex = new Regex(@"\[(.+)\]\((.+)\)");
+
+            if (regex.Match(value).Success)
+            {
+                Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_ENABLE_HYPERLINKS;
+                value = regex.Replace(value, "<a href=\"$2\">$1</a>");
+            }
+        }
+        return value;
+    }
+
+    public void AddCommandLink(string text, T value)
+    {
+        int n = 1000 + IdValueDic.Count + 1;
+        IdValueDic[n] = value == null ? (T)(object)text : value;
+        IdTextDic[n] = text;
+        Buttons.Add(new TaskDialogNative.TASKDIALOG_BUTTON(n, text));
+        Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_USE_COMMAND_LINKS;
+    }
+
+    public void AddCommandLink(string text, string description, T value, bool setShield = false)
+    {
+        int n = 1000 + IdValueDic.Count + 1;
+        IdValueDic[n] = value;
+        if (setShield) CommandLinkShieldList.Add(n);
+        if (!string.IsNullOrEmpty(description)) text += "\n" + description;
+        Buttons.Add(new TaskDialogNative.TASKDIALOG_BUTTON(n, text));
+        Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_USE_COMMAND_LINKS;
+    }
+
+    public void AddRadioButton(string text, T value)
+    {
+        int n = 1000 + IdValueDic.Count + 1;
+        IdValueDic[n] = value;
+        RadioButtons.Add(new TaskDialogNative.TASKDIALOG_BUTTON(n, text));
+    }
+
+    public T Show()
+    {
+        MarshalDialogControlStructs();
+        TaskDialogNative.TASKDIALOGCONFIG config = Config;
+        int errorCode = TaskDialogNative.TaskDialogIndirect(config, out int dummy1, out int dummy2, out bool isChecked);
+        if (errorCode < 0) Marshal.ThrowExceptionForHR(errorCode);
+        CheckBoxChecked = isChecked;
+        if (SelectedValue is MsgResult) SelectedValue = (T)(object)SelectedID;
+        return SelectedValue;
+    }
+
+    public int DialogProc(IntPtr hwnd, uint msg, IntPtr wParam, IntPtr lParam, IntPtr lpRefData)
+    {
+        switch (msg)
+        {
+            case 0: //TDN_CREATED
+                foreach (var i in CommandLinkShieldList)
+                    SendMessage(hwnd, TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE, new IntPtr(i), new IntPtr(1));
+                break;
+            case 2: //TDN_BUTTON_CLICKED
+            case 6: //TDN_RADIO_BUTTON_CLICKED
+                if (SelectedValue is MsgResult)
+                    _SelectedID = wParam.ToInt32();
+                else
+                    SelectedID = wParam.ToInt32();
+                break;
+            case 3: //TDN_HYPERLINK_CLICKED
+                string stringUni = Marshal.PtrToStringUni(lParam);
+                if (stringUni.StartsWith("mailto") || stringUni.StartsWith("http"))
+                    Process.Start(stringUni);
+                if (stringUni == "copymsg")
+                {
+                    Thread thread = new Thread((ThreadStart)(() => {
+                        Clipboard.SetText(MainInstruction + "\r\n\r\n" + Content + "\r\n\r\n" + ExpandedInformation);
+                        MessageBox.Show("Message was copied to clipboard.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }));
+                    thread.SetApartmentState(ApartmentState.STA);
+                    thread.Start();
+                }
+                break;
+            case 4: //TDN_TIMER
+                if (ExitTickCount == 0) ExitTickCount = Environment.TickCount + Timeout * 1000;
+                if (Environment.TickCount > ExitTickCount)
+                    TaskDialogNative.SendMessage(hwnd, 1126, new IntPtr(1), IntPtr.Zero);
+                break;
+        }
+        return 0;
+    }
+
+    public void MarshalDialogControlStructs()
+    {
+        if (Buttons != null && Buttons.Count > 0)
+        {
+            ButtonArray = TaskDialog<T>.AllocateAndMarshalButtons(Buttons);
+            Config.pButtons = ButtonArray;
+            Config.cButtons = (uint)Buttons.Count;
+        }
+
+        if (RadioButtons == null || RadioButtons.Count <= 0) return;
+        RadioButtonArray = TaskDialog<T>.AllocateAndMarshalButtons(RadioButtons);
+        Config.pRadioButtons = RadioButtonArray;
+        Config.cRadioButtons = (uint)RadioButtons.Count;
+    }
+
+    public static IntPtr AllocateAndMarshalButtons(List<TaskDialogNative.TASKDIALOG_BUTTON> structs)
+    {
+        var initialPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(TASKDIALOG_BUTTON)) * structs.Count);
+        var currentPtr = initialPtr;
+
+        foreach (var button in structs)
+        {
+            Marshal.StructureToPtr(button, currentPtr, false);
+            currentPtr = (IntPtr)(currentPtr.ToInt64() + Marshal.SizeOf(button));
+        }
+
+        return initialPtr;
+    }
+
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    ~TaskDialog()
+    {
+        Dispose(false);
+    }
+
+    protected void Dispose(bool disposing)
+    {
+        if (disposed) return;
+        disposed = true;
+
+        if (ButtonArray != IntPtr.Zero)
+        {
+            Marshal.FreeHGlobal(ButtonArray);
+            ButtonArray = IntPtr.Zero;
+        }
+
+        if (RadioButtonArray != IntPtr.Zero)
+        {
+            Marshal.FreeHGlobal(RadioButtonArray);
+            RadioButtonArray = IntPtr.Zero;
+        }
+    }
+}
+
+public delegate int PFTASKDIALOGCALLBACK(
+    IntPtr hwnd,
+    uint msg,
+    IntPtr wParam,
+    IntPtr lParam,
+    IntPtr lpRefData);
+
+public class TaskDialogNative
+{
+    [DllImport("comctl32", CharSet = CharSet.Unicode, SetLastError = true)]
+    public static extern int TaskDialogIndirect(
+        [In] TaskDialogNative.TASKDIALOGCONFIG pTaskConfig,
+        out int pnButton,
+        out int pnRadioButton,
+        [MarshalAs(UnmanagedType.Bool)] out bool pVerificationFlagChecked);
+
+    [DllImport("user32.dll")]
+    public static extern IntPtr GetForegroundWindow();
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    public static extern uint GetWindowModuleFileName(
+        IntPtr hwnd,
+        StringBuilder lpszFileName,
+        uint cchFileNameMax);
+
+    [DllImport("user32.dll")]
+    public static extern IntPtr SendMessage(
+        IntPtr handle,
+        int message,
+        IntPtr wParam,
+        IntPtr lParam);
+
+    [StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Unicode)]
+    public class TASKDIALOGCONFIG
+    {
+        public uint cbSize;
+        public IntPtr hwndParent;
+        public IntPtr hInstance;
+        public TaskDialogNative.TASKDIALOG_FLAGS dwFlags;
+        public MsgButtons dwCommonButtons;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszWindowTitle;
+        public TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION MainIcon;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszMainInstruction;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszContent;
+        public uint cButtons;
+        public IntPtr pButtons;
+        public int nDefaultButton;
+        public uint cRadioButtons;
+        public IntPtr pRadioButtons;
+        public int nDefaultRadioButton;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszVerificationText;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszExpandedInformation;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszExpandedControlText;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszCollapsedControlText;
+        public TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION FooterIcon;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszFooter;
+        public PFTASKDIALOGCALLBACK pfCallback;
+        public IntPtr lpCallbackData;
+        public uint cxWidth;
+    }
+
+    public enum TASKDIALOG_FLAGS
+    {
+        NONE = 0,
+        TDF_ENABLE_HYPERLINKS = 1,
+        TDF_USE_HICON_MAIN = 2,
+        TDF_USE_HICON_FOOTER = 4,
+        TDF_ALLOW_DIALOG_CANCELLATION = 8,
+        TDF_USE_COMMAND_LINKS = 16,
+        TDF_USE_COMMAND_LINKS_NO_ICON = 32,
+        TDF_EXPAND_FOOTER_AREA = 64,
+        TDF_EXPANDED_BY_DEFAULT = 128,
+        TDF_VERIFICATION_FLAG_CHECKED = 256,
+        TDF_SHOW_PROGRESS_BAR = 512,
+        TDF_SHOW_MARQUEE_PROGRESS_BAR = 1024,
+        TDF_CALLBACK_TIMER = 2048,
+        TDF_POSITION_RELATIVE_TO_WINDOW = 4096,
+        TDF_RTL_LAYOUT = 8192,
+        TDF_NO_DEFAULT_RADIO_BUTTON = 16384,
+    }
+
+    [StructLayout(LayoutKind.Explicit, CharSet = CharSet.Unicode)]
+    public struct TASKDIALOGCONFIG_ICON_UNION
+    {
+        [FieldOffset(0)]
+        public int hMainIcon;
+        [FieldOffset(0)]
+        public int pszIcon;
+        [FieldOffset(0)]
+        public IntPtr spacer;
+
+        public TASKDIALOGCONFIG_ICON_UNION(int i)
+        {
+            this = new TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION();
+            spacer = IntPtr.Zero;
+            pszIcon = 0;
+            hMainIcon = i;
+        }
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Unicode)]
+    public struct TASKDIALOG_BUTTON
+    {
+        public int nButtonID;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszButtonText;
+
+        public TASKDIALOG_BUTTON(int n, string txt)
+        {
+            this = new TaskDialogNative.TASKDIALOG_BUTTON();
+            nButtonID = n;
+            pszButtonText = txt;
+        }
+    }
+}
+
+public enum MsgButtons
+{
+    None = 0,
+    Ok = 1,
+    Yes = 2,
+    No = 4,
+    YesNo = 6,
+    Cancel = 8,
+    OkCancel = 9,
+    YesNoCancel = 14,
+    Retry = 16,
+    RetryCancel = 24,
+    Close = 32,
+}
+
+public enum MsgResult
+{
+    None,
+    OK,
+    Cancel,
+    Abort,
+    Retry,
+    Ignore,
+    Yes,
+    No,
+}
+
+public enum MsgIcon
+{
+    None = 0,
+    SecurityShieldGray = 65527,
+    SecuritySuccess = 65528,
+    SecurityError = 65529,
+    SecurityWarning = 65530,
+    SecurityShieldBlue = 65531,
+    Shield = 65532,
+    Info = 65533,
+    Error = 65534,
+    Warning = 65535,
+}
--- a/mpv.net/UI.cs
+++ b/mpv.net/UI.cs
@@ -1,36 +0,0 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace mpvnet
-{
-    public class CursorHelp
-    {
-        static bool IsVisible = true;
-
-        public static void Show()
-        {
-            if (!IsVisible)
-            {
-                Cursor.Show();
-                IsVisible = true;
-            }
-        }
-
-        public static void Hide()
-        {
-            if (IsVisible)
-            {
-                Cursor.Hide();
-                IsVisible = false;
-            }
-        }
-
-        public static bool IsPosDifferent(Point screenPos)
-        {
-            return
-                Math.Abs(screenPos.X - Control.MousePosition.X) > 10 ||
-                Math.Abs(screenPos.Y - Control.MousePosition.Y) > 10;
-        }
-    }
-}
--- a/mpv.net/WPF/Resources.xaml
+++ b/mpv.net/WPF/Resources.xaml
@@ -1,9 +1,7 @@
-<Application x:Class="DynamicGUI.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:DynamicGUI"
-             StartupUri="MainWindow.xaml">
-    <Application.Resources>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:WPF="clr-namespace:WPF">
+    
        <Style TargetType="TextBox">
            <Setter Property="Template">
                <Setter.Value>
@@ -19,12 +17,11 @@
                                <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 WPF:WPF.ThemeBrush}"/>
                            </Trigger>
                        </ControlTemplate.Triggers>
                    </ControlTemplate>
                </Setter.Value>
            </Setter>
        </Style>
-    </Application.Resources>
-</Application>
+</ResourceDictionary>
--- a/mpv.net/WPF/WPF.cs
+++ b/mpv.net/WPF/WPF.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Windows;
+using System.Windows.Media;
+
+namespace WPF
+{
+    public class WPF
+    {
+        public static void Init()
+        {
+            EnsureApplicationResources();
+        }
+
+        public static void EnsureApplicationResources()
+        {
+            if (Application.Current == null)
+            {
+                new Application();
+                Application.Current.Resources.MergedDictionaries.Add(
+                    Application.LoadComponent(new Uri("mpvnet;component/WPF/Resources.xaml",
+                        UriKind.Relative)) as ResourceDictionary);
+            }
+        }
+
+        public static Brush ThemeBrush {
+            get {
+                if (Environment.OSVersion.Version.Major < 10)
+                    return new SolidColorBrush(Colors.DarkSlateGray);
+                else
+                    return SystemParameters.WindowGlassBrush;
+            }
+        }
+    }
+}
--- a/mpv.net/Windows/AboutWindow.xaml
+++ b/mpv.net/Windows/AboutWindow.xaml
@@ -0,0 +1,17 @@
+<Window x:Class="mpvnet.AboutWindow"
+        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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="About mpv.net" Height="230" Width="420" FontSize="16" ShowInTaskbar="False"
+        WindowStartupLocation="CenterOwner" ResizeMode="NoResize">
+    <Grid>
+        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+            <TextBlock FontSize="48" HorizontalAlignment="Center" Margin="0,0,0,10">mpv.net</TextBlock>
+            <TextBlock HorizontalAlignment="Center">Copyright (c) 2017-2019 Frank Skare (stax76)</TextBlock>
+            <TextBlock Name="Version" HorizontalAlignment="Center" />
+            <TextBlock HorizontalAlignment="Center" Margin="0,0,0,20">MIT License</TextBlock>
+        </StackPanel>
+    </Grid>
+</Window>
--- a/mpv.net/Windows/AboutWindow.xaml.cs
+++ b/mpv.net/Windows/AboutWindow.xaml.cs
@@ -0,0 +1,18 @@
+using System.Windows;
+using System.Windows.Input;
+
+namespace mpvnet
+{
+    public partial class AboutWindow : Window
+    {
+        public AboutWindow()
+        {
+            InitializeComponent();
+            Version.Text = $"Version {System.Windows.Forms.Application.ProductVersion}";
+            Foreground = WPF.WPF.ThemeBrush;
+        }
+
+        protected override void OnPreviewKeyDown(KeyEventArgs e) => Close();
+        protected override void OnMouseDown(MouseButtonEventArgs e) => Close();
+    }
+}
--- a/mpv.net/Windows/CommandPaletteWindow.xaml
+++ b/mpv.net/Windows/CommandPaletteWindow.xaml
@@ -0,0 +1,35 @@
+<Window x:Class="mpvnet.CommandPaletteWindow"
+        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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="Command Palette" Height="295" Width="400" ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner" Loaded="Window_Loaded" FontSize="13">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition></RowDefinition>
+        </Grid.RowDefinitions>
+        <TextBox Name="FilterTextBox" PreviewKeyDown="FilterTextBox_PreviewKeyDown" TextChanged="FilterTextBox_TextChanged"></TextBox>
+        <ListView Name="ListView" Grid.Row="1" MouseUp="ListView_MouseUp">
+            <ListView.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                </Style>
+            </ListView.ItemContainerStyle>
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding Path}"></TextBlock>
+                        <TextBlock Grid.Column="1" Text="{Binding Input}" HorizontalAlignment="Right"></TextBlock>
+                    </Grid>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>        
+    </Grid>
+</Window>
--- a/mpv.net/Windows/CommandPaletteWindow.xaml.cs
+++ b/mpv.net/Windows/CommandPaletteWindow.xaml.cs
@@ -0,0 +1,122 @@
+using Microsoft.Win32;
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+
+namespace mpvnet
+{
+    public partial class CommandPaletteWindow : Window
+    {
+        ICollectionView CollectionView;
+
+        public CommandPaletteWindow()
+        {
+            InitializeComponent();
+            CollectionViewSource collectionViewSource = new CollectionViewSource() { Source = CommandItem.Items };
+            CollectionView = collectionViewSource.View;
+            var yourCostumFilter = new Predicate<object>(item => Filter((CommandItem)item));
+            CollectionView.Filter = yourCostumFilter;
+            ListView.ItemsSource = CollectionView;
+
+            if (App.IsDarkMode)
+            {
+                ListView.Foreground = Brushes.White;
+                ListView.Background = Brushes.Black;
+                FilterTextBox.Foreground = Brushes.White;
+                FilterTextBox.Background = Brushes.Black;
+            }
+        }
+
+        bool Filter(CommandItem item)
+        {
+            if (item.Command == "" || item.Path == "")
+                return false;
+            string filter = FilterTextBox.Text.ToLower();
+            if (filter == "") return true;
+            if (item.Command.ToLower().Contains(filter) ||
+                item.Input.ToLower().Contains(filter) ||
+                item.Path.ToLower().Contains(filter))
+                return true;
+            return false;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            HwndSource source = HwndSource.FromHwnd(new WindowInteropHelper(this).Handle);
+            source.AddHook(new HwndSourceHook(WndProc));
+            Keyboard.Focus(FilterTextBox);
+            SelectFirst();
+        }
+
+        void SelectFirst()
+        {
+            if (ListView.Items.Count > 0)
+                ListView.SelectedIndex = 0;
+        }
+
+        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            if (msg == 0x200 /*WM_MOUSEMOVE*/ && Mouse.LeftButton != MouseButtonState.Pressed)
+                handled = true;
+            return IntPtr.Zero;
+        }
+
+        private void FilterTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Up:
+                    {
+                        int index = ListView.SelectedIndex;
+                        index -= 1;
+                        if (index < 0) index = 0;
+                        ListView.SelectedIndex = index;
+                        ListView.ScrollIntoView(ListView.SelectedItem);
+                    }
+                    break;
+                case Key.Down:
+                    {
+                        int index = ListView.SelectedIndex;
+                        index += 1;
+                        if (index > ListView.Items.Count - 1) index = ListView.Items.Count - 1;
+                        ListView.SelectedIndex = index;
+                        ListView.ScrollIntoView(ListView.SelectedItem);
+                    }
+                    break;
+                case Key.Escape:
+                    Close();
+                    break;
+                case Key.Enter:
+                    Execute();
+                    break;
+            }
+        }
+
+        void Execute()
+        {
+            if (ListView.SelectedItem != null)
+            {
+                CommandItem item = ListView.SelectedItem as CommandItem;
+                Close();
+                mp.command_string(item.Command);
+            }
+        }
+
+        private void ListView_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Execute();
+        }
+
+        private void FilterTextBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+        {
+            CollectionView.Refresh();
+            SelectFirst();
+        }
+    }
+}
--- a/mpv.net/Windows/ConfWindow.xaml
+++ b/mpv.net/Windows/ConfWindow.xaml
@@ -1,36 +1,36 @@
-<Window xmlns:Controls="clr-namespace:Controls"  x:Name="MainWindow1"  x:Class="mpvConfEdit.MainWindow"
+<Window xmlns:Controls="clr-namespace:Controls"  x:Name="ConfWindow1"  x:Class="mpvnet.ConfWindow"
        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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:WPF="clr-namespace:WPF"
        mc:Ignorable="d"
-        Height="500" Width="700" Loaded="MainWindow1_Loaded">
+        Height="500" Width="700" Loaded="ConfWindow1_Loaded" ShowInTaskbar="False"
+        WindowStartupLocation="CenterScreen" Title="Config Editor">
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition Height="Auto" />
-            <RowDefinition Height="4*" />
+            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="10*" />
-            <ColumnDefinition Width="60*" />
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="6*" />
        </Grid.ColumnDefinitions>
-        <Controls:SearchTextBoxUserControl x:Name="SearchControl" Width="300" Margin="0,0,0,10" Grid.ColumnSpan="2" />
-        <ScrollViewer x:Name="MainScrollViewer" VerticalScrollBarVisibility="Auto" Grid.Row="1" Grid.Column="1">
+        <Controls:SearchTextBoxUserControl HintText="Find a setting" x:Name="SearchControl" Width="250" Margin="0,20,0,10" Grid.ColumnSpan="2" />
+        <ScrollViewer x:Name="MainScrollViewer" VerticalScrollBarVisibility="Auto" Grid.Row="1" Grid.Column="1" Margin="0,0,0,10">
            <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 WPF:WPF.ThemeBrush}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
                <ListBox.ItemTemplate>
                    <DataTemplate>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{Binding}" FontSize="16" />
-                        </StackPanel>
+                        <TextBlock Text="{Binding}" FontSize="16" />
                    </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>
-        </StackPanel>        
+            <TextBlock x:Name="OpenSettingsTextBlock" Margin="0,30,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static WPF:WPF.ThemeBrush}" MouseUp="OpenSettingsTextBlock_MouseUp">Open config folder</TextBlock>
+            <TextBlock x:Name="ShowManualTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static WPF:WPF.ThemeBrush}" MouseUp="ShowManualTextBlock_MouseUp">Show mpv manual</TextBlock>
+            <TextBlock x:Name="SupportTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static WPF:WPF.ThemeBrush}" MouseUp="SupportTextBlock_MouseUp">Show support forum</TextBlock>
+        </StackPanel>
    </Grid>
 </Window>
--- a/mpv.net/Windows/ConfWindow.xaml.cs
+++ b/mpv.net/Windows/ConfWindow.xaml.cs
@@ -0,0 +1,248 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+using DynamicGUI;
+
+namespace mpvnet
+{
+    public partial class ConfWindow : Window
+    {
+        private List<SettingBase> MpvSettingsDefinitions = Settings.LoadSettings(Properties.Resources.mpvConfToml);
+        private List<SettingBase> MpvNetSettingsDefinitions = Settings.LoadSettings(Properties.Resources.mpvNetConfToml);
+        private Dictionary<string, Dictionary<string, string>> Comments = new Dictionary<string, Dictionary<string, string>>();
+
+        public ObservableCollection<string> FilterStrings { get; } = new ObservableCollection<string>();
+
+        public ConfWindow()
+        {
+            InitializeComponent();
+            DataContext = this;
+            SearchControl.SearchTextBox.TextChanged += SearchTextBox_TextChanged;
+            LoadSettings(MpvSettingsDefinitions, MpvConf);
+            LoadSettings(MpvNetSettingsDefinitions, MpvNetConf);
+            SearchControl.Text = RegistryHelp.GetString(@"HKCU\Software\mpv.net", "config editor search");
+            
+            if (App.IsDarkMode)
+            {
+                Foreground = Brushes.White;
+                Foreground2 = Brushes.Silver;
+                Background = Brushes.Black;
+            }
+        }
+
+        public Brush Foreground2 {
+            get { return (Brush)GetValue(Foreground2Property); }
+            set { SetValue(Foreground2Property, value); }
+        }
+
+        public static readonly DependencyProperty Foreground2Property =
+            DependencyProperty.Register("Foreground2", typeof(Brush), typeof(ConfWindow), new PropertyMetadata(Brushes.DarkSlateGray));
+
+        private void LoadSettings(List<SettingBase> settingsDefinitions,
+                                  Dictionary<string, string> confSettings)
+        {
+            foreach (var setting in settingsDefinitions)
+            {
+                if (!FilterStrings.Contains(setting.Filter))
+                    FilterStrings.Add(setting.Filter);
+
+                foreach (var pair in confSettings)
+                {
+                    if (setting.Name == pair.Key)
+                    {
+                        setting.Value = pair.Value;
+                        setting.StartValue = pair.Value;
+                        continue;
+                    }
+                }
+
+                switch (setting)
+                {
+                    case StringSetting s:
+                        var sc = new StringSettingControl(s);
+                        sc.TitleTextBox.Foreground = WPF.WPF.ThemeBrush;
+                        MainStackPanel.Children.Add(sc);
+                        break;
+                    case OptionSetting s:
+                        var oc = new OptionSettingControl(s);
+                        oc.TitleTextBox.Foreground = WPF.WPF.ThemeBrush;
+                        MainStackPanel.Children.Add(oc);
+                        break;
+                }
+            }
+        }
+
+        private Dictionary<string, string> _mpvConf;
+
+        public Dictionary<string, string> MpvConf {
+            get {
+                if (_mpvConf == null) _mpvConf = LoadConf(mp.MpvConfPath);
+                return _mpvConf;
+            }
+        }
+
+        private Dictionary<string, string> _mpvNetConf;
+
+        public Dictionary<string, string> MpvNetConf {
+            get {
+                if (_mpvNetConf == null) _mpvNetConf = LoadConf(mp.MpvNetConfPath);
+                return _mpvNetConf;
+            }
+        }
+
+        private Dictionary<string, string> LoadConf(string filePath)
+        {
+            Dictionary<string, string> conf = new Dictionary<string, string>();
+            Comments[filePath] = new Dictionary<string, string>();
+
+            if (File.Exists(filePath))
+            {
+                foreach (string i in File.ReadAllLines(filePath))
+                {
+                    if (i.Contains("="))
+                    {
+                        int pos = i.IndexOf("=");
+                        string left = i.Substring(0, pos).Replace(" ", "").ToLower();
+                        string right = i.Substring(pos + 1).Trim();
+
+                        if (left.StartsWith("#"))
+                        {
+                            Comments[filePath][left.TrimStart('#')] = right;
+                            continue;
+                        }
+
+                        if (left == "fs") left = "fullscreen";
+                        if (left == "loop") left = "loop-file";
+                        conf[left] = right;
+                    }
+                }
+            }
+            return conf;
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            base.OnClosed(e);
+            WriteToDisk();
+            RegistryHelp.SetObject(@"HKCU\Software\mpv.net", "config editor search", SearchControl.Text);
+        }
+
+        void WriteToDisk()
+        {
+            bool isDirty = false;
+
+            foreach (SettingBase i in MpvSettingsDefinitions)
+                if (i.StartValue != i.Value)
+                    isDirty = true;
+
+            foreach (SettingBase i in MpvNetSettingsDefinitions)
+                if (i.StartValue != i.Value)
+                    isDirty = true;
+
+            if (!isDirty)
+                return;
+
+            WriteToDisk(mp.MpvConfPath, MpvConf, MpvSettingsDefinitions);
+            WriteToDisk(mp.MpvNetConfPath, MpvNetConf, MpvNetSettingsDefinitions);
+
+            Msg.Show("Changes will be available on next mpv.net startup.");
+        }
+
+        void WriteToDisk(string filePath,
+                         Dictionary<string, string> confSettings,
+                         List<SettingBase> settings)
+        {
+            string content = "";
+
+            foreach (var i in Comments[filePath])
+                content += $"#{i.Key} = {i.Value}\r\n";
+
+            foreach (var setting in settings)
+            {
+                if ((setting.Value ?? "") != setting.Default)
+                    confSettings[setting.Name] = setting.Value;
+
+                if (confSettings.ContainsKey(setting.Name) &&
+                    (setting.Value ?? "") == setting.Default ||
+                    (setting.Value ?? "") == "")
+                {
+                    confSettings.Remove(setting.Name);
+                }
+            }
+
+            foreach (var i in confSettings)
+                content = content + $"{i.Key} = {i.Value}\r\n";
+
+            File.WriteAllText(filePath, content);
+        }
+
+        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            string activeFilter = "";
+
+            foreach (var i in FilterStrings)
+                if (SearchControl.Text == i + ":")
+                    activeFilter = i;
+
+            if (activeFilter == "")
+            {
+                foreach (UIElement i in MainStackPanel.Children)
+                    if ((i as ISettingControl).Contains(SearchControl.Text))
+                        i.Visibility = Visibility.Visible;
+                    else
+                        i.Visibility = Visibility.Collapsed;
+
+                FilterListBox.SelectedItem = null;
+            }
+            else
+                foreach (UIElement i in MainStackPanel.Children)
+                    if ((i as ISettingControl).SettingBase.Filter == activeFilter)
+                        i.Visibility = Visibility.Visible;
+                    else
+                        i.Visibility = Visibility.Collapsed;
+
+            MainScrollViewer.ScrollToTop();
+        }
+        
+        private void ConfWindow1_Loaded(object sender, RoutedEventArgs e)
+        {
+            SearchControl.SearchTextBox.SelectAll();
+            Keyboard.Focus(SearchControl.SearchTextBox);
+        }
+
+        private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (e.AddedItems.Count > 0)
+                SearchControl.Text = e.AddedItems[0].ToString() + ":";
+        }
+
+        private void OpenSettingsTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Process.Start(Path.GetDirectoryName(mp.MpvConfPath));
+        }
+
+        private void ShowManualTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Process.Start("https://mpv.io/manual/master/");
+        }
+
+        private void SupportTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Process.Start("https://github.com/stax76/mpv.net#Support");
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if (e.Key == Key.Escape)
+                Close();
+        }
+    }
+}
--- a/mpv.net/Windows/EverythingWindow.xaml
+++ b/mpv.net/Windows/EverythingWindow.xaml
@@ -0,0 +1,23 @@
+<Window x:Class="mpvnet.EverythingWindow"
+        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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="Media File Search" Height="300" Width="600" ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner" Loaded="Window_Loaded" FontSize="13">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition></RowDefinition>
+        </Grid.RowDefinitions>
+        <TextBox Name="FilterTextBox" PreviewKeyDown="FilterTextBox_PreviewKeyDown" TextChanged="FilterTextBox_TextChanged"></TextBox>
+        <ListView Name="ListView" Grid.Row="1" MouseUp="ListView_MouseUp" PreviewKeyDown="ListView_PreviewKeyDown">
+            <ListView.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                </Style>
+            </ListView.ItemContainerStyle>
+        </ListView>        
+    </Grid>
+</Window>
--- a/mpv.net/Windows/EverythingWindow.xaml.cs
+++ b/mpv.net/Windows/EverythingWindow.xaml.cs
@@ -0,0 +1,168 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+
+namespace mpvnet
+{
+    public partial class EverythingWindow : Window
+    {
+        public EverythingWindow()
+        {
+            InitializeComponent();
+
+            if (App.IsDarkMode)
+            {
+                ListView.Foreground = Brushes.White;
+                ListView.Background = Brushes.Black;
+                FilterTextBox.Foreground = Brushes.White;
+                FilterTextBox.Background = Brushes.Black;
+            }
+        }
+
+        const int EVERYTHING_REQUEST_FILE_NAME = 0x00000001;
+        const int EVERYTHING_REQUEST_PATH = 0x00000002;
+        const int EVERYTHING_SORT_SIZE_DESCENDING = 6;
+
+        [DllImport("Everything.dll", CharSet = CharSet.Unicode)]
+        public static extern int Everything_SetSearch(string lpSearchString);
+
+        [DllImport("Everything.dll")]
+        public static extern void Everything_SetRequestFlags(UInt32 dwRequestFlags);
+
+        [DllImport("Everything.dll")]
+        public static extern void Everything_SetSort(UInt32 dwSortType);
+
+        [DllImport("Everything.dll", CharSet = CharSet.Unicode)]
+        public static extern bool Everything_Query(bool bWait);
+
+        [DllImport("Everything.dll", CharSet = CharSet.Unicode)]
+        public static extern void Everything_GetResultFullPathName(UInt32 nIndex, StringBuilder lpString, UInt32 nMaxCount);
+
+        [DllImport("Everything.dll")]
+        public static extern bool Everything_GetResultSize(UInt32 nIndex, out long lpFileSize);
+
+        [DllImport("Everything.dll")]
+        public static extern UInt32 Everything_GetNumResults();
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            HwndSource source = HwndSource.FromHwnd(new WindowInteropHelper(this).Handle);
+            source.AddHook(new HwndSourceHook(WndProc));
+            Keyboard.Focus(FilterTextBox);
+        }
+
+        void SelectFirst()
+        {
+            if (ListView.Items.Count > 0)
+                ListView.SelectedIndex = 0;
+        }
+
+        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            if (msg == 0x200 /*WM_MOUSEMOVE*/ && Mouse.LeftButton != MouseButtonState.Pressed)
+                handled = true;
+            return IntPtr.Zero;
+        }
+
+        private void FilterTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Up:
+                    {
+                        int index = ListView.SelectedIndex;
+                        index -= 1;
+                        if (index < 0) index = 0;
+                        ListView.SelectedIndex = index;
+                        ListView.ScrollIntoView(ListView.SelectedItem);
+                    }
+                    break;
+                case Key.Down:
+                    {
+                        int index = ListView.SelectedIndex;
+                        index += 1;
+                        if (index > ListView.Items.Count - 1) index = ListView.Items.Count - 1;
+                        ListView.SelectedIndex = index;
+                        ListView.ScrollIntoView(ListView.SelectedItem);
+                    }
+                    break;
+                case Key.Escape:
+                    Close();
+                    break;
+                case Key.Enter:
+                    Execute();
+                    break;
+            }
+        }
+
+        private void ListView_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape) Close();
+            if (e.Key == Key.Enter) Execute();
+        }
+
+        void Execute()
+        {
+            if (ListView.SelectedItem != null)
+                mp.LoadFiles(ListView.SelectedItem as string);
+            Keyboard.Focus(FilterTextBox);
+        }
+
+        private void ListView_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Execute();
+        }
+
+        private void FilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            string searchtext = FilterTextBox.Text;
+            Task.Run(() => Search(searchtext));
+        }
+
+        object LockObject = new object();
+
+        void Search(string searchtext)
+        {
+            lock (LockObject)
+            {
+                try
+                {
+                    List<string> items = new List<string>();
+                    UInt32 i;
+                    const int bufsize = 500;
+                    StringBuilder buf = new StringBuilder(bufsize);
+                    Everything_SetSearch(searchtext);
+                    Everything_SetRequestFlags(EVERYTHING_REQUEST_FILE_NAME | EVERYTHING_REQUEST_PATH);
+                    Everything_SetSort(EVERYTHING_SORT_SIZE_DESCENDING);
+                    Everything_Query(true);
+                    for (i = 0; i < Everything_GetNumResults(); i++)
+                    {
+                        Everything_GetResultFullPathName(i, buf, bufsize);
+                        string ext = Path.GetExtension(buf.ToString()).TrimStart('.').ToLower();
+                        if (App.AudioTypes.Contains(ext) || App.VideoTypes.Contains(ext))
+                            items.Add(buf.ToString());
+                        if (items.Count > 100) break;
+                    }
+                    Application.Current.Dispatcher.Invoke(() => {
+                        ListView.ItemsSource = items;
+                        SelectFirst();
+                    });
+                }
+                catch (Exception)
+                {
+                    Msg.ShowError("Search query failed.",
+                        "The search feature depends on [Everything](https://www.voidtools.com) being installed.");
+                }
+            }
+        }
+    }
+}
--- a/mpv.net/Windows/InputWindow.xaml
+++ b/mpv.net/Windows/InputWindow.xaml
@@ -0,0 +1,44 @@
+<Window xmlns:Controls="clr-namespace:Controls"  x:Class="mpvnet.InputWindow"
+        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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="Input Editor" Height="500" Width="750" FontSize="13"
+        Loaded="Window_Loaded" Closed="Window_Closed" ShowInTaskbar="False">
+    <Window.Resources>
+        <Style x:Key="DataGrid_Font_Centering" TargetType="{x:Type DataGridCell}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type DataGridCell}">
+                        <Grid Background="{TemplateBinding Background}">
+                            <ContentPresenter VerticalAlignment="Center" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Controls:SearchTextBoxUserControl HintText="Type ? to get help." x:Name="SearchControl" Width="300" Margin="0,20,0,20" Grid.ColumnSpan="2" />
+        <DataGrid Grid.Row="1" x:Name="DataGrid" CommandManager.PreviewCanExecute="DataGrid_PreviewCanExecute" AutoGenerateColumns="False" CellStyle="{StaticResource DataGrid_Font_Centering}">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Menu"  Binding="{Binding Path}"/>
+                <DataGridTemplateColumn Header="Input">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Button MinHeight="20" Click="ButtonClick">
+                                <TextBlock Text="{Binding Input}"></TextBlock>
+                            </Button>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTextColumn Header="Command" Binding="{Binding Command}" MaxWidth="330" />
+            </DataGrid.Columns>
+        </DataGrid>
+    </Grid>
+</Window>
--- a/mpv.net/Windows/InputWindow.xaml.cs
+++ b/mpv.net/Windows/InputWindow.xaml.cs
@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace mpvnet
+{
+    public partial class InputWindow : Window
+    {
+        ICollectionView CollectionView;
+        string InitialInputConfContent;
+
+        public InputWindow()
+        {
+            InitializeComponent();
+            InitialInputConfContent = GetInputConfContent();
+            SearchControl.SearchTextBox.TextChanged += SearchTextBox_TextChanged;
+            DataGrid.SelectionMode = DataGridSelectionMode.Single;
+            CollectionViewSource collectionViewSource = new CollectionViewSource() { Source = CommandItem.Items };
+            CollectionView = collectionViewSource.View;
+            var yourCostumFilter = new Predicate<object>(item => Filter((CommandItem)item));
+            CollectionView.Filter = yourCostumFilter;
+            DataGrid.ItemsSource = CollectionView;
+
+            if (App.IsDarkMode)
+            {
+                Foreground = Brushes.White;
+                Foreground2 = Brushes.Silver;
+                Background = Brushes.Black;
+            }
+        }
+
+        public Brush Foreground2 {
+            get { return (Brush)GetValue(Foreground2Property); }
+            set { SetValue(Foreground2Property, value); }
+        }
+
+        public static readonly DependencyProperty Foreground2Property =
+            DependencyProperty.Register("Foreground2", typeof(Brush), typeof(InputWindow), new PropertyMetadata(Brushes.DarkSlateGray));
+
+        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            CollectionView.Refresh();
+
+            if (SearchControl.SearchTextBox.Text == "?")
+                Msg.Show("Filtering works by searching in the Input, Menu and Command but it's possible to reduce the filter scope to either of Input, Menu or Command by prefixing as follows:\n\ni <input search>\ni: <input search>\n\nm <menu search>\nm: <menu search>\n\nc <command search>\nc: <command search>\n\nIf only one character is entered the search will be performed only in the input.", "Filtering");
+        }
+
+        bool Filter(CommandItem item)
+        {
+            if (item.Command == "") return false;
+            string searchText = SearchControl.SearchTextBox.Text.ToLower();
+            if (searchText == "") return true;
+
+            if (searchText.StartsWith("i ") || searchText.StartsWith("i:") || searchText.Length == 1)
+            {
+                if (searchText.Length > 1)
+                    searchText = searchText.Substring(2).Trim();
+
+                if (searchText.Length < 3)
+                    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:"))
+                return item.Path.ToLower().Contains(searchText.Substring(2).Trim());
+            else if (searchText.StartsWith("c ") || searchText.StartsWith("c:"))
+                return item.Command.ToLower().Contains(searchText.Substring(2).Trim());
+            else if (item.Command.ToLower().Contains(searchText) ||
+                item.Path.ToLower().Contains(searchText) ||
+                item.Input.ToLower().Contains(searchText))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        private void ButtonClick(object sender, RoutedEventArgs e)
+        {
+            CommandItem item = ((Button)e.Source).DataContext as CommandItem;
+            if (item is null) return;
+            LearnWindow w = new LearnWindow();
+            w.Owner = this;
+            w.InputItem = item;
+            w.ShowDialog();
+
+            var items = new Dictionary<string, CommandItem>();
+
+            foreach (CommandItem i in CommandItem.Items)
+                if (items.ContainsKey(i.Input) && i.Input != "")
+                    Msg.Show($"Duplicate found:\n\n{i.Input}: {i.Path}\n\n{items[i.Input].Input}: {items[i.Input].Path}\n\nPlease note that you can chain multiple commands in the same line by using a semicolon as separator.", "Duplicate Found");
+                else
+                    items[i.Input] = i;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e) => Keyboard.Focus(SearchControl.SearchTextBox);
+
+        string GetInputConfContent()
+        {
+            string text = Properties.Resources.inputConfHeader + "\r\n";
+
+            foreach (CommandItem item in CommandItem.Items)
+            {
+                string input = item.Input == "" ? "_" : item.Input;
+                string line = " " + input.PadRight(10);
+
+                if (item.Command.Trim() == "")
+                    line += " ignore";
+                else
+                    line += " " + item.Command.Trim();
+
+                if (item.Path.Trim() != "")
+                    line = line.PadRight(40) + " #menu: " + item.Path;
+
+                text += line + "\r\n";
+            }
+            return text;
+        }
+
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            if (InitialInputConfContent == GetInputConfContent()) return;
+            File.WriteAllText(mp.InputConfPath, GetInputConfContent());
+            Msg.Show("Changes will be available on next mpv.net startup.");
+        }
+
+        private void DataGrid_PreviewCanExecute(object sender, CanExecuteRoutedEventArgs e)
+        {
+            DataGrid grid = (DataGrid)sender;
+
+            if (e.Command == DataGrid.DeleteCommand)
+                if (Msg.ShowQuestion($"Confirm to delete: {(grid.SelectedItem as CommandItem).Input} ({(grid.SelectedItem as CommandItem).Path})") != MsgResult.OK)
+                    e.Handled = true;
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if (e.Key == Key.Escape)
+                Close();
+        }
+    }
+}
--- a/mpv.net/Windows/LearnWindow.xaml
+++ b/mpv.net/Windows/LearnWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="mpvInputEdit.InputWindow"
+<Window x:Class="mpvnet.LearnWindow"
        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"
--- a/mpv.net/Windows/LearnWindow.xaml.cs
+++ b/mpv.net/Windows/LearnWindow.xaml.cs
@@ -1,20 +1,18 @@
 using System;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
 using WF = System.Windows.Forms;

-namespace mpvInputEdit
+namespace mpvnet
 {
-    public partial class InputWindow : Window
+    public partial class LearnWindow : Window
    {
-        string InputString = "";
-        public InputItem InputItem { get; set; }
+        public CommandItem InputItem { get; set; }
        public string NewKey { get; set; } = "";

-        public InputWindow()
+        public LearnWindow()
        {
            InitializeComponent();
        }
@@ -32,22 +30,21 @@ namespace mpvInputEdit

        void OnKeyUp(WF.KeyEventArgs e)
        {
-            if (e.KeyCode == WF.Keys.None) return;
-            char c = Convert.ToChar(e.KeyCode);
-            string text = InputString;
-
            if (e.KeyCode == WF.Keys.ControlKey || e.KeyCode == WF.Keys.ShiftKey ||
-                e.KeyCode == WF.Keys.Menu)
-            {
-                return;
-            }
+                e.KeyCode == WF.Keys.Menu || e.KeyCode == WF.Keys.None)

-            if (text == "")
-            {
-                text = e.KeyCode.ToString();
-                if (text.Length == 1)
-                    text = text.ToLowerInvariant();
-            }
+                return;
+
+            string text = "";
+            uint charValue = MapVirtualKey((uint)e.KeyCode, 2);
+
+            if (charValue == 0 || (charValue & 1 << 31) == 1 << 31)
+                text = e.KeyCode.ToString().Trim();
+            else
+                try {
+                    text = Convert.ToChar(charValue).ToString().ToLower().Trim();
+                }
+                catch {}

            for (int i = 0; i < 13; i++)
                if ("D" + i.ToString() == text)
@@ -90,14 +87,6 @@ namespace mpvInputEdit
                    text = "Esc"; break;
                case WF.Keys.PrintScreen:
                    text = "Print"; break;
-                case WF.Keys.Right:
-                    text = "Right"; break;
-                case WF.Keys.Left:
-                    text = "Left"; break;
-                case WF.Keys.Up:
-                    text = "Up"; break;
-                case WF.Keys.Down:
-                    text = "Down"; break;
                case WF.Keys.Play:
                    text = "Play"; break;
                case WF.Keys.Pause:
@@ -130,20 +119,24 @@ namespace mpvInputEdit
                    text = "Cancel"; break;
            }

-            if (text == "#")
-                text = "Sharp";
+            bool shiftWasHandled = false;

-            bool isAlt = GetKeyState(18) < (short)0;
+            bool isAlt   = GetKeyState(18) < (short)0;
            bool isShift = GetKeyState(16) < (short)0;
-            bool isCtrl = GetKeyState(17) < (short)0;
+            bool isCtrl  = GetKeyState(17) < (short)0;

-            if (!(isAlt && isCtrl && !isShift) && !(isShift && !isAlt && !isCtrl && !int.TryParse(text.Replace("F", ""), out int value)))
+            if (text.Length == 1 && isShift && text[0] != GetModifiedKey(text[0]))
            {
-                if (isAlt) text = "Alt+" + text;
-                if (isShift) text = "Shift+" + text;
-                if (isCtrl) text = "Ctrl+" + text;
+                text = GetModifiedKey(text[0]).ToString();
+                shiftWasHandled = true;
            }

+            if (text == "#") text = "Sharp";
+
+            if (isAlt) text = "Alt+" + text;
+            if (isShift && !shiftWasHandled) text = "Shift+" + text;
+            if (isCtrl) text = "Ctrl+" + text;
+
            if (!string.IsNullOrEmpty(text))
                SetKey(text);
        }
@@ -151,17 +144,12 @@ namespace mpvInputEdit
        void SetKey(string key)
        {
            NewKey = key;
-            MenuLabel.Content = InputItem.Menu;
+            MenuLabel.Content = InputItem.Path;
            KeyLabel.Content = key;
        }

-        void OnKeyPress(WF.KeyPressEventArgs e)
-        {
-            if (char.IsControl(e.KeyChar))
-                InputString = "";
-            else
-                InputString = e.KeyChar.ToString();
-        }
+        [DllImport("user32.dll")]
+        static extern uint MapVirtualKey(uint uCode, uint uMapType);

        public static WF.Keys ModifierKeys {
            get {
@@ -176,80 +164,78 @@ namespace mpvInputEdit
            }
        }

+        public static char GetModifiedKey(char c)
+        {
+            short vkKeyScanResult = VkKeyScan(c);
+
+            if (vkKeyScanResult == -1)
+                return c;
+
+            uint code = (uint)vkKeyScanResult & 0xff;
+            byte[] b = new byte[256];
+            b[0x10] = 0x80;
+            uint r;
+
+            if (1 != ToAscii(code, code, b, out r, 0))
+                return c;
+
+            return (char)r;
+        }
+
        void ProcessKeyEventArgs(ref WF.Message m)
        {
-            int WM_CHAR = 258, WM_SYSCHAR = 262, /*WM_KEYDOWN = 256, WM_SYSKEYDOWN = 260,*/
-                WM_KEYUP = 0x0101, WM_SYSKEYUP = 0x0105, WM_APPCOMMAND = 0x0319;
+            int WM_KEYUP = 0x0101, WM_SYSKEYUP = 0x0105, WM_APPCOMMAND = 0x0319;

-            IntPtr newWParam = IntPtr.Zero;
-            WF.KeyEventArgs ke = null;
-            WF.KeyPressEventArgs kpe = null;
-
-            if (m.Msg == WM_CHAR || m.Msg == WM_SYSCHAR)
+            if (m.Msg == WM_KEYUP || m.Msg == WM_SYSKEYUP)
+                OnKeyUp(new WF.KeyEventArgs((WF.Keys)(unchecked((int)(long)m.WParam)) | ModifierKeys));
+            else if (m.Msg == WM_APPCOMMAND)
            {
-                kpe = new WF.KeyPressEventArgs(unchecked((char)(long)m.WParam));
-                OnKeyPress(kpe);
-                newWParam = (IntPtr)kpe.KeyChar;
-            }
-            else
-            {
-                ke = new WF.KeyEventArgs((WF.Keys)(unchecked((int)(long)m.WParam)) | ModifierKeys);
-
-                if (m.Msg == WM_KEYUP || m.Msg == WM_SYSKEYUP)
-                    OnKeyUp(ke);
-
-                if (m.Msg == WM_APPCOMMAND)
+                switch ((AppCommand)(m.LParam.ToInt32() >> 16))
                {
-                    switch ((AppCommand)(m.LParam.ToInt32() >> 16))
-                    {
-                        case AppCommand.MEDIA_CHANNEL_DOWN:
-                            SetKey("Channel_Down");
-                            break;
-                        case AppCommand.MEDIA_CHANNEL_UP:
-                            SetKey("Channel_Up");
-                            break;
-                        case AppCommand.MEDIA_FAST_FORWARD:
-                            SetKey("Forward");
-                            break;
-                        case AppCommand.MEDIA_REWIND:
-                            SetKey("Rewind");
-                            break;
-                        case AppCommand.MEDIA_PAUSE:
-                            SetKey("Pause");
-                            break;
-                        case AppCommand.MEDIA_PLAY:
-                            SetKey("Play");
-                            break;
-                        case AppCommand.MEDIA_PLAY_PAUSE:
-                            SetKey("PlayPause");
-                            break;
-                        case AppCommand.MEDIA_NEXTTRACK:
-                            SetKey("Next");
-                            break;
-                        case AppCommand.MEDIA_PREVIOUSTRACK:
-                            SetKey("Prev");
-                            break;
-                        case AppCommand.MEDIA_RECORD:
-                            SetKey("Record");
-                            break;
-                        case AppCommand.MEDIA_STOP:
-                            SetKey("Stop");
-                            break;
-                        case AppCommand.VolumeUp:
-                            SetKey("Volume_Up");
-                            break;
-                        case AppCommand.VolumeDown:
-                            SetKey("Volume_Down");
-                            break;
-                        case AppCommand.VolumeMute:
-                            SetKey("Mute");
-                            break;
-                    }
+                    case AppCommand.MEDIA_CHANNEL_DOWN:
+                        SetKey("Channel_Down");
+                        break;
+                    case AppCommand.MEDIA_CHANNEL_UP:
+                        SetKey("Channel_Up");
+                        break;
+                    case AppCommand.MEDIA_FAST_FORWARD:
+                        SetKey("Forward");
+                        break;
+                    case AppCommand.MEDIA_REWIND:
+                        SetKey("Rewind");
+                        break;
+                    case AppCommand.MEDIA_PAUSE:
+                        SetKey("Pause");
+                        break;
+                    case AppCommand.MEDIA_PLAY:
+                        SetKey("Play");
+                        break;
+                    case AppCommand.MEDIA_PLAY_PAUSE:
+                        SetKey("PlayPause");
+                        break;
+                    case AppCommand.MEDIA_NEXTTRACK:
+                        SetKey("Next");
+                        break;
+                    case AppCommand.MEDIA_PREVIOUSTRACK:
+                        SetKey("Prev");
+                        break;
+                    case AppCommand.MEDIA_RECORD:
+                        SetKey("Record");
+                        break;
+                    case AppCommand.MEDIA_STOP:
+                        SetKey("Stop");
+                        break;
+                    case AppCommand.VolumeUp:
+                        SetKey("Volume_Up");
+                        break;
+                    case AppCommand.VolumeDown:
+                        SetKey("Volume_Down");
+                        break;
+                    case AppCommand.VolumeMute:
+                        SetKey("Mute");
+                        break;
                }
            }
-
-            if (kpe != null)
-                m.WParam = newWParam;
        }

        internal enum AppCommand
@@ -273,22 +259,32 @@ namespace mpvInputEdit
        [DllImport("user32.dll", CharSet = CharSet.Auto)]
        public static extern short GetKeyState(int keyCode);

+        [DllImport("user32.dll")]
+        static extern short VkKeyScan(char c);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        static extern int ToAscii(uint     uVirtKey,
+                                  uint     uScanCode,
+                                  byte[]   lpKeyState,
+                                  out uint lpChar,
+                                  uint     flags);
+
        private void Window_Loaded(object sender, RoutedEventArgs e)
        {
            HwndSource source = HwndSource.FromHwnd(new WindowInteropHelper(this).Handle);
            source.AddHook(new HwndSourceHook(WndProc));
-            SetKey(InputItem.Key);
+            SetKey(InputItem.Input);
        }

        private void ConfirmButton_Click(object sender, RoutedEventArgs e)
        {
-            InputItem.Key = NewKey;
+            InputItem.Input = NewKey;
            Close();
        }

        private void ClearButton_Click(object sender, RoutedEventArgs e)
        {
-            InputItem.Key = "_";
+            InputItem.Input = "_";
            Close();
        }

--- a/mpv.net/mp.cs
+++ b/mpv.net/mp.cs
@@ -14,8 +14,6 @@ using System.Windows.Forms;
 using static mpvnet.libmpv;
 using static mpvnet.Native;

-using PyRT = IronPython.Runtime;
-
 namespace mpvnet
 {
    public delegate void MpvBoolPropChangeHandler(string propName, bool value);
@@ -23,7 +21,7 @@ namespace mpvnet
    public class mp
    {
        public static event Action VideoSizeChanged;
-                                                              // Lua/JS evens       libmpv events
+                                                              // Lua/JS event       libmpv event

                                                              //                    MPV_EVENT_NONE
        public static event Action Shutdown;                  // shutdown           MPV_EVENT_SHUTDOWN
@@ -52,18 +50,68 @@ namespace mpvnet
        public static event Action QueueOverflow;             //                    MPV_EVENT_QUEUE_OVERFLOW
        public static event Action Hook;                      //                    MPV_EVENT_HOOK

-        public static IntPtr MpvHandle;
-        public static IntPtr MpvWindowHandle;
-        public static Addon Addon;
-        public static List<KeyValuePair<string, Action<bool>>> BoolPropChangeActions = new List<KeyValuePair<string, Action<bool>>>();
-        public static Size VideoSize = new Size(1920, 1080);
-        public static string mpvConfFolderPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\";
-        public static string InputConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\input.conf";
-        public static string mpvConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpv.conf";
-        public static List<PythonScript> PythonScripts => new List<PythonScript>();
-        public static AutoResetEvent AutoResetEvent = new AutoResetEvent(false);
+        public static IntPtr MpvHandle { get; set; }
+        public static IntPtr MpvWindowHandle { get; set; }
+        public static Addon Addon { get; set; }
+        public static List<KeyValuePair<string, Action<bool>>> BoolPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<bool>>>();
+        public static List<KeyValuePair<string, Action<int>>> IntPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<int>>>();
+        public static List<KeyValuePair<string, Action<string>>> StringPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<string>>>();
+        public static Size VideoSize { get; set; } = new Size(1920, 1080);
+        public static List<PythonScript> PythonScripts { get; set; } = new List<PythonScript>();
+        public static AutoResetEvent AutoResetEvent { get; set; } = new AutoResetEvent(false);
+        public static List<MediaTrack> MediaTracks { get; set; } = new List<MediaTrack>();
+        public static List<KeyValuePair<string, double>> Chapters { get; set; } = new List<KeyValuePair<string, double>>();

-        private static Dictionary<string, string> _mpvConf;
+        public static string InputConfPath  { get; } = MpvConfFolder + "\\input.conf";
+        public static string MpvConfPath    { get; } = MpvConfFolder + "\\mpv.conf";
+        public static string MpvNetConfPath { get; } = MpvConfFolder + "\\mpvnet.conf";
+
+        static string _MpvConfFolder;
+
+        public static string MpvConfFolder {
+            get {
+                if (_MpvConfFolder == null)
+                {
+                    string portableFolder = Application.StartupPath + "\\portable_config\\";
+                    string appdataFolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\";
+                    string startupFolder = Application.StartupPath + "\\";
+
+                    if (!Directory.Exists(appdataFolder) && !Directory.Exists(portableFolder) &&
+                        Sys.IsDirectoryWritable(Application.StartupPath) &&
+                        !File.Exists(startupFolder + "mpv.conf"))
+                    {
+                        using (TaskDialog<string> td = new TaskDialog<string>())
+                        {
+                            td.MainInstruction = "Choose a settings folder.";
+                            td.Content = "[MPV documentation about files on Windows.](https://mpv.io/manual/master/#files-on-windows)";
+                            td.AddCommandLink("appdata", appdataFolder, appdataFolder);
+                            td.AddCommandLink("portable", portableFolder, portableFolder);
+                            td.AddCommandLink("startup", startupFolder, startupFolder);
+                            td.AllowCancel = false;
+                            _MpvConfFolder = td.Show();
+                        }
+                    }
+                    else if (Directory.Exists(portableFolder))
+                        _MpvConfFolder = portableFolder;
+                    else if (Directory.Exists(appdataFolder))
+                        _MpvConfFolder = appdataFolder;
+                    else if (File.Exists(Application.StartupPath + "\\mpv.conf"))
+                        _MpvConfFolder = Application.StartupPath + "\\";
+
+                    if (string.IsNullOrEmpty(_MpvConfFolder)) _MpvConfFolder = appdataFolder;
+                    if (!Directory.Exists(_MpvConfFolder)) Directory.CreateDirectory(_MpvConfFolder);
+
+                    if (!File.Exists(_MpvConfFolder + "\\input.conf"))
+                        File.WriteAllText(_MpvConfFolder + "\\input.conf", Properties.Resources.inputConf);
+
+                    if (!File.Exists(_MpvConfFolder + "\\mpv.conf"))
+                        File.WriteAllText(_MpvConfFolder + "\\mpv.conf", Properties.Resources.mpvConf);
+                }
+                return _MpvConfFolder;
+            }
+        }
+
+        static Dictionary<string, string> _mpvConf;

        public static Dictionary<string, string> mpvConf {
            get {
@@ -71,8 +119,8 @@ namespace mpvnet
                {
                    _mpvConf = new Dictionary<string, string>();

-                    if (File.Exists(mpvConfPath))
-                        foreach (var i in File.ReadAllLines(mpvConfPath))
+                    if (File.Exists(MpvConfPath))
+                        foreach (var i in File.ReadAllLines(MpvConfPath))
                            if (i.Contains("=") && ! i.StartsWith("#"))
                                _mpvConf[i.Substring(0, i.IndexOf("=")).Trim()] = i.Substring(i.IndexOf("=") + 1).Trim();
                }
@@ -80,17 +128,26 @@ namespace mpvnet
            }
        }

+        static Dictionary<string, string> _mpvNetConf;
+
+        public static Dictionary<string, string> mpvNetConf {
+            get {
+                if (_mpvNetConf == null)
+                {
+                    _mpvNetConf = new Dictionary<string, string>();
+
+                    if (File.Exists(MpvNetConfPath))
+                        foreach (string i in File.ReadAllLines(MpvNetConfPath))
+                            if (i.Contains("=") && !i.StartsWith("#"))
+                                _mpvNetConf[i.Substring(0, i.IndexOf("=")).Trim()] = i.Substring(i.IndexOf("=") + 1).Trim();
+                }
+                return _mpvNetConf;
+            }
+        }
+
        public static void Init()
        {
-            if (!Directory.Exists(mp.mpvConfFolderPath))
-                Directory.CreateDirectory(mp.mpvConfFolderPath);
-
-            if (!File.Exists(mp.mpvConfPath))
-                File.WriteAllText(mp.mpvConfPath, Properties.Resources.mpv_conf);
-
-            if (!File.Exists(mp.InputConfPath))
-                File.WriteAllText(mp.InputConfPath, Properties.Resources.input_conf);
-
+            string dummy = MpvConfFolder;
            LoadLibrary("mpv-1.dll");
            MpvHandle = mpv_create();
            set_property_string("input-default-bindings", "yes");
@@ -123,11 +180,12 @@ namespace mpvnet
                if (Path.GetExtension(scriptPath) == ".ps1")
                    PowerShellScript.Init(scriptPath);

-            foreach (var scriptPath in Directory.GetFiles(mp.mpvConfFolderPath + "Scripts"))
-                if (Path.GetExtension(scriptPath) == ".py")
-                    PythonScripts.Add(new PythonScript(File.ReadAllText(scriptPath)));
-                else if (Path.GetExtension(scriptPath) == ".ps1")
-                    PowerShellScript.Init(scriptPath);
+            if (Directory.Exists(mp.MpvConfFolder + "Scripts"))
+                foreach (var scriptPath in Directory.GetFiles(mp.MpvConfFolder + "Scripts"))
+                    if (Path.GetExtension(scriptPath) == ".py")
+                        PythonScripts.Add(new PythonScript(File.ReadAllText(scriptPath)));
+                    else if (Path.GetExtension(scriptPath) == ".ps1")
+                        PowerShellScript.Init(scriptPath);
        }

        public static void EventLoop()
@@ -142,137 +200,152 @@ namespace mpvnet

                //Debug.WriteLine(evt.event_id.ToString());

-                switch (evt.event_id)
+                try
                {
-                    case mpv_event_id.MPV_EVENT_SHUTDOWN:
-                        Shutdown?.Invoke();
-                        AutoResetEvent.Set();
-                        return;
-                    case mpv_event_id.MPV_EVENT_LOG_MESSAGE:
-                        LogMessage?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_GET_PROPERTY_REPLY:
-                        GetPropertyReply?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_SET_PROPERTY_REPLY:
-                        SetPropertyReply?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_COMMAND_REPLY:
-                        CommandReply?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_START_FILE:
-                        StartFile?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_END_FILE:
-                        var end_fileData = (mpv_event_end_file)Marshal.PtrToStructure(evt.data, typeof(mpv_event_end_file));
-                        EndFile?.Invoke((EndFileEventMode)end_fileData.reason);
-                        break;
-                    case mpv_event_id.MPV_EVENT_FILE_LOADED:
-                        FileLoaded?.Invoke();
-                        LoadFolder();
-                        break;
-                    case mpv_event_id.MPV_EVENT_TRACKS_CHANGED:
-                        TracksChanged?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_TRACK_SWITCHED:
-                        TrackSwitched?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_IDLE:
-                        Idle?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_PAUSE:
-                        Pause?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_UNPAUSE:
-                        Unpause?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_TICK:
-                        Tick?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_SCRIPT_INPUT_DISPATCH:
-                        ScriptInputDispatch?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_CLIENT_MESSAGE:
-                        if (ClientMessage != null)
-                        {
-                            try
+                    switch (evt.event_id)
+                    {
+                        case mpv_event_id.MPV_EVENT_SHUTDOWN:
+                            Shutdown?.Invoke();
+                            WriteHistory(null);
+                            AutoResetEvent.Set();
+                            return;
+                        case mpv_event_id.MPV_EVENT_LOG_MESSAGE:
+                            LogMessage?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_GET_PROPERTY_REPLY:
+                            GetPropertyReply?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_SET_PROPERTY_REPLY:
+                            SetPropertyReply?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_COMMAND_REPLY:
+                            CommandReply?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_START_FILE:
+                            StartFile?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_END_FILE:
+                            var end_fileData = (mpv_event_end_file)Marshal.PtrToStructure(evt.data, typeof(mpv_event_end_file));
+                            EndFile?.Invoke((EndFileEventMode)end_fileData.reason);
+                            break;
+                        case mpv_event_id.MPV_EVENT_FILE_LOADED:
+                            FileLoaded?.Invoke();
+                            LoadFolder();
+                            WriteHistory(mp.get_property_string("path"));
+                            break;
+                        case mpv_event_id.MPV_EVENT_TRACKS_CHANGED:
+                            TracksChanged?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_TRACK_SWITCHED:
+                            TrackSwitched?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_IDLE:
+                            Idle?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_PAUSE:
+                            Pause?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_UNPAUSE:
+                            Unpause?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_TICK:
+                            Tick?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_SCRIPT_INPUT_DISPATCH:
+                            ScriptInputDispatch?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_CLIENT_MESSAGE:
+                            var client_messageData = (mpv_event_client_message)Marshal.PtrToStructure(evt.data, typeof(mpv_event_client_message));
+                            string[] args = NativeUtf8StrArray2ManagedStrArray(client_messageData.args, client_messageData.num_args);
+
+                            if (args != null && args.Length > 1 && args[0] == "mpv.net")
                            {
-                                var client_messageData = (mpv_event_client_message)Marshal.PtrToStructure(evt.data, typeof(mpv_event_client_message));
-                                string[] args = NativeUtf8StrArray2ManagedStrArray(client_messageData.args, client_messageData.num_args);
+                                bool found = false;

-                                if (args != null && args.Length > 1 && args[0] == "mpv.net")
+                                foreach (var i in mpvnet.Command.Commands)
                                {
-                                    bool found = false;
-
-                                    foreach (var i in mpvnet.Command.Commands)
+                                    if (args[1] == i.Name)
                                    {
-                                        if (args[1] == i.Name)
-                                        {
-                                            found = true;
-                                            i.Action.Invoke(args.Skip(2).ToArray());
-                                        }
-                                    }
-                                    if (!found)
-                                    {
-                                        List<string> names = mpvnet.Command.Commands.Select((item) => item.Name).ToList();
-                                        names.Sort();
-                                        MainForm.Instance.ShowMsgBox($"No command '{args[1]}' found. Available commands are:\n\n{string.Join("\n", names)}\n\nHow to bind these commands can be seen in the default input bindings and menu definition located at:\n\nhttps://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt", MessageBoxIcon.Error);
+                                        found = true;
+                                        i.Action.Invoke(args.Skip(2).ToArray());
+                                        MainForm.Instance.BeginInvoke(new Action(() => {
+                                            Message m = new Message() { Msg = 0x0202 }; // WM_LBUTTONUP
+                                            Native.SendMessage(MainForm.Instance.Handle, m.Msg, m.WParam, m.LParam);
+                                        }));
                                    }
                                }
-                                ClientMessage?.Invoke(args);
+                                if (!found)
+                                {
+                                    List<string> names = mpvnet.Command.Commands.Select((item) => item.Name).ToList();
+                                    names.Sort();
+                                    Msg.ShowError($"No command '{args[1]}' found.", $"Available commands are:\n\n{string.Join("\n", names)}\n\nHow to bind these commands can be seen in the [default input bindings and menu definition](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt).");
+                                }
                            }
-                            catch (Exception ex)
+                            ClientMessage?.Invoke(args);
+                            break;
+                        case mpv_event_id.MPV_EVENT_VIDEO_RECONFIG:
+                            VideoReconfig?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_AUDIO_RECONFIG:
+                            AudioReconfig?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_METADATA_UPDATE:
+                            MetadataUpdate?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_SEEK:
+                            Seek?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_PROPERTY_CHANGE:
+                            var propData = (mpv_event_property)Marshal.PtrToStructure(evt.data, typeof(mpv_event_property));
+
+                            if (propData.format == mpv_format.MPV_FORMAT_FLAG)
+                                foreach (var i in BoolPropChangeActions)
+                                    if (i.Key== propData.name)
+                                        i.Value.Invoke(Marshal.PtrToStructure<int>(propData.data) == 1);
+
+                            if (propData.format == mpv_format.MPV_FORMAT_STRING)
+                                foreach (var i in StringPropChangeActions)
+                                    if (i.Key == propData.name)
+                                        i.Value.Invoke(StringFromNativeUtf8(Marshal.PtrToStructure<IntPtr>(propData.data)));
+
+                            if (propData.format == mpv_format.MPV_FORMAT_INT64)
+                                foreach (var i in IntPropChangeActions)
+                                    if (i.Key == propData.name)
+                                        i.Value.Invoke(Marshal.PtrToStructure<int>(propData.data));
+                            break;
+                        case mpv_event_id.MPV_EVENT_PLAYBACK_RESTART:
+                            PlaybackRestart?.Invoke();
+                            Size vidSize = new Size(get_property_int("dwidth"), get_property_int("dheight"));
+
+                            if (VideoSize != vidSize && vidSize != Size.Empty)
                            {
-                                MainForm.Instance.ShowMsgBox(ex.GetType().Name + "\n\n" + ex.ToString(), MessageBoxIcon.Error);
-                            }
-                        }
-                        break;
-                    case mpv_event_id.MPV_EVENT_VIDEO_RECONFIG:
-                        VideoReconfig?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_AUDIO_RECONFIG:
-                        AudioReconfig?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_METADATA_UPDATE:
-                        MetadataUpdate?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_SEEK:
-                        Seek?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_PROPERTY_CHANGE:
-                        var event_propertyData = (mpv_event_property)Marshal.PtrToStructure(evt.data, typeof(mpv_event_property));
+                                VideoSize = vidSize;
+                                VideoSizeChanged?.Invoke();
+                            }                    

-                        if (event_propertyData.format == mpv_format.MPV_FORMAT_FLAG)
-                            foreach (var i in BoolPropChangeActions)
-                                if (i.Key== event_propertyData.name)
-                                    i.Value.Invoke(Marshal.PtrToStructure<int>(event_propertyData.data) == 1);
-                        break;
-                    case mpv_event_id.MPV_EVENT_PLAYBACK_RESTART:
-                        PlaybackRestart?.Invoke();
-                        Size s = new Size(get_property_int("dwidth"), get_property_int("dheight"));
-
-                        if (VideoSize != s && s != Size.Empty)
-                        {
-                            VideoSize = s;
-                            VideoSizeChanged?.Invoke();
-                        }
-                        break;
-                    case mpv_event_id.MPV_EVENT_CHAPTER_CHANGE:
-                        ChapterChange?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_QUEUE_OVERFLOW:
-                        QueueOverflow?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_HOOK:
-                        Hook?.Invoke();
-                        break;
+                            Task.Run(new Action(() => ReadMetaData()));
+                            break;
+                        case mpv_event_id.MPV_EVENT_CHAPTER_CHANGE:
+                            ChapterChange?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_QUEUE_OVERFLOW:
+                            QueueOverflow?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_HOOK:
+                            Hook?.Invoke();
+                            break;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Msg.ShowException(ex);
                }
            }
        }

-        private static List<PythonEventObject> PythonEventObjects = new List<PythonEventObject>();
+        static List<PythonEventObject> PythonEventObjects = new List<PythonEventObject>();

-        public static void register_event(string name, PyRT.PythonFunction pyFunc)
+        public static void register_event(string name, IronPython.Runtime.PythonFunction pyFunc)
        {
            foreach (var eventInfo in typeof(mp).GetEvents())
            {
@@ -307,7 +380,7 @@ namespace mpvnet
            }
        }

-        public static void unregister_event(PyRT.PythonFunction pyFunc)
+        public static void unregister_event(IronPython.Runtime.PythonFunction pyFunc)
        {
            foreach (var eventObjects in PythonEventObjects)
                if (eventObjects.PythonFunction == pyFunc)
@@ -353,15 +426,23 @@ namespace mpvnet

        public static string get_property_string(string name, bool throwOnException = false)
        {
-            int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_STRING, out IntPtr lpBuffer);
+            try
+            {
+                int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_STRING, out IntPtr lpBuffer);

-            if (err < 0 && throwOnException)
-                throw new Exception($"{name}: {(mpv_error)err}");
+                if (err < 0 && throwOnException)
+                    throw new Exception($"{name}: {(mpv_error)err}");

-            var ret = StringFromNativeUtf8(lpBuffer);
-            mpv_free(lpBuffer);
+                string ret = StringFromNativeUtf8(lpBuffer);
+                mpv_free(lpBuffer);

-            return ret;
+                return ret;
+            }
+            catch (Exception ex)
+            {
+                if (throwOnException) throw ex;
+                return "";
+            }
        }

        public static int get_property_int(string name, bool throwOnException = false)
@@ -404,6 +485,16 @@ namespace mpvnet
                throw new Exception($"{name}: {(mpv_error)err}");
        }

+        public static void observe_property_int(string name, Action<int> action)
+        {
+            int err = mpv_observe_property(MpvHandle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_INT64);
+
+            if (err < 0)
+                throw new Exception($"{name}: {(mpv_error)err}");
+            else
+                IntPropChangeActions.Add(new KeyValuePair<string, Action<int>>(name, action));
+        }
+
        public static void observe_property_bool(string name, Action<bool> action)
        {
            int err = mpv_observe_property(MpvHandle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_FLAG);
@@ -414,16 +505,14 @@ namespace mpvnet
                BoolPropChangeActions.Add(new KeyValuePair<string, Action<bool>>(name, action));
        }

-        public static void unobserve_property_bool(string name, Action<bool> action)
+        public static void observe_property_string(string name, Action<string> action)
        {
-            foreach (var i in BoolPropChangeActions.ToArray())
-                if (i.Value == action)
-                    BoolPropChangeActions.Remove(i);
-
-            int err = mpv_unobserve_property(MpvHandle, (ulong)action.GetHashCode());
+            int err = mpv_observe_property(MpvHandle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_STRING);

            if (err < 0)
                throw new Exception($"{name}: {(mpv_error)err}");
+            else
+                StringPropChangeActions.Add(new KeyValuePair<string, Action<string>>(name, action));
        }

        protected static void ProcessCommandLine()
@@ -433,8 +522,6 @@ namespace mpvnet
            foreach (string i in args)
                if (!i.StartsWith("--") && File.Exists(i))
                    mp.commandv("loadfile", i, "append");
-                else if (!i.StartsWith("--") && i.StartsWith("http"))
-                    mp.LoadURL(i);

            mp.set_property_string("playlist-pos", "0");

@@ -454,16 +541,7 @@ namespace mpvnet
            }
        }

-        public static void LoadURL(string url)
-        {
-            int count = mp.get_property_int("playlist-count");
-            mp.commandv("loadfile", url, "append");
-            mp.set_property_int("playlist-pos", count);
-            for (int i = 0; i < count; i++)
-                mp.commandv("playlist-remove", "0");
-        }
-
-        public static void LoadFiles(string[] files)
+        public static void LoadFiles(params string[] files)
        {
            int count = mp.get_property_int("playlist-count");

@@ -478,26 +556,24 @@ namespace mpvnet
            mp.LoadFolder();
        }

-        private static bool WasFolderLoaded;
+        static bool WasFolderLoaded;

-        public static void LoadFolder()
+        static void LoadFolder()
        {
-            if (WasFolderLoaded)
-                return;
+            if (WasFolderLoaded) return;

            if (get_property_int("playlist-count") == 1)
            {
-                string[] types = "264 265 3gp aac ac3 avc avi avs bmp divx dts dtshd dtshr dtsma eac3 evo flac flv h264 h265 hevc hvc jpg jpeg m2t m2ts m2v m4a m4v mka mkv mlp mov mp2 mp3 mp4 mpa mpeg mpg mpv mts ogg ogm opus pcm png pva raw rmvb thd thd+ac3 true-hd truehd ts vdr vob vpy w64 wav webm wmv y4m".Split(' ');
                string path = get_property_string("path");
+                if (!File.Exists(path)) return;
                List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
-                files = files.Where((file) => types.Contains(Path.GetExtension(file).TrimStart(".".ToCharArray()).ToLower())).ToList();
+                files = files.Where((file) => App.VideoTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower()) ||
+                                              App.AudioTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower())).ToList();
                files.Sort(new StringLogicalComparer());
                int index = files.IndexOf(path);
                files.Remove(path);
-
                foreach (string i in files)
                    commandv("loadfile", i, "append");
-
                if (index > 0)
                    commandv("playlist-move", "0", (index + 1).ToString());
            }
@@ -505,7 +581,7 @@ namespace mpvnet
            WasFolderLoaded = true;
        }

-        public static IntPtr AllocateUtf8IntPtrArrayWithSentinel(string[] arr, out IntPtr[] byteArrayPointers)
+        static IntPtr AllocateUtf8IntPtrArrayWithSentinel(string[] arr, out IntPtr[] byteArrayPointers)
        {
            int numberOfStrings = arr.Length + 1; // add extra element for extra null pointer last (sentinel)
            byteArrayPointers = new IntPtr[numberOfStrings];
@@ -523,7 +599,7 @@ namespace mpvnet
            return rootPointer;
        }

-        public static string[] NativeUtf8StrArray2ManagedStrArray(IntPtr pUnmanagedStringArray, int StringCount)
+        static string[] NativeUtf8StrArray2ManagedStrArray(IntPtr pUnmanagedStringArray, int StringCount)
        {
            IntPtr[] pIntPtrArray = new IntPtr[StringCount];
            string[] ManagedStringArray = new string[StringCount];
@@ -535,7 +611,7 @@ namespace mpvnet
            return ManagedStringArray;
        }

-        public static string StringFromNativeUtf8(IntPtr nativeUtf8)
+        static string StringFromNativeUtf8(IntPtr nativeUtf8)
        {
            int len = 0;
            while (Marshal.ReadByte(nativeUtf8, len) != 0) ++len;
@@ -544,7 +620,124 @@ namespace mpvnet
            return Encoding.UTF8.GetString(buffer);
        }

-        public static byte[] GetUtf8Bytes(string s) => Encoding.UTF8.GetBytes(s + "\0");
+        static byte[] GetUtf8Bytes(string s) => Encoding.UTF8.GetBytes(s + "\0");
+
+        static string LastHistoryPath;
+        static DateTime LastHistoryStartDateTime;
+
+        static void WriteHistory(string filePath)
+        {
+            int totalMinutes = Convert.ToInt32((DateTime.Now - LastHistoryStartDateTime).TotalMinutes);
+
+            if (File.Exists(LastHistoryPath) && totalMinutes > 1)
+            {
+                string historyFilepath = mp.MpvConfFolder + "history.txt";
+
+                File.AppendAllText(historyFilepath, DateTime.Now.ToString().Substring(0, 16) +
+                    " " + totalMinutes.ToString().PadLeft(3) + " " +
+                    Path.GetFileNameWithoutExtension(LastHistoryPath) + "\r\n");
+            }
+
+            LastHistoryPath = filePath;
+            LastHistoryStartDateTime = DateTime.Now;
+        }
+
+        static void ReadMetaData()
+        {
+            lock (MediaTracks)
+            {
+                MediaTracks.Clear();
+
+                using (MediaInfo mi = new MediaInfo(mp.get_property_string("path")))
+                {
+                    int count = mi.GetCount(MediaInfoStreamKind.Video);
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        MediaTrack track = new MediaTrack();
+                        Add(track, mi.GetVideo(i, "Format"));
+                        Add(track, mi.GetVideo(i, "Format_Profile"));
+                        Add(track, mi.GetVideo(i, "Width") + "x" + mi.GetVideo(i, "Height"));
+                        Add(track, mi.GetVideo(i, "FrameRate") + " FPS");
+                        Add(track, mi.GetVideo(i, "Language/String"));
+                        Add(track, mi.GetVideo(i, "Forced") == "Yes" ? "Forced" : "");
+                        Add(track, mi.GetVideo(i, "Default") == "Yes" ? "Default" : "");
+                        Add(track, mi.GetVideo(i, "Title"));
+                        track.Text = "V: " + track.Text.Trim(' ', ',');
+                        track.Type = "v";
+                        track.ID = i + 1;
+                        MediaTracks.Add(track);
+                    }
+
+                    count = mi.GetCount(MediaInfoStreamKind.Audio);
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        MediaTrack track = new MediaTrack();
+                        Add(track, mi.GetAudio(i, "Language/String"));
+                        Add(track, mi.GetAudio(i, "Format"));
+                        Add(track, mi.GetAudio(i, "Format_Profile"));
+                        Add(track, mi.GetAudio(i, "BitRate/String"));
+                        Add(track, mi.GetAudio(i, "Channel(s)/String"));
+                        Add(track, mi.GetAudio(i, "SamplingRate/String"));
+                        Add(track, mi.GetAudio(i, "Forced") == "Yes" ? "Forced" : "");
+                        Add(track, mi.GetAudio(i, "Default") == "Yes" ? "Default" : "");
+                        Add(track, mi.GetAudio(i, "Title"));
+                        track.Text = "A: " + track.Text.Trim(' ', ',');
+                        track.Type = "a";
+                        track.ID = i + 1;
+                        MediaTracks.Add(track);
+                    }
+
+                    count = mi.GetCount(MediaInfoStreamKind.Text);
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        MediaTrack track = new MediaTrack();
+                        Add(track, mi.GetText(i, "Language/String"));
+                        Add(track, mi.GetText(i, "Format"));
+                        Add(track, mi.GetText(i, "Format_Profile"));
+                        Add(track, mi.GetText(i, "Forced") == "Yes" ? "Forced" : "");
+                        Add(track, mi.GetText(i, "Default") == "Yes" ? "Default" : "");
+                        Add(track, mi.GetText(i, "Title"));
+                        track.Text = "S: " + track.Text.Trim(' ', ',');
+                        track.Type = "s";
+                        track.ID = i + 1;
+                        MediaTracks.Add(track);
+                    }
+
+                    count = get_property_int("edition-list/count");
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        MediaTrack track = new MediaTrack();
+                        track.Text = "E: " + get_property_string($"edition-list/{i}/title");
+                        track.Type = "e";
+                        track.ID = i;
+                        MediaTracks.Add(track);
+                    }
+
+                    void Add(MediaTrack track, string val)
+                    {
+                        if (!string.IsNullOrEmpty(val) && !(track.Text != null && track.Text.Contains(val)))
+                            track.Text += " " + val + ",";
+                    }
+                }
+            }
+
+            lock (Chapters)
+            {
+                Chapters.Clear();
+                int count = get_property_int("chapter-list/count");
+
+                for (int x = 0; x < count; x++)
+                {
+                    string text = get_property_string($"chapter-list/{x}/title");
+                    double time = get_property_number($"chapter-list/{x}/time");
+                    Chapters.Add(new KeyValuePair<string, double>(text, time));
+                }
+            }
+        }
    }

    public enum EndFileEventMode
--- a/mpv.net/mpv.ico
+++ b/mpv.net/mpv.ico
--- a/mpv.net/mpv.net.csproj
+++ b/mpv.net/mpv.net.csproj
@@ -25,6 +25,7 @@
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
    <GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
+    <LangVersion>7.3</LangVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,52 +35,13 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup />
  <PropertyGroup />
  <PropertyGroup>
    <StartupObject>mpvnet.Program</StartupObject>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
  <PropertyGroup />
  <PropertyGroup />
  <PropertyGroup />
@@ -89,11 +51,51 @@
  <PropertyGroup />
  <PropertyGroup />
  <PropertyGroup>
-    <ApplicationIcon>mpv.ico</ApplicationIcon>
+    <ApplicationIcon>mpvnet.ico</ApplicationIcon>
  </PropertyGroup>
  <PropertyGroup>
    <ApplicationManifest>app.manifest</ApplicationManifest>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
  <ItemGroup>
    <Reference Include="IKVM.Reflection, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -119,6 +121,8 @@
      <HintPath>IronPython\Microsoft.Scripting.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
    <Reference Include="System" />
    <Reference Include="System.ComponentModel.Composition" />
    <Reference Include="System.Core" />
@@ -128,20 +132,53 @@
      <HintPath>..\packages\Microsoft.PowerShell.5.ReferenceAssemblies.1.1.0\lib\net4\System.Management.Automation.dll</HintPath>
    </Reference>
    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Addon.cs" />
+    <Page Include="Controls\SearchTextBoxUserControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\AboutWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\EverythingWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\CommandPaletteWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="WPF\Resources.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Compile Include="Controls\SearchTextBoxUserControl.xaml.cs">
+      <DependentUpon>SearchTextBoxUserControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DynamicGUI\DynamicGUI.cs" />
+    <Compile Include="DynamicGUI\OptionSettingControl.xaml.cs">
+      <DependentUpon>OptionSettingControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DynamicGUI\StringSettingControl.xaml.cs">
+      <DependentUpon>StringSettingControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DynamicGUI\Tommy.cs" />
    <Compile Include="MediaInfo.cs" />
    <Compile Include="Menu.cs">
      <SubType>Component</SubType>
    </Compile>
+    <Compile Include="PowerShellScript.cs" />
    <Compile Include="Properties\Resources.Designer.cs">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
-    <Compile Include="PowerShellScript.cs" />
    <Compile Include="PythonScript.cs" />
    <Compile Include="libmpv.cs" />
    <Compile Include="MainForm.cs">
@@ -157,8 +194,27 @@
    <Compile Include="NativeHelp.cs" />
    <Compile Include="Program.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TaskDialog.cs" />
+    <Compile Include="Windows\EverythingWindow.xaml.cs">
+      <DependentUpon>EverythingWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\CommandPaletteWindow.xaml.cs">
+      <DependentUpon>CommandPaletteWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ConfWindow.xaml.cs">
+      <DependentUpon>ConfWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\AboutWindow.xaml.cs">
+      <DependentUpon>AboutWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\LearnWindow.xaml.cs">
+      <DependentUpon>LearnWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\InputWindow.xaml.cs">
+      <DependentUpon>InputWindow.xaml</DependentUpon>
+    </Compile>
    <Compile Include="trash.cs" />
-    <Compile Include="UI.cs" />
+    <Compile Include="WPF\WPF.cs" />
    <EmbeddedResource Include="MainForm.resx">
      <DependentUpon>MainForm.cs</DependentUpon>
      <SubType>Designer</SubType>
@@ -168,6 +224,9 @@
      <SubType>Designer</SubType>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
+    <None Include="..\README.md">
+      <Link>README.md</Link>
+    </None>
    <None Include="app.manifest" />
    <None Include="packages.config" />
    <None Include="Properties\Settings.settings">
@@ -179,17 +238,44 @@
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
-    <Content Include="Resources\mpv.conf.txt" />
+    <Content Include="..\LICENSE.txt">
+      <Link>LICENSE.txt</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="mpvnet.ico" />
+    <Content Include="Resources\mpvConf.txt" />
+    <Content Include="Resources\mpvConfToml.txt" />
+    <Content Include="Resources\mpvNetConfToml.txt" />
  </ItemGroup>
  <ItemGroup>
    <None Include="App.config" />
  </ItemGroup>
  <ItemGroup>
-    <Content Include="mpv.ico" />
-    <Content Include="screenshot.jpg" />
-    <Content Include="Resources\input.conf.txt" />
+    <Content Include="Resources\inputConfHeader.txt" />
+    <Content Include="Resources\inputConf.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="DynamicGUI\OptionSettingControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="DynamicGUI\StringSettingControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\ConfWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\LearnWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\InputWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
  </ItemGroup>
-  <ItemGroup />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/mpv.net/mpvnet.ico
+++ b/mpv.net/mpvnet.ico
--- a/mpv.net/screenshot.jpg
+++ b/mpv.net/screenshot.jpg
--- a/mpvConfEdit/App.config
+++ b/mpvConfEdit/App.config
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
-    </startup>
-</configuration>
--- a/mpvConfEdit/App.xaml.cs
+++ b/mpvConfEdit/App.xaml.cs
@@ -1,8 +0,0 @@
-using System.Windows;
-
-namespace DynamicGUI
-{
-    public partial class App : Application
-    {
-    }
-}
--- a/mpvConfEdit/License.txt
+++ b/mpvConfEdit/License.txt
@@ -1,10 +0,0 @@
-MIT License
-
-Copyright (c) 2017 stax76
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and ssociated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/mpvConfEdit/MainWindow.xaml.cs
+++ b/mpvConfEdit/MainWindow.xaml.cs
@@ -1,214 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-
-using DynamicGUI;
-
-namespace mpvConfEdit
-{
-    public partial class MainWindow : Window
-    {
-        public string mpvConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpv.conf";
-        private List<SettingBase> DynamicSettings = Settings.LoadSettings(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\mpvConfEdit.toml");
-
-        public MainWindow()
-        {
-            InitializeComponent();
-            DataContext = this;
-            Title = (Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyProductAttribute), true)[0] as AssemblyProductAttribute).Product + " " + Assembly.GetExecutingAssembly().GetName().Version.ToString();
-            SearchControl.SearchTextBox.TextChanged += SearchTextBox_TextChanged;
-
-            foreach (var setting in DynamicSettings)
-            {
-                if (!FilterStrings.Contains(setting.Filter))
-                    FilterStrings.Add(setting.Filter);
-                foreach (var pair in mpvConf)
-                {
-                    if (setting.Name == pair.Key || setting.Alias == pair.Key)
-                        switch (setting)
-                        {
-                            case StringSetting s:
-                                s.Value = pair.Value;
-                                continue;
-                            case OptionSetting s:
-                                s.Value = pair.Value;
-                                break;
-                        }
-                }
-                switch (setting)
-                {
-                    case StringSetting s:
-                        MainStackPanel.Children.Add(new StringSettingControl(s));
-                        break;
-                    case OptionSetting s:
-                        MainStackPanel.Children.Add(new OptionSettingControl(s));
-                        break;
-                }
-            }
-        }
-
-        private Dictionary<string, string> _mpvConf;
-
-        public Dictionary<string, string> mpvConf {
-            get {
-                if (_mpvConf == null)
-                {
-                    _mpvConf = new Dictionary<string, string>();
-
-                    if (File.Exists(mpvConfPath))
-                        foreach (var i in File.ReadAllLines(mpvConfPath))
-                            if (i.Contains("=") && !i.Trim().StartsWith("#"))
-                            {
-                                int pos = i.IndexOf("=");
-                                _mpvConf[i.Substring(0, pos).Trim()] = i.Substring(pos + 1).Trim();
-                            }
-                }
-                return _mpvConf;
-            }
-        }
-
-        public ObservableCollection<string> FilterStrings { get; } = new ObservableCollection<string>();
-
-        protected override void OnClosed(EventArgs e)
-        {
-            base.OnClosed(e);
-
-            foreach (var mpvSetting in DynamicSettings)
-            {
-                switch (mpvSetting)
-                {
-                    case StringSetting s:
-                        if ((s.Value ?? "") != s.Default)
-                            mpvConf[s.Name] = s.Value;
-                        else
-                            mpvConf.Remove(s.Name);
-                        break;
-                    case OptionSetting s:
-                        if ((s.Value ?? "") != s.Default)
-                            mpvConf[s.Name] = s.Value;
-                        else
-                            mpvConf.Remove(s.Name);
-                        break;
-                }
-            }
-
-            if (!File.Exists(mpvConfPath))
-                File.WriteAllText(mpvConfPath, "");
-
-            List<string> lines = File.ReadAllLines(mpvConfPath).ToList();
-
-            foreach (var mpvSetting in DynamicSettings)
-            {
-                foreach (var line in lines.ToArray())
-                {
-                    string test = line.Replace("#", "").Replace(" ", "");
-                    if (test.StartsWith(mpvSetting.Alias + "="))
-                    {
-                        lines.Remove(line);
-                        foreach (var pair in mpvConf.ToArray())
-                            if (test.StartsWith(pair.Key + "="))
-                                mpvConf.Remove(pair.Key);
-                    }
-                }
-            }
-
-            foreach (var pair in mpvConf)
-            {
-                bool changed = false;
-
-                for (int i = 0; i < lines.Count; i++)
-                {
-                    if (lines[i].Contains("=") &&
-                        lines[i].Substring(0, lines[i].IndexOf("=")).Trim("# ".ToCharArray()) == pair.Key)
-                    {
-                        lines[i] = pair.Key + " = " + pair.Value;
-                        changed = true;
-                    }
-                }
-
-                if (!changed)
-                    lines.Add(pair.Key + " = " + pair.Value);
-            }
-
-            foreach (var mpvSetting in DynamicSettings)
-            {
-                foreach (var line in lines.ToArray())
-                {
-                    string test = line.Replace("#", "").Replace(" ", "");
-
-                    if (test.StartsWith(mpvSetting.Name + "=") && !mpvConf.ContainsKey(mpvSetting.Name))
-                        lines.Remove(line);
-                }
-            }
-
-            File.WriteAllText(mpvConfPath, String.Join(Environment.NewLine, lines));
-
-            foreach (Process process in Process.GetProcesses())
-                if (process.ProcessName == "mpvnet")
-                    MessageBox.Show("Restart mpv.net in order to apply changed settings.", Title, MessageBoxButton.OK, MessageBoxImage.Information);
-                else if (process.ProcessName == "mpv")
-                    MessageBox.Show("Restart mpv in order to apply changed settings.", Title, MessageBoxButton.OK, MessageBoxImage.Information);
-        }
-
-        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            string activeFilter = "";
-
-            foreach (var i in FilterStrings)
-                if (SearchControl.Text == i + ":")
-                    activeFilter = i;
-
-            if (activeFilter == "")
-            {
-                foreach (UIElement i in MainStackPanel.Children)
-                    if ((i as ISettingControl).Contains(SearchControl.Text))
-                        i.Visibility = Visibility.Visible;
-                    else
-                        i.Visibility = Visibility.Collapsed;
-
-                FilterListBox.SelectedItem = null;
-            }
-            else
-                foreach (UIElement i in MainStackPanel.Children)
-                    if ((i as ISettingControl).SettingBase.Filter == activeFilter)
-                        i.Visibility = Visibility.Visible;
-                    else
-                        i.Visibility = Visibility.Collapsed;
-
-            MainScrollViewer.ScrollToTop();
-        }
-        
-        private void MainWindow1_Loaded(object sender, RoutedEventArgs e)
-        {
-            Keyboard.Focus(SearchControl.SearchTextBox);
-        }
-
-        private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (e.AddedItems.Count > 0)
-                SearchControl.Text = e.AddedItems[0].ToString() + ":";
-        }
-
-        private void OpenSettingsTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            Process.Start(Path.GetDirectoryName(mpvConfPath));
-        }
-
-        private void ShowManualTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            Process.Start("https://mpv.io/manual/master/");
-        }
-
-        private void SupportTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            Process.Start("https://github.com/stax76/mpv.net#Support");
-        }
-    }
-}
--- a/mpvConfEdit/Properties/AssemblyInfo.cs
+++ b/mpvConfEdit/Properties/AssemblyInfo.cs
@@ -1,55 +0,0 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("mpv(.net) conf edit")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("mpv(.net) conf edit")]
-[assembly: AssemblyCopyright("Copyright © stax76")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// 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.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
--- a/mpvConfEdit/Properties/Resources.Designer.cs
+++ b/mpvConfEdit/Properties/Resources.Designer.cs
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace mpvConfEdit.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("mpvConfEdit.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
--- a/mpvConfEdit/Properties/Resources.resx
+++ b/mpvConfEdit/Properties/Resources.resx
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
--- a/mpvConfEdit/Properties/Settings.Designer.cs
+++ b/mpvConfEdit/Properties/Settings.Designer.cs
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace mpvConfEdit.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
--- a/mpvConfEdit/Properties/Settings.settings
+++ b/mpvConfEdit/Properties/Settings.settings
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
--- a/mpvConfEdit/SearchTextBoxUserControl.xaml
+++ b/mpvConfEdit/SearchTextBoxUserControl.xaml
@@ -1,13 +0,0 @@
-<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" 
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid x:Name="SearchTextBoxUserControl1" Background="White">
-        <TextBlock x:Name="SearchTextBlock" Margin="5,2" Text="Find a setting" Foreground="LightSteelBlue" VerticalAlignment="Center" />
-        <TextBox Name="SearchTextBox" Height="25" Padding="1,2,0,0" BorderThickness="2" Background="Transparent" TextChanged="SearchTextBox_TextChanged" />
-        <Button x:Name="SearchClearButton" Background="Transparent" HorizontalAlignment="Right" Margin="2,0,4,0" FontSize="5" Width="17" Height="17" Visibility="Hidden" Click="SearchClearButton_Click">╳</Button>
-    </Grid>
-</UserControl>
--- a/mpvConfEdit/SearchTextBoxUserControl.xaml.cs
+++ b/mpvConfEdit/SearchTextBoxUserControl.xaml.cs
@@ -1,32 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-
-namespace Controls
-{
-    public partial class SearchTextBoxUserControl : UserControl
-    {
-        public SearchTextBoxUserControl()
-        {
-            InitializeComponent();
-        }
-
-        public string Text { get => SearchTextBox.Text; set => SearchTextBox.Text = value; }
-
-        private void SearchClearButton_Click(object sender, RoutedEventArgs e)
-        {
-            SearchTextBox.Text = "";
-            Keyboard.Focus(SearchTextBox);
-        }
-
-        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            SearchTextBlock.Text = SearchTextBox.Text == "" ? "Find a setting" : "";
-
-            if (SearchTextBox.Text == "")
-                SearchClearButton.Visibility = Visibility.Hidden;
-            else
-                SearchClearButton.Visibility = Visibility.Visible;
-        }
-    }
-}
--- a/mpvConfEdit/mpv.ico
+++ b/mpvConfEdit/mpv.ico
--- a/mpvConfEdit/mpvConfEdit.csproj
+++ b/mpvConfEdit/mpvConfEdit.csproj
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C4FEAA45-001D-4DC8-8BFA-621527326D09}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>mpvConfEdit</RootNamespace>
-    <AssemblyName>mpvConfEdit</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\mpv.net\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>8.0</LangVersion>
-    <NullableReferenceTypes>true</NullableReferenceTypes>
-    <NullableContextOptions>enable</NullableContextOptions>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\mpv.net\bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>8.0</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>mpv.ico</ApplicationIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="DynamicGUI\DynamicGUI.cs" />
-    <Compile Include="DynamicGUI\OptionSettingControl.xaml.cs">
-      <DependentUpon>OptionSettingControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="DynamicGUI\StringSettingControl.xaml.cs">
-      <DependentUpon>StringSettingControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="DynamicGUI\Tommy.cs" />
-    <Compile Include="SearchTextBoxUserControl.xaml.cs">
-      <DependentUpon>SearchTextBoxUserControl.xaml</DependentUpon>
-    </Compile>
-    <Page Include="DynamicGUI\OptionSettingControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DynamicGUI\StringSettingControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="SearchTextBoxUserControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="mpvConfEdit.toml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="mpv.ico" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
--- a/mpvConfEdit/mpvConfEdit.sln
+++ b/mpvConfEdit/mpvConfEdit.sln
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28714.193
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mpvConfEdit", "mpvConfEdit.csproj", "{C4FEAA45-001D-4DC8-8BFA-621527326D09}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C4FEAA45-001D-4DC8-8BFA-621527326D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4FEAA45-001D-4DC8-8BFA-621527326D09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4FEAA45-001D-4DC8-8BFA-621527326D09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4FEAA45-001D-4DC8-8BFA-621527326D09}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {959F2890-E1FC-47A2-856C-A42F8C955D15}
-	EndGlobalSection
-EndGlobal
--- a/mpvInputEdit/App.config
+++ b/mpvInputEdit/App.config
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
-</configuration>
--- a/mpvInputEdit/App.xaml
+++ b/mpvInputEdit/App.xaml
@@ -1,42 +0,0 @@
-<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"
-             StartupUri="MainWindow.xaml">
-    <Application.Resources>
-        <Style TargetType="TextBox">
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type TextBox}">
-                        <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                            <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsEnabled" Value="false">
-                                <Setter Property="Opacity" TargetName="border" Value="0.56"/>
-                            </Trigger>
-                            <Trigger Property="IsMouseOver" Value="true">
-                                <Setter Property="BorderBrush" TargetName="border" Value="#FF7EB4EA"/>
-                            </Trigger>
-                            <Trigger Property="IsFocused" Value="true">
-                                <Setter Property="BorderBrush" TargetName="border" Value="{x:Static SystemParameters.WindowGlassBrush}"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style x:Key="DataGrid_Font_Centering"
-        TargetType="{x:Type DataGridCell}">
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type DataGridCell}">
-                        <Grid Background="{TemplateBinding Background}">
-                            <ContentPresenter VerticalAlignment="Center" />
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </Application.Resources>
-</Application>
--- a/mpvInputEdit/App.xaml.cs
+++ b/mpvInputEdit/App.xaml.cs
@@ -1,56 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Windows;
-
-namespace mpvInputEdit
-{
-    public partial class App : Application
-    {
-        public static string InputConfPath { get; } = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\input.conf";
-
-        private static ObservableCollection<InputItem> _InputItems;
-
-        public static ObservableCollection<InputItem> InputItems
-        {
-            get
-            {
-                if (_InputItems is null)
-                {
-                    _InputItems = new ObservableCollection<InputItem>();
-
-                    if (File.Exists(InputConfPath))
-                    {
-                        foreach (string line in File.ReadAllLines(InputConfPath))
-                        {
-                            string l = line.Trim();
-                            if (l.StartsWith("#")) continue;
-                            if (!l.Contains(" ")) continue;
-                            InputItem item = new InputItem();
-                            item.Key = l.Substring(0, l.IndexOf(" "));
-                            if (item.Key == "") continue;
-                            l = l.Substring(l.IndexOf(" ") + 1);
-
-                            if (l.Contains("#menu:"))
-                            {
-                                item.Menu = l.Substring(l.IndexOf("#menu:") + 6).Trim();
-                                l = l.Substring(0, l.IndexOf("#menu:"));
-
-                                if (item.Menu.Contains(";"))
-                                    item.Menu = item.Menu.Substring(item.Menu.IndexOf(";") + 1).Trim();
-                            }
-
-                            item.Command = l.Trim();
-                            if (item.Command == "")
-                                continue;
-                            if (item.Command.ToLower() == "ignore")
-                                item.Command = "";
-                            _InputItems.Add(item);
-                        }
-                    }
-                }
-                return _InputItems;
-            }
-        }
-    }
-}
--- a/mpvInputEdit/License.txt
+++ b/mpvInputEdit/License.txt
@@ -1,10 +0,0 @@
-MIT License
-
-Copyright (c) 2017 stax76
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and ssociated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/mpvInputEdit/MainWindow.xaml
+++ b/mpvInputEdit/MainWindow.xaml
@@ -1,31 +0,0 @@
-<Window xmlns:Controls="clr-namespace:Controls"  x:Class="mpvInputEdit.MainWindow"
-        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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        Title="MainWindow" Height="500" Width="750" FontSize="13"
-        Loaded="Window_Loaded" Closed="Window_Closed">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="60" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <Controls:SearchTextBoxUserControl x:Name="SearchControl" Width="300" Margin="0,0,0,10" Grid.ColumnSpan="2" />
-        <DataGrid Grid.Row="1" x:Name="DataGrid" AutoGenerateColumns="False" CellStyle="{StaticResource DataGrid_Font_Centering}">
-            <DataGrid.Columns>
-                <DataGridTextColumn Header="Context Menu"  Binding="{Binding Menu}"/>
-                <DataGridTemplateColumn Header="Input">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <Button MinHeight="20" Click="ButtonClick">
-                                <TextBlock Text="{Binding Key}"></TextBlock>
-                            </Button>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
-                <DataGridTextColumn Header="Command" Binding="{Binding Command}" MaxWidth="330" />
-            </DataGrid.Columns>
-        </DataGrid>
-    </Grid>
-</Window>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Frank Skare	2512c02bff	3.6.1	2019-05-23 00:51:15 +02:00
Frank Skare	351fae8344	-	2019-05-13 03:29:12 +02:00
Frank Skare	30b562a1e1	-	2019-05-13 03:23:33 +02:00
Frank Skare	8a9a017875	-	2019-05-13 03:22:31 +02:00
Frank Skare	fa0b0f496f	-	2019-05-13 03:20:44 +02:00
Frank Skare	83b5d9b65c	-	2019-05-13 03:19:17 +02:00
Frank Skare	b199d33f7a	-	2019-05-13 03:00:41 +02:00
Frank Skare	a7b6f79ee1	-	2019-05-13 02:48:46 +02:00
Frank Skare	fc3c5ee3a7	-	2019-05-13 02:35:31 +02:00
Frank Skare	ed71cb704f	-	2019-05-11 02:09:41 +02:00
Frank Skare	a9474b1c22	-	2019-05-11 00:49:38 +02:00
Frank Skare	be3b31f7e6	-	2019-05-09 19:16:48 +02:00
Frank Skare	b2884e2037	-	2019-05-09 12:41:58 +02:00
Frank Skare	3910776b54	-	2019-05-09 12:36:05 +02:00
Frank Skare	b37272db8b	-	2019-05-09 12:28:17 +02:00
Frank Skare	08a23430c7	-	2019-05-05 04:02:10 +02:00
Frank Skare	ba41b8026f	-	2019-05-04 19:15:18 +02:00
Frank Skare	4aeb00afb5	-	2019-05-04 19:04:18 +02:00
Frank Skare	6e6015b185	-	2019-05-04 15:10:00 +02:00
Frank Skare	68240ac49d	-	2019-05-04 15:02:26 +02:00
Frank Skare	bafc481117	-	2019-05-04 14:53:42 +02:00
Frank Skare	9198d610ad	-	2019-05-04 14:03:59 +02:00
Frank Skare	ad4199aff0	-	2019-05-04 00:17:31 +02:00
Frank Skare	3164e2322c	-	2019-05-03 18:27:05 +02:00
Frank Skare	a6d4570b81	-	2019-05-01 11:24:21 +02:00
Frank Skare	4fc9c61ecf	-	2019-05-01 10:28:35 +02:00
Frank Skare	5a969aac7d	-	2019-05-01 10:27:00 +02:00
Frank Skare	1b9229d4d9	-	2019-05-01 10:23:53 +02:00
Frank Skare	225979d220	-	2019-05-01 10:08:46 +02:00
Frank Skare	0c3a03181a	-	2019-05-01 10:07:01 +02:00
Frank Skare	867a83f15a	-	2019-05-01 09:36:48 +02:00
Frank Skare	1d78d4e4e2	-	2019-04-29 18:54:15 +02:00
Frank Skare	23bef4d971	-	2019-04-28 17:11:50 +02:00
Frank Skare	9b95b87177	-	2019-04-28 17:11:11 +02:00
Frank Skare	aa8ae225c5	-	2019-04-28 17:07:31 +02:00
Frank Skare	1bb05c4d99	-	2019-04-28 04:47:27 +02:00
Frank Skare	619fcef63f	-	2019-04-27 21:55:31 +02:00
Frank Skare	9170e55d81	-	2019-04-27 21:29:22 +02:00
Frank Skare	dc1240f606	-	2019-04-27 21:28:35 +02:00
Frank Skare	cb11279091	-	2019-04-27 21:26:29 +02:00
Frank Skare	fd956d401f	-	2019-04-27 21:25:34 +02:00
Frank Skare	6ea8a67390	-	2019-04-27 21:04:35 +02:00
Frank Skare	6d02203727	-	2019-04-27 20:59:28 +02:00
Frank Skare	0d396947c1	-	2019-04-27 20:56:42 +02:00
Frank Skare	6c85ea9625	-	2019-04-27 06:16:46 +02:00
Frank Skare	2d9a67c502	-	2019-04-27 05:26:17 +02:00
Frank Skare	d9000a570b	-	2019-04-27 03:31:46 +02:00
Frank Skare	f35ab46c3f	-	2019-04-27 02:16:13 +02:00
Frank Skare	143934ca49	-	2019-04-27 02:06:04 +02:00
Frank Skare	669750eaf4	-	2019-04-27 01:56:51 +02:00
Frank Skare	cde8a6495a	-	2019-04-27 01:55:53 +02:00
Frank Skare	c774d4d490	-	2019-04-27 01:53:26 +02:00
Frank Skare	55cafbcdbf	-	2019-04-27 01:45:34 +02:00
Frank Skare	4f508f3af0	-	2019-04-27 01:38:55 +02:00
Frank Skare	8cea79e67f	-	2019-04-27 01:32:20 +02:00
Frank Skare	c6c3a3e8fa	-	2019-04-27 01:30:18 +02:00
Frank Skare	8c87ac0c47	-	2019-04-27 01:23:58 +02:00
Frank Skare	d777ca912a	-	2019-04-26 11:22:07 +02:00
Frank Skare	c9ffbaa679	-	2019-04-25 10:33:21 +02:00
Frank Skare	1476059601	-	2019-04-25 10:30:47 +02:00
Frank Skare	757502e8bf	-	2019-04-25 10:13:48 +02:00
Frank Skare	4bbf84532e	-	2019-04-25 08:30:31 +02:00
Frank Skare	433d741c68	-	2019-04-25 08:04:49 +02:00
Frank Skare	8fdbe22dd8	-	2019-04-25 05:27:01 +02:00
Frank Skare	8bed98ded5	-	2019-04-25 05:24:42 +02:00
Frank Skare	4abfa73fba	-	2019-04-25 05:03:43 +02:00
Frank Skare	b868d63946	-	2019-04-25 04:55:09 +02:00
Frank Skare	3bdb88787e	-	2019-04-25 04:51:12 +02:00
Frank Skare	8b74abc2f6	-	2019-04-25 04:46:30 +02:00
Frank Skare	a516f9f947	-	2019-04-25 04:44:43 +02:00
Frank Skare	ecab31f108	-	2019-04-25 04:36:57 +02:00
Frank Skare	c5a5a09300	-	2019-04-25 04:33:32 +02:00
Frank Skare	5a2f5614a3	-	2019-04-25 03:43:48 +02:00
Frank Skare	5e0162f2c8	-	2019-04-25 03:41:12 +02:00
Frank Skare	14ba006de1	-	2019-04-25 00:11:55 +02:00
Frank Skare	8f7aa7db2d	-	2019-04-24 23:59:34 +02:00
Frank Skare	3e70e8e5ea	-	2019-04-24 20:26:41 +02:00
Frank Skare	36f5357ff7	-	2019-04-24 20:15:27 +02:00
Frank Skare	dc3b275291	-	2019-04-24 20:09:54 +02:00
Frank Skare	abc49f55d5	-	2019-04-24 19:41:55 +02:00
Frank Skare	40b9f21101	-	2019-04-23 17:00:28 +02:00
Frank Skare	164076e237	-	2019-04-23 16:57:44 +02:00
Frank Skare	b7d948f12d	-	2019-04-23 16:56:34 +02:00
Frank Skare	22e4ba1824	-	2019-04-23 16:55:56 +02:00
Frank Skare	efd2ddf367	-	2019-04-23 16:23:06 +02:00
Frank Skare	2415e2ed43	-	2019-04-21 00:18:42 +02:00
Frank Skare	d5d26784e8	-	2019-04-21 00:04:39 +02:00
Frank Skare	6c1bad15f2	-	2019-04-21 00:00:48 +02:00
Frank Skare	5137e43aad	-	2019-04-20 23:59:31 +02:00
Frank Skare	6fc0ebf9d5	-	2019-04-20 23:49:05 +02:00
Frank Skare	a0e30ff982	-	2019-04-20 23:27:14 +02:00
Frank Skare	c2a0d95851	-	2019-04-20 23:07:04 +02:00
Frank Skare	34d5d2fff5	-	2019-04-20 20:56:54 +02:00
Frank Skare	baa669fe1e	-	2019-04-20 20:51:05 +02:00
Frank Skare	67ecebbf6b	-	2019-04-20 04:34:44 +02:00
Frank Skare	e9a8b1962a	-	2019-04-16 19:04:52 +02:00
Frank Skare	3ded1573f4	-	2019-04-16 18:46:24 +02:00
Frank Skare	d38adcfc70	-	2019-04-16 18:42:03 +02:00
Frank Skare	5f1f5b3811	-	2019-04-16 18:31:39 +02:00
Frank Skare	c18c70c2af	-	2019-04-16 18:14:22 +02:00
Frank Skare	9cdd76e1ac	-	2019-04-13 03:07:57 +02:00
Frank Skare	7db8a1e534	-	2019-04-13 03:05:07 +02:00
Frank Skare	b93972c7f7	-	2019-04-12 18:01:23 +02:00
Frank Skare	1bae00051b	-	2019-04-12 16:12:12 +02:00
Frank Skare	b75bae3c38	2.6	2019-04-09 05:09:43 +02:00
Frank Skare	2e435dcdc0	2.6	2019-04-09 04:57:29 +02:00
Frank Skare	fec33056cb	2.5	2019-04-08 04:38:17 +02:00
Frank Skare	0836b63439	2.5	2019-04-08 04:22:09 +02:00
Frank Skare	2b5dbfa19f	-	2019-04-07 02:39:39 +02:00
Frank Skare	b6072f03bf	-	2019-04-07 00:29:04 +02:00
Frank Skare	4492a423b4	-	2019-04-06 16:03:46 +02:00
Frank Skare	39f6f4de0d	-	2019-04-06 02:10:41 +02:00
Frank Skare	b16bcd0295	-	2019-04-05 15:49:01 +02:00
Frank Skare	1caa814c95	-	2019-04-04 19:48:00 +02:00
Frank Skare	bbf0f6e127	-	2019-04-04 19:43:41 +02:00
Frank Skare	22bd5a5999	-	2019-04-04 19:39:00 +02:00
Frank Skare	cb146c1cf1	-	2019-04-04 19:37:25 +02:00
Frank Skare	1671cd6c3c	-	2019-04-04 19:25:22 +02:00
Frank Skare	541ac5f6d5	-	2019-04-01 13:24:14 +02:00