diff --git a/Music/_NSYNC/Celebrity/01 - Pop.flac b/Music/_NSYNC/Celebrity/01 - Pop.flac
deleted file mode 100644
index 079095f6..00000000
Binary files a/Music/_NSYNC/Celebrity/01 - Pop.flac and /dev/null differ
diff --git a/Music/_NSYNC/Celebrity/cover.jpg b/Music/_NSYNC/Celebrity/cover.jpg
deleted file mode 100644
index 202ef70b..00000000
Binary files a/Music/_NSYNC/Celebrity/cover.jpg and /dev/null differ
diff --git a/config/settings.py b/config/settings.py
index 94105426..55709478 100644
--- a/config/settings.py
+++ b/config/settings.py
@@ -495,6 +495,17 @@ class ConfigManager:
             "hifi_download": {
                 "quality": "lossless",  # Options: "low", "high", "lossless", "hires"
             },
+            "hifi": {
+                "embed_tags": True,
+                "tags": {
+                    "track_id": True,
+                    "artist_id": True,
+                    "album_id": True,
+                    "isrc": True,
+                    "bpm": True,
+                    "copyright": True,
+                }
+            },
             "lidarr_download": {
                 "url": "",
                 "api_key": "",
diff --git a/webui/index.html b/webui/index.html
index 31f00e67..81a11004 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -5217,13 +5217,14 @@
                                                 <label class="checkbox-label" onclick="event.stopPropagation()">
                                                     <input type="checkbox" id="embed-tidal" checked onchange="toggleServiceTags(this, 'tidal')"> Tidal
                                                 </label>
-                                                <span class="tag-service-count">4 tags</span>
+                                                <span class="tag-service-count">5 tags</span>
                                             </div>
                                             <div class="tag-service-body" style="display:none;">
                                                 <label class="checkbox-label"><input type="checkbox" data-config="tidal.tags.track_id" checked> Track ID</label>
                                                 <label class="checkbox-label"><input type="checkbox" data-config="tidal.tags.artist_id" checked> Artist ID</label>
                                                 <label class="checkbox-label"><input type="checkbox" data-config="tidal.tags.isrc" checked> ISRC</label>
                                                 <label class="checkbox-label"><input type="checkbox" data-config="tidal.tags.copyright" checked> Copyright</label>
+                                                <label class="checkbox-label"><input type="checkbox" data-config="tidal.tags.bpm" checked> BPM</label>
                                             </div>
                                         </div>
 
@@ -5275,6 +5276,25 @@
                                             </div>
                                         </div>
 
+                                        <!-- HiFi -->
+                                        <div class="tag-service-group">
+                                            <div class="tag-service-header" onclick="toggleTagGroup(this)">
+                                                <span class="tag-group-arrow">&#9654;</span>
+                                                <label class="checkbox-label" onclick="event.stopPropagation()">
+                                                    <input type="checkbox" id="embed-hifi" checked onchange="toggleServiceTags(this, 'hifi')"> HiFi
+                                                </label>
+                                                <span class="tag-service-count">6 tags</span>
+                                            </div>
+                                            <div class="tag-service-body" style="display:none;">
+                                                <label class="checkbox-label"><input type="checkbox" data-config="hifi.tags.track_id" checked> Track ID</label>
+                                                <label class="checkbox-label"><input type="checkbox" data-config="hifi.tags.artist_id" checked> Artist ID</label>
+                                                <label class="checkbox-label"><input type="checkbox" data-config="hifi.tags.album_id" checked> Album ID</label>
+                                                <label class="checkbox-label"><input type="checkbox" data-config="hifi.tags.isrc" checked> ISRC</label>
+                                                <label class="checkbox-label"><input type="checkbox" data-config="hifi.tags.bpm" checked> BPM</label>
+                                                <label class="checkbox-label"><input type="checkbox" data-config="hifi.tags.copyright" checked> Copyright</label>
+                                            </div>
+                                        </div>
+
                                         <!-- General -->
                                         <div class="tag-service-group">
                                             <div class="tag-service-header" onclick="toggleTagGroup(this)">
diff --git a/webui/static/settings.js b/webui/static/settings.js
index dfa092bb..8b9aa005 100644
--- a/webui/static/settings.js
+++ b/webui/static/settings.js
@@ -978,6 +978,7 @@ async function loadSettingsData() {
         document.getElementById('embed-qobuz').checked = settings.qobuz?.embed_tags !== false;
         document.getElementById('embed-lastfm').checked = settings.lastfm?.embed_tags !== false;
         document.getElementById('embed-genius').checked = settings.genius?.embed_tags !== false;
+        document.getElementById('embed-hifi').checked = settings.hifi?.embed_tags !== false;
         // Load per-tag toggles from data-config attributes
         document.querySelectorAll('[data-config]').forEach(cb => {
             const path = cb.dataset.config.split('.');
@@ -986,7 +987,7 @@ async function loadSettingsData() {
             cb.checked = val !== false;
         });
         // Apply service disabled state to child tags
-        ['spotify', 'itunes', 'musicbrainz', 'deezer', 'audiodb', 'tidal', 'qobuz', 'lastfm', 'genius'].forEach(svc => {
+        ['spotify', 'itunes', 'musicbrainz', 'deezer', 'audiodb', 'tidal', 'qobuz', 'lastfm', 'genius', 'hifi'].forEach(svc => {
             const master = document.getElementById('embed-' + svc);
             if (master) toggleServiceTags(master, svc);
         });
@@ -2653,6 +2654,10 @@ async function saveSettings(quiet = false) {
             quality: document.getElementById('hifi-download-quality').value || 'lossless',
             allow_fallback: document.getElementById('hifi-allow-fallback').checked,
         },
+        hifi: {
+            embed_tags: document.getElementById('embed-hifi').checked,
+            tags: _collectServiceTags('hifi')
+        },
         deezer_download: {
             quality: document.getElementById('deezer-download-quality').value || 'flac',
             arl: document.getElementById('deezer-download-arl').value || '',