diff --git a/.gitignore b/.gitignore
index 414ff3d..851d9fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@ device_private_key
 client_id.bin
 private_key.pem
 .idea
-remote.json
\ No newline at end of file
+remote.json
diff --git a/background.js b/background.js
index ed91225..56346f3 100644
--- a/background.js
+++ b/background.js
@@ -4,7 +4,9 @@ window.requests=[];
 window.bodys=[];
 window.targetIds=[];
 window.pageURL="";
+window.title = "";   
 window.clearkey="";
+window.manifests = [];
 
 chrome.storage.local.get("isBlock", (value) => {
     window.isBlock = value.isBlock;
@@ -62,11 +64,16 @@ chrome.runtime.onMessage.addListener(
             case "PSSH":
                 window.psshs.push(request.text)
                 window.pageURL=sender.tab.url
+                window.title = sender.tab.title
                 window.targetIds=[sender.tab.id, sender.frameId]
                 break;
             case "CLEARKEY":
                 window.clearkey=request.text
                 break;
+            case "MANIFEST":
+                window.manifests.push(JSON.parse(request.text))
+                break;
+
         }
     }
 );
diff --git a/content.js b/content.js
index 5dcc6f7..9232d07 100644
--- a/content.js
+++ b/content.js
@@ -26,6 +26,13 @@ document.addEventListener('clearkey', (e) => {
     },null);
 });
 
+document.addEventListener('manifest', (e) => {
+    chrome.runtime.sendMessage({
+        type: "MANIFEST",
+        text: e.detail
+    },null);
+});
+
 //Fetch from original origin
 chrome.runtime.onMessage.addListener(
     function (request, sender, sendResponse) {
diff --git a/inject.js b/inject.js
index 4b6956e..08ab782 100644
--- a/inject.js
+++ b/inject.js
@@ -48,3 +48,132 @@ MediaKeySession.prototype.update = function(response) {
         return result;
     }
 };
+
+
+
+function uint8ArrayToString(uint8array) {
+    return String.fromCharCode.apply(null, uint8array)
+}
+
+class Evaluator {
+    static isDASH(text) {
+        return text.includes('<mpd') && text.includes('</mpd>');
+    }
+
+    static isHLS(text) {
+        return text.includes('#extm3u');
+    }
+
+    static isHLSMaster(text) {
+        return text.includes('#ext-x-stream-inf');
+    }
+
+    static isMSS(text) {
+        return text.includes('<smoothstreamingmedia') && text.includes('</smoothstreamingmedia>');
+    }
+
+    static getManifestType(text) {
+        const lower = text.toLowerCase();
+        if (this.isDASH(lower)) {
+            return "DASH";
+        } else if (this.isHLS(lower)) {
+            if (this.isHLSMaster(lower)) {
+                return "HLS_MASTER";
+            } else {
+                return "HLS_PLAYLIST";
+            }
+        } else if (this.isMSS(lower)) {
+            return "MSS";
+        }
+    }
+}
+
+const originalFetch = window.fetch;
+window.fetch = function() {
+    return new Promise(async (resolve, reject) => {
+        originalFetch.apply(this, arguments).then((response) => {
+            if (response) {
+                response.clone().text().then((text) => {
+                    const manifest_type = Evaluator.getManifestType(text);
+                    if (manifest_type) {
+                        if (arguments.length === 1) {
+                            console.log('fetch1 manifest', arguments[0].url, manifest_type);
+                            document.dispatchEvent(new CustomEvent('manifest', {
+                                detail: JSON.stringify({
+                                    "url": arguments[0].url,
+                                    "type": manifest_type,
+                                })
+                            }));
+                        } else if (arguments.length === 2) {
+                            console.log('fetch2 manifest', arguments[0], manifest_type);
+                            document.dispatchEvent(new CustomEvent('manifest', {
+                                detail: JSON.stringify({
+                                    "url": arguments[0],
+                                    "type": manifest_type,
+                                })
+                            }));
+                        }
+                    }
+                    resolve(response);
+                }).catch(() => {
+                    resolve(response);
+                })
+            } else {
+                resolve(response);
+            }
+        }).catch(() => {
+            resolve();
+        })
+    })
+}
+
+const open = XMLHttpRequest.prototype.open;
+XMLHttpRequest.prototype.open = function(method, url) {
+    this._method = method;
+    return open.apply(this, arguments);
+};
+
+const send = XMLHttpRequest.prototype.send;
+XMLHttpRequest.prototype.send = function(postData) {
+    this.addEventListener('load', async function() {
+        if (this._method === "GET") {
+            let body = void 0;
+            switch (this.responseType) {
+                case "":
+                case "text":
+                    body = this.responseText ?? this.response;
+                    break;
+                case "json":
+                    // TODO: untested
+                    body = JSON.stringify(this.response);
+                    break;
+                case "arraybuffer":
+                    // TODO: untested
+                    if (this.response.byteLength) {
+                        const response = new Uint8Array(this.response);
+                        body = uint8ArrayToString(new Uint8Array([...response.slice(0, 2000), ...response.slice(-2000)]));
+                    }
+                    break;
+                case "document":
+                    // todo
+                    break;
+                case "blob":
+                    body = await this.response.text();
+                    break;
+            }
+            if (body) {
+                const manifest_type = Evaluator.getManifestType(body);
+                if (manifest_type) {
+                    console.log('send manifest', this.responseURL, manifest_type);
+                    document.dispatchEvent(new CustomEvent('manifest', {
+                        detail: JSON.stringify({
+                            "url": this.responseURL,
+                            "type": manifest_type,
+                        })
+                    }));
+                }
+            }
+        }
+    });
+    return send.apply(this, arguments);
+};
diff --git a/manifest.json b/manifest.json
index 2cdd168..610a141 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Widevine L3 Decrypter",
-    "version": "241029.1",
+    "version": "250709.2",
     "version_name": "4316530",
     "icons": {
         "128": "icon.png"
diff --git a/popup/main.html b/popup/main.html
index d8a5173..2afe65d 100644
--- a/popup/main.html
+++ b/popup/main.html
@@ -24,6 +24,13 @@
         <input type="text" id="license" disabled/>
         <input type="button" id="licenseButton" value="Select" /><br>
 
+        <label for="title">Title</label>
+        <input type="text" id="title"><br>
+        <label for="manifest">Manifest</label>
+        <select id="manifest"></select><br>
+        <label for="command">Cmd</label>
+        <textarea id="command" rows="3" cols="50"></textarea><br>
+        
         <label for="schemeSelect">Challenge scheme</label>
         <select id="schemeSelect">
           <option value="Amazon">Amazon</option>
@@ -57,6 +64,19 @@
         <textarea id="result" rows="10" cols="50"></textarea>
 
       </form>
+      <fieldset id="settings">
+        <legend>Settings</legend>
+        <input type="checkbox" id="use-shaka">
+        <label for="use-shaka"> Use Shaka Packager</label><br>
+        <input type="checkbox" id="set-filename-from-title">
+        <label for="set-filename-from-title"> Set Filename from Title</label><br>
+        <input type="checkbox" id="use-select-video">
+        <label for="use-select-video"> Select Video: </label>
+        <input type="text" class="text-box" id="select-video-param"><br>
+        <input type="checkbox" id="use-select-audio">
+        <label for="use-select-audio"> Select Audio: </label>
+        <input type="text" class="text-box" id="select-audio-param">
+      </fieldset>
     </div>
     <div id="ckHome" class="hidden">
       <h3>Clearkey detected</h3>
diff --git a/popup/main.js b/popup/main.js
index ec31493..3179b93 100644
--- a/popup/main.js
+++ b/popup/main.js
@@ -1,8 +1,17 @@
+import { SettingsManager } from "./settingManager.js";
+
 let psshs=chrome.extension.getBackgroundPage().psshs;
 let requests=chrome.extension.getBackgroundPage().requests;
 let pageURL=chrome.extension.getBackgroundPage().pageURL;
+let title=chrome.extension.getBackgroundPage().title;
 let targetIds=chrome.extension.getBackgroundPage().targetIds;
 let clearkey=chrome.extension.getBackgroundPage().clearkey;
+let manifests = chrome.extension.getBackgroundPage().manifests;
+
+async function createCommand() {
+    const header_string = Object.entries(JSON.parse(requests[userInputs['license']]['headers'])).filter(([key, value]) => key != 'Host').map(([key, value]) => `-H "${key}: ${value.replace(/"/g, "'")}"`).join(' ');
+    return `N_m3u8DL-RE "${manifest_list.value}" ${header_string} ${document.getElementById('result').value.split('\n').filter(key => key != '').map(key => `--key ${key}`).join(' ')} ${await SettingsManager.getUseShakaPackager() ? "--use-shaka-packager " : ""}-M format=mkv${await SettingsManager.getSetFilenameFromTitle() && title ? " --save-name ".concat('"', title, '"') : ""}${await SettingsManager.getUseSelectVideo() ? " --select-video ".concat(await SettingsManager.getSelectVideoParam()) : ""}${await SettingsManager.getUseSelectAudio() ? " --select-audio ".concat(await SettingsManager.getSelectAudioParam()) : ""}`;
+}
 
 async function guess(){
     //Be patient!
@@ -35,7 +44,9 @@ async function guess(){
 
     //All Done!
     document.body.style.cursor = "auto";
-    document.getElementById("guess").disabled=false
+    document.getElementById("guess").disabled = false
+    command.value = await createCommand();
+    command.disabled = false;
 }
 
 function copyResult(){
@@ -55,6 +66,7 @@ async function autoSelect(){
     userInputs["license"]=0;
     document.getElementById("license").value=requests[0]['url'];
     document.getElementById('pssh').value=psshs[0];
+    document.getElementById('title').value = title;
     
     let selectRules = await fetch("/selectRules.conf").then((r)=>r.text());
     //Remove blank lines, comment-outs, and trailing spaces at the end of lines
@@ -83,5 +95,57 @@ if (clearkey) {
     document.getElementById('home').style.display = 'grid';
     document.getElementById('guess').addEventListener("click", guess);
     document.getElementById('result').addEventListener("click", copyResult);
+    document.getElementById('command').addEventListener("click", copyResult);
     autoSelect();
 }
+
+document.addEventListener('DOMContentLoaded', async function () {
+    use_shaka.checked = await SettingsManager.getUseShakaPackager();
+    set_filename_from_title.checked = await SettingsManager.getSetFilenameFromTitle();
+    use_select_video.checked = await SettingsManager.getUseSelectVideo();
+    select_video_param.value = await SettingsManager.getSelectVideoParam();
+    use_select_audio.checked = await SettingsManager.getUseSelectAudio();
+    select_audio_param.value = await SettingsManager.getSelectAudioParam();
+});
+
+const use_shaka = document.getElementById('use-shaka');
+use_shaka.addEventListener('change', async function (){
+    await SettingsManager.saveUseShakaPackager(use_shaka.checked);
+});
+
+const set_filename_from_title = document.getElementById('set-filename-from-title');
+set_filename_from_title.addEventListener('change', async function () {
+    await SettingsManager.saveSetFilenameFromTitle(set_filename_from_title.checked);
+});
+
+const use_select_video = document.getElementById('use-select-video');
+use_select_video.addEventListener('change', async function (){
+    await SettingsManager.saveUseSelectVideo(use_select_video.checked);
+});
+
+const select_video_param = document.getElementById('select-video-param');
+select_video_param.addEventListener('input', async function (event) {
+    await SettingsManager.saveSelectVideoParam(select_video_param.value);
+});
+
+const use_select_audio = document.getElementById('use-select-audio');
+use_select_audio.addEventListener('change', async function () {
+    await SettingsManager.saveUseSelectAudio(use_select_audio.checked);
+});
+
+const select_audio_param = document.getElementById('select-audio-param');
+select_audio_param.addEventListener('input', async function (event) {
+    await SettingsManager.saveSelectAudioParam(select_audio_param.value);
+});
+
+const command = document.getElementById('command');
+command.disabled = true;
+const manifest_list = document.getElementById('manifest');
+manifest_list.addEventListener('change', async () => {
+    command.value = await createCommand();
+});
+manifests.forEach(element => {
+    const option = new Option(`[${element.type}] ${element.url}`, element.url, element.type.startsWith('DASH'), element.type.startsWith('DASH'));
+    manifest_list.add(option);
+});
+
diff --git a/popup/settingManager.js b/popup/settingManager.js
new file mode 100644
index 0000000..3fc6774
--- /dev/null
+++ b/popup/settingManager.js
@@ -0,0 +1,101 @@
+class AsyncSyncStorage {
+    static async setStorage(items) {
+        return new Promise((resolve, reject) => {
+            chrome.storage.sync.set(items, () => {
+                if (chrome.runtime.lastError) {
+                    reject(new Error(chrome.runtime.lastError));
+                } else {
+                    resolve();
+                }
+            });
+        });
+    }
+
+    static async getStorage(keys) {
+        return new Promise((resolve, reject) => {
+            chrome.storage.sync.get(keys, (result) => {
+                if (chrome.runtime.lastError) {
+                    reject(new Error(chrome.runtime.lastError));
+                } else {
+                    resolve(result);
+                }
+            });
+        });
+    }
+
+    static async removeStorage(keys) {
+        return new Promise((resolve, reject) => {
+            chrome.storage.sync.remove(keys, (result) => {
+                if (chrome.runtime.lastError) {
+                    reject(new Error(chrome.runtime.lastError));
+                } else {
+                    resolve(result);
+                }
+            });
+        });
+    }
+}
+
+export class SettingsManager {
+    static async saveUseShakaPackager(use_shaka) {
+        await AsyncSyncStorage.setStorage({ use_shaka: use_shaka });
+    }
+
+    static async getUseShakaPackager() {
+        const result = await AsyncSyncStorage.getStorage(["use_shaka"]);
+        return result["use_shaka"] ?? true;
+    }
+
+    static async saveExecutableName(exe_name) {
+        await AsyncSyncStorage.setStorage({ exe_name: exe_name });
+    }
+
+    static async getExecutableName() {
+        const result = await AsyncSyncStorage.getStorage(["exe_name"]);
+        return result["exe_name"] ?? "N_m3u8DL-RE";
+    }
+
+    static async getSetFilenameFromTitle() {
+        const result = await AsyncSyncStorage.getStorage(["set_filename_from_title"]);
+        return result["set_filename_from_title"] ?? false;
+    }
+
+    static async saveSetFilenameFromTitle(set_filename_from_title) {
+        await AsyncSyncStorage.setStorage({ set_filename_from_title: set_filename_from_title });
+    }
+
+    static async getUseSelectVideo() {
+        const result = await AsyncSyncStorage.getStorage(["use_select_video"]);
+        return result["use_select_video"] ?? false;
+    }
+
+    static async saveUseSelectVideo(use_select_video) {
+        await AsyncSyncStorage.setStorage({ use_select_video: use_select_video });
+    }
+
+    static async getSelectVideoParam() {
+        const result = await AsyncSyncStorage.getStorage(["select_video_param"]);
+        return result["select_video_param"] ?? "best";
+    }
+
+    static async saveSelectVideoParam(select_video_param) {
+        await AsyncSyncStorage.setStorage({ select_video_param: select_video_param });
+    }
+
+    static async getUseSelectAudio() {
+        const result = await AsyncSyncStorage.getStorage(["use_select_audio"]);
+        return result["use_select_audio"] ?? false;
+    }
+
+    static async saveUseSelectAudio(use_select_audio) {
+        await AsyncSyncStorage.setStorage({ use_select_audio: use_select_audio });
+    }
+
+    static async getSelectAudioParam() {
+        const result = await AsyncSyncStorage.getStorage(["select_audio_param"]);
+        return result["select_audio_param"] ?? "best";
+    }
+    static async saveSelectAudioParam(select_audio_param) {
+        await AsyncSyncStorage.setStorage({ select_audio_param: select_audio_param });
+    }
+}
\ No newline at end of file
diff --git a/popup/style.css b/popup/style.css
index 66dfb5e..c34ec92 100644
--- a/popup/style.css
+++ b/popup/style.css
@@ -44,7 +44,7 @@ body {
     justify-self: center;
 }
 
-#pssh, #license, #schemeSelect {
+#pssh, #license, #title, #manifest, #command, #schemeSelect {
     width: 80%;
     justify-self: center;
 }
@@ -77,7 +77,7 @@ body {
     justify-self: center;
 }
 
-#chooserContainer {
+#chooserContainer, #settings {
     color: white;
 }
 
diff --git a/python/schemes/Amazon.py b/python/schemes/Amazon.py
index 0af5723..0ad8faa 100644
--- a/python/schemes/Amazon.py
+++ b/python/schemes/Amazon.py
@@ -1,7 +1,4 @@
-import urllib.parse
-payload = f'widevine2Challenge={urllib.parse.quote(base64.b64encode(cdm.service_certificate_challenge).decode())}&includeHdcpTestKeyInLicense=true'
-service_cert = await corsFetch(licUrl, "POST", licHeaders, payload, "json")
-service_cert = service_cert['widevine2License']['license']
-payload = f'widevine2Challenge={urllib.parse.quote(getChallenge("b64", service_cert))}&includeHdcpTestKeyInLicense=true'
+payload = loadBody("json")
+payload['licenseChallenge'] = getChallenge("b64")
 licence = await corsFetch(licUrl, "POST", licHeaders, payload, "json")
-licence = licence['widevine2License']['license']
+licence = licence['widevineLicense']['license']
\ No newline at end of file
diff --git a/python/schemes/DRMToday.py b/python/schemes/DRMToday.py
index f6a7269..9637ee2 100644
--- a/python/schemes/DRMToday.py
+++ b/python/schemes/DRMToday.py
@@ -1,2 +1 @@
-licence = await corsFetch(licUrl, "POST", licHeaders, getChallenge('blob'), "json")
-licence = licence['license']
+licence = await corsFetch(licUrl, "POST", licHeaders, getChallenge('blob'), "arraybuffer")
\ No newline at end of file