From be3fa436ac573c4873f8c7a54df824c1d83e9bc4 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 23 May 2024 10:33:57 -0400
Subject: [PATCH 01/30] Add dictionary import to welcome page

---
 ext/js/pages/welcome-main.js |  8 ++++
 ext/welcome.html             | 85 +++++++++++++++++++++++++++++++++++-
 2 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/ext/js/pages/welcome-main.js b/ext/js/pages/welcome-main.js
index 10a84a59da..31a185dddf 100644
--- a/ext/js/pages/welcome-main.js
+++ b/ext/js/pages/welcome-main.js
@@ -20,6 +20,8 @@ import {Application} from '../application.js';
 import {DocumentFocusController} from '../dom/document-focus-controller.js';
 import {querySelectorNotNull} from '../dom/query-selector.js';
 import {ExtensionContentController} from './common/extension-content-controller.js';
+import {DictionaryController} from './settings/dictionary-controller.js';
+import {DictionaryImportController} from './settings/dictionary-import-controller.js';
 import {GenericSettingController} from './settings/generic-setting-controller.js';
 import {LanguagesController} from './settings/languages-controller.js';
 import {ModalController} from './settings/modal-controller.js';
@@ -83,6 +85,12 @@ await Application.main(true, async (application) => {
     const genericSettingController = new GenericSettingController(settingsController);
     preparePromises.push(setupGenericSettingsController(genericSettingController));
 
+    const dictionaryController = new DictionaryController(settingsController, modalController, statusFooter);
+    preparePromises.push(dictionaryController.prepare());
+
+    const dictionaryImportController = new DictionaryImportController(settingsController, modalController, statusFooter);
+    preparePromises.push(dictionaryImportController.prepare());
+
     const simpleScanningInputController = new ScanInputsSimpleController(settingsController);
     preparePromises.push(simpleScanningInputController.prepare());
 
diff --git a/ext/welcome.html b/ext/welcome.html
index dd3e2f1e20..8bf3c17ffe 100644
--- a/ext/welcome.html
+++ b/ext/welcome.html
@@ -70,6 +70,20 @@ <h2><strong>Recommended Permissions &#40;Important&#41;</strong></h2>
     </div>
 
     <!-- Content -->
+    <h2><strong>Import Dictionaries &#40;Important&#41;</strong></h2>
+    <div class="settings-group">
+        <div class="settings-item">
+            <div class="settings-item settings-item-button" data-modal-action="show,dictionaries"><div class="settings-item-inner">
+                <div class="settings-item-left">
+                    <div class="settings-item-label">Import dictionaries&hellip;</div>
+                </div>
+                <div class="settings-item-right open-panel-button-container">
+                    <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                </div>
+            </div></div>
+        </div>
+    </div>
+
     <h2>Here are some basics to get started</h2>
     <div class="settings-group">
         <a href="/quick-start-guide.html" rel="noopener" class="settings-item settings-item-button"><div class="settings-item-inner">
@@ -222,7 +236,9 @@ <h2>Basic customization</h2>
             <div class="dictionary-item-top"></div>
             <label class="dictionary-item-top toggle dictionary-item-enabled-toggle-container"><input type="checkbox" id="all-dictionaries-enabled"><span class="toggle-body"><span class="toggle-track"></span><span class="toggle-knob"></span></span></label>
             <div class="dictionary-item-top dictionary-item-title-container">All</div>
-            <div class="dictionary-item-top">Priority</div>
+            <div class="dictionary-item-top advanced-only">Priority</div>
+            <div class="dictionary-item-top dictionary-item-button-height"></div>
+            <div class="dictionary-item-top dictionary-item-button-height"></div>
             <div class="dictionary-item-top dictionary-item-button-height"></div>
         </div>
 
@@ -238,7 +254,32 @@ <h2>Basic customization</h2>
     </div>
     <div class="modal-footer">
         <button type="button" class="low-emphasis danger dictionary-database-mutating-input" id="dictionary-delete-all-button">Delete All</button>
-        <button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-import-file-button">Import</button>
+        <button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-check-integrity">Check Integrity</button>
+        <button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-import-button">Import</button>
+        <button type="button" data-modal-action="hide">Close</button>
+    </div>
+</div></div>
+
+<div id="dictionary-import-modal" class="modal" tabindex="-1" role="dialog" hidden><div class="modal-content modal-content-medium">
+    <div class="modal-header"><div class="modal-title">Import Dictionaries</div></div>
+    <div class="modal-body">
+        <div id="dictionary-drop-file-zone">
+            <div id="dictionary-drag-drop-text">
+                <span class="icon" data-icon="book"></span>
+                <h1>Drag and drop dictionaries (.zip)</h1>
+                <h5>or click here to upload</h5>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" data-modal-action="hide" class="basic-only">Close</button>
+    </div>
+    <div class="modal-body advanced-only">
+        <p>Import dictionaries from URLs:</p>
+        <textarea type="text" id="dictionary-import-url-text"></textarea>
+    </div>
+    <div class="modal-footer advanced-only">
+        <button type="button" data-modal-action="hide" class="low-emphasis dictionary-database-mutating-input" id="dictionary-import-url-button">Import from URLs</button>
         <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
@@ -268,6 +309,28 @@ <h2>Basic customization</h2>
     </div>
 </div></div>
 
+<div id="secondary-search-dictionaries-modal" class="modal" tabindex="-1" role="dialog" hidden><div class="modal-content">
+    <div class="modal-header">
+        <div class="modal-title">Secondary Search Dictionaries</div>
+        <div class="modal-header-button-container">
+            <div class="modal-header-button-group">
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+            </div>
+        </div>
+    </div>
+    <div class="modal-body">
+        <p>
+            These dictionaries will be used to search for definitions of the related terms when the grouping mode is
+            <em>Group related terms</em>.
+        </p>
+        <div id="secondary-search-dictionary-list" class="secondary-search-dictionary-list"></div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" data-modal-action="hide">Close</button>
+    </div>
+</div></div>
+
 <div id="dictionary-details-modal" class="modal" tabindex="-1" role="dialog" hidden><div class="modal-content">
     <div class="modal-header">
         <div class="modal-title"><strong class="dictionary-title"></strong> <span class="light dictionary-version"></span></div>
@@ -341,6 +404,24 @@ <h2>Basic customization</h2>
     </div>
 </div></div>
 
+<div id="dictionary-extra-data-modal" class="modal" tabindex="-1" role="dialog" hidden><div class="modal-content">
+    <div class="modal-header">
+        <div class="modal-title">
+            <strong class="dictionary-title">Unassociated Data</strong> <span class="light dictionary-total-count"></span>
+        </div>
+    </div>
+    <div class="modal-body">
+        <p class="warning-text">
+            The database contains extra data which is not associated with any installed dictionary.
+            Purging the database can fix this issue.
+        </p>
+        <div class="dictionary-counts"></div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" data-modal-action="hide">Close</button>
+    </div>
+</div></div>
+
 <div id="dictionary-move-location-modal" class="modal" tabindex="-1" role="dialog" hidden><div class="modal-content modal-content-small">
     <div class="modal-header"><div class="modal-title">Move Dictionary Options</div></div>
     <div class="modal-body">

From 75b16d7b4e30d51b7fb04a2f3c8cd26657a49cc1 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 23 May 2024 11:42:34 -0400
Subject: [PATCH 02/30] Initial prototype of recommended dict importing

---
 .../settings/dictionary-import-controller.js  | 34 ++++++-
 ext/welcome.html                              | 90 ++++++++++++++++++-
 2 files changed, 120 insertions(+), 4 deletions(-)

diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index 7090e29604..b035735def 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -87,10 +87,39 @@ export class DictionaryImportController {
         this._importFileDrop.addEventListener('dragover', this._onFileDropOver.bind(this), false);
         this._importFileDrop.addEventListener('dragleave', this._onFileDropLeave.bind(this), false);
         this._importFileDrop.addEventListener('drop', this._onFileDrop.bind(this), false);
+
+        // Welcome page
+        /** @type {NodeListOf<HTMLElement>} */
+        const buttons = document.querySelectorAll('.action-button[data-action=import-recommended-dictionary]');
+        for (const button of buttons) {
+            button.addEventListener('click', this._onRecommendedImportClick.bind(this), false);
+        }
     }
 
     // Private
 
+    /**
+     * @param {MouseEvent} e
+     */
+    async _onRecommendedImportClick(e) {
+        console.log(e);
+        if (!(e instanceof PointerEvent)) { return; }
+        if (!e.target || !(e.target instanceof HTMLButtonElement)) { return; }
+        /** @type {string} */
+        const import_url = e.target.attributes[3].value;
+        try {
+            const file = await fetch(import_url.trim())
+                .then((res) => res.blob())
+                .then((blob) => {
+                    return new File([blob], 'fileFromURL');
+                });
+            void this._importDictionaries([file]);
+        } catch (error) {
+            log.error(error);
+        }
+        e.target.disabled = true;
+    }
+
     /** */
     _onImportFileButtonClick() {
         /** @type {HTMLInputElement} */ (this._importFileInput).click();
@@ -303,6 +332,7 @@ export class DictionaryImportController {
         const statusFooter = this._statusFooter;
         const progressSelector = '.dictionary-import-progress';
         const progressContainers = /** @type {NodeListOf<HTMLElement>} */ (document.querySelectorAll(`#dictionaries-modal ${progressSelector}`));
+        const recommendedProgressContainers = /** @type {NodeListOf<HTMLElement>} */ (document.querySelectorAll(`#recommended-dictionaries-modal ${progressSelector}`));
         const progressBars = /** @type {NodeListOf<HTMLElement>} */ (document.querySelectorAll(`${progressSelector} .progress-bar`));
         const infoLabels = /** @type {NodeListOf<HTMLElement>} */ (document.querySelectorAll(`${progressSelector} .progress-info`));
         const statusLabels = /** @type {NodeListOf<HTMLElement>} */ (document.querySelectorAll(`${progressSelector} .progress-status`));
@@ -315,7 +345,7 @@ export class DictionaryImportController {
             this._setModifying(true);
             this._hideErrors();
 
-            for (const progress of progressContainers) { progress.hidden = false; }
+            for (const progress of [...progressContainers, ...recommendedProgressContainers]) { progress.hidden = false; }
 
             const optionsFull = await this._settingsController.getOptionsFull();
             const importDetails = {
@@ -365,7 +395,7 @@ export class DictionaryImportController {
         } finally {
             this._showErrors(errors);
             prevention.end();
-            for (const progress of progressContainers) { progress.hidden = true; }
+            for (const progress of [...progressContainers, ...recommendedProgressContainers]) { progress.hidden = true; }
             if (statusFooter !== null) { statusFooter.setTaskActive(progressSelector, false); }
             this._setModifying(false);
             this._triggerStorageChanged();
diff --git a/ext/welcome.html b/ext/welcome.html
index 8bf3c17ffe..a19f9cec05 100644
--- a/ext/welcome.html
+++ b/ext/welcome.html
@@ -72,10 +72,20 @@ <h2><strong>Recommended Permissions &#40;Important&#41;</strong></h2>
     <!-- Content -->
     <h2><strong>Import Dictionaries &#40;Important&#41;</strong></h2>
     <div class="settings-group">
+        <div class="settings-item">
+            <div class="settings-item settings-item-button" data-modal-action="show,recommended-dictionaries"><div class="settings-item-inner">
+                <div class="settings-item-left">
+                    <div class="settings-item-label">Get recommended dictionaries&hellip;</div>
+                </div>
+                <div class="settings-item-right open-panel-button-container">
+                    <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                </div>
+            </div></div>
+        </div>
         <div class="settings-item">
             <div class="settings-item settings-item-button" data-modal-action="show,dictionaries"><div class="settings-item-inner">
                 <div class="settings-item-left">
-                    <div class="settings-item-label">Import dictionaries&hellip;</div>
+                    <div class="settings-item-label">Configure Installed and enabled dictionaries&hellip;</div>
                 </div>
                 <div class="settings-item-right open-panel-button-container">
                     <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
@@ -254,7 +264,7 @@ <h2>Basic customization</h2>
     </div>
     <div class="modal-footer">
         <button type="button" class="low-emphasis danger dictionary-database-mutating-input" id="dictionary-delete-all-button">Delete All</button>
-        <button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-check-integrity">Check Integrity</button>
+        <button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-check-integrity" hidden>Check Integrity</button>
         <button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-import-button">Import</button>
         <button type="button" data-modal-action="hide">Close</button>
     </div>
@@ -436,5 +446,81 @@ <h5>or click here to upload</h5>
     </div>
 </div></div>
 
+<div id="recommended-dictionaries-modal" class="modal" tabindex="-1" role="dialog" hidden><div class="modal-content">
+    <div class="modal-header">
+        <div class="modal-title">Recommended Dictionaries</div>
+        <div class="modal-header-button-container">
+            <div class="modal-header-button-group">
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+            </div>
+        </div>
+    </div>
+    <div class="modal-body">
+        <h1 class="modal-title">Term Dictionaries</h1>
+        <div class="settings-item">
+            <div class="settings-item-inner">
+                <div class="settings-item-left">
+                    <div class="settings-item-label">
+                        <strong>Jitendex 2024-05-20</strong>
+                    </div>
+                </div>
+                <div class="settings-item-right">
+                    <button type="button" class="action-button" data-action="import-recommended-dictionary" data-import-url="https://github.com/stephenmk/stephenmk.github.io/releases/download/v4.7-5/jitendex-yomitan-2024-05-20.zip">Import</button>
+                </div>
+            </div>
+        </div>
+        <h1 class="modal-title">Kanji Dictionaries</h1>
+        <div class="settings-item">
+            <div class="settings-item-inner">
+                <div class="settings-item-left">
+                    <div class="settings-item-label">
+                        <strong>KanjiDic</strong>
+                    </div>
+                </div>
+                <div class="settings-item-right">
+                    <button type="button" class="action-button" data-action="import-recommended-dictionary" data-import-url="https://cdn.discordapp.com/attachments/747469894639157392/1240336918961586288/KANJIDIC_english.zip?ex=66501485&is=664ec305&hm=db6eebde59bddf10df03410c0055f18211625dc18fe26b3e4d5661b007c6ca67&">Import</button>
+                </div>
+            </div>
+        </div>
+        <h1 class="modal-title">Frequency Dictionaries</h1>
+        <div class="settings-item">
+            <div class="settings-item-inner">
+                <div class="settings-item-left">
+                    <div class="settings-item-label">
+                        <strong>CC100</strong>
+                    </div>
+                </div>
+                <div class="settings-item-right">
+                    <button type="button" class="action-button" data-action="import-recommended-dictionary" data-import-url="https://cdn.discordapp.com/attachments/747469894639157392/1243219125770387506/Freq_CC100.zip?ex=6650ad89&is=664f5c09&hm=7645b0bc1f771dfa798679014115b1302fdaeb66e52dfd582437b9cce1f01780&">Import</button>
+                </div>
+            </div>
+        </div>
+        <div class="settings-item">
+            <div class="settings-item-inner">
+                <div class="settings-item-left">
+                    <div class="settings-item-label">
+                        <strong>BCCWJ</strong>
+                    </div>
+                </div>
+                <div class="settings-item-right">
+                    <button type="button" class="action-button" data-action="import-recommended-dictionary" data-import-url="https://github.com/toasted-nutbread/yomichan-bccwj-frequency-dictionary/releases/download/1.0.1/BCCWJ-SUW.zip">Import</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="modal-body-addon dictionary-delete-progress" hidden>
+        <div class="progress-labels"><div class="progress-info"></div><div class="progress-status"></div></div>
+        <div class="progress-bar-track"><div class="progress-bar danger"></div></div>
+    </div>
+    <div class="modal-body-addon dictionary-import-progress" hidden>
+        <div class="progress-labels"><div class="progress-info"></div><div class="progress-status"></div></div>
+        <div class="progress-bar-track"><div class="progress-bar"></div></div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" data-modal-action="hide">Close</button>
+    </div>
+</div></div>
+
 </body>
 </html>

From 10375c14b4c906b542f115c6174f4ed9e44277b7 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 23 May 2024 14:09:34 -0400
Subject: [PATCH 03/30] Disable button immediately

---
 ext/js/pages/settings/dictionary-import-controller.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index b035735def..7a8f1b0a5e 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -102,9 +102,9 @@ export class DictionaryImportController {
      * @param {MouseEvent} e
      */
     async _onRecommendedImportClick(e) {
-        console.log(e);
         if (!(e instanceof PointerEvent)) { return; }
         if (!e.target || !(e.target instanceof HTMLButtonElement)) { return; }
+        e.target.disabled = true;
         /** @type {string} */
         const import_url = e.target.attributes[3].value;
         try {
@@ -117,7 +117,6 @@ export class DictionaryImportController {
         } catch (error) {
             log.error(error);
         }
-        e.target.disabled = true;
     }
 
     /** */

From 63b087bb68e3082e9053b3b2e647955f42b511be Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 23 May 2024 14:25:21 -0400
Subject: [PATCH 04/30] Add queue to allow clicking multiple import buttons at
 once

---
 .../settings/dictionary-import-controller.js  | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index 7a8f1b0a5e..2a476fcb80 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -69,6 +69,10 @@ export class DictionaryImportController {
                 'Unable to access IndexedDB due to a possibly corrupt user profile. Try using the "Refresh Firefox" feature to reset your user profile.'
             ]
         ];
+        /** @type {string[]} */
+        this._recommendedDictionaryQueue = [];
+        /** @type {boolean} */
+        this._recommendedDictionaryActiveImport = false;
     }
 
     /** */
@@ -104,19 +108,31 @@ export class DictionaryImportController {
     async _onRecommendedImportClick(e) {
         if (!(e instanceof PointerEvent)) { return; }
         if (!e.target || !(e.target instanceof HTMLButtonElement)) { return; }
+
+        const import_url = e.target.attributes.getNamedItem('data-import-url');
+        if (!import_url) { return; }
+        this._recommendedDictionaryQueue.push(import_url.value);
+
         e.target.disabled = true;
-        /** @type {string} */
-        const import_url = e.target.attributes[3].value;
-        try {
-            const file = await fetch(import_url.trim())
-                .then((res) => res.blob())
-                .then((blob) => {
-                    return new File([blob], 'fileFromURL');
-                });
-            void this._importDictionaries([file]);
-        } catch (error) {
-            log.error(error);
+
+        if (this._recommendedDictionaryActiveImport) { return; }
+
+        while (this._recommendedDictionaryQueue.length > 0) {
+            this._recommendedDictionaryActiveImport = true;
+            try {
+                const url = this._recommendedDictionaryQueue.shift();
+                if (!url) { continue; }
+                const file = await fetch(url.trim())
+                    .then((res) => res.blob())
+                    .then((blob) => {
+                        return new File([blob], 'fileFromURL');
+                    });
+                await this._importDictionaries([file]);
+            } catch (error) {
+                log.error(error);
+            }
         }
+        this._recommendedDictionaryActiveImport = false;
     }
 
     /** */

From b8906c6e1d8728b48732df09f02000994ff5692a Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 23 May 2024 16:54:20 -0400
Subject: [PATCH 05/30] Dynamic assignment of recommended dictionaries

---
 ext/data/recommended-dictionaries.json        | 14 +++++
 .../settings/dictionary-import-controller.js  | 63 +++++++++++++++++--
 ext/templates-settings.html                   | 12 ++++
 ext/welcome.html                              | 59 ++++-------------
 types/ext/dictionary-recommended.ts           | 32 ++++++++++
 5 files changed, 128 insertions(+), 52 deletions(-)
 create mode 100644 ext/data/recommended-dictionaries.json
 create mode 100644 types/ext/dictionary-recommended.ts

diff --git a/ext/data/recommended-dictionaries.json b/ext/data/recommended-dictionaries.json
new file mode 100644
index 0000000000..c1ce90f480
--- /dev/null
+++ b/ext/data/recommended-dictionaries.json
@@ -0,0 +1,14 @@
+{
+    "ja": {
+        "terms": [
+            {"name": "Jitendex 2024-05-20", "url": "https://github.com/stephenmk/stephenmk.github.io/releases/download/v4.7-5/jitendex-yomitan-2024-05-20.zip"}
+        ],
+        "kanji": [
+            {"name": "Kanjidic English 2024-05-23", "url": "https://github.com/themoeway/jmdict-yomitan/releases/download/2024-05-23/KANJIDIC_english.zip"}
+        ],
+        "frequency": [
+            {"name": "BCCWJ-LUW 1.0.1", "url": "https://github.com/toasted-nutbread/yomichan-bccwj-frequency-dictionary/releases/download/1.0.1/BCCWJ-LUW.zip"}
+        ],
+        "grammar": []
+    }
+}
diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index 2a476fcb80..52c36e9e2b 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -17,6 +17,7 @@
  */
 
 import {ExtensionError} from '../../core/extension-error.js';
+import {readResponseJson} from '../../core/json.js';
 import {log} from '../../core/log.js';
 import {toError} from '../../core/to-error.js';
 import {DictionaryWorker} from '../../dictionary/dictionary-worker.js';
@@ -93,11 +94,7 @@ export class DictionaryImportController {
         this._importFileDrop.addEventListener('drop', this._onFileDrop.bind(this), false);
 
         // Welcome page
-        /** @type {NodeListOf<HTMLElement>} */
-        const buttons = document.querySelectorAll('.action-button[data-action=import-recommended-dictionary]');
-        for (const button of buttons) {
-            button.addEventListener('click', this._onRecommendedImportClick.bind(this), false);
-        }
+        void this._renderRecommendedDictionaries('../../data/recommended-dictionaries.json');
     }
 
     // Private
@@ -135,6 +132,62 @@ export class DictionaryImportController {
         this._recommendedDictionaryActiveImport = false;
     }
 
+    /**
+     * @param {string} url
+     */
+    async _renderRecommendedDictionaries(url) {
+        const response = await fetch(url, {
+            method: 'GET',
+            mode: 'no-cors',
+            cache: 'default',
+            credentials: 'omit',
+            redirect: 'follow',
+            referrerPolicy: 'no-referrer'
+        });
+        if (!response.ok) {
+            throw new Error(`Failed to fetch ${url}: ${response.status}`);
+        }
+
+        const language = (await this._settingsController.getOptions()).general.language;
+        /** @type {import('dictionary-recommended.js').RecommendedDictionaries} */
+        const recommendedDictionaries = (await readResponseJson(response));
+
+        this._renderRecommendedDictionaryGroup(recommendedDictionaries[language].terms, document.querySelector('#recommended-term-dictionaries'));
+        this._renderRecommendedDictionaryGroup(recommendedDictionaries[language].kanji, document.querySelector('#recommended-kanji-dictionaries'));
+        this._renderRecommendedDictionaryGroup(recommendedDictionaries[language].frequency, document.querySelector('#recommended-frequency-dictionaries'));
+        this._renderRecommendedDictionaryGroup(recommendedDictionaries[language].grammar, document.querySelector('#recommended-grammar-dictionaries'));
+
+        /** @type {NodeListOf<HTMLElement>} */
+        const buttons = document.querySelectorAll('.action-button[data-action=import-recommended-dictionary]');
+        for (const button of buttons) {
+            button.addEventListener('click', this._onRecommendedImportClick.bind(this), false);
+        }
+    }
+
+    /**
+     *
+     * @param {import('dictionary-recommended.js').Dictionary[]} recommendedDictionaries
+     * @param {HTMLElement | null} dictionariesList
+     */
+    _renderRecommendedDictionaryGroup(recommendedDictionaries, dictionariesList) {
+        for (const dictionary of recommendedDictionaries) {
+            if (dictionariesList) {
+                dictionariesList.hidden = false;
+                const template = this._settingsController.instantiateTemplate('recommended-dictionaries-list-item');
+                const label = querySelectorNotNull(template, '.settings-item-label');
+                const button = querySelectorNotNull(template, '.action-button[data-action=import-recommended-dictionary]');
+
+                const urlAttribute = document.createAttribute('data-import-url');
+                urlAttribute.value = dictionary.url;
+                button.attributes.setNamedItem(urlAttribute);
+
+                label.textContent = dictionary.name;
+
+                dictionariesList.append(template);
+            }
+        }
+    }
+
     /** */
     _onImportFileButtonClick() {
         /** @type {HTMLInputElement} */ (this._importFileInput).click();
diff --git a/ext/templates-settings.html b/ext/templates-settings.html
index 3112d30fd5..207909b5ed 100644
--- a/ext/templates-settings.html
+++ b/ext/templates-settings.html
@@ -107,6 +107,18 @@
         </select>
     </div>
 </div></template>
+<template id="recommended-dictionaries-list-item-template">
+    <div class="settings-item">
+        <div class="settings-item-inner">
+            <div class="settings-item-left">
+                <strong><div class="settings-item-label"></div></strong>
+            </div>
+            <div class="settings-item-right">
+                <button type="button" class="action-button" data-action="import-recommended-dictionary" data-import-url="">Download</button>
+            </div>
+        </div>
+    </div>
+</template>
 
 <!-- Audio -->
 <template id="audio-source-template"><div class="audio-source">
diff --git a/ext/welcome.html b/ext/welcome.html
index a19f9cec05..861338d1db 100644
--- a/ext/welcome.html
+++ b/ext/welcome.html
@@ -457,56 +457,21 @@ <h5>or click here to upload</h5>
         </div>
     </div>
     <div class="modal-body">
-        <h1 class="modal-title">Term Dictionaries</h1>
-        <div class="settings-item">
-            <div class="settings-item-inner">
-                <div class="settings-item-left">
-                    <div class="settings-item-label">
-                        <strong>Jitendex 2024-05-20</strong>
-                    </div>
-                </div>
-                <div class="settings-item-right">
-                    <button type="button" class="action-button" data-action="import-recommended-dictionary" data-import-url="https://github.com/stephenmk/stephenmk.github.io/releases/download/v4.7-5/jitendex-yomitan-2024-05-20.zip">Import</button>
-                </div>
-            </div>
+        <div id="recommended-term-dictionaries" hidden>
+            <h1 class="modal-title">Term Dictionaries</h1>
+            <div class="recommended-dictionary-list"></div>
         </div>
-        <h1 class="modal-title">Kanji Dictionaries</h1>
-        <div class="settings-item">
-            <div class="settings-item-inner">
-                <div class="settings-item-left">
-                    <div class="settings-item-label">
-                        <strong>KanjiDic</strong>
-                    </div>
-                </div>
-                <div class="settings-item-right">
-                    <button type="button" class="action-button" data-action="import-recommended-dictionary" data-import-url="https://cdn.discordapp.com/attachments/747469894639157392/1240336918961586288/KANJIDIC_english.zip?ex=66501485&is=664ec305&hm=db6eebde59bddf10df03410c0055f18211625dc18fe26b3e4d5661b007c6ca67&">Import</button>
-                </div>
-            </div>
+        <div id="recommended-kanji-dictionaries" hidden>
+            <h1 class="modal-title">Kanji Dictionaries</h1>
+            <div class="recommended-dictionary-list"></div>
         </div>
-        <h1 class="modal-title">Frequency Dictionaries</h1>
-        <div class="settings-item">
-            <div class="settings-item-inner">
-                <div class="settings-item-left">
-                    <div class="settings-item-label">
-                        <strong>CC100</strong>
-                    </div>
-                </div>
-                <div class="settings-item-right">
-                    <button type="button" class="action-button" data-action="import-recommended-dictionary" data-import-url="https://cdn.discordapp.com/attachments/747469894639157392/1243219125770387506/Freq_CC100.zip?ex=6650ad89&is=664f5c09&hm=7645b0bc1f771dfa798679014115b1302fdaeb66e52dfd582437b9cce1f01780&">Import</button>
-                </div>
-            </div>
+        <div id="recommended-frequency-dictionaries" hidden>
+            <h1 class="modal-title">Frequency Dictionaries</h1>
+            <div class="recommended-dictionary-list"></div>
         </div>
-        <div class="settings-item">
-            <div class="settings-item-inner">
-                <div class="settings-item-left">
-                    <div class="settings-item-label">
-                        <strong>BCCWJ</strong>
-                    </div>
-                </div>
-                <div class="settings-item-right">
-                    <button type="button" class="action-button" data-action="import-recommended-dictionary" data-import-url="https://github.com/toasted-nutbread/yomichan-bccwj-frequency-dictionary/releases/download/1.0.1/BCCWJ-SUW.zip">Import</button>
-                </div>
-            </div>
+        <div id="recommended-grammar-dictionaries" hidden>
+            <h1 class="modal-title">Grammar Dictionaries</h1>
+            <div class="recommended-dictionary-list"></div>
         </div>
     </div>
     <div class="modal-body-addon dictionary-delete-progress" hidden>
diff --git a/types/ext/dictionary-recommended.ts b/types/ext/dictionary-recommended.ts
new file mode 100644
index 0000000000..80bcdad183
--- /dev/null
+++ b/types/ext/dictionary-recommended.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2023-2024  Yomitan Authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export type RecommendedDictionaries = {
+    [key: string]: LanguageDictionaries;
+};
+
+export type LanguageDictionaries = {
+    terms: Dictionary[];
+    kanji: Dictionary[];
+    frequency: Dictionary[];
+    grammar: Dictionary[];
+};
+
+export type Dictionary = {
+    name: string;
+    url: string;
+};

From e072029118cde20ee5ae025983face393c0f0eb4 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 23 May 2024 17:03:36 -0400
Subject: [PATCH 06/30] Add to json.json

---
 test/data/json.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/data/json.json b/test/data/json.json
index 73709fd5ac..070cb0132f 100644
--- a/test/data/json.json
+++ b/test/data/json.json
@@ -180,6 +180,7 @@
             "typeFile": "types/ext/dictionary-data.d.ts",
             "type": "TermMetaArray",
             "schema": "ext/data/schemas/dictionary-term-meta-bank-v3-schema.json"
-        }
+        },
+        {"path": "ext/data/recommended-dictionaries.json", "ignore": true}
     ]
 }

From 94d13bd69d3f5058091b65bac0fff3a11954f033 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 20 Jun 2024 00:33:00 -0400
Subject: [PATCH 07/30] Change kanjidic to grab latest release

---
 ext/data/recommended-dictionaries.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/data/recommended-dictionaries.json b/ext/data/recommended-dictionaries.json
index c1ce90f480..e5fc1473b8 100644
--- a/ext/data/recommended-dictionaries.json
+++ b/ext/data/recommended-dictionaries.json
@@ -4,7 +4,7 @@
             {"name": "Jitendex 2024-05-20", "url": "https://github.com/stephenmk/stephenmk.github.io/releases/download/v4.7-5/jitendex-yomitan-2024-05-20.zip"}
         ],
         "kanji": [
-            {"name": "Kanjidic English 2024-05-23", "url": "https://github.com/themoeway/jmdict-yomitan/releases/download/2024-05-23/KANJIDIC_english.zip"}
+            {"name": "Kanjidic English", "url": "https://github.com/themoeway/jmdict-yomitan/releases/latest/download/KANJIDIC_english.zip"}
         ],
         "frequency": [
             {"name": "BCCWJ-LUW 1.0.1", "url": "https://github.com/toasted-nutbread/yomichan-bccwj-frequency-dictionary/releases/download/1.0.1/BCCWJ-LUW.zip"}

From 8f4927f51ad01ea74cd3dd229151d44242dafe53 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 20 Jun 2024 01:04:58 -0400
Subject: [PATCH 08/30] Make linter happy

---
 ext/js/pages/settings/dictionary-import-controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index 369792954f..b0d04c79cc 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -142,7 +142,7 @@ export class DictionaryImportController {
             cache: 'default',
             credentials: 'omit',
             redirect: 'follow',
-            referrerPolicy: 'no-referrer'
+            referrerPolicy: 'no-referrer',
         });
         if (!response.ok) {
             throw new Error(`Failed to fetch ${url}: ${response.status}`);

From d94ac5e21dfb28cb863196601297065bc169bf84 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 20 Jun 2024 01:19:39 -0400
Subject: [PATCH 09/30] Add json schema

---
 .../recommended-dictionaries-schema.json      | 96 +++++++++++++++++++
 test/data/json.json                           | 10 +-
 2 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 ext/data/schemas/recommended-dictionaries-schema.json

diff --git a/ext/data/schemas/recommended-dictionaries-schema.json b/ext/data/schemas/recommended-dictionaries-schema.json
new file mode 100644
index 0000000000..350ff8d110
--- /dev/null
+++ b/ext/data/schemas/recommended-dictionaries-schema.json
@@ -0,0 +1,96 @@
+{
+    "$id": "recommended-dictionaries",
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "description": "Contains data for recommended dictionaries on welcome page.",
+    "type": "object",
+    "patternProperties": {
+        "^.{2,}$": {
+            "type": "object",
+            "properties": {
+                "terms": {
+                    "type": "array",
+                    "items": {
+                        "required": [
+                            "name",
+                            "url"
+                        ],
+                        "properties": {
+                            "name": {
+                                "type": "string",
+                                "minLength": 2
+                            },
+                            "url": {
+                                "type": "string",
+                                "minLength": 2
+                            }
+                        }
+                    }
+                },
+                "kanji": {
+                    "type": "array",
+                    "items": {
+                        "required": [
+                            "name",
+                            "url"
+                        ],
+                        "properties": {
+                            "name": {
+                                "type": "string",
+                                "minLength": 2
+                            },
+                            "url": {
+                                "type": "string",
+                                "minLength": 2
+                            }
+                        }
+                    }
+                },
+                "frequency": {
+                    "type": "array",
+                    "items": {
+                        "required": [
+                            "name",
+                            "url"
+                        ],
+                        "properties": {
+                            "name": {
+                                "type": "string",
+                                "minLength": 2
+                            },
+                            "url": {
+                                "type": "string",
+                                "minLength": 2
+                            }
+                        }
+                    }
+                },
+                "grammar": {
+                    "type": "array",
+                    "items": {
+                        "required": [
+                            "name",
+                            "url"
+                        ],
+                        "properties": {
+                            "name": {
+                                "type": "string",
+                                "minLength": 2
+                            },
+                            "url": {
+                                "type": "string",
+                                "minLength": 2
+                            }
+                        }
+                    }
+                }
+            },
+            "required": [
+                "terms",
+                "kanji",
+                "frequency",
+                "grammar"
+            ],
+            "additionalProperties": false
+        }
+    }
+}
diff --git a/test/data/json.json b/test/data/json.json
index b3b072a000..618ad2474b 100644
--- a/test/data/json.json
+++ b/test/data/json.json
@@ -93,6 +93,11 @@
             "typeFile": "types/test/json.d.ts",
             "type": "AjvSchema"
         },
+        {
+            "path": "ext/data/schemas/recommended-dictionaries-schema.json",
+            "typeFile": "types/test/json.d.ts",
+            "type": "AjvSchema"
+        },
         {
             "path": "test/data/translator-test-inputs.json",
             "typeFile": "types/test/translator.d.ts",
@@ -182,6 +187,9 @@
             "type": "TermMetaArray",
             "schema": "ext/data/schemas/dictionary-term-meta-bank-v3-schema.json"
         },
-        {"path": "ext/data/recommended-dictionaries.json", "ignore": true}
+        {
+            "path": "ext/data/recommended-dictionaries.json",
+            "schema": "ext/data/schemas/recommended-dictionaries-schema.json"
+        }
     ]
 }

From 0b9e8e6b43ea3c0792cc0ae903f5076e73352d6d Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 20 Jun 2024 01:31:24 -0400
Subject: [PATCH 10/30] Add explicit types to dict array properties

---
 ext/data/schemas/recommended-dictionaries-schema.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ext/data/schemas/recommended-dictionaries-schema.json b/ext/data/schemas/recommended-dictionaries-schema.json
index 350ff8d110..cd58df2d17 100644
--- a/ext/data/schemas/recommended-dictionaries-schema.json
+++ b/ext/data/schemas/recommended-dictionaries-schema.json
@@ -10,6 +10,7 @@
                 "terms": {
                     "type": "array",
                     "items": {
+                        "type": "object",
                         "required": [
                             "name",
                             "url"
@@ -29,6 +30,7 @@
                 "kanji": {
                     "type": "array",
                     "items": {
+                        "type": "object",
                         "required": [
                             "name",
                             "url"
@@ -48,6 +50,7 @@
                 "frequency": {
                     "type": "array",
                     "items": {
+                        "type": "object",
                         "required": [
                             "name",
                             "url"
@@ -67,6 +70,7 @@
                 "grammar": {
                     "type": "array",
                     "items": {
+                        "type": "object",
                         "required": [
                             "name",
                             "url"

From 5df34fe11c28d3e36387f686eb38c897ab604824 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 20 Jun 2024 01:31:51 -0400
Subject: [PATCH 11/30] Fix schema $id

---
 ext/data/schemas/recommended-dictionaries-schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/data/schemas/recommended-dictionaries-schema.json b/ext/data/schemas/recommended-dictionaries-schema.json
index cd58df2d17..7f3de9972b 100644
--- a/ext/data/schemas/recommended-dictionaries-schema.json
+++ b/ext/data/schemas/recommended-dictionaries-schema.json
@@ -1,5 +1,5 @@
 {
-    "$id": "recommended-dictionaries",
+    "$id": "recommendedDictionaries",
     "$schema": "http://json-schema.org/draft-07/schema#",
     "description": "Contains data for recommended dictionaries on welcome page.",
     "type": "object",

From 3eb3d9513077b0e99e59f85a214edb20185df87c Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 20 Jun 2024 01:57:51 -0400
Subject: [PATCH 12/30] Change types file to dts and add labeled test type

---
 test/data/json.json                                          | 2 ++
 ...dictionary-recommended.ts => dictionary-recommended.d.ts} | 5 +++++
 2 files changed, 7 insertions(+)
 rename types/ext/{dictionary-recommended.ts => dictionary-recommended.d.ts} (87%)

diff --git a/test/data/json.json b/test/data/json.json
index 618ad2474b..9fdda0b86b 100644
--- a/test/data/json.json
+++ b/test/data/json.json
@@ -189,6 +189,8 @@
         },
         {
             "path": "ext/data/recommended-dictionaries.json",
+            "typeFile": "types/ext/dictionary-recommended.d.ts",
+            "type": "RecommendedDictionaries",
             "schema": "ext/data/schemas/recommended-dictionaries-schema.json"
         }
     ]
diff --git a/types/ext/dictionary-recommended.ts b/types/ext/dictionary-recommended.d.ts
similarity index 87%
rename from types/ext/dictionary-recommended.ts
rename to types/ext/dictionary-recommended.d.ts
index 80bcdad183..b27cdf399b 100644
--- a/types/ext/dictionary-recommended.ts
+++ b/types/ext/dictionary-recommended.d.ts
@@ -30,3 +30,8 @@ export type Dictionary = {
     name: string;
     url: string;
 };
+
+export type RecommendedDictionariesTest = {
+    type: 'recommendedDictionaries';
+    recommendedDictionaries: RecommendedDictionaries;
+};

From 6552b7d4531035f5d724f822db0e076ca6d04807 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 4 Jul 2024 19:47:46 -0400
Subject: [PATCH 13/30] Use static jitendex url

---
 ext/data/recommended-dictionaries.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/data/recommended-dictionaries.json b/ext/data/recommended-dictionaries.json
index e5fc1473b8..52407be393 100644
--- a/ext/data/recommended-dictionaries.json
+++ b/ext/data/recommended-dictionaries.json
@@ -1,7 +1,7 @@
 {
     "ja": {
         "terms": [
-            {"name": "Jitendex 2024-05-20", "url": "https://github.com/stephenmk/stephenmk.github.io/releases/download/v4.7-5/jitendex-yomitan-2024-05-20.zip"}
+            {"name": "Jitendex", "url": "https://github.com/stephenmk/stephenmk.github.io/releases/download/v4.7-5/jitendex-yomitan.zip"}
         ],
         "kanji": [
             {"name": "Kanjidic English", "url": "https://github.com/themoeway/jmdict-yomitan/releases/latest/download/KANJIDIC_english.zip"}

From 64dc0819c80011fddb827f294de5b021f2c1d78c Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 4 Jul 2024 19:48:59 -0400
Subject: [PATCH 14/30] Fix url path

---
 ext/data/recommended-dictionaries.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/data/recommended-dictionaries.json b/ext/data/recommended-dictionaries.json
index 52407be393..3a5dab8a05 100644
--- a/ext/data/recommended-dictionaries.json
+++ b/ext/data/recommended-dictionaries.json
@@ -1,7 +1,7 @@
 {
     "ja": {
         "terms": [
-            {"name": "Jitendex", "url": "https://github.com/stephenmk/stephenmk.github.io/releases/download/v4.7-5/jitendex-yomitan.zip"}
+            {"name": "Jitendex", "url": "https://github.com/stephenmk/stephenmk.github.io/releases/latest/download/jitendex-yomitan.zip"}
         ],
         "kanji": [
             {"name": "Kanjidic English", "url": "https://github.com/themoeway/jmdict-yomitan/releases/latest/download/KANJIDIC_english.zip"}

From c2a4031b8829a68a448c9d763801ad584c253c96 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Thu, 4 Jul 2024 19:49:21 -0400
Subject: [PATCH 15/30] Remove BCCWJ-LUW version from name

---
 ext/data/recommended-dictionaries.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/data/recommended-dictionaries.json b/ext/data/recommended-dictionaries.json
index 3a5dab8a05..ed0d99af20 100644
--- a/ext/data/recommended-dictionaries.json
+++ b/ext/data/recommended-dictionaries.json
@@ -7,7 +7,7 @@
             {"name": "Kanjidic English", "url": "https://github.com/themoeway/jmdict-yomitan/releases/latest/download/KANJIDIC_english.zip"}
         ],
         "frequency": [
-            {"name": "BCCWJ-LUW 1.0.1", "url": "https://github.com/toasted-nutbread/yomichan-bccwj-frequency-dictionary/releases/download/1.0.1/BCCWJ-LUW.zip"}
+            {"name": "BCCWJ-LUW", "url": "https://github.com/toasted-nutbread/yomichan-bccwj-frequency-dictionary/releases/download/1.0.1/BCCWJ-LUW.zip"}
         ],
         "grammar": []
     }

From 773ac3ef3f64beb23d7e58223048ec72e3fb3fd7 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Tue, 16 Jul 2024 13:20:39 -0400
Subject: [PATCH 16/30] Only render recommended dictionaries on button click

---
 .../pages/settings/dictionary-import-controller.js   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index db300da659..747300ff8b 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -94,7 +94,10 @@ export class DictionaryImportController {
         this._importFileDrop.addEventListener('drop', this._onFileDrop.bind(this), false);
 
         // Welcome page
-        void this._renderRecommendedDictionaries('../../data/recommended-dictionaries.json');
+        const recommendedDictionaryButton = document.querySelector('[data-modal-action="show,recommended-dictionaries"]');
+        if (recommendedDictionaryButton) {
+            recommendedDictionaryButton.addEventListener('click', this._renderRecommendedDictionaries.bind(this), false);
+        }
     }
 
     // Private
@@ -132,10 +135,9 @@ export class DictionaryImportController {
         this._recommendedDictionaryActiveImport = false;
     }
 
-    /**
-     * @param {string} url
-     */
-    async _renderRecommendedDictionaries(url) {
+    /** */
+    async _renderRecommendedDictionaries() {
+        const url = '../../data/recommended-dictionaries.json';
         const response = await fetch(url, {
             method: 'GET',
             mode: 'no-cors',

From 6feb4b593929edfd7e392e1e378f23bd99082f4c Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Tue, 16 Jul 2024 13:38:33 -0400
Subject: [PATCH 17/30] Clean up dictionary rendering

---
 .../settings/dictionary-import-controller.js      | 15 +++++++++++----
 types/ext/dictionary-recommended.d.ts             |  5 +++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index 747300ff8b..3daaf90c8a 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -150,14 +150,21 @@ export class DictionaryImportController {
             throw new Error(`Failed to fetch ${url}: ${response.status}`);
         }
 
+        /** @type {import('dictionary-recommended.js').RecommendedDictionaryElementMap[]} */
+        const recommendedDictionaryCategories = [
+            {property: 'terms', element: querySelectorNotNull(document, '#recommended-term-dictionaries')},
+            {property: 'kanji', element: querySelectorNotNull(document, '#recommended-kanji-dictionaries')},
+            {property: 'frequency', element: querySelectorNotNull(document, '#recommended-frequency-dictionaries')},
+            {property: 'grammar', element: querySelectorNotNull(document, '#recommended-grammar-dictionaries')},
+        ];
+
         const language = (await this._settingsController.getOptions()).general.language;
         /** @type {import('dictionary-recommended.js').RecommendedDictionaries} */
         const recommendedDictionaries = (await readResponseJson(response));
 
-        this._renderRecommendedDictionaryGroup(recommendedDictionaries[language].terms, document.querySelector('#recommended-term-dictionaries'));
-        this._renderRecommendedDictionaryGroup(recommendedDictionaries[language].kanji, document.querySelector('#recommended-kanji-dictionaries'));
-        this._renderRecommendedDictionaryGroup(recommendedDictionaries[language].frequency, document.querySelector('#recommended-frequency-dictionaries'));
-        this._renderRecommendedDictionaryGroup(recommendedDictionaries[language].grammar, document.querySelector('#recommended-grammar-dictionaries'));
+        for (const {property, element} of recommendedDictionaryCategories) {
+            this._renderRecommendedDictionaryGroup(recommendedDictionaries[language][property], element);
+        }
 
         /** @type {NodeListOf<HTMLElement>} */
         const buttons = document.querySelectorAll('.action-button[data-action=import-recommended-dictionary]');
diff --git a/types/ext/dictionary-recommended.d.ts b/types/ext/dictionary-recommended.d.ts
index b27cdf399b..41d3c0c7a5 100644
--- a/types/ext/dictionary-recommended.d.ts
+++ b/types/ext/dictionary-recommended.d.ts
@@ -35,3 +35,8 @@ export type RecommendedDictionariesTest = {
     type: 'recommendedDictionaries';
     recommendedDictionaries: RecommendedDictionaries;
 };
+
+export type RecommendedDictionaryElementMap = {
+    property: 'terms' | 'kanji' | 'frequency' | 'grammar';
+    element: HTMLElement;
+};

From 2bdc15f1702c33f4400ad790da3f5734e06e16c8 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Tue, 16 Jul 2024 13:40:31 -0400
Subject: [PATCH 18/30] Hide dictionaries when going from a language supporting
 recommended dictionaries to one that doesnt

---
 ext/js/pages/settings/dictionary-import-controller.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index 3daaf90c8a..597b7a2327 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -162,6 +162,13 @@ export class DictionaryImportController {
         /** @type {import('dictionary-recommended.js').RecommendedDictionaries} */
         const recommendedDictionaries = (await readResponseJson(response));
 
+        if (!(language in recommendedDictionaries)) {
+            for (const {element} of recommendedDictionaryCategories) {
+                element.hidden = true;
+            }
+            return;
+        }
+
         for (const {property, element} of recommendedDictionaryCategories) {
             this._renderRecommendedDictionaryGroup(recommendedDictionaries[language][property], element);
         }

From 2d8c55d6bb24f6a7eff11483e367abf813893abd Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Mon, 29 Jul 2024 12:23:46 -0400
Subject: [PATCH 19/30] Update welcome page dict modals

---
 ext/welcome.html | 65 +++++++++++++++++-------------------------------
 1 file changed, 23 insertions(+), 42 deletions(-)

diff --git a/ext/welcome.html b/ext/welcome.html
index 48616152e6..9b6b64402f 100644
--- a/ext/welcome.html
+++ b/ext/welcome.html
@@ -266,7 +266,8 @@ <h2>Basic customization</h2>
     </div>
     <div class="modal-footer">
         <button type="button" class="low-emphasis danger dictionary-database-mutating-input" id="dictionary-delete-all-button">Delete All</button>
-        <button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-check-integrity" hidden>Check Integrity</button>
+        <button type="button" class="low-emphasis dictionary-database-mutating-input debug-only" id="dictionary-check-integrity">Check Integrity</button>
+        <button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-check-updates">Check for Updates</button>
         <button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-import-button">Import</button>
         <button type="button" data-modal-action="hide">Close</button>
     </div>
@@ -321,6 +322,27 @@ <h5>or click here to upload</h5>
     </div>
 </div></div>
 
+<div id="dictionary-confirm-update-modal" class="modal" tabindex="-1" role="dialog" hidden><div class="modal-content modal-content-small">
+    <div class="modal-header"><div class="modal-title">Confirm Dictionary Update</div></div>
+    <div class="modal-body">
+        <p>Are you sure you want to update the dictionary:</p>
+        <p><strong id="dictionary-confirm-update-name"></strong>?</p>
+        <section>
+            Updating a dictionary involves:
+            <ul>
+                <li>Deleting the installed version</li>
+                <li>Downloading the latest version </li>
+                <li>Importing the latest version</li>
+            </ul>
+            <p class="warning-text">Especially for large dictionaries, this process can take a while, and downloading will use your network.</p>
+        </section>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="low-emphasis" data-modal-action="hide">Cancel</button>
+        <button type="button" class="danger" data-modal-action="hide" id="dictionary-confirm-update-button">Update</button>
+    </div>
+</div></div>
+
 <div id="secondary-search-dictionaries-modal" class="modal" tabindex="-1" role="dialog" hidden><div class="modal-content">
     <div class="modal-header">
         <div class="modal-title">Secondary Search Dictionaries</div>
@@ -448,46 +470,5 @@ <h5>or click here to upload</h5>
     </div>
 </div></div>
 
-<div id="recommended-dictionaries-modal" class="modal" tabindex="-1" role="dialog" hidden><div class="modal-content">
-    <div class="modal-header">
-        <div class="modal-title">Recommended Dictionaries</div>
-        <div class="modal-header-button-container">
-            <div class="modal-header-button-group">
-                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
-            </div>
-        </div>
-    </div>
-    <div class="modal-body">
-        <div id="recommended-term-dictionaries" hidden>
-            <h1 class="modal-title">Term Dictionaries</h1>
-            <div class="recommended-dictionary-list"></div>
-        </div>
-        <div id="recommended-kanji-dictionaries" hidden>
-            <h1 class="modal-title">Kanji Dictionaries</h1>
-            <div class="recommended-dictionary-list"></div>
-        </div>
-        <div id="recommended-frequency-dictionaries" hidden>
-            <h1 class="modal-title">Frequency Dictionaries</h1>
-            <div class="recommended-dictionary-list"></div>
-        </div>
-        <div id="recommended-grammar-dictionaries" hidden>
-            <h1 class="modal-title">Grammar Dictionaries</h1>
-            <div class="recommended-dictionary-list"></div>
-        </div>
-    </div>
-    <div class="modal-body-addon dictionary-delete-progress" hidden>
-        <div class="progress-labels"><div class="progress-info"></div><div class="progress-status"></div></div>
-        <div class="progress-bar-track"><div class="progress-bar danger"></div></div>
-    </div>
-    <div class="modal-body-addon dictionary-import-progress" hidden>
-        <div class="progress-labels"><div class="progress-info"></div><div class="progress-status"></div></div>
-        <div class="progress-bar-track"><div class="progress-bar"></div></div>
-    </div>
-    <div class="modal-footer">
-        <button type="button" data-modal-action="hide">Close</button>
-    </div>
-</div></div>
-
 </body>
 </html>

From f119f45bca114062cae3bc5f49c2666c9ce22537 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Mon, 29 Jul 2024 12:24:53 -0400
Subject: [PATCH 20/30] Fix spacing

---
 ext/js/pages/settings/dictionary-import-controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index c16b5e7bd8..c51cf9f133 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -94,7 +94,7 @@ export class DictionaryImportController {
         this._importFileDrop.addEventListener('drop', this._onFileDrop.bind(this), false);
 
         this._settingsController.on('importDictionaryFromUrl', this._onEventImportDictionaryFromUrl.bind(this));
-      
+
         // Welcome page
         const recommendedDictionaryButton = document.querySelector('[data-modal-action="show,recommended-dictionaries"]');
         if (recommendedDictionaryButton) {
@@ -205,7 +205,7 @@ export class DictionaryImportController {
             }
         }
     }
-  
+
     /**
      * @param {import('settings-controller').EventArgument<'importDictionaryFromUrl'>} details
      */

From 54797aee2a2588212668549f2de35659829147f0 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Mon, 29 Jul 2024 12:31:10 -0400
Subject: [PATCH 21/30] Add back recommended dictionary modals

---
 ext/welcome.html | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/ext/welcome.html b/ext/welcome.html
index 9b6b64402f..f801beba66 100644
--- a/ext/welcome.html
+++ b/ext/welcome.html
@@ -470,5 +470,47 @@ <h5>or click here to upload</h5>
     </div>
 </div></div>
 
+<!-- Recommended dictionary modals -->
+<div id="recommended-dictionaries-modal" class="modal" tabindex="-1" role="dialog" hidden><div class="modal-content">
+    <div class="modal-header">
+        <div class="modal-title">Recommended Dictionaries</div>
+        <div class="modal-header-button-container">
+            <div class="modal-header-button-group">
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+            </div>
+        </div>
+    </div>
+    <div class="modal-body">
+        <div id="recommended-term-dictionaries" hidden>
+            <h1 class="modal-title">Term Dictionaries</h1>
+            <div class="recommended-dictionary-list"></div>
+        </div>
+        <div id="recommended-kanji-dictionaries" hidden>
+            <h1 class="modal-title">Kanji Dictionaries</h1>
+            <div class="recommended-dictionary-list"></div>
+        </div>
+        <div id="recommended-frequency-dictionaries" hidden>
+            <h1 class="modal-title">Frequency Dictionaries</h1>
+            <div class="recommended-dictionary-list"></div>
+        </div>
+        <div id="recommended-grammar-dictionaries" hidden>
+            <h1 class="modal-title">Grammar Dictionaries</h1>
+            <div class="recommended-dictionary-list"></div>
+        </div>
+    </div>
+    <div class="modal-body-addon dictionary-delete-progress" hidden>
+        <div class="progress-labels"><div class="progress-info"></div><div class="progress-status"></div></div>
+        <div class="progress-bar-track"><div class="progress-bar danger"></div></div>
+    </div>
+    <div class="modal-body-addon dictionary-import-progress" hidden>
+        <div class="progress-labels"><div class="progress-info"></div><div class="progress-status"></div></div>
+        <div class="progress-bar-track"><div class="progress-bar"></div></div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" data-modal-action="hide">Close</button>
+    </div>
+</div></div>
+
 </body>
 </html>

From eab65ad85d54d7dda051a99c813c62f57a60687f Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Mon, 29 Jul 2024 12:40:18 -0400
Subject: [PATCH 22/30] Fix dictionary importing

---
 ext/js/pages/settings/dictionary-import-controller.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index c51cf9f133..50c283acf1 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -129,7 +129,11 @@ export class DictionaryImportController {
                     .then((blob) => {
                         return new File([blob], 'fileFromURL');
                     });
-                await this._importDictionaries([file]);
+                const importProgressTracker = new ImportProgressTracker(this._getFileImportSteps(), 1);
+                void this._importDictionaries(
+                    this._arrayToAsyncGenerator([file]),
+                    importProgressTracker,
+                );
             } catch (error) {
                 log.error(error);
             }

From a03db48f3a524204fed2b4b4f583915e03cc57e6 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Mon, 29 Jul 2024 12:40:43 -0400
Subject: [PATCH 23/30] Remove unneeded progress selectors

---
 ext/js/pages/settings/dictionary-import-controller.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index 50c283acf1..7cb5c13823 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -489,9 +489,6 @@ export class DictionaryImportController {
         const progressSelector = '.dictionary-import-progress';
         const progressContainers = /** @type {NodeListOf<HTMLElement>} */ (document.querySelectorAll(`#dictionaries-modal ${progressSelector}`));
         const recommendedProgressContainers = /** @type {NodeListOf<HTMLElement>} */ (document.querySelectorAll(`#recommended-dictionaries-modal ${progressSelector}`));
-        const progressBars = /** @type {NodeListOf<HTMLElement>} */ (document.querySelectorAll(`${progressSelector} .progress-bar`));
-        const infoLabels = /** @type {NodeListOf<HTMLElement>} */ (document.querySelectorAll(`${progressSelector} .progress-info`));
-        const statusLabels = /** @type {NodeListOf<HTMLElement>} */ (document.querySelectorAll(`${progressSelector} .progress-status`));
 
         const prevention = this._preventPageExit();
 

From 0faa65f0d6456cda5c634f4bc28f70654b394e78 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Mon, 29 Jul 2024 12:53:31 -0400
Subject: [PATCH 24/30] Fix recommended dictionary modal rendering

---
 .../settings/dictionary-import-controller.js     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index 7cb5c13823..1dd007a3b3 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -158,10 +158,10 @@ export class DictionaryImportController {
 
         /** @type {import('dictionary-recommended.js').RecommendedDictionaryElementMap[]} */
         const recommendedDictionaryCategories = [
-            {property: 'terms', element: querySelectorNotNull(document, '#recommended-term-dictionaries')},
-            {property: 'kanji', element: querySelectorNotNull(document, '#recommended-kanji-dictionaries')},
-            {property: 'frequency', element: querySelectorNotNull(document, '#recommended-frequency-dictionaries')},
-            {property: 'grammar', element: querySelectorNotNull(document, '#recommended-grammar-dictionaries')},
+            {property: 'terms', element: querySelectorNotNull(querySelectorNotNull(document, '#recommended-term-dictionaries'), '.recommended-dictionary-list')},
+            {property: 'kanji', element: querySelectorNotNull(querySelectorNotNull(document, '#recommended-kanji-dictionaries'), '.recommended-dictionary-list')},
+            {property: 'frequency', element: querySelectorNotNull(querySelectorNotNull(document, '#recommended-frequency-dictionaries'), '.recommended-dictionary-list')},
+            {property: 'grammar', element: querySelectorNotNull(querySelectorNotNull(document, '#recommended-grammar-dictionaries'), '.recommended-dictionary-list')},
         ];
 
         const language = (await this._settingsController.getOptions()).general.language;
@@ -189,12 +189,16 @@ export class DictionaryImportController {
     /**
      *
      * @param {import('dictionary-recommended.js').Dictionary[]} recommendedDictionaries
-     * @param {HTMLElement | null} dictionariesList
+     * @param {HTMLElement} dictionariesList
      */
     _renderRecommendedDictionaryGroup(recommendedDictionaries, dictionariesList) {
+        const dictionariesListParent = dictionariesList.parentElement;
+        dictionariesList.innerHTML = '';
         for (const dictionary of recommendedDictionaries) {
             if (dictionariesList) {
-                dictionariesList.hidden = false;
+                if (dictionariesListParent) {
+                    dictionariesListParent.hidden = false;
+                }
                 const template = this._settingsController.instantiateTemplate('recommended-dictionaries-list-item');
                 const label = querySelectorNotNull(template, '.settings-item-label');
                 const button = querySelectorNotNull(template, '.action-button[data-action=import-recommended-dictionary]');

From 812567a09385adc2b8f5626b617b62fbb927542a Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Mon, 29 Jul 2024 13:20:09 -0400
Subject: [PATCH 25/30] Add pronunciation to recommended dictionary types

---
 ext/data/recommended-dictionaries.json        |  3 ++-
 .../recommended-dictionaries-schema.json      | 20 +++++++++++++++++++
 .../settings/dictionary-import-controller.js  |  1 +
 ext/welcome.html                              |  4 ++++
 types/ext/dictionary-recommended.d.ts         |  3 ++-
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/ext/data/recommended-dictionaries.json b/ext/data/recommended-dictionaries.json
index ed0d99af20..d8c39f4fe9 100644
--- a/ext/data/recommended-dictionaries.json
+++ b/ext/data/recommended-dictionaries.json
@@ -9,6 +9,7 @@
         "frequency": [
             {"name": "BCCWJ-LUW", "url": "https://github.com/toasted-nutbread/yomichan-bccwj-frequency-dictionary/releases/download/1.0.1/BCCWJ-LUW.zip"}
         ],
-        "grammar": []
+        "grammar": [],
+        "pronunciation": []
     }
 }
diff --git a/ext/data/schemas/recommended-dictionaries-schema.json b/ext/data/schemas/recommended-dictionaries-schema.json
index 7f3de9972b..36d8f03fd9 100644
--- a/ext/data/schemas/recommended-dictionaries-schema.json
+++ b/ext/data/schemas/recommended-dictionaries-schema.json
@@ -86,6 +86,26 @@
                             }
                         }
                     }
+                },
+                "pronunciation": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "required": [
+                            "name",
+                            "url"
+                        ],
+                        "properties": {
+                            "name": {
+                                "type": "string",
+                                "minLength": 2
+                            },
+                            "url": {
+                                "type": "string",
+                                "minLength": 2
+                            }
+                        }
+                    }
                 }
             },
             "required": [
diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index 1dd007a3b3..254c67518b 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -162,6 +162,7 @@ export class DictionaryImportController {
             {property: 'kanji', element: querySelectorNotNull(querySelectorNotNull(document, '#recommended-kanji-dictionaries'), '.recommended-dictionary-list')},
             {property: 'frequency', element: querySelectorNotNull(querySelectorNotNull(document, '#recommended-frequency-dictionaries'), '.recommended-dictionary-list')},
             {property: 'grammar', element: querySelectorNotNull(querySelectorNotNull(document, '#recommended-grammar-dictionaries'), '.recommended-dictionary-list')},
+            {property: 'pronunciation', element: querySelectorNotNull(querySelectorNotNull(document, '#recommended-pronunciation-dictionaries'), '.recommended-dictionary-list')},
         ];
 
         const language = (await this._settingsController.getOptions()).general.language;
diff --git a/ext/welcome.html b/ext/welcome.html
index f801beba66..b94403274c 100644
--- a/ext/welcome.html
+++ b/ext/welcome.html
@@ -498,6 +498,10 @@ <h1 class="modal-title">Frequency Dictionaries</h1>
             <h1 class="modal-title">Grammar Dictionaries</h1>
             <div class="recommended-dictionary-list"></div>
         </div>
+        <div id="recommended-pronunciation-dictionaries" hidden>
+            <h1 class="modal-title">Pronunciation Dictionaries</h1>
+            <div class="recommended-dictionary-list"></div>
+        </div>
     </div>
     <div class="modal-body-addon dictionary-delete-progress" hidden>
         <div class="progress-labels"><div class="progress-info"></div><div class="progress-status"></div></div>
diff --git a/types/ext/dictionary-recommended.d.ts b/types/ext/dictionary-recommended.d.ts
index 41d3c0c7a5..6eba321b5f 100644
--- a/types/ext/dictionary-recommended.d.ts
+++ b/types/ext/dictionary-recommended.d.ts
@@ -24,6 +24,7 @@ export type LanguageDictionaries = {
     kanji: Dictionary[];
     frequency: Dictionary[];
     grammar: Dictionary[];
+    pronunciation: Dictionary[];
 };
 
 export type Dictionary = {
@@ -37,6 +38,6 @@ export type RecommendedDictionariesTest = {
 };
 
 export type RecommendedDictionaryElementMap = {
-    property: 'terms' | 'kanji' | 'frequency' | 'grammar';
+    property: 'terms' | 'kanji' | 'frequency' | 'grammar' | 'pronunciation';
     element: HTMLElement;
 };

From 3fdb94c849b072c3c97123482485f45d004e97ee Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Mon, 29 Jul 2024 13:26:10 -0400
Subject: [PATCH 26/30] Fix KANJIDIC name

---
 ext/data/recommended-dictionaries.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/data/recommended-dictionaries.json b/ext/data/recommended-dictionaries.json
index d8c39f4fe9..98fcc597ef 100644
--- a/ext/data/recommended-dictionaries.json
+++ b/ext/data/recommended-dictionaries.json
@@ -4,7 +4,7 @@
             {"name": "Jitendex", "url": "https://github.com/stephenmk/stephenmk.github.io/releases/latest/download/jitendex-yomitan.zip"}
         ],
         "kanji": [
-            {"name": "Kanjidic English", "url": "https://github.com/themoeway/jmdict-yomitan/releases/latest/download/KANJIDIC_english.zip"}
+            {"name": "KANJIDIC", "url": "https://github.com/themoeway/jmdict-yomitan/releases/latest/download/KANJIDIC_english.zip"}
         ],
         "frequency": [
             {"name": "BCCWJ-LUW", "url": "https://github.com/toasted-nutbread/yomichan-bccwj-frequency-dictionary/releases/download/1.0.1/BCCWJ-LUW.zip"}

From 706859fd431d7ce1055615cbce0db4b3a561c024 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Mon, 29 Jul 2024 13:29:10 -0400
Subject: [PATCH 27/30] Fix hiding and unhiding of elements

---
 ext/js/pages/settings/dictionary-import-controller.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index 254c67518b..b7e2707a7a 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -171,7 +171,10 @@ export class DictionaryImportController {
 
         if (!(language in recommendedDictionaries)) {
             for (const {element} of recommendedDictionaryCategories) {
-                element.hidden = true;
+                const dictionaryCategoryParent = element.parentElement;
+                if (dictionaryCategoryParent) {
+                    dictionaryCategoryParent.hidden = true;
+                }
             }
             return;
         }

From 381645627e4b6211470965b8748c8161da7d97ca Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Mon, 29 Jul 2024 13:29:29 -0400
Subject: [PATCH 28/30] Move language select above recommended dictionaries

---
 ext/welcome.html | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ext/welcome.html b/ext/welcome.html
index b94403274c..dc3fa1f013 100644
--- a/ext/welcome.html
+++ b/ext/welcome.html
@@ -72,6 +72,19 @@ <h2><strong>Recommended Permissions &#40;Important&#41;</strong></h2>
     <!-- Content -->
     <h2><strong>Import Dictionaries &#40;Important&#41;</strong></h2>
     <div class="settings-group">
+        <div class="settings-item"><div class="settings-item-inner settings-item-inner-wrappable">
+            <div class="settings-item-left">
+                <div class="settings-item-label">
+                    Language
+                </div>
+                <div class="settings-item-description">
+                    Language of the text that is being looked up.
+                </div>
+            </div>
+            <div class="settings-item-right">
+                <select id="language-select" data-setting="general.language"></select>
+            </div>
+        </div></div>
         <div class="settings-item">
             <div class="settings-item settings-item-button" data-modal-action="show,recommended-dictionaries"><div class="settings-item-inner">
                 <div class="settings-item-left">
@@ -116,19 +129,6 @@ <h2>Basic customization</h2>
                 <label class="toggle"><input type="checkbox" data-setting="general.showGuide"><span class="toggle-body"><span class="toggle-track"></span><span class="toggle-knob"></span></span></label>
             </div>
         </div></div>
-        <div class="settings-item"><div class="settings-item-inner settings-item-inner-wrappable">
-            <div class="settings-item-left">
-                <div class="settings-item-label">
-                    Language
-                </div>
-                <div class="settings-item-description">
-                    Language of the text that is being looked up.
-                </div>
-            </div>
-            <div class="settings-item-right">
-                <select id="language-select" data-setting="general.language"></select>
-            </div>
-        </div></div>
         <div class="settings-item">
             <div class="settings-item-inner settings-item-inner-wrappable">
                 <div class="settings-item-left">

From 2e504785c0aa82c8d8c8a66eb8477b164160a583 Mon Sep 17 00:00:00 2001
From: kuuuube <hexagonisalie@gmail.com>
Date: Mon, 29 Jul 2024 13:34:53 -0400
Subject: [PATCH 29/30] Use BCCWJ combined instead of BCCWJ-LUW

---
 ext/data/recommended-dictionaries.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/data/recommended-dictionaries.json b/ext/data/recommended-dictionaries.json
index 98fcc597ef..245f638e18 100644
--- a/ext/data/recommended-dictionaries.json
+++ b/ext/data/recommended-dictionaries.json
@@ -7,7 +7,7 @@
             {"name": "KANJIDIC", "url": "https://github.com/themoeway/jmdict-yomitan/releases/latest/download/KANJIDIC_english.zip"}
         ],
         "frequency": [
-            {"name": "BCCWJ-LUW", "url": "https://github.com/toasted-nutbread/yomichan-bccwj-frequency-dictionary/releases/download/1.0.1/BCCWJ-LUW.zip"}
+            {"name": "BCCWJ", "url": "https://github.com/Kuuuube/yomitan-dictionaries/releases/download/yomitan-permalink/BCCWJ_SUW_LUW_combined.zip"}
         ],
         "grammar": [],
         "pronunciation": []

From 5503f0cec263c7ccee3ea91b37e236c68c3d73f1 Mon Sep 17 00:00:00 2001
From: Stefan Vukovic <stefanvukovic44@gmail.com>
Date: Mon, 29 Jul 2024 19:35:59 +0200
Subject: [PATCH 30/30] show download progress

---
 ext/js/pages/settings/dictionary-import-controller.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
index b7e2707a7a..1c1b7720c4 100644
--- a/ext/js/pages/settings/dictionary-import-controller.js
+++ b/ext/js/pages/settings/dictionary-import-controller.js
@@ -124,14 +124,11 @@ export class DictionaryImportController {
             try {
                 const url = this._recommendedDictionaryQueue.shift();
                 if (!url) { continue; }
-                const file = await fetch(url.trim())
-                    .then((res) => res.blob())
-                    .then((blob) => {
-                        return new File([blob], 'fileFromURL');
-                    });
-                const importProgressTracker = new ImportProgressTracker(this._getFileImportSteps(), 1);
+
+                const importProgressTracker = new ImportProgressTracker(this._getUrlImportSteps(), 1);
+                const onProgress = importProgressTracker.onProgress.bind(importProgressTracker);
                 void this._importDictionaries(
-                    this._arrayToAsyncGenerator([file]),
+                    this._generateFilesFromUrls([url], onProgress),
                     importProgressTracker,
                 );
             } catch (error) {