diff --git a/CANCEL_BUTTON_IMPLEMENTATION.md b/CANCEL_BUTTON_IMPLEMENTATION.md
deleted file mode 100644
index 3c3b454c..00000000
--- a/CANCEL_BUTTON_IMPLEMENTATION.md
+++ /dev/null
@@ -1,512 +0,0 @@
-# Cancel Button Implementation Guide
-
-This document details the exact changes made to implement cancel functionality in the download modals.
-
-## Overview
-
-Added intelligent individual track cancellation functionality to sync.py that:
-- **Smart button visibility**: Only shows cancel buttons for tracks missing from Plex
-- **Dynamic UI updates**: Buttons appear during analysis and disappear when downloaded
-- **Works at any phase**: Database check, downloads, post-download
-- **Clean interface**: No unnecessary buttons on tracks that don't need downloading
-- **Proper integration**: Seamlessly works with existing worker system
-- **Defensive programming**: Prevents crashes in all scenarios
-
-## Files Modified
-
-### 1. `/ui/pages/sync.py` - DownloadMissingTracksModal
-
-## Detailed Changes
-
-### Change 1: Table Structure Extension
-**Location**: `create_track_table()` method, lines ~4105-4113
-
-**Before**:
-```python
-self.track_table.setColumnCount(5)
-self.track_table.setHorizontalHeaderLabels(["Track", "Artist", "Duration", "Matched", "Status"])
-self.track_table.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.Stretch)
-self.track_table.horizontalHeader().setSectionResizeMode(2, QHeaderView.ResizeMode.Interactive)
-self.track_table.horizontalHeader().setSectionResizeMode(3, QHeaderView.ResizeMode.Interactive)
-self.track_table.setColumnWidth(2, 90)
-self.track_table.setColumnWidth(3, 140)
-self.track_table.verticalHeader().setDefaultSectionSize(35)
-```
-
-**After**:
-```python
-self.track_table.setColumnCount(6)
-self.track_table.setHorizontalHeaderLabels(["Track", "Artist", "Duration", "Matched", "Status", "Cancel"])
-self.track_table.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.Stretch)
-self.track_table.horizontalHeader().setSectionResizeMode(2, QHeaderView.ResizeMode.Interactive)
-self.track_table.horizontalHeader().setSectionResizeMode(3, QHeaderView.ResizeMode.Interactive)
-self.track_table.horizontalHeader().setSectionResizeMode(5, QHeaderView.ResizeMode.Fixed)
-self.track_table.setColumnWidth(2, 90)
-self.track_table.setColumnWidth(3, 140)
-self.track_table.setColumnWidth(5, 70)
-self.track_table.verticalHeader().setDefaultSectionSize(50)
-```
-
-**Purpose**: Extends table from 5 to 6 columns, adds "Cancel" header, sets fixed 70px width for cancel column, increases row height to 50px to accommodate centered buttons.
-
-### Change 2: State Tracking Addition
-**Location**: `__init__()` method, after line ~3817
-
-**Added**:
-```python
-self.cancelled_tracks = set()  # Track indices of cancelled tracks
-```
-
-**Purpose**: Simple set to track which row indices have been cancelled.
-
-### Change 3: Smart Cancel Button Container Creation
-**Location**: `populate_track_table()` method, after status item creation
-
-**Added**:
-```python
-# Create empty container for cancel button (will be populated later for missing tracks only)
-container = QWidget()
-container.setStyleSheet("background: transparent;")
-layout = QVBoxLayout(container)
-layout.setContentsMargins(5, 5, 5, 5)
-layout.setAlignment(Qt.AlignmentFlag.AlignCenter)
-
-self.track_table.setCellWidget(i, 5, container)
-```
-
-**Purpose**: Creates empty containers that will only get cancel buttons for tracks that are missing from Plex, keeping the UI clean.
-
-### Change 4: Conditional Cancel Button Addition
-**Location**: `on_track_analyzed()` method
-
-**Before**:
-```python
-def on_track_analyzed(self, track_index, result):
-    """Handle individual track analysis completion with live UI updates"""
-    self.analysis_progress.setValue(track_index)
-    if result.exists_in_plex:
-        matched_text = f"✅ Found ({result.confidence:.1f})"
-        self.matched_tracks_count += 1
-        self.matched_count_label.setText(str(self.matched_tracks_count))
-    else:
-        matched_text = "❌ Missing"
-        self.tracks_to_download_count += 1
-        self.download_count_label.setText(str(self.tracks_to_download_count))
-    self.track_table.setItem(track_index - 1, 3, QTableWidgetItem(matched_text))
-```
-
-**After**:
-```python
-def on_track_analyzed(self, track_index, result):
-    """Handle individual track analysis completion with live UI updates"""
-    self.analysis_progress.setValue(track_index)
-    row_index = track_index - 1
-    if result.exists_in_plex:
-        matched_text = f"✅ Found ({result.confidence:.1f})"
-        self.matched_tracks_count += 1
-        self.matched_count_label.setText(str(self.matched_tracks_count))
-    else:
-        matched_text = "❌ Missing"
-        self.tracks_to_download_count += 1
-        self.download_count_label.setText(str(self.tracks_to_download_count))
-        # Add cancel button for missing tracks only
-        self.add_cancel_button_to_row(row_index)
-    self.track_table.setItem(row_index, 3, QTableWidgetItem(matched_text))
-```
-
-**Purpose**: Only adds cancel buttons to tracks that are missing from Plex during real-time analysis.
-
-### Change 5: Dynamic Cancel Button Creation Method
-**Location**: After `format_duration()` method
-
-**Added Complete Method**:
-```python
-def add_cancel_button_to_row(self, row):
-    """Add cancel button to a specific row (only for missing tracks)"""
-    container = self.track_table.cellWidget(row, 5)
-    if container and container.layout().count() == 0:  # Only add if container is empty
-        cancel_button = QPushButton("×")
-        cancel_button.setFixedSize(20, 20)
-        cancel_button.setMinimumSize(20, 20)
-        cancel_button.setMaximumSize(20, 20)
-        cancel_button.setStyleSheet("""
-            QPushButton {
-                background-color: #dc3545; 
-                color: white; 
-                border: 1px solid #c82333;
-                border-radius: 3px; 
-                font-size: 14px; 
-                font-weight: bold;
-                padding: 0px;
-                margin: 0px;
-                text-align: center;
-                min-width: 20px;
-                max-width: 20px;
-                width: 20px;
-            }
-            QPushButton:hover { 
-                background-color: #c82333; 
-                border-color: #bd2130;
-            }
-            QPushButton:pressed { 
-                background-color: #bd2130; 
-                border-color: #b21f2d;
-            }
-            QPushButton:disabled { 
-                background-color: #28a745; 
-                color: white; 
-                border-color: #1e7e34;
-            }
-        """)
-        cancel_button.setFocusPolicy(Qt.FocusPolicy.NoFocus)
-        cancel_button.clicked.connect(lambda checked, row_idx=row: self.cancel_track(row_idx))
-        
-        layout = container.layout()
-        layout.addWidget(cancel_button)
-```
-
-**Purpose**: Creates perfect 20x20px square red "×" buttons only for missing tracks, properly styled and connected.
-
-### Change 6: Cancel Button Hiding for Downloaded Tracks
-**Location**: After `add_cancel_button_to_row()` method
-
-**Added Complete Method**:
-```python
-def hide_cancel_button_for_row(self, row):
-    """Hide cancel button for a specific row (when track is downloaded)"""
-    container = self.track_table.cellWidget(row, 5)
-    if container:
-        layout = container.layout()
-        if layout and layout.count() > 0:
-            cancel_button = layout.itemAt(0).widget()
-            if cancel_button:
-                cancel_button.setVisible(False)
-                print(f"🫥 Hidden cancel button for downloaded track at row {row}")
-```
-
-**Purpose**: Hides cancel buttons when tracks are successfully downloaded since cancellation is no longer relevant.
-
-### Change 7: Download Queue Integration
-**Location**: `start_next_batch_of_downloads()` method, inside the while loop
-
-**Added**:
-```python
-# Skip if track was cancelled
-if hasattr(self, 'cancelled_tracks') and track_index in self.cancelled_tracks:
-    print(f"🚫 Skipping cancelled track at index {track_index}: {track.name}")
-    self.download_queue_index += 1
-    self.completed_downloads += 1
-    continue
-```
-
-**Purpose**: Prevents cancelled tracks from entering the download queue, automatically skips them.
-
-### Change 8: Integration with Download Completion
-**Location**: `on_parallel_track_completed()` method, success section
-
-**Before**:
-```python
-if success:
-    print(f"🔧 Track {download_index} completed successfully - updating table index {track_info['table_index']} to '✅ Downloaded'")
-    self.track_table.setItem(track_info['table_index'], 4, QTableWidgetItem("✅ Downloaded"))
-    self.downloaded_tracks_count += 1
-    self.downloaded_count_label.setText(str(self.downloaded_tracks_count))
-    self.successful_downloads += 1
-```
-
-**After**:
-```python
-if success:
-    print(f"🔧 Track {download_index} completed successfully - updating table index {track_info['table_index']} to '✅ Downloaded'")
-    self.track_table.setItem(track_info['table_index'], 4, QTableWidgetItem("✅ Downloaded"))
-    # Hide cancel button since track is now downloaded
-    self.hide_cancel_button_for_row(track_info['table_index'])
-    self.downloaded_tracks_count += 1
-    self.downloaded_count_label.setText(str(self.downloaded_tracks_count))
-    self.successful_downloads += 1
-```
-
-**Purpose**: Automatically hides cancel buttons when tracks are successfully downloaded.
-
-### Change 9: Cancel Track Method
-**Location**: After `format_duration()` method
-
-**Added Complete Method**:
-```python
-def cancel_track(self, row):
-    """Cancel a specific track - works at any phase"""
-    # Get cancel button and disable it
-    cancel_button = self.track_table.cellWidget(row, 5)
-    if cancel_button:
-        cancel_button.setEnabled(False)
-        cancel_button.setText("✓")
-        cancel_button.setStyleSheet("""
-            QPushButton {
-                background-color: #28a745; color: white; border: none;
-                border-radius: 8px; font-size: 10px; font-weight: bold;
-            }
-        """)
-    
-    # Update status to cancelled
-    self.track_table.setItem(row, 4, QTableWidgetItem("🚫 Cancelled"))
-    
-    # Add to cancelled tracks set
-    if not hasattr(self, 'cancelled_tracks'):
-        self.cancelled_tracks = set()
-    self.cancelled_tracks.add(row)
-    
-    track = self.playlist.tracks[row]
-    print(f"🚫 Track cancelled: {track.name} (row {row})")
-    
-    # If downloads are active, also handle active download cancellation
-    download_index = None
-    
-    # Check active_downloads list
-    if hasattr(self, 'active_downloads'):
-        for download in self.active_downloads:
-            if download.get('table_index') == row:
-                download_index = download.get('download_index', row)
-                print(f"🚫 Found active download {download_index} for cancelled track")
-                break
-    
-    # Check parallel_search_tracking for download index
-    if download_index is None and hasattr(self, 'parallel_search_tracking'):
-        for idx, track_info in self.parallel_search_tracking.items():
-            if track_info.get('table_index') == row:
-                download_index = idx
-                print(f"🚫 Found parallel tracking {download_index} for cancelled track")
-                break
-    
-    # If we found an active download, trigger completion to free up the worker
-    if download_index is not None and hasattr(self, 'on_parallel_track_completed'):
-        print(f"🚫 Triggering completion for active download {download_index}")
-        self.on_parallel_track_completed(download_index, success=False)
-```
-
-**Purpose**: Main cancellation logic that works at any phase, handles UI updates, state management, and **properly cancels active workers**.
-
-### Change 6: Defensive Programming for Completion Handler
-**Location**: `on_parallel_track_completed()` method, beginning
-
-**Added**:
-```python
-if not hasattr(self, 'parallel_search_tracking'):
-    print(f"⚠️ parallel_search_tracking not initialized yet, skipping completion for download {download_index}")
-    return
-```
-
-**Purpose**: Prevents AttributeError when cancel is called before downloads start.
-
-### Change 7: Preserve Cancelled Status in Completion Handler
-**Location**: `on_parallel_track_completed()` method, failure handling section
-
-**Before**:
-```python
-else:
-    print(f"🔧 Track {download_index} failed - updating table index {track_info['table_index']} to '❌ Failed'")
-    self.track_table.setItem(track_info['table_index'], 4, QTableWidgetItem("❌ Failed"))
-    self.failed_downloads += 1
-    if track_info not in self.permanently_failed_tracks:
-        self.permanently_failed_tracks.append(track_info)
-    self.update_failed_matches_button()
-```
-
-**After**:
-```python
-else:
-    # Check if track was cancelled (don't overwrite cancelled status)
-    table_index = track_info['table_index']
-    current_status = self.track_table.item(table_index, 4)
-    if current_status and "🚫 Cancelled" in current_status.text():
-        print(f"🔧 Track {download_index} was cancelled - preserving cancelled status")
-    else:
-        print(f"🔧 Track {download_index} failed - updating table index {table_index} to '❌ Failed'")
-        self.track_table.setItem(table_index, 4, QTableWidgetItem("❌ Failed"))
-        if track_info not in self.permanently_failed_tracks:
-            self.permanently_failed_tracks.append(track_info)
-        self.update_failed_matches_button()
-    self.failed_downloads += 1
-```
-
-**Purpose**: **CRITICAL FIX** - Prevents cancelled tracks from having their status overwritten with "❌ Failed" when completion handler is triggered.
-
-### Change 8: Smart Wishlist Integration for Cancelled Tracks
-**Location**: `on_all_downloads_complete()` method, before wishlist processing
-
-**Added**:
-```python
-# Add cancelled tracks that were missing from Plex to permanently_failed_tracks for wishlist inclusion
-if hasattr(self, 'cancelled_tracks') and hasattr(self, 'missing_tracks'):
-    for cancelled_row in self.cancelled_tracks:
-        # Check if this cancelled track was actually missing from Plex
-        cancelled_track = self.playlist.tracks[cancelled_row]
-        missing_track_result = None
-        
-        # Find the corresponding missing track result
-        for missing_result in self.missing_tracks:
-            if missing_result.spotify_track.id == cancelled_track.id:
-                missing_track_result = missing_result
-                break
-        
-        # Only add to wishlist if track was actually missing from Plex AND not successfully downloaded
-        if missing_track_result:
-            # Check if track was successfully downloaded (don't add downloaded tracks to wishlist)
-            status_item = self.track_table.item(cancelled_row, 4)
-            current_status = status_item.text() if status_item else ""
-            
-            if "✅ Downloaded" in current_status:
-                print(f"🚫 Cancelled track {cancelled_track.name} was already downloaded, skipping wishlist addition")
-            else:
-                cancelled_track_info = {
-                    'download_index': cancelled_row,
-                    'table_index': cancelled_row,
-                    'track': cancelled_track,
-                    'track_name': cancelled_track.name,
-                    'artist_name': cancelled_track.artists[0] if cancelled_track.artists else "Unknown",
-                    'retry_count': 0,
-                    'spotify_track': missing_track_result.spotify_track  # Include the spotify track for wishlist
-                }
-                # Check if not already in permanently_failed_tracks
-                if not any(t.get('table_index') == cancelled_row for t in self.permanently_failed_tracks):
-                    self.permanently_failed_tracks.append(cancelled_track_info)
-                    print(f"🚫 Added cancelled missing track {cancelled_track.name} to failed list for wishlist")
-        else:
-            print(f"🚫 Cancelled track {cancelled_track.name} was not missing from Plex, skipping wishlist addition")
-```
-
-**Purpose**: **COMPLETE LOGIC** - Ensures only cancelled tracks that were missing from Plex AND not successfully downloaded get added to wishlist. Prevents downloaded tracks from being added to wishlist even if cancelled after download.
-
-## Key Design Decisions
-
-### 1. **Simple State Tracking**
-- Uses `set()` for cancelled track indices instead of complex tracking
-- Integrates at queue entry point for immediate effect
-- No need for complex worker cancellation logic
-
-### 2. **Timeline-Agnostic Design**
-- Works whether called during database check, download phase, or after
-- Uses defensive `hasattr()` checks throughout
-- Gracefully handles missing attributes
-
-### 3. **Visual Feedback**
-- Button changes from red "×" to green "✓" when clicked
-- Status updates to "🚫 Cancelled" immediately
-- Button becomes disabled to prevent double-clicking
-
-### 4. **Smart Button Visibility**
-- Buttons only appear for tracks missing from Plex ("❌ Missing")
-- Buttons automatically hide when tracks are downloaded ("✅ Downloaded")
-- Clean UI with no unnecessary buttons on found tracks
-- Dynamic updates during real-time analysis
-
-### 5. **Size Optimization**
-- 20x20px buttons with proper centering
-- 70px column width for Cancel column
-- 50px row height to accommodate centered buttons
-- Fixed column sizing to prevent layout issues
-
-## Expected Behavior
-
-### **Button Visibility Logic**
-- ✅ **Found tracks**: No cancel button (already exists in Plex)
-- ❌ **Missing tracks**: Cancel button appears during analysis
-- ⏳ **Downloading tracks**: Cancel button remains visible and functional
-- ✅ **Downloaded tracks**: Cancel button automatically disappears
-- 🚫 **Cancelled tracks**: Button changes to green "✓" and becomes disabled
-- ❌ **Failed tracks**: Cancel button remains for potential retry cancellation
-
-### **Cancellation Behavior**
-1. **Before downloads start**: Track added to cancelled set, skipped when queue processes
-2. **During downloads**: Active download cancelled, worker immediately moves to next track, cancelled status preserved
-3. **After downloads**: Visual cancellation only (track already processed)
-4. **When downloaded**: Cancel button automatically hidden (nothing left to cancel)
-
-## Critical Issue Resolution
-
-### **Problem 1**: Active Worker Cancellation
-- Initial implementation skipped future tracks but didn't cancel active workers
-- Workers would continue processing cancelled tracks instead of moving to next available track
-- Cancelled status would be overwritten with "❌ Failed"
-
-### **Solution 1**: Completion Flow Integration  
-- Enhanced download detection to find active `download_index`
-- Trigger `on_parallel_track_completed(download_index, success=False)` to:
-  - Decrement `active_parallel_downloads` counter
-  - Call `start_next_batch_of_downloads()` to continue queue
-  - Preserve "🚫 Cancelled" status instead of overwriting with "❌ Failed"
-
-### **Problem 2**: Cancelled Tracks Not Added to Wishlist
-- Cancelled tracks were being skipped completely and not added to wishlist for future retry
-- Only tracks that actually failed during download processing were being added to wishlist
-- Users expected cancelled tracks that were missing from Plex to be retryable later
-
-### **Solution 2**: Smart Wishlist Integration
-- At completion time, cross-reference `cancelled_tracks` with `missing_tracks` 
-- Check track status to determine if it was successfully downloaded
-- Only add cancelled tracks that were missing from Plex AND not successfully downloaded
-- Skip cancelled tracks that already exist in Plex (no point retrying those)
-- Skip cancelled tracks that were successfully downloaded (already have the file)
-- Include proper `spotify_track` reference needed by wishlist system
-- Existing wishlist logic then processes all failed tracks (including cancelled ones)
-
-## No AttributeErrors
-
-All potential crashes prevented by:
-- `hasattr()` checks before accessing attributes
-- Defensive initialization in cancel_track method
-- Early returns in completion handler
-
-## Testing Scenarios - All Working ✅
-
-1. ✅ **Smart button visibility** → Only missing tracks get cancel buttons
-2. ✅ **Button appears during analysis** → Real-time button addition for missing tracks
-3. ✅ **Button hidden when downloaded** → Automatic removal when status = "✅ Downloaded"
-4. ✅ **No buttons on found tracks** → Clean UI for tracks already in Plex
-5. ✅ **Cancel during database check** → Track skipped when downloads start
-6. ✅ **Cancel during active download** → Worker immediately moves to next track
-7. ✅ **Cancel multiple tracks rapidly** → All handled correctly
-8. ✅ **Workers continue after cancellation** → Queue proceeds automatically  
-9. ✅ **Button states and UI updates** → Proper visual feedback
-10. ✅ **No crashes in any scenario** → Defensive programming prevents errors
-11. ✅ **Status preservation** → "🚫 Cancelled" status maintained, not overwritten
-12. ✅ **Wishlist integration** → Cancelled tracks missing from Plex added to wishlist
-13. ✅ **Smart wishlist filtering** → Downloaded tracks not added to wishlist
-
-### **Debug Output for Active Cancellation**:
-```
-🚫 Track cancelled: [Track Name] (row X)
-🚫 Found parallel tracking Y for cancelled track
-🚫 Triggering completion for active download Y
-🔧 Track Y was cancelled - preserving cancelled status
-```
-
-### **Debug Output for Smart Button Management**:
-```
-🫥 Hidden cancel button for downloaded track at row 3
-🫥 Hidden cancel button for downloaded track at row 7
-```
-
-### **Debug Output for Wishlist Integration**:
-```
-🚫 Added cancelled missing track Summer Rain to failed list for wishlist
-🚫 Cancelled track Already Have This was not missing from Plex, skipping wishlist addition
-🚫 Cancelled track Downloaded Song was already downloaded, skipping wishlist addition
-✨ Added 3 failed tracks to wishlist for automatic retry.
-```
-
-## Replication Instructions
-
-To replicate this exact implementation:
-
-1. Follow changes in order listed above
-2. Use exact code snippets provided
-3. Test after each major change
-4. Verify Python syntax with `python3 -m py_compile ui/pages/sync.py`
-
-## Extension to Other Modals
-
-This same pattern can be applied to:
-- `artists.py` - DownloadMissingAlbumTracksModal
-- `dashboard.py` - DownloadMissingWishlistTracksModal
-
-Adjust column indices and track access patterns as needed for each modal's structure.
\ No newline at end of file
diff --git a/MATCHED_DOWNLOAD_SYSTEM.md b/MATCHED_DOWNLOAD_SYSTEM.md
deleted file mode 100644
index 67e2e701..00000000
--- a/MATCHED_DOWNLOAD_SYSTEM.md
+++ /dev/null
@@ -1,259 +0,0 @@
-# 🎯 SoulSync Matched Download System - Technical Deep Dive
-
-## Overview
-
-SoulSync's matched download system is the core mechanism that transforms messy, inconsistent Soulseek filenames into pristine, Spotify-accurate folder structures. This system is used universally across all download modalities in the application.
-
-## Universal System Usage
-
-**All download modals use the same matched download system:**
-
-### 📋 **Sync Page**: "Download Missing Tracks" Modal
-- **Entry Point**: `DownloadMissingTracksModal` in `sync.py`
-- **Flow**: User selects tracks → SpotifyMatchingModal → `_handle_match_confirmed()` → `_start_download_with_artist()`
-- **Organization**: Uses `_organize_matched_download()` for file placement
-
-### 🎨 **Artists Page**: "Download Missing Album Tracks" Modal  
-- **Entry Point**: `DownloadMissingAlbumTracksModal` in `artists.py`
-- **Flow**: Same as Sync page - all paths lead to downloads.py
-- **Special Feature**: Can force album mode with `_force_album_mode = True`
-
-### 📊 **Dashboard Page**: Automatic Wishlist Processing
-- **Entry Point**: `DownloadMissingWishlistTracksModal` in `dashboard.py`
-- **Flow**: Background processing every 60 minutes → same matched download system
-- **Automation**: Processes up to 25 wishlist tracks without user intervention
-
-### 💿 **Downloads Page**: Manual "Matched Download" Button
-- **Entry Point**: Direct user click on matched download button
-- **Flow**: `SpotifyMatchingModal` → same system as all others
-
-**Key Point**: All modals ultimately call the same core functions in `downloads.py`, ensuring consistent behavior and file organization across the entire application.
-
----
-
-## Folder Structure Decision Matrix
-
-### 🎵 **Album Track Structure**
-```
-Transfer/
-├── ARTIST_NAME/
-    └── ARTIST_NAME - ALBUM_NAME/
-        ├── 01 - Track Title.flac
-        ├── 02 - Another Track.flac
-        └── 03 - Final Track.flac
-```
-
-### 🎤 **Single Track Structure**  
-```
-Transfer/
-├── ARTIST_NAME/
-    └── ARTIST_NAME - SINGLE_NAME/
-        └── Single Name.flac
-```
-
----
-
-## The Algorithm: Album vs Single Decision
-
-### **Priority 1: Forced Album Mode** (Always Album)
-```python
-if hasattr(download_item, '_force_album_mode') and download_item._force_album_mode:
-    return {'is_album': True, ...}
-```
-- **When**: User explicitly selected album mode via "Download Missing Album Tracks"
-- **Result**: Album structure regardless of Spotify data
-
-### **Priority 2: Album-Aware Search** (Existing Context)
-```python
-if download_item.album and download_item.album != "Unknown Album":
-    # Search within that specific album context
-```
-- **When**: Download item has existing album information
-- **Process**: Searches Spotify for track within specific album
-
-### **Priority 3: Spotify API Decision** (The Core Logic)
-```python
-# Get detailed track info from Spotify API
-detailed_track = self.spotify_client.get_track_details(best_match.id)
-
-# THE CRITICAL DECISION:
-is_album = (
-    # 1. Spotify classifies as 'album' (not 'single')
-    album_type == 'album' and
-    # 2. Album has multiple tracks (not just 1)  
-    total_tracks > 1 and
-    # 3. Album name ≠ Track name (prevents self-titled singles)
-    album_name != track_name and
-    # 4. Album name ≠ Artist name (prevents artist name albums)
-    album_name != artist_name
-)
-```
-
----
-
-## Real-World Decision Examples
-
-### **Case Study: "bad guy" by Billie Eilish**
-
-**The Challenge**: Track exists as both single and album track
-- **Single Version**: `album_type: "single"`, `total_tracks: 1`
-- **Album Version**: `album_type: "album"`, `total_tracks: 14`, album: "WHEN WE ALL FALL ASLEEP, WHERE DO WE GO?"
-
-**SoulSync's Decision Process**:
-```python
-# Spotify search returns album version first (canonical)
-album_type = "album"           # ✅ TRUE
-total_tracks = 14             # ✅ TRUE (14 > 1)  
-album_name = "WHEN WE ALL FALL ASLEEP, WHERE DO WE GO?"
-track_name = "bad guy"        # ✅ TRUE (album ≠ track)
-artist_name = "Billie Eilish" # ✅ TRUE (album ≠ artist)
-
-# Result: is_album = TRUE
-```
-
-**Final Structure**:
-```
-Transfer/
-└── Billie Eilish/
-    └── Billie Eilish - WHEN WE ALL FALL ASLEEP, WHERE DO WE GO?/
-        ├── 01 - bury a friend.flac
-        ├── 02 - bad guy.flac          // Album context preserved!
-        └── 03 - xanny.flac
-```
-
-### **Edge Cases Handled**
-
-| Scenario | Spotify Data | Decision | Structure |
-|----------|-------------|----------|-----------|
-| **Normal Album Track** | `album_type: "album"`, `total_tracks: 12` | Album | `Artist/Artist - Album/01 - Track.flac` |
-| **True Single** | `album_type: "single"`, `total_tracks: 1` | Single | `Artist/Artist - Track/Track.flac` |
-| **Self-Titled** | Track: "Metallica", Album: "Metallica" | Single | `Artist/Artist - Track/Track.flac` |
-| **Artist Name Album** | Track: "Something", Album: "Pink Floyd" | Single | `Artist/Artist - Track/Track.flac` |
-
----
-
-## Naming Source Hierarchy
-
-### **Artist Folder**: `Transfer/ARTIST_NAME/`
-- **Source**: `download_item.matched_artist.name` (Spotify Artist object)
-- **NOT** the original Soulseek filename artist
-
-### **Album Folder**: `ARTIST_NAME - ALBUM_NAME/`
-```python
-# Both parts from Spotify match
-album_folder_name = f"{artist.name} - {album_info['album_name']}"
-```
-- **Artist**: `matched_artist.name` from Spotify
-- **Album**: Priority order:
-  1. `download_item.matched_album.name` (Spotify album)
-  2. `download_item._force_album_name` (user-selected)
-  3. Cleaned original Soulseek album name
-
-### **Track Filename**: `01 - Track Title.ext`
-```python
-track_filename = f"{track_number:02d} - {clean_track_name}{file_ext}"
-```
-
-**Track Number Source**:
-- **Primary**: Spotify track number from album
-- **Fallback**: Sequential numbering (1, 2, 3...)
-
-**Track Title Priority**:
-1. `download_item._spotify_clean_title` (Spotify track name)
-2. `album_info.get('clean_track_name')` (processed Spotify name)  
-3. `download_item.title` (original Soulseek filename)
-
----
-
-## File Sanitization & Cleaning
-
-### **Filename Sanitization**
-```python
-def _sanitize_filename(self, filename: str) -> str:
-    # Replace invalid characters with underscores
-    sanitized = re.sub(r'[<>:"/\\|?*]', '_', filename)
-    # Consolidate multiple spaces
-    sanitized = re.sub(r'\s+', ' ', sanitized).strip()
-    # Limit to 200 characters
-    return sanitized[:200]
-```
-
-### **Album Title Cleaning**
-Removes Soulseek noise patterns:
-- **Artist redundancy**: "Kendrick Lamar - good kid, m.A.A.d city" → "good kid, m.A.A.d city"
-- **Quality indicators**: "[320 Kbps]", "[FLAC]", "(2012)"
-- **Format tags**: "[Album+iTunes+Bonus Tracks]", "[Deluxe Edition]"
-
----
-
-## Smart Album Grouping System
-
-### **Consistency Cache**
-```python
-# Ensures all tracks from same album get identical folder names
-self.album_name_cache[f"{artist}::{base_album}"] = resolved_name
-```
-
-### **Upgrade Logic**
-If ANY track is from a deluxe/special edition:
-- ALL tracks get grouped under that enhanced name
-- Prevents folder fragmentation (e.g., "Album" vs "Album (Deluxe)")
-
-### **Base Album Extraction**
-```python
-# "The Dark Side of the Moon (2011 Remaster)" → "The Dark Side of the Moon"
-base_album = self._get_base_album_name(album_name)
-```
-
----
-
-## Integration Flow Diagram
-
-```
-[User Action: Download Missing Tracks]
-           ↓
-[SpotifyMatchingModal: Select Artist/Album] 
-           ↓
-[_handle_match_confirmed(): Attach Spotify metadata]
-    • download_item.matched_artist = Artist
-    • download_item.matched_album = Album  
-    • download_item._spotify_clean_title = Title
-           ↓
-[_start_download_with_artist(): Preserve metadata]
-           ↓
-[Download Completion]
-           ↓
-[_organize_matched_download(): Apply naming system]
-    • _detect_album_info(): Album vs Single decision
-    • _resolve_album_group(): Consistent album naming
-    • _sanitize_filename(): Safe filesystem names
-           ↓
-[Final Organization: Clean folder structure]
-```
-
----
-
-## Why This System Is Powerful
-
-1. **Universal Consistency**: Same logic across all download methods
-2. **Spotify Accuracy**: Uses official metadata, not messy filenames  
-3. **Album Bias**: Prefers proper album organization over scattered singles
-4. **Smart Grouping**: Prevents folder fragmentation for different editions
-5. **Context Preservation**: Maintains musical relationships and album integrity
-
-The result is a pristine, professionally organized music library that looks like it was curated by a music service, regardless of how chaotic the original Soulseek files were named.
-
----
-
-## Key Files & Functions
-
-- **`ui/pages/downloads.py`**: Core organization logic
-  - `_organize_matched_download()`: Main organization function
-  - `_detect_album_info()`: Album vs single decision
-  - `_start_download_with_artist()`: Metadata preservation
-- **`ui/pages/sync.py`**: Playlist-based download modal
-- **`ui/pages/artists.py`**: Artist discography download modal  
-- **`ui/pages/dashboard.py`**: Wishlist automatic processing
-- **SpotifyMatchingModal**: User selection interface (shared across all modals)
-
-This system ensures that whether you're downloading from playlists, artist pages, or the automatic wishlist, every track gets the same high-quality, Spotify-matched organization.
\ No newline at end of file
diff --git a/METADATA_ENHANCEMENT_IMPLEMENTATION.md b/METADATA_ENHANCEMENT_IMPLEMENTATION.md
deleted file mode 100644
index 9f1035eb..00000000
--- a/METADATA_ENHANCEMENT_IMPLEMENTATION.md
+++ /dev/null
@@ -1,161 +0,0 @@
-# 🎵 SoulSync Metadata Enhancement System - Implementation Complete
-
-## 🎯 Overview
-
-The metadata enhancement system has been successfully implemented in SoulSync! This powerful feature automatically enriches downloaded music files with accurate Spotify metadata, transforming them from messy Soulseek files into perfectly tagged, Plex-ready tracks.
-
-## ✨ Features Implemented
-
-### 🎼 **Core Metadata Enhancement Engine**
-- **Universal Integration**: Automatically enhances every matched download
-- **Multi-Format Support**: MP3 (ID3v2.4), FLAC (Vorbis), MP4/M4A (iTunes), OGG (Vorbis)
-- **Rich Metadata**: Artist, Album, Title, Track #, Total Tracks, Release Date, Genres
-- **Plex Optimization**: Album Artist tags and format-specific optimizations for perfect Plex integration
-
-### 🎨 **High-Quality Album Art Embedding**
-- **Direct Spotify Integration**: Downloads 640x640 high-quality album art from Spotify CDN
-- **Format-Appropriate Embedding**: ID3 APIC for MP3, PICTURE for FLAC, covr for MP4/M4A
-- **Smart Caching**: Avoids redundant downloads for multiple tracks from same album
-- **Network Resilience**: Graceful fallback when album art is unavailable
-
-### ⚙️ **Configuration & User Control**
-- **Settings Page Integration**: Three toggle switches for granular control
-- **Per-Feature Control**: Enable/disable metadata enhancement, album art embedding, and Plex optimizations
-- **Real-Time Configuration**: Changes apply immediately to new downloads
-- **Smart Defaults**: Enabled by default with user-friendly settings
-
-### 🔄 **Seamless Integration**
-- **Zero User Intervention**: Works automatically with all download modals (Sync, Artists, Dashboard, Downloads)
-- **Perfect Timing**: Enhances metadata after file organization but before final completion
-- **Error Handling**: Comprehensive fallback system preserves original tags on any failure
-- **Performance Optimized**: Background processing doesn't impact UI responsiveness
-
-## 🛠️ Technical Implementation
-
-### **Integration Point**
-```python
-# In _organize_matched_download() after file move:
-if self._enhance_file_metadata(new_file_path, download_item, artist, album_info):
-    print(f"✅ Metadata enhanced with Spotify data")
-else:
-    print(f"⚠️ Metadata enhancement failed, using original tags")
-```
-
-### **Core Enhancement Pipeline**
-1. **Load Audio File**: Uses Mutagen to detect and load the audio file
-2. **Extract Spotify Metadata**: Pulls rich data from matched Artist/Album objects
-3. **Format Detection**: Identifies MP3/FLAC/MP4/OGG for appropriate tag handling
-4. **Apply Tags**: Uses format-specific tag writers for optimal compatibility
-5. **Embed Album Art**: Downloads and embeds high-quality Spotify album art
-6. **Validation**: Ensures successful enhancement with comprehensive error handling
-
-### **Metadata Mapping**
-
-| Field | Purpose | MP3 (ID3v2.4) | FLAC | MP4/M4A |
-|-------|---------|---------------|------|---------|
-| **Title** | Track name | TIT2 | TITLE | ©nam |
-| **Artist** | Primary performer | TPE1 | ARTIST | ©ART |
-| **Album Artist** | **Critical for Plex** | TPE2 | ALBUMARTIST | aART |
-| **Album** | Album/single name | TALB | ALBUM | ©alb |
-| **Date** | Release year | TDRC | DATE | ©day |
-| **Track Number** | Track position | TRCK | TRACKNUMBER | trkn |
-| **Genre** | Music classification | TCON | GENRE | ©gen |
-| **Album Art** | Visual identification | APIC | PICTURE | covr |
-
-## 📁 Configuration
-
-### **config.json Addition**
-```json
-{
-  "metadata_enhancement": {
-    "enabled": true,
-    "embed_album_art": true,
-    "plex_optimizations": true,
-    "preserve_original_tags": false,
-    "supported_formats": ["mp3", "flac", "mp4", "m4a", "ogg"],
-    "fallback_behavior": "preserve_original",
-    "logging_level": "info"
-  }
-}
-```
-
-### **Settings Page Controls**
-- **Enable metadata enhancement with Spotify data**: Master toggle for the entire system
-- **Embed high-quality album art from Spotify**: Control album art embedding
-- **Apply Plex-specific tag optimizations**: Enable Album Artist and other Plex-friendly tags
-- **Supported Formats Display**: Shows MP3, FLAC, MP4/M4A, OGG
-
-## 🎯 Expected Benefits
-
-### **For Plex Users**
-- **Instant Recognition**: Plex immediately identifies artists, albums, and tracks
-- **Perfect Organization**: No manual matching or correction needed
-- **Rich Metadata**: Genres, release years, and popularity for smart features
-- **Visual Appeal**: High-quality embedded album art throughout library
-- **Advanced Features**: Artist radio, similar tracks, and decade organization work perfectly
-
-### **For Music Libraries**
-- **Professional Quality**: Broadcast-standard metadata consistency
-- **Cross-Platform**: Enhanced files work in any music application
-- **Future-Proof**: Rich metadata supports advanced music features
-- **Backup Reliability**: Metadata travels with files during backup/migration
-
-### **For Users**
-- **"Set and Forget"**: Files are perfectly tagged automatically
-- **Zero Manual Work**: No more editing tags or fixing metadata
-- **Consistency**: Uniform metadata quality across entire library
-- **Peace of Mind**: Every download is enhanced to perfection
-
-## 🔧 Usage
-
-### **For New Downloads**
-1. Download any track using SoulSync's matched download system
-2. The system automatically detects the matched Spotify data
-3. After file organization, metadata is enhanced using Spotify information
-4. Album art is downloaded and embedded from Spotify's CDN
-5. Files are ready for Plex with perfect metadata!
-
-### **Verification**
-Check the console output during downloads for metadata enhancement status:
-- `🎵 Enhancing metadata for: [filename]`
-- `🎯 Extracted metadata: Artist - Title (Album)`
-- `🎨 Downloading album art for embedding...`
-- `✅ Metadata enhanced with Spotify data`
-
-### **Troubleshooting**
-- **No Enhancement**: Check Settings > Metadata Enhancement > Enable checkbox
-- **No Album Art**: Verify embed album art setting and internet connection
-- **Format Issues**: Only MP3, FLAC, MP4/M4A, and OGG files are supported
-- **Error Messages**: Check console output for detailed error information
-
-## 📊 Implementation Stats
-
-- **Files Modified**: 3 (downloads.py, settings.py, config.json)
-- **New Methods Added**: 8 core metadata enhancement functions
-- **Lines of Code**: ~350 lines of new functionality
-- **Audio Formats**: 4 format-specific tag writers
-- **Configuration Options**: 7 user-controllable settings
-- **Integration Points**: 1 seamless hook in matched download system
-
-## 🚀 Future Enhancements
-
-The system is designed for extensibility. Potential future improvements:
-
-1. **Batch Processing**: Enhance existing files in Transfer folder
-2. **Advanced Genre Intelligence**: Multi-level genre classification
-3. **Custom Metadata Fields**: User-defined tag additions
-4. **Metadata Validation**: Post-enhancement quality checks
-5. **Performance Analytics**: Track enhancement success rates
-
-## 🎉 Conclusion
-
-The metadata enhancement system transforms SoulSync from a simple file organizer into a complete music library curator. Every downloaded track now comes with:
-
-- ✅ Accurate artist, album, and track information from Spotify
-- ✅ Proper track numbering and album organization
-- ✅ High-quality embedded album art (640x640 from Spotify)
-- ✅ Genre classification and release date information
-- ✅ Plex-optimized tags for instant recognition
-- ✅ Cross-platform compatibility with all music applications
-
-**The feature is now live and ready to enhance your music collection automatically!** 🎵
\ No newline at end of file