diff --git a/bucket/mp3tag.json b/bucket/mp3tag.json
index d3fa584d8d2387..922d35c887fe67 100644
--- a/bucket/mp3tag.json
+++ b/bucket/mp3tag.json
@@ -1,79 +1,79 @@
-{
-    "version": "3.28",
-    "description": "Powerful and easy-to-use tool to edit metadata of audio files.",
-    "homepage": "https://www.mp3tag.de/en/",
-    "license": {
-        "identifier": "Freeware",
-        "url": "https://docs.mp3tag.de/license/"
-    },
-    "notes": [
-        "If you want 'mp3tag' as a context menu option run the following commands:",
-        "For 64bit Windows OS users run,",
-        "To Install:",
-        "start 'regsvr32' -Verb 'RunAs' -Args @(\"$dir\\Mp3tagShell.dll\", '/s')",
-        "To Uninstall:",
-        "start 'regsvr32' -Verb 'RunAs' -Args @('/u', \"$dir\\Mp3tagShell.dll\", '/s')",
-        "",
-        "For 32bit Windows OS users run,",
-        "To Install:",
-        "start 'regsvr32' -Verb 'RunAs' -Args @(\"$dir\\Mp3tagShell32.dll\", '/s')",
-        "To Uninstall:",
-        "start 'regsvr32' -Verb 'RunAs' -Args @('/u', \"$dir\\Mp3tagShell32.dll\", '/s')",
-        "",
-        "To find out if you have a have 32bit or 64bit Windows OS, run the following command:",
-        "(Get-CimInstance win32_operatingsystem).OSArchitecture"
-    ],
-    "architecture": {
-        "64bit": {
-            "url": "https://download.mp3tag.de/mp3tagv328-x64-setup.exe#/dl.7z",
-            "hash": "2187f3e971e270a932f3db2ca4a3a93cd35ea5f59f2430e8409538323d579554"
-        },
-        "32bit": {
-            "url": "https://download.mp3tag.de/mp3tagv328setup.exe#/dl.7z",
-            "hash": "54605ca46fc2d510e93fe8bb7af71b81a5e53c019ac92f478937d25654c762af"
-        }
-    },
-    "pre_install": [
-        "'mp3tag.cfg', 'data\\columns.ini' | ForEach-Object {",
-        "    if (!(Test-Path \"$persist_dir\\$_\")) { New-Item \"$dir\\$_\" | Out-Null }",
-        "}",
-        "Remove-Item \"$dir\\`$*\", \"$dir\\Mp3tagUninst*\" -Recurse",
-        "if (!(Test-Path \"$persist_dir\\data\\usrfields.ini\")) {",
-        "    Start-Process \"$dir\\mp3tag.exe\" -Verb Open -WindowStyle Minimized; Start-Sleep -Seconds 3; Stop-Process -Name 'mp3tag'",
-        "}",
-        "Copy-Item \"$persist_dir\\export\\*\" \"$dir\\export\" -Recurse -ErrorAction SilentlyContinue"
-    ],
-    "bin": "mp3tag.exe",
-    "shortcuts": [
-        [
-            "mp3tag.exe",
-            "Mp3tag"
-        ]
-    ],
-    "persist": [
-        "data",
-        "mp3tag.cfg"
-    ],
-    "pre_uninstall": [
-        "Copy-Item \"$dir\\export\\*\" \"$persist_dir\\export\" -Recurse -ErrorAction SilentlyContinue",
-        "if (Test-Path 'HKLM:\\SOFTWARE\\Classes\\Directory\\shellex\\ContextMenuHandlers\\Mp3tagShell\\') {",
-        "    if (!(is_admin)) { error \"$app requires admin rights to $cmd\"; break }",
-        "    Start-Process 'regsvr32' -Wait -Verb RunAs -ArgumentList @('/u', \"$dir\\Mp3tagShell32.dll\", '/s')",
-        "    Start-Process 'regsvr32' -Wait -Verb RunAs -ArgumentList @('/u', \"$dir\\Mp3tagShell.dll\", '/s')",
-        "}"
-    ],
-    "checkver": {
-        "url": "https://www.mp3tag.de/en/download.html",
-        "regex": "(?i)<h\\d>Mp3tag\\s+v(?<version>[\\d.]+[a-z]{0,1})</h\\d>"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://download.mp3tag.de/mp3tagv$cleanVersion-x64-setup.exe#/dl.7z"
-            },
-            "32bit": {
-                "url": "https://download.mp3tag.de/mp3tagv$cleanVersionsetup.exe#/dl.7z"
-            }
-        }
-    }
-}
+{
+    "version": "3.28",
+    "description": "Powerful and easy-to-use tool to edit metadata of audio files.",
+    "homepage": "https://www.mp3tag.de/en/",
+    "license": {
+        "identifier": "Freeware",
+        "url": "https://docs.mp3tag.de/license/"
+    },
+    "notes": [
+        "If you want 'mp3tag' as a context menu option run the following commands:",
+        "To Install:",
+        "$dir\\install-mp3tag-context.cmd",
+        "To Uninstall:",
+        "$dir\\uninstall-mp3tag-context.cmd"
+    ],
+    "architecture": {
+        "64bit": {
+            "url": "https://download.mp3tag.de/mp3tagv328-x64-setup.exe#/dl.7z",
+            "hash": "2187f3e971e270a932f3db2ca4a3a93cd35ea5f59f2430e8409538323d579554"
+        },
+        "32bit": {
+            "url": "https://download.mp3tag.de/mp3tagv328setup.exe#/dl.7z",
+            "hash": "54605ca46fc2d510e93fe8bb7af71b81a5e53c019ac92f478937d25654c762af"
+        }
+    },
+    "pre_install": [
+        "foreach ($i in @('mp3tag.cfg', 'data\\columns.ini')) {",
+        "    if (!(Test-Path \"$persist_dir\\$i\")) { New-Item $(Join-Path $dir $i) | Out-Null }",
+        "}",
+        "Remove-Item \"$dir\\`$*\", \"$dir\\Mp3tagUninst*\" -Recurse",
+        "if (!(Test-Path \"$persist_dir\\data\\usrfields.ini\")) {",
+        "    Start-Process \"$dir\\mp3tag.exe\" -Verb Open -WindowStyle Minimized; Start-Sleep -Seconds 3; Stop-Process -Name 'mp3tag'",
+        "}",
+        "Copy-Item \"$persist_dir\\export\\*\" \"$dir\\export\" -Recurse -ErrorAction SilentlyContinue"
+    ],
+    "bin": "Mp3tag.exe",
+    "shortcuts": [
+        [
+            "Mp3tag.exe",
+            "Mp3tag"
+        ]
+    ],
+    "persist": [
+        "data\\panels",
+        "data\\columns",
+        "data\\columns.ini",
+        "data\\usrfields.ini",
+        "mp3tag.cfg"
+    ],
+    "post_install": [
+        "$scriptsdir = Resolve-Path \"$bucketsdir\\*MyScoop*\\scripts\\mp3tag\"",
+        "$content = Get-Content \"$scriptsdir\\install-mp3tag-context.cmd\"",
+        "$content = $content.Replace('REPLACE_HERE', $dir)",
+        "[System.IO.File]::WriteAllLines(\"$dir\\install-mp3tag-context.cmd\", $content, [System.text.UTF8Encoding]($false))",
+        "Copy-Item \"$scriptsdir\\uninstall-mp3tag-context.cmd\" \"$dir\\uninstall-mp3tag-context.cmd\""
+    ],
+    "pre_uninstall": [
+        "if ($cmd -eq 'uninstall') {",
+        "    reg delete 'HKCU\\SOFTWARE\\Classes\\*\\shell\\&Mp3tag' /f",
+        "    reg delete 'HKCU\\SOFTWARE\\Classes\\*\\shell\\Mp3tag' /f",
+        "    reg delete 'HKCU\\SOFTWARE\\Classes\\Directory\\shell\\&Mp3tag' /f",
+        "    reg delete 'HKCU\\SOFTWARE\\Classes\\Directory\\shell\\Mp3tag' /f",
+        "}"
+    ],
+    "checkver": {
+        "url": "https://www.mp3tag.de/en/download.html",
+        "regex": "(?i)\\<h\\d\\>Mp3tag\\s+v(?<version>[\\d.]+[a-z]{0,1})\\</h\\d\\>"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://download.mp3tag.de/mp3tagv$cleanVersion-x64-setup.exe#/dl.7z"
+            },
+            "32bit": {
+                "url": "https://download.mp3tag.de/mp3tagv$cleanVersionsetup.exe#/dl.7z"
+            }
+        }
+    }
+}
diff --git a/scripts/mp3tag/install-mp3tag-context.cmd b/scripts/mp3tag/install-mp3tag-context.cmd
new file mode 100644
index 00000000000000..0a8a281d1e2341
--- /dev/null
+++ b/scripts/mp3tag/install-mp3tag-context.cmd
@@ -0,0 +1,8 @@
+@echo off
+reg add "HKCU\SOFTWARE\Classes\*\shell\&Mp3tag" /v "MUIVerb" /t REG_SZ /d "&Mp3tag" /f
+reg add "HKCU\SOFTWARE\Classes\*\shell\&Mp3tag" /v "Icon" /t REG_SZ /d "REPLACE_HERE\Mp3tag.exe,0" /f
+reg add "HKCU\SOFTWARE\Classes\*\shell\&Mp3tag\command" /ve /t REG_SZ /d "REPLACE_HERE\Mp3tag.exe  \"%%1\"" /f
+reg add "HKCU\SOFTWARE\Classes\Directory\shell\&Mp3tag" /v "MUIVerb" /t REG_SZ /d "&Mp3tag" /f
+reg add "HKCU\SOFTWARE\Classes\Directory\shell\&Mp3tag" /v "Icon" /t REG_SZ /d "REPLACE_HERE\Mp3tag.exe,0" /f
+reg add "HKCU\SOFTWARE\Classes\Directory\shell\&Mp3tag\command" /ve /t REG_SZ /d "REPLACE_HERE\Mp3tag.exe  \"%%1\"" /f
+
diff --git a/scripts/mp3tag/uninstall-mp3tag-context.cmd b/scripts/mp3tag/uninstall-mp3tag-context.cmd
new file mode 100644
index 00000000000000..8d3f46d5f086b7
--- /dev/null
+++ b/scripts/mp3tag/uninstall-mp3tag-context.cmd
@@ -0,0 +1,5 @@
+@echo off
+reg delete "HKCU\SOFTWARE\Classes\*\shell\&Mp3tag" /f
+reg delete "HKCU\SOFTWARE\Classes\*\shell\Mp3tag" /f
+reg delete "HKCU\SOFTWARE\Classes\Directory\shell\&Mp3tag" /f
+reg delete "HKCU\SOFTWARE\Classes\Directory\shell\Mp3tag" /f