diff --git a/.gitignore b/.gitignore
index af7bdaf..79ec79b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -362,3 +362,10 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 /.claude
+
+# Release packages / build artifacts (not tracked in git)
+Releases/
+dist/
+*.zip
+*.rar
+*.7z
diff --git a/CHANGES.md b/CHANGES.md
new file mode 100644
index 0000000..0bbc980
--- /dev/null
+++ b/CHANGES.md
@@ -0,0 +1,85 @@
+# 本機分支相對 GitHub (Babyhamsta/Yoable, origin/master) 的變更
+
+比較基準：`origin/master` @ `37ec380`（"Update README installation requirements"）
+本機領先 5 個已提交的 commit，另外工作區還有尚未提交的變更。
+
+## 一、已提交但尚未推送的 5 個 commit
+
+1. **Add automatic UI language detection based on system locale** (`5a5664d`)
+   - 首次啟動且尚無語言偏好設定時，自動偵測系統 UI 語系並套用最接近的支援語言
+   - 中文依文字系統分流：繁體（zh-Hant/zh-TW/zh-HK/zh-MO）→ zh-TW，簡體 → zh-CN
+   - 系統語言不支援時退回英文；使用者手動選擇的語言永遠優先，不會被自動偵測覆蓋
+
+2. **Ignore release packages (zip/rar/7z) in git** (`11029bb`)
+   - `.gitignore` 新增規則，避免發布用的壓縮檔被提交進版本庫
+
+3. **Use dist/ folder for release packages and ignore it** (`2fbe1e4`)
+   - 發布封裝統一輸出到 `dist/` 資料夾，並加入 `.gitignore`
+
+4. **Fix label exports and YouTube downloads** (`c2c5fdd`)
+   - 修正標籤匯出流程的問題
+   - 修正 YouTube 下載器（`YoutubeDownloader.cs`）的相關錯誤
+   - 調整 `NewProjectDialog.xaml` 版面
+   - 專案檔版本號更新
+
+5. **Update README installation requirements** (`37ec380`)
+   - 更新 README 的安裝需求說明
+
+## 二、工作區尚未提交的變更
+
+### 1. 圖片載入效能優化（大型專案 8000~10000 張圖片時的卡頓改善）
+
+**問題**：
+- 每次切換圖片時，在 **UI 執行緒同步解碼**整張圖片，且沒有任何快取，切回看過的圖也要重新解碼
+- 開啟大型專案時，即使 `.yoable` 專案檔的 `ImageReference` 早就有 `Width`/`Height` 欄位，存檔時卻從未寫入，導致每次開專案都要對上萬張圖逐一開檔解碼標頭來取得尺寸
+
+**解法**：
+- 新增 `Managers/ImageCacheManager.cs`：記憶體內的 LRU 點陣圖快取（預設上限 512MB / 512 張），並支援背景預載（prefetch）
+  - 快取的 `BitmapImage` 會 `Freeze()`，可在背景執行緒解碼、UI 執行緒直接顯示
+- `ImageManager.cs`：
+  - 新增 `Cache` 屬性（`ImageCacheManager`）
+  - 新增 `AddImageWithKnownSize(path, dimensions)`：跳過解碼標頭，直接用已知尺寸登記圖片
+  - `LoadImagesFromPathsAsync` 新增 `clearExisting` 參數，支援與"已知尺寸快速路徑"混合載入
+- `UI/DrawingCanvas.cs`：`LoadImage` 拆出一個接受已解碼 `ImageSource` 的多載，避免重複解碼
+- `MainWindow.xaml.cs`：
+  - `ImageListBox_SelectionChanged` 改為 `async`：快取命中則瞬間顯示；未命中則在背景執行緒解碼，不卡 UI
+  - 加入 generation 計數器，快速連續切圖時會捨棄過時的解碼結果，避免標籤存錯檔案
+  - 新增 `PrefetchNeighboringImages()`：每次切圖後自動背景預載後續 12 張、前面 4 張圖片，讓連續標註時下一張幾乎都是瞬間顯示
+- `ProjectManager.cs`：
+  - 匯出專案資料時，`ImageReference` 現在會寫入圖片的 `Width`/`Height`
+  - 匯入專案資料時，優先使用已存的尺寸直接註冊圖片（完全跳過解碼），只有舊專案檔（尺寸為 0x0）才會退回原本的解碼路徑
+  - `SaveProjectAs` 改為 `SaveProjectAsAsync`：資料夾建立與標籤檔複製移到背景執行緒，避免另存新檔時 UI 卡住；並修正失敗時專案路徑未回滾的問題
+
+### 2. 標籤「變更類別」功能
+
+- `MainWindow.xaml`：標籤清單（`LabelListBox`）的每個項目新增一顆「變更類別」圖示按鈕，並支援雙擊清單項目開啟類別選單
+- `MainWindow.xaml.cs`：
+  - 新增 `ChangeLabelClass_Click` / `LabelListBox_MouseDoubleClick` / `ShowChangeClassMenu`
+  - 以 `ContextMenu` 列出專案所有類別（含顏色色塊），點選後即時套用到該標籤並刷新畫布與清單
+- 多語系字串新增 `Main_ChangeClass`（English/日本語/Русский/简体中文/繁體中文皆已補上）
+
+### 3. 手動標註進度標記（Manual Labeling Progress）
+
+- `Models/ProjectData.cs`：新增 `ManualProgressImageFile` 欄位，記錄使用者手動標註進度的檔名檢查點
+- `MainWindow.xaml`：選單新增「設定目前為手動進度」／「跳至手動進度」兩個選項
+- `MainWindow.xaml.cs`：
+  - `SetManualProgress_Click`：將目前選取圖片設為進度檢查點，並重新計算所有圖片狀態
+  - `JumpToManualProgress_Click`：跳轉並選取到檢查點對應的圖片（會先清除篩選以確保可見）
+  - `IsAtOrBeforeManualProgress`：判斷某檔名是否在檢查點（依檔名排序）之前或等於檢查點
+  - 狀態判定邏輯（`DetermineImageStatus`）納入此檢查點：已在檢查點之前的 AI/匯入標籤，即使重新匯入也維持「已驗證」狀態，不會被誤判為需要複審
+- `ProjectManager.cs` 的狀態校正邏輯同步套用此規則
+- 新增對應多語系字串：`Menu_SetManualProgress`、`Menu_JumpManualProgress`、`Msg_ManualProgress_*` 系列（5 支語言檔皆已同步）
+
+### 4. 匯入標籤去重合併（Idempotent Import）
+
+- `Managers/LabelManager.cs`：
+  - 新增 `IsSameImportedLabel`：以 0.01 的座標容差判斷兩個標籤是否視為同一個框（因為 YOLO 匯出座標常有四捨五入誤差）
+  - 新增 `MergeImportedLabels`：合併既有標籤與匯入標籤時，先去除既有重複，再避免加入與既有標籤相同的匯入標籤
+  - 套用到兩處標籤匯入流程，確保重複匯入同一份已匯出的資料集不會造成標籤重複堆疊
+
+### 5. 其他小修正
+
+- `MainWindow.xaml.cs`：
+  - 「另存新檔」對話框補上 `DefaultExt`/`AddExtension`，避免使用者輸入檔名時漏副檔名
+  - 修正 `IsDescendantOf`（或同類的視覺樹判斷輔助方法）在 `OriginalSource` 為 `Run`（TextBlock 內的行內文字，非 Visual 節點）時，呼叫 `VisualTreeHelper.GetParent` 會拋例外的問題；改為先判斷是否為 `Visual`/`Visual3D` 節點，否則退回邏輯樹（`LogicalTreeHelper`）向上查找
+- `SettingsWindow.xaml`：語言下拉選單的顯示樣板，將原本用多個 `Run` 拼接語言名稱＋國際化名稱的寫法，改為 `StackPanel` + `StringFormat` 綁定，避免留白/格式問題
diff --git a/README.md b/README.md
index 8fc5b07..9491e62 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,12 @@ For non-WPF version you can build the legacy source or use v1.2.0 from releases
 
 ### 📥 Installation
 
+**Requirement:** Yoable needs the **[.NET 9 Desktop Runtime (x64)](https://dotnet.microsoft.com/download/dotnet/9.0/runtime?cid=getdotnetcore&runtime=desktop)** installed. If the app does not launch, install it first.
+
+需求:Yoable 需要先安裝 **[.NET 9 Desktop Runtime (x64)](https://dotnet.microsoft.com/download/dotnet/9.0/runtime?cid=getdotnetcore&runtime=desktop)**。如果程式無法開啟，請先安裝它。
+
 1. Download the latest release from our [GitHub Releases](https://github.com/Babyhamsta/Yoable/releases).
-2. Download and run Yoable (No install required!).
+2. Extract the zip and run `YoableWPF.exe`.
 3. (Optional) Load a **YOLO v5/v8/v11 (ONNX)** model for AI-assisted labeling.
 
 ### 🛠️ How to Use
diff --git a/YoableWPF/App.xaml b/YoableWPF/App.xaml
index 3674560..406af3a 100644
--- a/YoableWPF/App.xaml
+++ b/YoableWPF/App.xaml
@@ -8,6 +8,11 @@
             <ResourceDictionary.MergedDictionaries>
                 <ui:ThemeResources />
                 <ui:XamlControlsResources />
+                <ResourceDictionary Source="Themes/Palette.xaml"/>
+                <ResourceDictionary Source="Themes/Cards.xaml"/>
+                <ResourceDictionary Source="Themes/Controls.xaml"/>
+                <ResourceDictionary Source="Themes/Lists.xaml"/>
+                <ResourceDictionary Source="Themes/Shell.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/YoableWPF/App.xaml.cs b/YoableWPF/App.xaml.cs
index b943519..7d77989 100644
--- a/YoableWPF/App.xaml.cs
+++ b/YoableWPF/App.xaml.cs
@@ -26,6 +26,19 @@ protected override void OnStartup(StartupEventArgs e)
             // The LanguageManager constructor already loads the language from settings
             _ = LanguageManager.Instance;
 
+            // Apply saved theme + accent before any window shows so the
+            // StartupWindow (and everything after) respects them
+            ModernWpf.ThemeManager.Current.ApplicationTheme = YoableWPF.Properties.Settings.Default.DarkTheme
+                ? ModernWpf.ApplicationTheme.Dark
+                : ModernWpf.ApplicationTheme.Light;
+            try
+            {
+                ModernWpf.ThemeManager.Current.AccentColor =
+                    (System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString(
+                        YoableWPF.Properties.Settings.Default.FormAccent);
+            }
+            catch { /* invalid stored hex — keep default accent */ }
+
             // Show the startup window (combined splash screen and project selector)
             var startupWindow = new StartupWindow();
             startupWindow.Show();
diff --git a/YoableWPF/AugmentationDialog.xaml b/YoableWPF/AugmentationDialog.xaml
new file mode 100644
index 0000000..b114045
--- /dev/null
+++ b/YoableWPF/AugmentationDialog.xaml
@@ -0,0 +1,113 @@
+<Window x:Class="YoableWPF.AugmentationDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:ui="http://schemas.modernwpf.com/2019"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        Title="{DynamicResource Aug_Title}"
+        Width="560"
+        Height="620"
+        MinWidth="480"
+        MinHeight="520"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="CanResize">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <Border Grid.Row="0"
+                Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
+                BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                BorderThickness="0,0,0,1"
+                Padding="20,16">
+            <StackPanel>
+                <TextBlock Text="{DynamicResource Aug_Title}" FontSize="18" FontWeight="SemiBold"/>
+                <TextBlock Text="{DynamicResource Aug_Subtitle}"
+                           Margin="0,6,0,0" FontSize="12"
+                           Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"
+                           TextWrapping="Wrap"/>
+            </StackPanel>
+        </Border>
+
+        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" Padding="20,16">
+            <StackPanel>
+                <!-- Output folder -->
+                <TextBlock Text="{DynamicResource Aug_OutputFolder}" FontWeight="SemiBold" Margin="0,0,0,6"/>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBox x:Name="OutputPathBox" Grid.Column="0" Height="30" IsReadOnly="True"
+                             VerticalContentAlignment="Center" TextChanged="OutputPath_TextChanged"/>
+                    <Button Grid.Column="1" Content="{DynamicResource Aug_Browse}" Width="100" Height="30"
+                            Margin="8,0,0,0" Click="Browse_Click"/>
+                </Grid>
+
+                <!-- Scope -->
+                <TextBlock Text="{DynamicResource Aug_Scope}" FontWeight="SemiBold" Margin="0,20,0,6"/>
+                <StackPanel Orientation="Horizontal">
+                    <RadioButton x:Name="ScopeAll" GroupName="scope" IsChecked="True"
+                                 Content="{DynamicResource Aug_ScopeAll}" Margin="0,0,20,0"/>
+                    <RadioButton x:Name="ScopeCurrent" GroupName="scope"
+                                 Content="{DynamicResource Aug_ScopeCurrent}"/>
+                </StackPanel>
+
+                <!-- Variants + seed -->
+                <Grid Margin="0,20,0,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <StackPanel Grid.Column="0" Margin="0,0,10,0">
+                        <TextBlock Text="{DynamicResource Aug_Variants}" FontWeight="SemiBold" Margin="0,0,0,6"/>
+                        <xctk:IntegerUpDown x:Name="VariantsInput" Height="30" Minimum="1" Maximum="50"
+                                            Increment="1" Value="3" ValueChanged="Options_Changed"/>
+                    </StackPanel>
+                    <StackPanel Grid.Column="1" Margin="10,0,0,0">
+                        <TextBlock Text="{DynamicResource Aug_Seed}" FontWeight="SemiBold" Margin="0,0,0,6"/>
+                        <xctk:IntegerUpDown x:Name="SeedInput" Height="30" Minimum="0" Maximum="2147483647"
+                                            Increment="1" Value="0"/>
+                    </StackPanel>
+                </Grid>
+
+                <!-- Augmentations -->
+                <TextBlock Text="{DynamicResource Aug_Augmentations}" FontWeight="SemiBold" Margin="0,20,0,6"/>
+                <CheckBox x:Name="FlipCheck" Content="{DynamicResource Aug_Flip}" IsChecked="True"
+                          Margin="0,0,0,8" Checked="Options_CheckChanged" Unchecked="Options_CheckChanged"/>
+                <CheckBox x:Name="BrightnessCheck" Content="{DynamicResource Aug_Brightness}" IsChecked="True"
+                          Margin="0,0,0,8" Checked="Options_CheckChanged" Unchecked="Options_CheckChanged"/>
+                <CheckBox x:Name="HsvCheck" Content="{DynamicResource Aug_Hsv}" IsChecked="True"
+                          Margin="0,0,0,8" Checked="Options_CheckChanged" Unchecked="Options_CheckChanged"/>
+                <CheckBox x:Name="NoiseCheck" Content="{DynamicResource Aug_Noise}"
+                          Margin="0,0,0,8" Checked="Options_CheckChanged" Unchecked="Options_CheckChanged"/>
+                <CheckBox x:Name="BlurCheck" Content="{DynamicResource Aug_Blur}"
+                          Checked="Options_CheckChanged" Unchecked="Options_CheckChanged"/>
+
+                <!-- Output options -->
+                <TextBlock Text="{DynamicResource Aug_OutputOptions}" FontWeight="SemiBold" Margin="0,20,0,6"/>
+                <CheckBox x:Name="IncludeOriginalsCheck" Content="{DynamicResource Aug_IncludeOriginals}"
+                          IsChecked="True" Margin="0,0,0,8"/>
+                <CheckBox x:Name="LabeledOnlyCheck" Content="{DynamicResource Aug_LabeledOnly}" IsChecked="True"/>
+
+                <TextBlock x:Name="WarningText" Margin="0,14,0,0" FontSize="11" Foreground="IndianRed"
+                           TextWrapping="Wrap" Visibility="Collapsed"/>
+            </StackPanel>
+        </ScrollViewer>
+
+        <Border Grid.Row="2"
+                BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                BorderThickness="0,1,0,0"
+                Padding="20,14">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button Content="{DynamicResource Common_Cancel}" Width="96" Margin="0,0,8,0"
+                        IsCancel="True" Click="Cancel_Click"/>
+                <Button x:Name="OkButton" Content="{DynamicResource Common_OK}" Width="96"
+                        IsDefault="True" Click="Confirm_Click"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>
diff --git a/YoableWPF/AugmentationDialog.xaml.cs b/YoableWPF/AugmentationDialog.xaml.cs
new file mode 100644
index 0000000..00a1a5c
--- /dev/null
+++ b/YoableWPF/AugmentationDialog.xaml.cs
@@ -0,0 +1,110 @@
+using System;
+using System.IO;
+using System.Windows;
+using Microsoft.Win32;
+using YoableWPF.Managers;
+
+namespace YoableWPF
+{
+    public partial class AugmentationDialog : Window
+    {
+        public AugmentationOptions Options { get; private set; }
+
+        public AugmentationDialog(string defaultOutputDir, int variants, int seed, bool allowCurrentScope)
+        {
+            InitializeComponent();
+
+            OutputPathBox.Text = defaultOutputDir ?? string.Empty;
+            VariantsInput.Value = Math.Clamp(variants, 1, 50);
+            SeedInput.Value = Math.Max(0, seed);
+
+            if (!allowCurrentScope)
+            {
+                ScopeCurrent.IsEnabled = false;
+                ScopeAll.IsChecked = true;
+            }
+
+            UpdateValidationState();
+        }
+
+        private void Browse_Click(object sender, RoutedEventArgs e)
+        {
+            var dialog = new OpenFileDialog
+            {
+                ValidateNames = false,
+                CheckFileExists = false,
+                CheckPathExists = true,
+                FileName = "Select Folder"
+            };
+
+            if (!string.IsNullOrEmpty(OutputPathBox.Text) && Directory.Exists(OutputPathBox.Text))
+                dialog.InitialDirectory = OutputPathBox.Text;
+
+            if (dialog.ShowDialog() == true)
+            {
+                string folderPath = Path.GetDirectoryName(dialog.FileName);
+                if (!string.IsNullOrEmpty(folderPath))
+                    OutputPathBox.Text = folderPath;
+            }
+        }
+
+        private void Options_Changed(object sender, RoutedPropertyChangedEventArgs<object> e) => UpdateValidationState();
+        private void Options_CheckChanged(object sender, RoutedEventArgs e) => UpdateValidationState();
+        private void OutputPath_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e) => UpdateValidationState();
+
+        private bool AnyAugEnabled =>
+            (FlipCheck?.IsChecked == true) ||
+            (BrightnessCheck?.IsChecked == true) ||
+            (HsvCheck?.IsChecked == true) ||
+            (NoiseCheck?.IsChecked == true) ||
+            (BlurCheck?.IsChecked == true);
+
+        private void UpdateValidationState()
+        {
+            if (OkButton == null || WarningText == null) return;
+
+            bool hasOutput = !string.IsNullOrWhiteSpace(OutputPathBox?.Text);
+            bool anyAug = AnyAugEnabled;
+
+            OkButton.IsEnabled = hasOutput && anyAug;
+
+            if (!anyAug)
+            {
+                WarningText.Text = LanguageManager.Instance.GetString("Aug_NeedAugmentation")
+                    ?? "Enable at least one augmentation.";
+                WarningText.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                WarningText.Visibility = Visibility.Collapsed;
+            }
+        }
+
+        private void Confirm_Click(object sender, RoutedEventArgs e)
+        {
+            Options = new AugmentationOptions
+            {
+                OutputDirectory = OutputPathBox.Text.Trim(),
+                Scope = ScopeCurrent.IsChecked == true ? AugmentationScope.CurrentImage : AugmentationScope.AllImages,
+                VariantsPerImage = VariantsInput.Value ?? 3,
+                Seed = SeedInput.Value ?? 0,
+                IncludeOriginals = IncludeOriginalsCheck.IsChecked == true,
+                LabeledOnly = LabeledOnlyCheck.IsChecked == true,
+                EnableFlip = FlipCheck.IsChecked == true,
+                EnableBrightnessContrast = BrightnessCheck.IsChecked == true,
+                EnableHsv = HsvCheck.IsChecked == true,
+                EnableNoise = NoiseCheck.IsChecked == true,
+                EnableBlur = BlurCheck.IsChecked == true
+            };
+
+            DialogResult = true;
+            Close();
+        }
+
+        private void Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+    }
+}
diff --git a/YoableWPF/ChangelogWindow.xaml b/YoableWPF/ChangelogWindow.xaml
index 7df4368..c140cf2 100644
--- a/YoableWPF/ChangelogWindow.xaml
+++ b/YoableWPF/ChangelogWindow.xaml
@@ -13,71 +13,10 @@
 
     <Window.Resources>
         <!-- Accent color for buttons (uses system accent) -->
-        <SolidColorBrush x:Key="AccentButtonBrush" Color="{DynamicResource SystemAccentColor}"/>
 
         <!-- Modern Button Style -->
-        <Style x:Key="ModernButton" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource AccentButtonBrush}"/>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="20,10"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.9"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
 
         <!-- Secondary Button Style -->
-        <Style x:Key="SecondaryButton" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"/>
-            <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="20,10"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
 
         <!-- Section Header Style -->
         <Style x:Key="SectionHeader" TargetType="TextBlock">
diff --git a/YoableWPF/ClassConfidenceDialog.xaml b/YoableWPF/ClassConfidenceDialog.xaml
new file mode 100644
index 0000000..199dd9c
--- /dev/null
+++ b/YoableWPF/ClassConfidenceDialog.xaml
@@ -0,0 +1,144 @@
+<Window x:Class="YoableWPF.ClassConfidenceDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:ui="http://schemas.modernwpf.com/2019"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        Title="{DynamicResource AIClassConfidence_Title}"
+        Width="640"
+        Height="560"
+        MinWidth="540"
+        MinHeight="420"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="CanResize">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <Border Grid.Row="0"
+                Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
+                BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                BorderThickness="0,0,0,1"
+                Padding="20,16">
+            <StackPanel>
+                <TextBlock Text="{DynamicResource AIClassConfidence_Title}"
+                           FontSize="18"
+                           FontWeight="SemiBold"/>
+                <TextBlock Text="{DynamicResource AIClassConfidence_Subtitle}"
+                           Margin="0,6,0,0"
+                           FontSize="12"
+                           Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"
+                           TextWrapping="Wrap"/>
+            </StackPanel>
+        </Border>
+
+        <Grid Grid.Row="1" Margin="20,14,20,6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="28"/>
+                <ColumnDefinition Width="2*" MinWidth="130"/>
+                <ColumnDefinition Width="3*" MinWidth="180"/>
+                <ColumnDefinition Width="90"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Grid.Column="1"
+                       Text="{DynamicResource AIClassConfidence_Class}"
+                       FontSize="11"
+                       FontWeight="SemiBold"/>
+            <TextBlock Grid.Column="2"
+                       Text="{DynamicResource AIClassConfidence_Threshold}"
+                       FontSize="11"
+                       FontWeight="SemiBold"/>
+        </Grid>
+
+        <ScrollViewer Grid.Row="2"
+                      Margin="20,0"
+                      VerticalScrollBarVisibility="Auto">
+            <ItemsControl ItemsSource="{Binding ThresholdItems}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Border BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                                BorderThickness="0,0,0,1"
+                                Padding="0,10">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="28"/>
+                                    <ColumnDefinition Width="2*" MinWidth="130"/>
+                                    <ColumnDefinition Width="3*" MinWidth="180"/>
+                                    <ColumnDefinition Width="74"/>
+                                    <ColumnDefinition Width="16"/>
+                                </Grid.ColumnDefinitions>
+                                <Rectangle Grid.Column="0"
+                                           Width="12"
+                                           Height="12"
+                                           RadiusX="2"
+                                           RadiusY="2"
+                                           HorizontalAlignment="Left"
+                                           VerticalAlignment="Center"
+                                           Fill="{Binding ColorBrush}"/>
+                                <StackPanel Grid.Column="1" VerticalAlignment="Center">
+                                    <TextBlock Text="{Binding Name}"
+                                               FontWeight="SemiBold"
+                                               TextTrimming="CharacterEllipsis"/>
+                                    <TextBlock Text="{Binding ClassId, StringFormat=ID: {0}}"
+                                               FontSize="10"
+                                               Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+                                </StackPanel>
+                                <Slider Grid.Column="2"
+                                        Height="28"
+                                        Margin="8,0,12,0"
+                                        Minimum="0"
+                                        Maximum="100"
+                                        TickFrequency="5"
+                                        IsSnapToTickEnabled="False"
+                                        Value="{Binding ThresholdPercent, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                <xctk:DoubleUpDown Grid.Column="3"
+                                                   Height="28"
+                                                   Minimum="0"
+                                                   Maximum="100"
+                                                   Increment="1"
+                                                   FormatString="F0"
+                                                   Value="{Binding ThresholdPercent, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                <TextBlock Grid.Column="4"
+                                           Text="%"
+                                           Margin="4,0,0,0"
+                                           VerticalAlignment="Center"/>
+                            </Grid>
+                        </Border>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </ScrollViewer>
+
+        <Grid Grid.Row="3" Margin="20,14,20,18">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Grid Grid.Row="1" Margin="0,14,0,0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Button Grid.Column="0"
+                        Content="{DynamicResource AIClassConfidence_Reset}"
+                        Width="210"
+                        HorizontalAlignment="Left"
+                        Click="Reset_Click"/>
+                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                    <Button Content="{DynamicResource Common_Cancel}"
+                            Width="96"
+                            Margin="0,0,8,0"
+                            IsCancel="True"
+                            Click="Cancel_Click"/>
+                    <Button Content="{DynamicResource Common_OK}"
+                            Width="96"
+                            IsDefault="True"
+                            Click="Confirm_Click"/>
+                </StackPanel>
+            </Grid>
+        </Grid>
+    </Grid>
+</Window>
diff --git a/YoableWPF/ClassConfidenceDialog.xaml.cs b/YoableWPF/ClassConfidenceDialog.xaml.cs
new file mode 100644
index 0000000..cd7bae6
--- /dev/null
+++ b/YoableWPF/ClassConfidenceDialog.xaml.cs
@@ -0,0 +1,96 @@
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Windows;
+using System.Windows.Media;
+using YoableWPF.Managers;
+
+namespace YoableWPF
+{
+    public sealed class ClassConfidenceThresholdItem : INotifyPropertyChanged
+    {
+        private double thresholdPercent;
+
+        public int ClassId { get; }
+        public string Name { get; }
+        public Brush ColorBrush { get; }
+
+        public double ThresholdPercent
+        {
+            get => thresholdPercent;
+            set
+            {
+                double clampedValue = Math.Clamp(value, 0, 100);
+                if (Math.Abs(thresholdPercent - clampedValue) < 0.001)
+                    return;
+
+                thresholdPercent = clampedValue;
+                OnPropertyChanged();
+            }
+        }
+
+        public ClassConfidenceThresholdItem(LabelClass labelClass, float threshold)
+        {
+            ClassId = labelClass.ClassId;
+            Name = labelClass.Name;
+            ColorBrush = labelClass.ColorBrush;
+            thresholdPercent = Math.Clamp(threshold, 0f, 1f) * 100;
+        }
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        private void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+
+    public partial class ClassConfidenceDialog : Window
+    {
+        private readonly float globalConfidence;
+
+        public ObservableCollection<ClassConfidenceThresholdItem> ThresholdItems { get; }
+        public Dictionary<int, float> ConfidenceThresholds => ThresholdItems.ToDictionary(
+            item => item.ClassId,
+            item => (float)(item.ThresholdPercent / 100));
+
+        public ClassConfidenceDialog(
+            IEnumerable<LabelClass> classes,
+            IReadOnlyDictionary<int, float>? savedThresholds,
+            float globalConfidence)
+        {
+            this.globalConfidence = Math.Clamp(globalConfidence, 0f, 1f);
+            ThresholdItems = new ObservableCollection<ClassConfidenceThresholdItem>(
+                classes
+                    .OrderBy(labelClass => labelClass.ClassId)
+                    .Select(labelClass => new ClassConfidenceThresholdItem(
+                        labelClass,
+                        savedThresholds != null && savedThresholds.TryGetValue(
+                            labelClass.ClassId,
+                            out float savedThreshold)
+                            ? savedThreshold
+                            : this.globalConfidence)));
+
+            InitializeComponent();
+            DataContext = this;
+        }
+
+        private void Reset_Click(object sender, RoutedEventArgs e)
+        {
+            foreach (ClassConfidenceThresholdItem item in ThresholdItems)
+                item.ThresholdPercent = globalConfidence * 100;
+        }
+
+        private void Confirm_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = true;
+            Close();
+        }
+
+        private void Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+    }
+}
diff --git a/YoableWPF/ClassInputDialog.xaml b/YoableWPF/ClassInputDialog.xaml
index 699cbe8..8650211 100644
--- a/YoableWPF/ClassInputDialog.xaml
+++ b/YoableWPF/ClassInputDialog.xaml
@@ -85,15 +85,15 @@
             <StackPanel>
                 <TextBlock Text="Preview:" FontSize="11" Opacity="0.7" Margin="0,0,0,8"/>
                 <Border x:Name="PreviewBorder"
-                        Background="#44E57373"
-                        BorderBrush="#E57373"
+                        Background="{StaticResource StatusNoLabelSubtleBrush}"
+                        BorderBrush="{StaticResource StatusNoLabelBrush}"
                         BorderThickness="2"
                         CornerRadius="4"
                         Padding="8,6">
                     <StackPanel Orientation="Horizontal">
                         <Ellipse Width="12" Height="12" 
                                  x:Name="PreviewColorIndicator"
-                                 Fill="#E57373"
+                                 Fill="{StaticResource StatusNoLabelBrush}"
                                  Margin="0,0,8,0"
                                  VerticalAlignment="Center"/>
                         <TextBlock x:Name="PreviewText"
diff --git a/YoableWPF/ClassMigrationDialog.xaml b/YoableWPF/ClassMigrationDialog.xaml
index 3040bde..17aab84 100644
--- a/YoableWPF/ClassMigrationDialog.xaml
+++ b/YoableWPF/ClassMigrationDialog.xaml
@@ -16,15 +16,15 @@
         </Grid.RowDefinitions>
         
         <!-- Warning message -->
-        <Border Grid.Row="0" Background="#44FFB74D" 
-                BorderBrush="#FFB74D" BorderThickness="1"
+        <Border Grid.Row="0" Background="{StaticResource StatusReviewSubtleBrush}"
+                BorderBrush="{StaticResource StatusReviewBrush}" BorderThickness="1"
                 CornerRadius="4" Padding="12" Margin="0,0,0,16">
             <StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,8">
                     <TextBlock FontFamily="Segoe MDL2 Assets" 
                                Text="&#xE7BA;" 
                                FontSize="20"
-                               Foreground="#FFB74D"
+                               Foreground="{StaticResource StatusReviewBrush}"
                                Margin="0,0,8,0"/>
                     <TextBlock Text="Class In Use" 
                                FontWeight="Bold" 
@@ -64,7 +64,7 @@
         <!-- Option 2: Delete -->
         <RadioButton Grid.Row="3" x:Name="DeleteRadio" 
                      Content="Delete all labels with this class (cannot be undone!)" 
-                     Foreground="#E57373" 
+                     Foreground="{StaticResource StatusNoLabelBrush}"
                      VerticalAlignment="Top"
                      Checked="DeleteRadio_Checked"/>
         
diff --git a/YoableWPF/CustomMessageBox.xaml.cs b/YoableWPF/CustomMessageBox.xaml.cs
index 0e3ae98..da4eb1b 100644
--- a/YoableWPF/CustomMessageBox.xaml.cs
+++ b/YoableWPF/CustomMessageBox.xaml.cs
@@ -9,18 +9,12 @@ public partial class CustomMessageBox : Window
     {
         private MessageBoxResult result = MessageBoxResult.None;
 
-        // Icon colors
-        private static readonly SolidColorBrush InfoBrush = CreateFrozenBrush(0x64, 0xB5, 0xF6);
-        private static readonly SolidColorBrush WarningBrush = CreateFrozenBrush(0xFF, 0xB7, 0x4D);
-        private static readonly SolidColorBrush ErrorBrush = CreateFrozenBrush(0xE5, 0x73, 0x73);
-        private static readonly SolidColorBrush QuestionBrush = CreateFrozenBrush(0x81, 0xC7, 0x84);
-
-        private static SolidColorBrush CreateFrozenBrush(byte r, byte g, byte b)
-        {
-            var brush = new SolidColorBrush(Color.FromRgb(r, g, b));
-            brush.Freeze();
-            return brush;
-        }
+        // Icon colors sourced from the shared palette (Themes/Palette.xaml)
+        private static SolidColorBrush Pal(string key) => (SolidColorBrush)Application.Current.FindResource(key);
+        private static readonly SolidColorBrush InfoBrush = Pal("StatusSuggestedBrush");
+        private static readonly SolidColorBrush WarningBrush = Pal("StatusReviewBrush");
+        private static readonly SolidColorBrush ErrorBrush = Pal("StatusNoLabelBrush");
+        private static readonly SolidColorBrush QuestionBrush = Pal("StatusVerifiedBrush");
 
         private CustomMessageBox()
         {
@@ -161,10 +155,9 @@ private void AddButton(string content, MessageBoxResult buttonResult, bool isDef
                 IsCancel = isCancel
             };
 
-            if (isPrimary)
-            {
-                button.Style = (Style)FindResource("AccentButtonStyle");
-            }
+            // Use the shared theme styles (Themes/Controls.xaml)
+            button.Style = (Style)(TryFindResource(isPrimary ? "ModernButton" : "SecondaryButton")
+                ?? (isPrimary ? FindResource("AccentButtonStyle") : null));
 
             button.Click += (s, e) =>
             {
diff --git a/YoableWPF/DatasetStatisticsControl.xaml b/YoableWPF/DatasetStatisticsControl.xaml
new file mode 100644
index 0000000..f29c4a2
--- /dev/null
+++ b/YoableWPF/DatasetStatisticsControl.xaml
@@ -0,0 +1,292 @@
+<UserControl x:Class="YoableWPF.DatasetStatisticsControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ui="http://schemas.modernwpf.com/2019">
+    <UserControl.Resources>
+        <!-- Summary stat tile -->
+        <Style x:Key="StatCard" TargetType="Border">
+            <Setter Property="Background" Value="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"/>
+            <Setter Property="CornerRadius" Value="8"/>
+            <Setter Property="Padding" Value="14,12"/>
+            <Setter Property="MinWidth" Value="170"/>
+            <Setter Property="Margin" Value="0,0,12,12"/>
+        </Style>
+        <Style x:Key="StatNumber" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="24"/>
+            <Setter Property="FontWeight" Value="SemiBold"/>
+        </Style>
+        <Style x:Key="StatCaption" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="11"/>
+            <Setter Property="Margin" Value="0,2,0,0"/>
+            <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+        </Style>
+        <!-- Icon tile inside a stat card -->
+        <Style x:Key="StatIconTile" TargetType="Border">
+            <Setter Property="Width" Value="38"/>
+            <Setter Property="Height" Value="38"/>
+            <Setter Property="CornerRadius" Value="8"/>
+            <Setter Property="Margin" Value="0,0,12,0"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+        </Style>
+        <Style x:Key="StatIconGlyph" TargetType="TextBlock">
+            <Setter Property="FontFamily" Value="Segoe MDL2 Assets"/>
+            <Setter Property="FontSize" Value="17"/>
+            <Setter Property="HorizontalAlignment" Value="Center"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+        </Style>
+        <!-- Row label + right-aligned badge -->
+        <Style x:Key="BadgeCount" TargetType="TextBlock">
+            <Setter Property="FontWeight" Value="SemiBold"/>
+            <Setter Property="FontSize" Value="12"/>
+        </Style>
+    </UserControl.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <Border Grid.Row="0"
+                Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
+                BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                BorderThickness="0,0,0,1"
+                Padding="20,14">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <StackPanel Grid.Column="0">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE9D9;" FontSize="18"
+                                   Foreground="{StaticResource GlyphTealBrush}"
+                                   VerticalAlignment="Center" Margin="0,0,8,0"/>
+                        <TextBlock Text="{DynamicResource Stats_Title}" FontSize="18" FontWeight="SemiBold"/>
+                    </StackPanel>
+                    <TextBlock Text="{DynamicResource Stats_Subtitle}"
+                               Margin="0,4,0,0" FontSize="12"
+                               Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"
+                               TextWrapping="Wrap"/>
+                </StackPanel>
+                <Button Grid.Column="1"
+                        x:Name="RefreshButton"
+                        Style="{StaticResource SecondaryButton}"
+                        Content="{DynamicResource Stats_Refresh}"
+                        Height="32" MinWidth="110"
+                        VerticalAlignment="Center"
+                        Click="Refresh_Click"/>
+            </Grid>
+        </Border>
+
+        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" Padding="20,16">
+            <StackPanel>
+                <TextBlock x:Name="EmptyText"
+                           Text="{DynamicResource Stats_Empty}"
+                           Visibility="Collapsed"
+                           Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+
+                <StackPanel x:Name="ContentPanel">
+                    <!-- Summary stat tiles -->
+                    <WrapPanel>
+                        <Border Style="{StaticResource StatCard}">
+                            <StackPanel Orientation="Horizontal">
+                                <Border Style="{StaticResource StatIconTile}" Background="{StaticResource InfoSubtleBrush}">
+                                    <TextBlock Style="{StaticResource StatIconGlyph}" Text="&#xEB9F;"
+                                               Foreground="{StaticResource InfoBrush}"/>
+                                </Border>
+                                <StackPanel VerticalAlignment="Center">
+                                    <TextBlock x:Name="StatTotalImages" Style="{StaticResource StatNumber}" Text="0"/>
+                                    <TextBlock Style="{StaticResource StatCaption}" Text="{DynamicResource Stats_TotalImages}"/>
+                                </StackPanel>
+                            </StackPanel>
+                        </Border>
+                        <Border Style="{StaticResource StatCard}">
+                            <StackPanel Orientation="Horizontal">
+                                <Border Style="{StaticResource StatIconTile}" Background="{StaticResource StatusVerifiedSubtleBrush}">
+                                    <TextBlock Style="{StaticResource StatIconGlyph}" Text="&#xE73E;"
+                                               Foreground="{StaticResource StatusVerifiedBrush}"/>
+                                </Border>
+                                <StackPanel VerticalAlignment="Center">
+                                    <TextBlock x:Name="StatLabeled" Style="{StaticResource StatNumber}" Text="0"/>
+                                    <TextBlock Style="{StaticResource StatCaption}" Text="{DynamicResource Stats_LabeledImages}"/>
+                                </StackPanel>
+                            </StackPanel>
+                        </Border>
+                        <Border Style="{StaticResource StatCard}">
+                            <StackPanel Orientation="Horizontal">
+                                <Border Style="{StaticResource StatIconTile}" Background="{StaticResource StatusNoLabelSubtleBrush}">
+                                    <TextBlock Style="{StaticResource StatIconGlyph}" Text="&#xE7BA;"
+                                               Foreground="{StaticResource StatusNoLabelBrush}"/>
+                                </Border>
+                                <StackPanel VerticalAlignment="Center">
+                                    <TextBlock x:Name="StatUnlabeled" Style="{StaticResource StatNumber}" Text="0"/>
+                                    <TextBlock Style="{StaticResource StatCaption}" Text="{DynamicResource Stats_UnlabeledImages}"/>
+                                </StackPanel>
+                            </StackPanel>
+                        </Border>
+                        <Border Style="{StaticResource StatCard}">
+                            <StackPanel Orientation="Horizontal">
+                                <Border Style="{StaticResource StatIconTile}" Background="{StaticResource StatusAiSubtleBrush}">
+                                    <TextBlock Style="{StaticResource StatIconGlyph}" Text="&#xE7C1;"
+                                               Foreground="{StaticResource StatusAiBrush}"/>
+                                </Border>
+                                <StackPanel VerticalAlignment="Center">
+                                    <TextBlock x:Name="StatTotalBoxes" Style="{StaticResource StatNumber}" Text="0"/>
+                                    <TextBlock Style="{StaticResource StatCaption}" Text="{DynamicResource Stats_TotalBoxes}"/>
+                                </StackPanel>
+                            </StackPanel>
+                        </Border>
+                        <Border Style="{StaticResource StatCard}">
+                            <StackPanel Orientation="Horizontal">
+                                <Border Style="{StaticResource StatIconTile}" Background="{StaticResource StatusReviewSubtleBrush}">
+                                    <TextBlock Style="{StaticResource StatIconGlyph}" Text="&#xE9D2;"
+                                               Foreground="{StaticResource StatusReviewBrush}"/>
+                                </Border>
+                                <StackPanel VerticalAlignment="Center">
+                                    <TextBlock x:Name="StatAvgBoxes" Style="{StaticResource StatNumber}" Text="0"/>
+                                    <TextBlock Style="{StaticResource StatCaption}" Text="{DynamicResource Stats_AvgBoxes}"/>
+                                </StackPanel>
+                            </StackPanel>
+                        </Border>
+                    </WrapPanel>
+
+                    <!-- Class balance -->
+                    <Border Style="{StaticResource ModernCard}" Margin="0,8,12,12">
+                        <StackPanel>
+                            <TextBlock Text="{DynamicResource Stats_ClassBalance}" Style="{StaticResource SectionHeader}"/>
+                            <ItemsControl x:Name="ClassStatsItems">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Margin="0,0,0,12">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="16"/>
+                                                <ColumnDefinition Width="2*" MinWidth="120"/>
+                                                <ColumnDefinition Width="3*"/>
+                                            </Grid.ColumnDefinitions>
+                                            <Rectangle Grid.Column="0" Width="12" Height="12" RadiusX="3" RadiusY="3"
+                                                       VerticalAlignment="Center" HorizontalAlignment="Left"
+                                                       Fill="{Binding ColorBrush}"/>
+                                            <StackPanel Grid.Column="1" VerticalAlignment="Center" Margin="6,0,10,0">
+                                                <TextBlock Text="{Binding DisplayName}" FontWeight="SemiBold" TextTrimming="CharacterEllipsis"/>
+                                                <TextBlock Text="{Binding CountText}" FontSize="11"
+                                                           Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+                                            </StackPanel>
+                                            <ProgressBar Grid.Column="2" Height="8" VerticalAlignment="Center"
+                                                         Minimum="0"
+                                                         Maximum="{Binding BarMax}"
+                                                         Value="{Binding BoxCount}"
+                                                         BorderThickness="0"
+                                                         Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
+                                                         Foreground="{Binding ColorBrush}"/>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </StackPanel>
+                    </Border>
+
+                    <!-- Size distribution + review status, side by side -->
+                    <Grid Margin="0,0,12,20">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="12"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <!-- Box size distribution -->
+                        <Border Grid.Column="0" Style="{StaticResource ModernCard}" Margin="0" VerticalAlignment="Stretch">
+                            <StackPanel>
+                                <TextBlock Text="{DynamicResource Stats_SizeDistribution}" Style="{StaticResource SectionHeader}"/>
+                                <Grid Margin="0,0,0,8">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="{DynamicResource Stats_SizeSmall}" VerticalAlignment="Center"/>
+                                    <Border Grid.Column="1" Style="{StaticResource BadgePill}" Background="{StaticResource InfoSubtleBrush}">
+                                        <TextBlock x:Name="StatSmall" Text="0" Style="{StaticResource BadgeCount}"
+                                                   Foreground="{StaticResource InfoBrush}"/>
+                                    </Border>
+                                </Grid>
+                                <Grid Margin="0,0,0,8">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="{DynamicResource Stats_SizeMedium}" VerticalAlignment="Center"/>
+                                    <Border Grid.Column="1" Style="{StaticResource BadgePill}" Background="{StaticResource StatusReviewSubtleBrush}">
+                                        <TextBlock x:Name="StatMedium" Text="0" Style="{StaticResource BadgeCount}"
+                                                   Foreground="{StaticResource StatusReviewBrush}"/>
+                                    </Border>
+                                </Grid>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="{DynamicResource Stats_SizeLarge}" VerticalAlignment="Center"/>
+                                    <Border Grid.Column="1" Style="{StaticResource BadgePill}" Background="{StaticResource StatusAiSubtleBrush}">
+                                        <TextBlock x:Name="StatLarge" Text="0" Style="{StaticResource BadgeCount}"
+                                                   Foreground="{StaticResource StatusAiBrush}"/>
+                                    </Border>
+                                </Grid>
+                            </StackPanel>
+                        </Border>
+
+                        <!-- Review status -->
+                        <Border Grid.Column="2" Style="{StaticResource ModernCard}" Margin="0" VerticalAlignment="Stretch">
+                            <StackPanel>
+                                <TextBlock Text="{DynamicResource Stats_ReviewStatus}" Style="{StaticResource SectionHeader}"/>
+                                <Grid Margin="0,0,0,8">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="{DynamicResource Stats_Verified}" VerticalAlignment="Center"/>
+                                    <Border Grid.Column="1" Style="{StaticResource BadgePill}" Background="{StaticResource StatusVerifiedSubtleBrush}">
+                                        <TextBlock x:Name="StatVerified" Text="0" Style="{StaticResource BadgeCount}"
+                                                   Foreground="{StaticResource StatusVerifiedBrush}"/>
+                                    </Border>
+                                </Grid>
+                                <Grid Margin="0,0,0,8">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="{DynamicResource Stats_NeedsReview}" VerticalAlignment="Center"/>
+                                    <Border Grid.Column="1" Style="{StaticResource BadgePill}" Background="{StaticResource StatusReviewSubtleBrush}">
+                                        <TextBlock x:Name="StatNeedsReview" Text="0" Style="{StaticResource BadgeCount}"
+                                                   Foreground="{StaticResource StatusReviewBrush}"/>
+                                    </Border>
+                                </Grid>
+                                <Grid Margin="0,0,0,8">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="{DynamicResource Stats_Suggested}" VerticalAlignment="Center"/>
+                                    <Border Grid.Column="1" Style="{StaticResource BadgePill}" Background="{StaticResource StatusSuggestedSubtleBrush}">
+                                        <TextBlock x:Name="StatSuggested" Text="0" Style="{StaticResource BadgeCount}"
+                                                   Foreground="{StaticResource StatusSuggestedBrush}"/>
+                                    </Border>
+                                </Grid>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="{DynamicResource Stats_NoLabelStatus}" VerticalAlignment="Center"/>
+                                    <Border Grid.Column="1" Style="{StaticResource BadgePill}" Background="{StaticResource StatusNoLabelSubtleBrush}">
+                                        <TextBlock x:Name="StatNoLabel" Text="0" Style="{StaticResource BadgeCount}"
+                                                   Foreground="{StaticResource StatusNoLabelBrush}"/>
+                                    </Border>
+                                </Grid>
+                            </StackPanel>
+                        </Border>
+                    </Grid>
+                </StackPanel>
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
+</UserControl>
diff --git a/YoableWPF/DatasetStatisticsControl.xaml.cs b/YoableWPF/DatasetStatisticsControl.xaml.cs
new file mode 100644
index 0000000..971281b
--- /dev/null
+++ b/YoableWPF/DatasetStatisticsControl.xaml.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using YoableWPF.Managers;
+
+namespace YoableWPF
+{
+    public partial class DatasetStatisticsControl : UserControl
+    {
+        private Func<DatasetStatistics> computeStats;
+
+        public DatasetStatisticsControl()
+        {
+            InitializeComponent();
+        }
+
+        public void Initialize(Func<DatasetStatistics> computeCallback)
+        {
+            computeStats = computeCallback;
+        }
+
+        public void Refresh()
+        {
+            if (computeStats == null)
+                return;
+
+            DatasetStatistics stats = computeStats();
+
+            bool hasImages = stats.TotalImages > 0;
+            EmptyText.Visibility = hasImages ? Visibility.Collapsed : Visibility.Visible;
+            ContentPanel.Visibility = hasImages ? Visibility.Visible : Visibility.Collapsed;
+            if (!hasImages)
+                return;
+
+            StatTotalImages.Text = stats.TotalImages.ToString(CultureInfo.CurrentCulture);
+            StatLabeled.Text = stats.LabeledImages.ToString(CultureInfo.CurrentCulture);
+            StatUnlabeled.Text = stats.UnlabeledImages.ToString(CultureInfo.CurrentCulture);
+            StatTotalBoxes.Text = stats.TotalBoxes.ToString(CultureInfo.CurrentCulture);
+            StatAvgBoxes.Text = stats.AvgBoxesPerLabeledImage.ToString("F1", CultureInfo.CurrentCulture);
+
+            ClassStatsItems.ItemsSource = stats.ClassStats;
+
+            StatSmall.Text = stats.SmallBoxes.ToString(CultureInfo.CurrentCulture);
+            StatMedium.Text = stats.MediumBoxes.ToString(CultureInfo.CurrentCulture);
+            StatLarge.Text = stats.LargeBoxes.ToString(CultureInfo.CurrentCulture);
+
+            StatVerified.Text = stats.VerifiedCount.ToString(CultureInfo.CurrentCulture);
+            StatNeedsReview.Text = stats.NeedsReviewCount.ToString(CultureInfo.CurrentCulture);
+            StatSuggested.Text = stats.SuggestedCount.ToString(CultureInfo.CurrentCulture);
+            StatNoLabel.Text = stats.NoLabelCount.ToString(CultureInfo.CurrentCulture);
+        }
+
+        private void Refresh_Click(object sender, RoutedEventArgs e)
+        {
+            Refresh();
+        }
+    }
+}
diff --git a/YoableWPF/DuplicateImageReviewControl.xaml b/YoableWPF/DuplicateImageReviewControl.xaml
new file mode 100644
index 0000000..afa4c18
--- /dev/null
+++ b/YoableWPF/DuplicateImageReviewControl.xaml
@@ -0,0 +1,319 @@
+<UserControl x:Class="YoableWPF.DuplicateImageReviewControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:YoableWPF"
+             MinWidth="640"
+             MinHeight="420">
+    <UserControl.Resources>
+        <local:DuplicateThumbnailConverter x:Key="DuplicateThumbnailConverter"/>
+    </UserControl.Resources>
+    <Grid Background="{DynamicResource SystemControlPageBackgroundChromeLowBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <Border Grid.Row="0"
+                Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
+                BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                BorderThickness="0,0,0,1"
+                Padding="18,12">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <StackPanel>
+                    <TextBlock Text="{DynamicResource Duplicate_Title}"
+                               FontSize="18"
+                               FontWeight="SemiBold"/>
+                    <TextBlock x:Name="SummaryText"
+                               Margin="0,4,0,0"
+                               FontSize="12"
+                               Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+                </StackPanel>
+                <Button x:Name="ScanButton"
+                        Grid.Column="1"
+                        Click="ScanButton_Click"
+                        Padding="12,7"
+                        MinWidth="110">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock FontFamily="Segoe MDL2 Assets"
+                                   Text="&#xE72C;"
+                                   Margin="0,0,7,0"/>
+                        <TextBlock Text="{DynamicResource Duplicate_Scan}"/>
+                    </StackPanel>
+                </Button>
+            </Grid>
+        </Border>
+
+        <Grid Grid.Row="1" Margin="18">
+            <Grid x:Name="ReviewPanel" Visibility="Collapsed">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="164"/>
+                </Grid.RowDefinitions>
+                <TextBlock x:Name="GroupProgressText"
+                           HorizontalAlignment="Center"
+                           Margin="0,0,0,10"
+                           FontSize="12"
+                           FontWeight="SemiBold"/>
+                <Grid Grid.Row="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="16"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Border Grid.Column="0"
+                            Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                            BorderThickness="1"
+                            CornerRadius="6"
+                            Padding="12">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <Border Background="{StaticResource CanvasBackgroundBrush}" CornerRadius="4" ClipToBounds="True">
+                                <local:DuplicateLabelPreview x:Name="LeftImage"/>
+                            </Border>
+                            <TextBlock x:Name="LeftFileNameText"
+                                       Grid.Row="1"
+                                       Margin="0,10,0,0"
+                                       FontWeight="SemiBold"
+                                       TextTrimming="CharacterEllipsis"
+                                       ToolTip="{Binding Text, RelativeSource={RelativeSource Self}}"/>
+                            <TextBlock x:Name="LeftDetailsText"
+                                       Grid.Row="2"
+                                       Margin="0,4,0,10"
+                                       FontSize="12"
+                                       Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+                            <Grid Grid.Row="3">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="8"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                <Button x:Name="EditLeftButton"
+                                        Click="EditLeftButton_Click"
+                                        Width="40"
+                                        Padding="0"
+                                        ToolTip="{DynamicResource Duplicate_OpenEdit}">
+                                    <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE70F;"/>
+                                </Button>
+                                <Button x:Name="KeepLeftButton"
+                                        Grid.Column="2"
+                                        Click="KeepLeftButton_Click"
+                                        Padding="10,8"
+                                        HorizontalAlignment="Stretch">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE76B;" Margin="0,0,6,0"/>
+                                        <TextBlock Text="{DynamicResource Duplicate_KeepLeft}"
+                                                   TextWrapping="Wrap"
+                                                   TextAlignment="Center"/>
+                                    </StackPanel>
+                                </Button>
+                            </Grid>
+                        </Grid>
+                    </Border>
+
+                    <Border Grid.Column="2"
+                            Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                            BorderThickness="1"
+                            CornerRadius="6"
+                            Padding="12">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <Border Background="{StaticResource CanvasBackgroundBrush}" CornerRadius="4" ClipToBounds="True">
+                                <local:DuplicateLabelPreview x:Name="RightImage"/>
+                            </Border>
+                            <TextBlock x:Name="RightFileNameText"
+                                       Grid.Row="1"
+                                       Margin="0,10,0,0"
+                                       FontWeight="SemiBold"
+                                       TextTrimming="CharacterEllipsis"
+                                       ToolTip="{Binding Text, RelativeSource={RelativeSource Self}}"/>
+                            <TextBlock x:Name="RightDetailsText"
+                                       Grid.Row="2"
+                                       Margin="0,4,0,10"
+                                       FontSize="12"
+                                       Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+                            <Grid Grid.Row="3">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="8"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                <Button x:Name="EditRightButton"
+                                        Click="EditRightButton_Click"
+                                        Width="40"
+                                        Padding="0"
+                                        ToolTip="{DynamicResource Duplicate_OpenEdit}">
+                                    <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE70F;"/>
+                                </Button>
+                                <Button x:Name="KeepRightButton"
+                                        Grid.Column="2"
+                                        Click="KeepRightButton_Click"
+                                        Padding="10,8"
+                                        HorizontalAlignment="Stretch">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE76C;" Margin="0,0,6,0"/>
+                                        <TextBlock Text="{DynamicResource Duplicate_KeepRight}"
+                                                   TextWrapping="Wrap"
+                                                   TextAlignment="Center"/>
+                                    </StackPanel>
+                                </Button>
+                            </Grid>
+                        </Grid>
+                    </Border>
+                </Grid>
+
+                <Border Grid.Row="2"
+                        Margin="0,12,0,0"
+                        Padding="10,8"
+                        Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
+                        BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                        BorderThickness="1"
+                        CornerRadius="6">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Text="{DynamicResource Duplicate_AllGroups}"
+                                       VerticalAlignment="Center"
+                                       FontSize="12"
+                                       FontWeight="SemiBold"/>
+                            <Button x:Name="PreviousGroupButton"
+                                    Grid.Column="1"
+                                    Width="34"
+                                    Height="28"
+                                    Margin="0,0,6,0"
+                                    Padding="0"
+                                    Click="PreviousGroupButton_Click"
+                                    ToolTip="{DynamicResource Duplicate_PreviousGroup}">
+                                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE76B;"/>
+                            </Button>
+                            <Button x:Name="NextGroupButton"
+                                    Grid.Column="2"
+                                    Width="34"
+                                    Height="28"
+                                    Padding="0"
+                                    Click="NextGroupButton_Click"
+                                    ToolTip="{DynamicResource Duplicate_NextGroup}">
+                                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE76C;"/>
+                            </Button>
+                        </Grid>
+
+                        <ListBox x:Name="DuplicateGroupListBox"
+                                 Grid.Row="1"
+                                 Margin="0,7,0,0"
+                                 Background="Transparent"
+                                 BorderThickness="0"
+                                 SelectionMode="Single"
+                                 SelectionChanged="DuplicateGroupListBox_SelectionChanged"
+                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                 ScrollViewer.VerticalScrollBarVisibility="Disabled">
+                            <ListBox.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <VirtualizingStackPanel Orientation="Horizontal"/>
+                                </ItemsPanelTemplate>
+                            </ListBox.ItemsPanel>
+                            <ListBox.ItemContainerStyle>
+                                <Style TargetType="ListBoxItem">
+                                    <Setter Property="Width" Value="270"/>
+                                    <Setter Property="Height" Value="104"/>
+                                    <Setter Property="Margin" Value="0,0,7,0"/>
+                                    <Setter Property="Padding" Value="7,5"/>
+                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                                </Style>
+                            </ListBox.ItemContainerStyle>
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="*"/>
+                                            <RowDefinition Height="Auto"/>
+                                        </Grid.RowDefinitions>
+                                        <TextBlock Text="{Binding HeaderText}"
+                                                   FontSize="11"
+                                                   FontWeight="SemiBold"/>
+                                        <Grid Grid.Row="1" Margin="0,4,0,3">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*"/>
+                                                <ColumnDefinition Width="5"/>
+                                                <ColumnDefinition Width="*"/>
+                                            </Grid.ColumnDefinitions>
+                                            <Border Background="{StaticResource CanvasBackgroundBrush}" ClipToBounds="True" CornerRadius="2">
+                                                <Image Source="{Binding LeftFullPath, Converter={StaticResource DuplicateThumbnailConverter}, IsAsync=True}"
+                                                       Stretch="UniformToFill"/>
+                                            </Border>
+                                            <Border Grid.Column="2" Background="{StaticResource CanvasBackgroundBrush}" ClipToBounds="True" CornerRadius="2">
+                                                <Image Source="{Binding RightFullPath, Converter={StaticResource DuplicateThumbnailConverter}, IsAsync=True}"
+                                                       Stretch="UniformToFill"/>
+                                            </Border>
+                                        </Grid>
+                                        <Grid Grid.Row="2">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*"/>
+                                                <ColumnDefinition Width="5"/>
+                                                <ColumnDefinition Width="*"/>
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock Text="{Binding LeftCaption}"
+                                                       FontSize="9"
+                                                       TextTrimming="CharacterEllipsis"
+                                                       ToolTip="{Binding LeftToolTip}"/>
+                                            <TextBlock Grid.Column="2"
+                                                       Text="{Binding RightCaption}"
+                                                       FontSize="9"
+                                                       TextTrimming="CharacterEllipsis"
+                                                       ToolTip="{Binding RightToolTip}"/>
+                                        </Grid>
+                                    </Grid>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+                    </Grid>
+                </Border>
+            </Grid>
+
+            <StackPanel x:Name="EmptyPanel"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center">
+                <TextBlock FontFamily="Segoe MDL2 Assets"
+                           Text="&#xEB9F;"
+                           FontSize="40"
+                           HorizontalAlignment="Center"
+                           Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+                <TextBlock x:Name="EmptyText"
+                           Text="{DynamicResource Duplicate_NoScan}"
+                           Margin="0,12,0,0"
+                           FontSize="14"
+                           HorizontalAlignment="Center"/>
+                <ProgressBar x:Name="ScanProgressBar"
+                             Width="280"
+                             Height="4"
+                             Margin="0,14,0,0"
+                             Visibility="Collapsed"/>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/YoableWPF/DuplicateImageReviewControl.xaml.cs b/YoableWPF/DuplicateImageReviewControl.xaml.cs
new file mode 100644
index 0000000..09025c3
--- /dev/null
+++ b/YoableWPF/DuplicateImageReviewControl.xaml.cs
@@ -0,0 +1,527 @@
+using System.Windows;
+using System.Windows.Controls;
+using YoableWPF.Managers;
+using YoableWPF.Models;
+
+namespace YoableWPF
+{
+    public partial class DuplicateImageReviewControl : UserControl
+    {
+        private readonly DuplicateImageDetector detector = new();
+        private readonly List<DuplicateImageGroup> duplicateGroups = new();
+        private ImageManager? imageManager;
+        private LabelManager? labelManager;
+        private Func<IReadOnlyList<LabelClass>>? getProjectClasses;
+        private Func<string, bool>? removeImage;
+        private Func<string, bool>? openImageForEditing;
+        private CancellationTokenSource? scanCancellation;
+        private int currentGroupIndex;
+        private bool hasScanned;
+        private int lastImageSignature;
+        private bool isUpdatingGroupSelection;
+        private bool isResolvingDuplicate;
+        private bool isGroupListDirty = true;
+        private int lastAutoResolvedCount;
+
+        public DuplicateImageReviewControl()
+        {
+            InitializeComponent();
+        }
+
+        public void Initialize(
+            ImageManager manager,
+            LabelManager labels,
+            Func<string, bool> removeImageCallback,
+            Func<string, bool> openImageForEditingCallback,
+            Func<IReadOnlyList<LabelClass>> projectClassesProvider)
+        {
+            imageManager = manager;
+            labelManager = labels;
+            removeImage = removeImageCallback;
+            openImageForEditing = openImageForEditingCallback;
+            getProjectClasses = projectClassesProvider;
+        }
+
+        public async Task EnsureScannedAsync()
+        {
+            if (!hasScanned || lastImageSignature != CalculateImageSignature())
+                await ScanAsync();
+            else if (duplicateGroups.Count > 0)
+                await ShowCurrentPairAsync();
+        }
+
+        public void InvalidateResults()
+        {
+            hasScanned = false;
+            duplicateGroups.Clear();
+            DuplicateGroupListBox.Items.Clear();
+            isGroupListDirty = true;
+            currentGroupIndex = 0;
+            lastAutoResolvedCount = 0;
+            ReviewPanel.Visibility = Visibility.Collapsed;
+            EmptyPanel.Visibility = Visibility.Visible;
+            EmptyText.Text = GetString("Duplicate_NoScan", "Scan the current project for duplicate images.");
+            SummaryText.Text = "";
+        }
+
+        private async void ScanButton_Click(object sender, RoutedEventArgs e)
+        {
+            await ScanAsync();
+        }
+
+        private async Task ScanAsync()
+        {
+            if (imageManager == null || labelManager == null)
+                return;
+
+            scanCancellation?.Cancel();
+            scanCancellation?.Dispose();
+            scanCancellation = new CancellationTokenSource();
+            var cancellationToken = scanCancellation.Token;
+
+            ScanButton.IsEnabled = false;
+            ReviewPanel.Visibility = Visibility.Collapsed;
+            EmptyPanel.Visibility = Visibility.Visible;
+            EmptyText.Text = GetString("Duplicate_Scanning", "Scanning images...");
+            ScanProgressBar.Visibility = Visibility.Visible;
+            ScanProgressBar.Value = 0;
+            lastAutoResolvedCount = 0;
+
+            var snapshot = imageManager.ImagePathMap.ToArray();
+            if (snapshot.Length < 2)
+            {
+                FinishEmptyScan("Duplicate_NoImages", "Add at least two images before scanning.");
+                return;
+            }
+
+            var progress = new Progress<(int current, int total)>(value =>
+            {
+                ScanProgressBar.Maximum = Math.Max(1, value.total);
+                ScanProgressBar.Value = value.current;
+            });
+
+            try
+            {
+                var results = await detector.FindDuplicatesAsync(snapshot, progress, cancellationToken);
+                duplicateGroups.Clear();
+                duplicateGroups.AddRange(results);
+                lastAutoResolvedCount = AutoResolveMatchingLabelGroups();
+                isGroupListDirty = true;
+                currentGroupIndex = 0;
+                hasScanned = true;
+                lastImageSignature = CalculateImageSignature();
+
+                if (duplicateGroups.Count == 0)
+                {
+                    if (lastAutoResolvedCount > 0)
+                    {
+                        FinishEmptyScan(
+                            "Duplicate_AutoResolvedOnly",
+                            "Duplicate images with identical labels were automatically resolved.");
+                        EmptyText.Text = string.Format(
+                            GetString(
+                                "Duplicate_AutoResolvedOnly",
+                                "Automatically removed {0} duplicate image(s) with identical labels from the project."),
+                            lastAutoResolvedCount);
+                    }
+                    else
+                    {
+                        FinishEmptyScan("Duplicate_NoMatches", "No duplicate images found.");
+                    }
+                    return;
+                }
+
+                ScanProgressBar.Visibility = Visibility.Collapsed;
+                ScanButton.IsEnabled = true;
+                EmptyPanel.Visibility = Visibility.Collapsed;
+                ReviewPanel.Visibility = Visibility.Visible;
+                await ShowCurrentPairAsync();
+            }
+            catch (OperationCanceledException)
+            {
+                ScanButton.IsEnabled = true;
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"Duplicate scan failed: {ex.Message}");
+                FinishEmptyScan("Duplicate_ScanFailed", "Could not scan duplicate images.");
+            }
+        }
+
+        private void FinishEmptyScan(string resourceKey, string fallback)
+        {
+            hasScanned = true;
+            ScanProgressBar.Visibility = Visibility.Collapsed;
+            ScanButton.IsEnabled = true;
+            ReviewPanel.Visibility = Visibility.Collapsed;
+            EmptyPanel.Visibility = Visibility.Visible;
+            EmptyText.Text = GetString(resourceKey, fallback);
+            SummaryText.Text = "";
+            DuplicateGroupListBox.Items.Clear();
+        }
+
+        private async Task ShowCurrentPairAsync()
+        {
+            if (imageManager == null || duplicateGroups.Count == 0)
+            {
+                FinishEmptyScan("Duplicate_Resolved", "All duplicate images have been resolved.");
+                return;
+            }
+
+            var group = duplicateGroups[currentGroupIndex];
+            var left = group.Candidates[0];
+            var right = group.Candidates[1];
+            int remainingImages = duplicateGroups.Sum(item => item.Candidates.Count - 1);
+
+            string summary = string.Format(
+                GetString("Duplicate_Summary", "{0} duplicate group(s), {1} extra image(s) remaining"),
+                duplicateGroups.Count,
+                remainingImages);
+            if (lastAutoResolvedCount > 0)
+            {
+                summary += "  |  " + string.Format(
+                    GetString(
+                        "Duplicate_AutoResolvedSummary",
+                        "Automatically resolved: {0}"),
+                    lastAutoResolvedCount);
+            }
+            SummaryText.Text = summary;
+            GroupProgressText.Text = string.Format(
+                GetString("Duplicate_GroupProgress", "Group {0} of {1}"),
+                Math.Min(currentGroupIndex + 1, duplicateGroups.Count),
+                duplicateGroups.Count);
+            RefreshGroupList();
+
+            LeftFileNameText.Text = left.FileName;
+            RightFileNameText.Text = right.FileName;
+            var leftLabels = labelManager?.GetLabels(left.FileName) ?? new List<LabelData>();
+            var rightLabels = labelManager?.GetLabels(right.FileName) ?? new List<LabelData>();
+            LeftDetailsText.Text = BuildDetails(left, leftLabels.Count);
+            RightDetailsText.Text = BuildDetails(right, rightLabels.Count);
+
+            int generation = Environment.TickCount;
+            Tag = generation;
+            var leftTask = Task.Run(() => imageManager.Cache.GetOrLoad(left.FullPath));
+            var rightTask = Task.Run(() => imageManager.Cache.GetOrLoad(right.FullPath));
+            await Task.WhenAll(leftTask, rightTask);
+
+            if (Tag is int activeGeneration && activeGeneration == generation)
+            {
+                var projectClasses = getProjectClasses?.Invoke() ?? Array.Empty<LabelClass>();
+                LeftImage.SetContent(leftTask.Result, leftLabels, projectClasses);
+                RightImage.SetContent(rightTask.Result, rightLabels, projectClasses);
+            }
+        }
+
+        private string BuildDetails(DuplicateImageCandidate candidate, int labelCount)
+        {
+            string labels = string.Format(
+                GetString("Duplicate_LabelCount", "{0} label(s)"),
+                labelCount);
+            return $"{labels}  |  {FormatFileSize(candidate.FileSize)}";
+        }
+
+        private static string FormatFileSize(long bytes)
+        {
+            if (bytes >= 1024 * 1024)
+                return $"{bytes / (1024d * 1024d):0.##} MB";
+            if (bytes >= 1024)
+                return $"{bytes / 1024d:0.##} KB";
+            return $"{bytes} B";
+        }
+
+        private async void KeepLeftButton_Click(object sender, RoutedEventArgs e)
+        {
+            await KeepCandidateAsync(keepLeft: true);
+        }
+
+        private async void KeepRightButton_Click(object sender, RoutedEventArgs e)
+        {
+            await KeepCandidateAsync(keepLeft: false);
+        }
+
+        private void EditLeftButton_Click(object sender, RoutedEventArgs e)
+        {
+            OpenCandidateForEditing(candidateIndex: 0);
+        }
+
+        private void EditRightButton_Click(object sender, RoutedEventArgs e)
+        {
+            OpenCandidateForEditing(candidateIndex: 1);
+        }
+
+        private void OpenCandidateForEditing(int candidateIndex)
+        {
+            if (openImageForEditing == null ||
+                duplicateGroups.Count == 0 ||
+                candidateIndex < 0 ||
+                candidateIndex >= duplicateGroups[currentGroupIndex].Candidates.Count)
+                return;
+
+            DuplicateImageCandidate candidate =
+                duplicateGroups[currentGroupIndex].Candidates[candidateIndex];
+            if (!openImageForEditing(candidate.FileName))
+            {
+                CustomMessageBox.Show(
+                    GetString(
+                        "Duplicate_OpenEditFailed",
+                        "Could not open the image for editing."),
+                    GetString("Duplicate_Title", "Duplicate Images"),
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Warning);
+            }
+        }
+
+        private async void PreviousGroupButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (currentGroupIndex <= 0)
+                return;
+
+            currentGroupIndex--;
+            await ShowCurrentPairAsync();
+        }
+
+        private async void NextGroupButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (currentGroupIndex >= duplicateGroups.Count - 1)
+                return;
+
+            currentGroupIndex++;
+            await ShowCurrentPairAsync();
+        }
+
+        private async void DuplicateGroupListBox_SelectionChanged(
+            object sender,
+            SelectionChangedEventArgs e)
+        {
+            if (isUpdatingGroupSelection ||
+                DuplicateGroupListBox.SelectedItem is not DuplicateGroupListItem selected ||
+                selected.GroupIndex == currentGroupIndex)
+            {
+                return;
+            }
+
+            currentGroupIndex = selected.GroupIndex;
+            await ShowCurrentPairAsync();
+        }
+
+        private async Task KeepCandidateAsync(bool keepLeft)
+        {
+            if (removeImage == null || duplicateGroups.Count == 0 || isResolvingDuplicate)
+                return;
+
+            isResolvingDuplicate = true;
+            KeepLeftButton.IsEnabled = false;
+            KeepRightButton.IsEnabled = false;
+
+            try
+            {
+                var group = duplicateGroups[currentGroupIndex];
+                int removeIndex = keepLeft ? 1 : 0;
+                var candidate = group.Candidates[removeIndex];
+
+                if (!removeImage(candidate.FileName))
+                {
+                    CustomMessageBox.Show(
+                        GetString("Duplicate_RemoveFailed", "The duplicate image could not be removed from the project."),
+                        GetString("Duplicate_Title", "Duplicate Images"),
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Warning);
+                    return;
+                }
+
+                lastImageSignature = CalculateImageSignature();
+
+                group.Candidates.RemoveAt(removeIndex);
+                isGroupListDirty = true;
+                if (group.Candidates.Count < 2)
+                {
+                    duplicateGroups.RemoveAt(currentGroupIndex);
+                    if (currentGroupIndex >= duplicateGroups.Count)
+                        currentGroupIndex = Math.Max(0, duplicateGroups.Count - 1);
+                }
+
+                if (duplicateGroups.Count == 0)
+                {
+                    LeftImage.Clear();
+                    RightImage.Clear();
+                    FinishEmptyScan("Duplicate_Resolved", "All duplicate images have been resolved.");
+                    return;
+                }
+
+                await ShowCurrentPairAsync();
+            }
+            finally
+            {
+                isResolvingDuplicate = false;
+                KeepLeftButton.IsEnabled = true;
+                KeepRightButton.IsEnabled = true;
+            }
+        }
+
+        private void RefreshGroupList()
+        {
+            isUpdatingGroupSelection = true;
+            try
+            {
+                if (isGroupListDirty || DuplicateGroupListBox.Items.Count != duplicateGroups.Count)
+                {
+                    DuplicateGroupListBox.Items.Clear();
+                    for (int index = 0; index < duplicateGroups.Count; index++)
+                    {
+                        var group = duplicateGroups[index];
+                        var left = group.Candidates[0];
+                        var right = group.Candidates[1];
+                        int leftLabelCount = labelManager?.GetLabels(left.FileName).Count ?? 0;
+                        int rightLabelCount = labelManager?.GetLabels(right.FileName).Count ?? 0;
+                        string leftCountText = string.Format(
+                            GetString("Duplicate_LabelCount", "{0} label(s)"),
+                            leftLabelCount);
+                        string rightCountText = string.Format(
+                            GetString("Duplicate_LabelCount", "{0} label(s)"),
+                            rightLabelCount);
+                        string groupTitle = string.Format(
+                            GetString("Duplicate_GroupTitle", "Group {0}"),
+                            index + 1);
+                        string extraCount = string.Format(
+                            GetString("Duplicate_ExtraCount", "{0} extra image(s)"),
+                            group.Candidates.Count - 1);
+                        DuplicateGroupListBox.Items.Add(new DuplicateGroupListItem(
+                            index,
+                            $"{groupTitle}  |  {extraCount}",
+                            left.FullPath,
+                            right.FullPath,
+                            $"{left.FileName} ({leftLabelCount})",
+                            $"{right.FileName} ({rightLabelCount})",
+                            $"{left.FileName} - {leftCountText}",
+                            $"{right.FileName} - {rightCountText}"));
+                    }
+
+                    isGroupListDirty = false;
+                }
+
+                DuplicateGroupListBox.SelectedIndex = currentGroupIndex;
+                if (DuplicateGroupListBox.SelectedItem != null)
+                    DuplicateGroupListBox.ScrollIntoView(DuplicateGroupListBox.SelectedItem);
+            }
+            finally
+            {
+                isUpdatingGroupSelection = false;
+            }
+
+            PreviousGroupButton.IsEnabled = currentGroupIndex > 0;
+            NextGroupButton.IsEnabled = currentGroupIndex < duplicateGroups.Count - 1;
+        }
+
+        private int AutoResolveMatchingLabelGroups()
+        {
+            if (labelManager == null || removeImage == null)
+                return 0;
+
+            int removedCount = 0;
+            foreach (DuplicateImageGroup group in duplicateGroups.ToArray())
+            {
+                var candidates = group.Candidates.ToArray();
+                for (int keepIndex = 0; keepIndex < candidates.Length; keepIndex++)
+                {
+                    DuplicateImageCandidate keepCandidate = candidates[keepIndex];
+                    if (!group.Candidates.Contains(keepCandidate))
+                        continue;
+
+                    List<LabelData> keepLabels = labelManager.GetLabels(keepCandidate.FileName);
+                    for (int compareIndex = keepIndex + 1;
+                         compareIndex < candidates.Length;
+                         compareIndex++)
+                    {
+                        DuplicateImageCandidate compareCandidate = candidates[compareIndex];
+                        if (!group.Candidates.Contains(compareCandidate))
+                            continue;
+
+                        List<LabelData> compareLabels = labelManager.GetLabels(compareCandidate.FileName);
+                        if (!HaveEquivalentLabels(keepLabels, compareLabels))
+                            continue;
+
+                        if (removeImage(compareCandidate.FileName))
+                        {
+                            group.Candidates.Remove(compareCandidate);
+                            removedCount++;
+                        }
+                    }
+                }
+            }
+
+            duplicateGroups.RemoveAll(group => group.Candidates.Count < 2);
+            return removedCount;
+        }
+
+        private static bool HaveEquivalentLabels(
+            IReadOnlyCollection<LabelData> leftLabels,
+            IReadOnlyCollection<LabelData> rightLabels)
+        {
+            const double coordinateTolerance = 0.01;
+            if (leftLabels.Count != rightLabels.Count)
+                return false;
+
+            var left = leftLabels
+                .OrderBy(label => label.ClassId)
+                .ThenBy(label => label.Rect.X)
+                .ThenBy(label => label.Rect.Y)
+                .ThenBy(label => label.Rect.Width)
+                .ThenBy(label => label.Rect.Height)
+                .ToArray();
+            var right = rightLabels
+                .OrderBy(label => label.ClassId)
+                .ThenBy(label => label.Rect.X)
+                .ThenBy(label => label.Rect.Y)
+                .ThenBy(label => label.Rect.Width)
+                .ThenBy(label => label.Rect.Height)
+                .ToArray();
+
+            for (int index = 0; index < left.Length; index++)
+            {
+                if (left[index].ClassId != right[index].ClassId ||
+                    Math.Abs(left[index].Rect.X - right[index].Rect.X) > coordinateTolerance ||
+                    Math.Abs(left[index].Rect.Y - right[index].Rect.Y) > coordinateTolerance ||
+                    Math.Abs(left[index].Rect.Width - right[index].Rect.Width) > coordinateTolerance ||
+                    Math.Abs(left[index].Rect.Height - right[index].Rect.Height) > coordinateTolerance)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private static string GetString(string key, string fallback)
+        {
+            return LanguageManager.Instance.GetString(key) ?? fallback;
+        }
+
+        private int CalculateImageSignature()
+        {
+            if (imageManager == null)
+                return 0;
+
+            var hash = new HashCode();
+            foreach (var pair in imageManager.ImagePathMap.OrderBy(
+                         item => item.Key,
+                         StringComparer.OrdinalIgnoreCase))
+            {
+                hash.Add(pair.Key, StringComparer.OrdinalIgnoreCase);
+                hash.Add(pair.Value.FileLength);
+                hash.Add(pair.Value.LastWriteTimeUtcTicks);
+            }
+            return hash.ToHashCode();
+        }
+    }
+
+    internal sealed record DuplicateGroupListItem(
+        int GroupIndex,
+        string HeaderText,
+        string LeftFullPath,
+        string RightFullPath,
+        string LeftCaption,
+        string RightCaption,
+        string LeftToolTip,
+        string RightToolTip);
+}
diff --git a/YoableWPF/DuplicateLabelPreview.cs b/YoableWPF/DuplicateLabelPreview.cs
new file mode 100644
index 0000000..e1a0e98
--- /dev/null
+++ b/YoableWPF/DuplicateLabelPreview.cs
@@ -0,0 +1,154 @@
+using System.Globalization;
+using System.IO;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace YoableWPF
+{
+    public sealed class DuplicateLabelPreview : FrameworkElement
+    {
+        private ImageSource? image;
+        private IReadOnlyList<LabelData> labels = Array.Empty<LabelData>();
+        private IReadOnlyDictionary<int, LabelClass> classes =
+            new Dictionary<int, LabelClass>();
+
+        public DuplicateLabelPreview()
+        {
+            SnapsToDevicePixels = true;
+            UseLayoutRounding = true;
+        }
+
+        public void SetContent(
+            ImageSource? imageSource,
+            IReadOnlyList<LabelData>? imageLabels,
+            IReadOnlyList<LabelClass>? projectClasses)
+        {
+            image = imageSource;
+            labels = imageLabels ?? Array.Empty<LabelData>();
+            classes = (projectClasses ?? Array.Empty<LabelClass>())
+                .GroupBy(item => item.ClassId)
+                .ToDictionary(group => group.Key, group => group.First());
+            InvalidateVisual();
+        }
+
+        public void Clear()
+        {
+            image = null;
+            labels = Array.Empty<LabelData>();
+            classes = new Dictionary<int, LabelClass>();
+            InvalidateVisual();
+        }
+
+        protected override void OnRender(DrawingContext drawingContext)
+        {
+            base.OnRender(drawingContext);
+            drawingContext.DrawRectangle(Brushes.Black, null, new Rect(RenderSize));
+
+            if (image == null || image.Width <= 0 || image.Height <= 0 ||
+                ActualWidth <= 0 || ActualHeight <= 0)
+            {
+                return;
+            }
+
+            double scale = Math.Min(ActualWidth / image.Width, ActualHeight / image.Height);
+            double renderedWidth = image.Width * scale;
+            double renderedHeight = image.Height * scale;
+            double offsetX = (ActualWidth - renderedWidth) / 2;
+            double offsetY = (ActualHeight - renderedHeight) / 2;
+            var imageRect = new Rect(offsetX, offsetY, renderedWidth, renderedHeight);
+
+            drawingContext.DrawImage(image, imageRect);
+            drawingContext.PushClip(new RectangleGeometry(imageRect));
+
+            var imageBounds = new Rect(0, 0, image.Width, image.Height);
+            double pixelsPerDip = VisualTreeHelper.GetDpi(this).PixelsPerDip;
+            double lineThickness = Math.Clamp(scale * 2, 1.5, 3.5);
+
+            foreach (var label in labels)
+            {
+                Rect clippedLabel = Rect.Intersect(label.Rect, imageBounds);
+                if (clippedLabel.IsEmpty || clippedLabel.Width <= 0 || clippedLabel.Height <= 0)
+                    continue;
+
+                var color = classes.TryGetValue(label.ClassId, out var labelClass)
+                    ? labelClass.ColorBrush.Color
+                    : Colors.LightCoral;
+                color.A = 245;
+                var brush = new SolidColorBrush(color);
+                brush.Freeze();
+
+                var displayRect = new Rect(
+                    offsetX + clippedLabel.X * scale,
+                    offsetY + clippedLabel.Y * scale,
+                    clippedLabel.Width * scale,
+                    clippedLabel.Height * scale);
+                drawingContext.DrawRectangle(null, new Pen(brush, lineThickness), displayRect);
+
+                string className = labelClass?.Name ?? $"Class {label.ClassId}";
+                var text = new FormattedText(
+                    className,
+                    CultureInfo.CurrentUICulture,
+                    FlowDirection.LeftToRight,
+                    new Typeface("Segoe UI Semibold"),
+                    11,
+                    Brushes.White,
+                    pixelsPerDip)
+                {
+                    MaxTextWidth = Math.Max(1, Math.Min(180, displayRect.Width))
+                };
+
+                double textX = displayRect.Left;
+                double textY = Math.Max(imageRect.Top, displayRect.Top - text.Height - 3);
+                var textBackground = new SolidColorBrush(Color.FromArgb(220, color.R, color.G, color.B));
+                textBackground.Freeze();
+                drawingContext.DrawRectangle(
+                    textBackground,
+                    null,
+                    new Rect(textX, textY, text.Width + 6, text.Height + 2));
+                drawingContext.DrawText(text, new Point(textX + 3, textY + 1));
+            }
+
+            drawingContext.Pop();
+        }
+    }
+
+    public sealed class DuplicateThumbnailConverter : IValueConverter
+    {
+        public object? Convert(
+            object value,
+            Type targetType,
+            object parameter,
+            CultureInfo culture)
+        {
+            if (value is not string path || !File.Exists(path))
+                return null;
+
+            try
+            {
+                var thumbnail = new BitmapImage();
+                thumbnail.BeginInit();
+                thumbnail.CacheOption = BitmapCacheOption.OnLoad;
+                thumbnail.DecodePixelWidth = 180;
+                thumbnail.UriSource = new Uri(path, UriKind.Absolute);
+                thumbnail.EndInit();
+                thumbnail.Freeze();
+                return thumbnail;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        public object ConvertBack(
+            object value,
+            Type targetType,
+            object parameter,
+            CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}
diff --git a/YoableWPF/HotkeyInputControl.xaml b/YoableWPF/HotkeyInputControl.xaml
index f7438ef..8e5036c 100644
--- a/YoableWPF/HotkeyInputControl.xaml
+++ b/YoableWPF/HotkeyInputControl.xaml
@@ -153,11 +153,11 @@
                                 </Border>
                                 <ControlTemplate.Triggers>
                                     <Trigger Property="IsMouseOver" Value="True">
-                                        <Setter TargetName="Border" Property="Background" Value="#22FF0000"/>
+                                        <Setter TargetName="Border" Property="Background" Value="{StaticResource DangerFaintBrush}"/>
                                         <Setter Property="Foreground" Value="Red"/>
                                     </Trigger>
                                     <Trigger Property="IsPressed" Value="True">
-                                        <Setter TargetName="Border" Property="Background" Value="#44FF0000"/>
+                                        <Setter TargetName="Border" Property="Background" Value="{StaticResource DangerSubtleBrush}"/>
                                     </Trigger>
                                 </ControlTemplate.Triggers>
                             </ControlTemplate>
diff --git a/YoableWPF/ImportLabelsAndImageDialog.xaml b/YoableWPF/ImportLabelsAndImageDialog.xaml
index 5d17d50..ba714ce 100644
--- a/YoableWPF/ImportLabelsAndImageDialog.xaml
+++ b/YoableWPF/ImportLabelsAndImageDialog.xaml
@@ -13,79 +13,8 @@
 
     <Window.Resources>
         <!-- Modern Button Style -->
-        <Style x:Key="ModernButton" TargetType="Button">
-            <Setter Property="Background" Value="#FF0078D4"/>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="20,10"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.9"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.5"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
 
         <!-- Secondary Button Style -->
-        <Style x:Key="SecondaryButton" TargetType="Button">
-            <Setter Property="Background">
-                <Setter.Value>
-                    <SolidColorBrush Color="#33FFFFFF"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="20,10"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background">
-                                    <Setter.Value>
-                                        <SolidColorBrush Color="#44FFFFFF"/>
-                                    </Setter.Value>
-                                </Setter>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
 
         <!-- Icon Button Style (for browse button) -->
         <Style x:Key="IconButton" TargetType="Button">
@@ -156,7 +85,7 @@
                     <TextBlock FontFamily="Segoe MDL2 Assets" 
                                Text="&#xE8B7;" 
                                FontSize="24"
-                               Foreground="#FF9C27B0"
+                               Foreground="{StaticResource GlyphPurpleBrush}"
                                VerticalAlignment="Center"
                                Margin="0,0,12,0"/>
                     <TextBlock Text="{DynamicResource Dialog_ImportLabelsAndImage_Title}" 
diff --git a/YoableWPF/MainWindow.xaml b/YoableWPF/MainWindow.xaml
index a07bbb3..778d23f 100644
--- a/YoableWPF/MainWindow.xaml
+++ b/YoableWPF/MainWindow.xaml
@@ -15,125 +15,12 @@
     PreviewMouseWheel="Window_PreviewMouseWheel"
     Closing="Window_Closing">
 
-    <Window.Resources>
-        <!-- Accent Brush -->
-        <SolidColorBrush x:Key="AccentBrush" Color="{DynamicResource SystemAccentColor}"/>
+    <!-- Shared styles now live in Themes/*.xaml (merged app-wide via App.xaml) -->
 
-        <!-- Modern Card Style -->
-        <Style x:Key="ModernCard" TargetType="Border">
-            <Setter Property="Background" Value="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"/>
-            <Setter Property="CornerRadius" Value="8"/>
-            <Setter Property="Padding" Value="16"/>
-            <Setter Property="Margin" Value="0,0,0,12"/>
-            <Setter Property="Effect">
-                <Setter.Value>
-                    <DropShadowEffect BlurRadius="10" ShadowDepth="2" Opacity="0.15" Direction="270"/>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <!-- Status Card Style -->
-        <Style x:Key="StatusCard" TargetType="Border">
-            <Setter Property="CornerRadius" Value="6"/>
-            <Setter Property="Padding" Value="12,10"/>
-            <Setter Property="Effect">
-                <Setter.Value>
-                    <DropShadowEffect BlurRadius="8" ShadowDepth="1" Opacity="0.2" Direction="270"/>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <!-- Modern ListBox Style -->
-        <Style x:Key="ModernListBox" TargetType="ListBox" BasedOn="{StaticResource {x:Type ListBox}}">
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="4"/>
-        </Style>
-
-        <!-- Image List Item Style -->
-        <Style x:Key="ImageListItemStyle" TargetType="ListBoxItem">
-            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-            <Setter Property="Padding" Value="0"/>
-            <Setter Property="Margin" Value="0,2"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ListBoxItem">
-                        <Border x:Name="Border" 
-                                Background="Transparent"
-                                CornerRadius="6"
-                                Padding="10,8"
-                                Margin="0,1">
-                            <ContentPresenter/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
-                            </Trigger>
-                            <Trigger Property="IsSelected" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource AccentBrush}"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <!-- Collapsible Panel Button Style -->
-        <Style x:Key="CollapsePanelButton" TargetType="Button">
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="8"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}" 
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        
-        <!-- Icon Button Style for Edit -->
-        <Style x:Key="IconButton" TargetType="Button">
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="4"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Width" Value="24"/>
-            <Setter Property="Height" Value="24"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}" 
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </Window.Resources>
-
-    <Grid>
+    <Grid x:Name="RootGrid">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="320"/>
+            <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="320"/>
         </Grid.ColumnDefinitions>
 
         <Grid.RowDefinitions>
@@ -142,121 +29,271 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <!-- Menu Bar -->
-        <Menu Grid.Row="0" Grid.ColumnSpan="3" Padding="4,2">
-            <MenuItem Header="{DynamicResource Menu_Project}">
-                <MenuItem Header="{DynamicResource Menu_NewProject}" Click="NewProject_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" 
-                                   Text="&#xE710;" 
-                                   FontSize="16" 
-                                   Foreground="#FF9C27B0"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource Menu_OpenProject}" Click="OpenProject_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" 
-                                   Text="&#xE8E5;" 
-                                   FontSize="16" 
-                                   Foreground="#4CAF50"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <Separator/>
-                <MenuItem Header="{DynamicResource Menu_SaveProject}" Click="SaveProject_Click" InputGestureText="Ctrl+S">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" 
-                                   Text="&#xE74E;" 
-                                   FontSize="16" 
-                                   Foreground="#2196F3"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource Menu_SaveProjectAs}" Click="SaveProjectAs_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" 
-                                   Text="&#xE792;" 
-                                   FontSize="16" 
-                                   Foreground="#2196F3"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <Separator/>
-                <MenuItem Header="{DynamicResource Menu_CloseProject}" Click="CloseProject_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" 
-                                   Text="&#xE711;" 
-                                   FontSize="16" 
-                                   Foreground="#F44336"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-            </MenuItem>
-            <MenuItem Header="{DynamicResource Menu_File}">
-                <MenuItem Header="{DynamicResource Menu_ImportDirectory}" Click="ImportDirectory_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8B7;" FontSize="16" Foreground="#FF9C27B0"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource Menu_ImportLabelsAndImage}" Click="ImportLabelsAndImage_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8A5;" FontSize="16" Foreground="#FF00BCD4"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource Menu_ImportImage}" Click="ImportImage_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xEB9F;" FontSize="16" Foreground="#FF4CAF50"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource Menu_ImportLabels}" Click="ImportLabels_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8E5;" FontSize="16" Foreground="#FF2196F3"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource Menu_YoutubeToImages}" Click="YTToImage_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE714;" FontSize="16" Foreground="#FFF44336"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource Menu_ExportLabels}" Click="ExportLabels_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xEDE1;" FontSize="16" Foreground="#FFFF9800"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource Menu_ClearAll}" Click="ClearAll_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE74D;" FontSize="16" Foreground="#FFF44336"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource Menu_ClearAllSuggestions}" Click="ClearAllSuggestions_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE74D;" FontSize="16" Foreground="#FFE57373"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-            </MenuItem>
-            <MenuItem Header="{DynamicResource Menu_AI}">
-                <MenuItem Header="{DynamicResource Menu_ManageModels}" Click="ManageModels_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE950;" FontSize="16" Foreground="#FF9C27B0"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <Separator/>
-                <MenuItem Header="{DynamicResource Menu_AutoLabelImages}" Click="AutoLabelImages_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8FE;" FontSize="16" Foreground="#FF00BCD4"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource Menu_AutoSuggestLabels}" Click="AutoSuggestLabels_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xEA80;" FontSize="16" Foreground="#FF3F51B5"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-            </MenuItem>
-            <MenuItem Header="{DynamicResource Menu_Settings}" x:Name="SettingsMenuItem" Click="SettingsMenuItem_Click">
-                <MenuItem.Icon>
-                    <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE115;" FontSize="16" Foreground="#FF607D8B"/>
-                </MenuItem.Icon>
-            </MenuItem>
-        </Menu>
+        <!-- ================= Top Toolbar ================= -->
+        <Border Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource TopToolbar}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+
+                <!-- Left: primary actions -->
+                <StackPanel Grid.Column="0" Orientation="Horizontal">
+                    <Button Style="{StaticResource ToolbarButton}"
+                            Click="NewProject_Click"
+                            ToolTip="{DynamicResource Menu_NewProject}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE710;" FontSize="16"
+                                       Foreground="{StaticResource GlyphPurpleBrush}" VerticalAlignment="Center"/>
+                            <TextBlock Text="{DynamicResource Menu_NewProject}" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                    <Button Style="{StaticResource ToolbarButton}"
+                            Click="OpenProject_Click"
+                            ToolTip="{DynamicResource Menu_OpenProject}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8E5;" FontSize="16"
+                                       Foreground="{StaticResource SuccessBrush}" VerticalAlignment="Center"/>
+                            <TextBlock Text="{DynamicResource Menu_OpenProject}" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                    <Button Style="{StaticResource ToolbarButton}"
+                            Click="SaveProject_Click"
+                            ToolTip="{DynamicResource Toolbar_SaveTooltip}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE74E;" FontSize="16"
+                                       Foreground="{StaticResource GlyphBlueBrush}" VerticalAlignment="Center"/>
+                            <TextBlock Text="{DynamicResource Menu_SaveProject}" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+
+                    <Rectangle Style="{StaticResource ToolbarSeparator}"/>
+
+                    <!-- Import flyout -->
+                    <Button Style="{StaticResource ToolbarButton}"
+                            Click="ToolbarFlyout_Click"
+                            ToolTip="{DynamicResource Toolbar_Import}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8B5;" FontSize="16"
+                                       Foreground="{StaticResource GlyphTealBrush}" VerticalAlignment="Center"/>
+                            <TextBlock Text="{DynamicResource Toolbar_Import}" Margin="6,0,4,0" VerticalAlignment="Center"/>
+                            <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE70D;" FontSize="10"
+                                       Opacity="0.6" VerticalAlignment="Center"/>
+                        </StackPanel>
+                        <Button.ContextMenu>
+                            <ContextMenu>
+                                <MenuItem Header="{DynamicResource Menu_ImportDirectory}" Click="ImportDirectory_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8B7;" FontSize="16" Foreground="{StaticResource GlyphPurpleBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="{DynamicResource Menu_ImportLabelsAndImage}" Click="ImportLabelsAndImage_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8A5;" FontSize="16" Foreground="{StaticResource InfoBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="{DynamicResource Menu_ImportImage}" Click="ImportImage_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xEB9F;" FontSize="16" Foreground="{StaticResource SuccessBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="{DynamicResource Menu_ImportLabels}" Click="ImportLabels_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8E5;" FontSize="16" Foreground="{StaticResource GlyphBlueBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                            </ContextMenu>
+                        </Button.ContextMenu>
+                    </Button>
+
+                    <!-- AI flyout -->
+                    <Button Style="{StaticResource ToolbarButton}"
+                            Click="ToolbarFlyout_Click"
+                            ToolTip="{DynamicResource Toolbar_AITools}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8FE;" FontSize="16"
+                                       Foreground="{StaticResource GlyphIndigoBrush}" VerticalAlignment="Center"/>
+                            <TextBlock Text="{DynamicResource Toolbar_AITools}" Margin="6,0,4,0" VerticalAlignment="Center"/>
+                            <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE70D;" FontSize="10"
+                                       Opacity="0.6" VerticalAlignment="Center"/>
+                        </StackPanel>
+                        <Button.ContextMenu>
+                            <ContextMenu>
+                                <MenuItem Header="{DynamicResource Menu_AILabelCurrentImage}" Click="AILabelCurrentImage_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8FE;" FontSize="16" Foreground="{StaticResource GlyphTealBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="{DynamicResource Menu_AutoLabelImages}" Click="AutoLabelImages_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8FE;" FontSize="16" Foreground="{StaticResource InfoBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="{DynamicResource Menu_AutoSuggestLabels}" Click="AutoSuggestLabels_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xEA80;" FontSize="16" Foreground="{StaticResource GlyphIndigoBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                            </ContextMenu>
+                        </Button.ContextMenu>
+                    </Button>
+                </StackPanel>
+
+                <!-- Right: overflow + settings -->
+                <StackPanel Grid.Column="2" Orientation="Horizontal">
+                    <Button Style="{StaticResource ToolbarButton}"
+                            Click="ToolbarFlyout_Click"
+                            ToolTip="{DynamicResource Toolbar_MoreTooltip}">
+                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE712;" FontSize="16"
+                                   VerticalAlignment="Center"/>
+                        <Button.ContextMenu>
+                            <ContextMenu>
+                                <MenuItem Header="{DynamicResource Menu_SaveProjectAs}" Click="SaveProjectAs_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE792;" FontSize="16" Foreground="{StaticResource GlyphBlueBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="{DynamicResource Menu_CloseProject}" Click="CloseProject_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE711;" FontSize="16" Foreground="{StaticResource DangerBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="{DynamicResource Menu_BackToStart}" Click="BackToStart_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE80F;" FontSize="16" Foreground="{StaticResource GlyphTealBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <Separator/>
+                                <MenuItem Header="{DynamicResource Menu_SetManualProgress}" Click="SetManualProgress_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE7C1;" FontSize="16" Foreground="{StaticResource SuccessBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="{DynamicResource Menu_JumpManualProgress}" Click="JumpToManualProgress_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE72A;" FontSize="16" Foreground="{StaticResource GlyphBlueBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <Separator/>
+                                <MenuItem Header="{DynamicResource Menu_YoutubeToImages}" Click="YTToImage_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE714;" FontSize="16" Foreground="{StaticResource DangerBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="{DynamicResource Menu_ExportLabels}" Click="ExportLabels_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xEDE1;" FontSize="16" Foreground="{StaticResource WarningBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="{DynamicResource Menu_ExportTrainingDataset}" Click="ExportTrainingDataset_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8F1;" FontSize="16" Foreground="{StaticResource InfoBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="{DynamicResource Menu_DataAugmentation}" Click="DataAugmentation_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8B9;" FontSize="16" Foreground="{StaticResource GlyphLimeBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <Separator/>
+                                <MenuItem Header="{DynamicResource Menu_ManageModels}" Click="ManageModels_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE950;" FontSize="16" Foreground="{StaticResource GlyphPurpleBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <Separator/>
+                                <MenuItem Header="{DynamicResource Menu_ClearAllSuggestions}" Click="ClearAllSuggestions_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE74D;" FontSize="16" Foreground="{StaticResource GlyphRedLightBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="{DynamicResource Menu_ClearAll}" Click="ClearAll_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE74D;" FontSize="16" Foreground="{StaticResource DangerBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                            </ContextMenu>
+                        </Button.ContextMenu>
+                    </Button>
+                    <Button x:Name="SettingsMenuItem"
+                            Style="{StaticResource ToolbarButton}"
+                            Click="SettingsMenuItem_Click"
+                            ToolTip="{DynamicResource Menu_Settings}">
+                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE713;" FontSize="16"
+                                   Foreground="{StaticResource GlyphGreyBrush}" VerticalAlignment="Center"/>
+                    </Button>
+                </StackPanel>
+            </Grid>
+        </Border>
+
+        <!-- ================= Left Navigation Rail ================= -->
+        <Border Grid.Row="1" Grid.Column="0" Style="{StaticResource NavRail}">
+            <StackPanel>
+                <RadioButton x:Name="NavAnnotateButton"
+                             Style="{StaticResource NavRailButton}"
+                             GroupName="NavRail" Tag="0" IsChecked="True"
+                             Checked="NavRail_Checked"
+                             ToolTip="{DynamicResource Main_TabAnnotate}">
+                    <StackPanel>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE70F;" FontSize="18" HorizontalAlignment="Center"/>
+                        <TextBlock Text="{DynamicResource Main_TabAnnotate}" FontSize="10" Margin="0,4,0,0"
+                                   HorizontalAlignment="Center" TextTrimming="CharacterEllipsis" MaxWidth="60"/>
+                    </StackPanel>
+                </RadioButton>
+                <RadioButton x:Name="NavDuplicatesButton"
+                             Style="{StaticResource NavRailButton}"
+                             GroupName="NavRail" Tag="1"
+                             Checked="NavRail_Checked"
+                             ToolTip="{DynamicResource Main_TabDuplicates}">
+                    <StackPanel>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8C8;" FontSize="18" HorizontalAlignment="Center"/>
+                        <TextBlock Text="{DynamicResource Main_TabDuplicates}" FontSize="10" Margin="0,4,0,0"
+                                   HorizontalAlignment="Center" TextTrimming="CharacterEllipsis" MaxWidth="60"/>
+                    </StackPanel>
+                </RadioButton>
+                <RadioButton x:Name="NavRoiCropButton"
+                             Style="{StaticResource NavRailButton}"
+                             GroupName="NavRail" Tag="2"
+                             Checked="NavRail_Checked"
+                             ToolTip="{DynamicResource Main_TabRoiCrop}">
+                    <StackPanel>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE7A8;" FontSize="18" HorizontalAlignment="Center"/>
+                        <TextBlock Text="{DynamicResource Main_TabRoiCrop}" FontSize="10" Margin="0,4,0,0"
+                                   HorizontalAlignment="Center" TextTrimming="CharacterEllipsis" MaxWidth="60"/>
+                    </StackPanel>
+                </RadioButton>
+                <RadioButton x:Name="NavStatsButton"
+                             Style="{StaticResource NavRailButton}"
+                             GroupName="NavRail" Tag="3"
+                             Checked="NavRail_Checked"
+                             ToolTip="{DynamicResource Main_TabStats}">
+                    <StackPanel>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE9D9;" FontSize="18" HorizontalAlignment="Center"/>
+                        <TextBlock Text="{DynamicResource Main_TabStats}" FontSize="10" Margin="0,4,0,0"
+                                   HorizontalAlignment="Center" TextTrimming="CharacterEllipsis" MaxWidth="60"/>
+                    </StackPanel>
+                </RadioButton>
+            </StackPanel>
+        </Border>
+
+
+        <TabControl x:Name="MainWorkspaceTabs"
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Style="{StaticResource WorkspaceTabControl}"
+                    ItemContainerStyle="{StaticResource HiddenTabItemStyle}"
+                    SelectionChanged="MainWorkspaceTabs_SelectionChanged">
+            <TabItem x:Name="ImageAnnotationTab" Header="{DynamicResource Main_TabAnnotate}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="320"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="320"/>
+                    </Grid.ColumnDefinitions>
 
         <!-- Left Panel - Images List -->
-        <Border Grid.Row="1" Grid.Column="0" 
+        <Border Grid.Column="0"
                 Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
                 Padding="12">
             <Grid>
@@ -278,11 +315,16 @@
                 </Grid>
 
                 <!-- Sort and Filter Controls -->
-                <Border Grid.Row="1" 
+                <Border Grid.Row="1"
                         Background="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"
                         CornerRadius="6"
                         Padding="12,12,20,12"
                         Margin="0,0,0,8">
+                    <!-- Cap the filter card so an expanded class filter can't crush the image list;
+                         on short windows this scrolls instead -->
+                    <ScrollViewer MaxHeight="400"
+                                  VerticalScrollBarVisibility="Auto"
+                                  ScrollViewer.CanContentScroll="False">
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
@@ -299,7 +341,7 @@
                                 <TextBlock FontFamily="Segoe MDL2 Assets"
                                            Text="&#xE8CB;"
                                            FontSize="12"
-                                           Foreground="#FFFF9800"
+                                           Foreground="{StaticResource WarningBrush}"
                                            VerticalAlignment="Center"
                                            Margin="0,0,6,0"/>
                                 <TextBlock Text="{DynamicResource Main_Sort}"
@@ -316,6 +358,8 @@
                                       HorizontalAlignment="Stretch">
                                 <ComboBoxItem Content="{DynamicResource Main_SortByName}"/>
                                 <ComboBoxItem Content="{DynamicResource Main_SortByStatus}"/>
+                                <ComboBoxItem Content="{DynamicResource Main_SortByDateNewest}"/>
+                                <ComboBoxItem Content="{DynamicResource Main_SortByDateOldest}"/>
                             </ComboBox>
                         </StackPanel>
 
@@ -334,7 +378,7 @@
                                 <TextBlock FontFamily="Segoe MDL2 Assets"
                                            Text="&#xE71C;"
                                            FontSize="12"
-                                           Foreground="#FF3F51B5"
+                                           Foreground="{StaticResource GlyphIndigoBrush}"
                                            VerticalAlignment="Center"
                                            Margin="0,0,6,0"/>
                                 <TextBlock Text="{DynamicResource Main_Filter}"
@@ -357,64 +401,77 @@
 
                                 <Button Grid.Row="0" Grid.Column="0"
                                         x:Name="FilterAllButton"
-                                        Content="{DynamicResource Main_FilterAll}"
+                                        Style="{StaticResource FilterChip}"
                                         Click="FilterAll_Click"
-                                        FontSize="10"
-                                        FontWeight="SemiBold"
-                                        Padding="6,6"
                                         Margin="0,0,6,6"
-                                        HorizontalAlignment="Stretch"
                                         Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
                                         Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"
-                                        BorderThickness="1"
-                                        BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"/>
+                                        BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="{DynamicResource Main_FilterAll}"/>
+                                        <TextBlock x:Name="FilterAllCountText" Text="0" Margin="4,0,0,0" Opacity="0.75"/>
+                                    </StackPanel>
+                                </Button>
                                 <Button Grid.Row="0" Grid.Column="1"
                                         x:Name="FilterReviewButton"
-                                        Content="{DynamicResource Main_FilterReview}"
+                                        Style="{StaticResource FilterChip}"
                                         Click="FilterReview_Click"
-                                        FontSize="10"
-                                        FontWeight="SemiBold"
-                                        Padding="6,6"
                                         Margin="0,0,6,6"
-                                        HorizontalAlignment="Stretch"
-                                        Background="#44FFB74D"
-                                        Foreground="#FFB74D"
-                                        BorderThickness="0"/>
+                                        Background="{StaticResource StatusReviewSubtleBrush}"
+                                        Foreground="{StaticResource StatusReviewBrush}"
+                                        BorderThickness="0">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="{DynamicResource Main_FilterReview}"/>
+                                        <TextBlock x:Name="FilterReviewCountText" Text="0" Margin="4,0,0,0" Opacity="0.75"/>
+                                    </StackPanel>
+                                </Button>
                                 <Button Grid.Row="0" Grid.Column="2"
                                         x:Name="FilterSuggestedButton"
-                                        Content="{DynamicResource Main_FilterSuggested}"
+                                        Style="{StaticResource FilterChip}"
                                         Click="FilterSuggested_Click"
-                                        FontSize="10"
-                                        FontWeight="SemiBold"
-                                        Padding="6,6"
                                         Margin="0,0,0,6"
-                                        HorizontalAlignment="Stretch"
-                                        Background="#4464B5F6"
-                                        Foreground="#64B5F6"
-                                        BorderThickness="0"/>
+                                        Background="{StaticResource StatusSuggestedSubtleBrush}"
+                                        Foreground="{StaticResource StatusSuggestedBrush}"
+                                        BorderThickness="0">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="{DynamicResource Main_FilterSuggested}"/>
+                                        <TextBlock x:Name="FilterSuggestedCountText" Text="0" Margin="4,0,0,0" Opacity="0.75"/>
+                                    </StackPanel>
+                                </Button>
                                 <Button Grid.Row="1" Grid.Column="0"
                                         x:Name="FilterNoLabelButton"
-                                        Content="{DynamicResource Main_FilterNone}"
+                                        Style="{StaticResource FilterChip}"
                                         Click="FilterNoLabel_Click"
-                                        FontSize="10"
-                                        FontWeight="SemiBold"
-                                        Padding="6,6"
                                         Margin="0,0,6,0"
-                                        HorizontalAlignment="Stretch"
-                                        Background="#44E57373"
-                                        Foreground="#E57373"
-                                        BorderThickness="0"/>
+                                        Background="{StaticResource StatusNoLabelSubtleBrush}"
+                                        Foreground="{StaticResource StatusNoLabelBrush}"
+                                        BorderThickness="0">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="{DynamicResource Main_FilterNone}"/>
+                                        <TextBlock x:Name="FilterNoLabelCountText" Text="0" Margin="4,0,0,0" Opacity="0.75"/>
+                                    </StackPanel>
+                                </Button>
                                 <Button Grid.Row="1" Grid.Column="1"
                                         x:Name="FilterVerifiedButton"
-                                        Content="{DynamicResource Main_FilterDone}"
+                                        Style="{StaticResource FilterChip}"
                                         Click="FilterVerified_Click"
-                                        FontSize="10"
-                                        FontWeight="SemiBold"
-                                        Padding="6,6"
                                         Margin="0"
-                                        HorizontalAlignment="Stretch"
-                                        Background="#4481C784"
-                                        Foreground="#81C784"
+                                        Background="{StaticResource StatusVerifiedSubtleBrush}"
+                                        Foreground="{StaticResource StatusVerifiedBrush}"
+                                        BorderThickness="0">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="{DynamicResource Main_FilterDone}"/>
+                                        <TextBlock x:Name="FilterVerifiedCountText" Text="0" Margin="4,0,0,0" Opacity="0.75"/>
+                                    </StackPanel>
+                                </Button>
+                                <Button Grid.Row="1" Grid.Column="2"
+                                        x:Name="FilterAiLabelsButton"
+                                        Style="{StaticResource FilterChip}"
+                                        Content="{DynamicResource Main_FilterAiLabels}"
+                                        Click="FilterAiLabels_Click"
+                                        Margin="6,0,0,0"
+                                        Background="{StaticResource StatusAiSubtleBrush}"
+                                        Foreground="{StaticResource StatusAiBrush}"
                                         BorderThickness="0"/>
                             </Grid>
                         </StackPanel>
@@ -433,10 +490,10 @@
                                             <ColumnDefinition Width="Auto"/>
                                         </Grid.ColumnDefinitions>
                                         <StackPanel Grid.Column="0" Orientation="Horizontal">
-                                            <TextBlock FontFamily="Segoe MDL2 Assets" 
-                                                       Text="&#xE8C8;" 
+                                            <TextBlock FontFamily="Segoe MDL2 Assets"
+                                                       Text="&#xE8C8;"
                                                        FontSize="12"
-                                                       Foreground="#FF9C27B0"
+                                                       Foreground="{StaticResource GlyphPurpleBrush}"
                                                        VerticalAlignment="Center"
                                                        Margin="0,0,6,0"/>
                                             <TextBlock Text="{Binding}" 
@@ -448,24 +505,105 @@
                                     </Grid>
                                 </DataTemplate>
                             </Expander.HeaderTemplate>
-                            <ScrollViewer MaxHeight="200" VerticalScrollBarVisibility="Auto" Margin="0,8,0,0">
-                                <StackPanel x:Name="ClassFilterCheckBoxPanel" Orientation="Vertical">
-                                    <!-- Checkboxes will be added dynamically -->
+                            <StackPanel Margin="0,8,0,0">
+                                <WrapPanel Margin="0,0,0,6">
+                                    <RadioButton x:Name="ClassFilterModeInclude"
+                                                 GroupName="classFilterMode"
+                                                 IsChecked="True"
+                                                 Content="{DynamicResource Main_FilterModeInclude}"
+                                                 FontSize="11"
+                                                 Margin="0,0,14,4"
+                                                 Checked="ClassFilterMode_Changed"/>
+                                    <RadioButton x:Name="ClassFilterModeAll"
+                                                 GroupName="classFilterMode"
+                                                 Content="{DynamicResource Main_FilterModeAll}"
+                                                 FontSize="11"
+                                                 Margin="0,0,14,4"
+                                                 Checked="ClassFilterMode_Changed"/>
+                                    <RadioButton x:Name="ClassFilterModeOnly"
+                                                 GroupName="classFilterMode"
+                                                 Content="{DynamicResource Main_FilterModeOnly}"
+                                                 FontSize="11"
+                                                 Margin="0,0,14,4"
+                                                 Checked="ClassFilterMode_Changed"/>
+                                    <RadioButton x:Name="ClassFilterModeExclude"
+                                                 GroupName="classFilterMode"
+                                                 Content="{DynamicResource Main_FilterModeExclude}"
+                                                 FontSize="11"
+                                                 Margin="0,0,0,4"
+                                                 Checked="ClassFilterMode_Changed"/>
+                                </WrapPanel>
+                                <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
+                                    <Button Content="{DynamicResource Main_FilterSelectAll}"
+                                            FontSize="10" Padding="6,2" Margin="0,0,6,0"
+                                            Click="ClassFilterSelectAll_Click"/>
+                                    <Button Content="{DynamicResource Main_FilterClear}"
+                                            FontSize="10" Padding="6,2" Margin="0,0,6,0"
+                                            Click="ClassFilterClear_Click"/>
+                                    <Button Content="{DynamicResource Main_FilterInvert}"
+                                            FontSize="10" Padding="6,2"
+                                            Click="ClassFilterInvert_Click"/>
                                 </StackPanel>
-                            </ScrollViewer>
+                                <ScrollViewer MaxHeight="160" VerticalScrollBarVisibility="Auto"
+                                              ScrollViewer.CanContentScroll="False">
+                                    <ItemsControl x:Name="ClassFilterItemsControl">
+                                        <ItemsControl.ItemTemplate>
+                                            <DataTemplate>
+                                                <Grid Margin="0,3">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="Auto"/>
+                                                        <ColumnDefinition Width="*"/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <Border Width="4" Height="16" CornerRadius="2"
+                                                            Background="{Binding ColorBrush}"
+                                                            Margin="0,0,8,0" VerticalAlignment="Center"/>
+                                                    <CheckBox Grid.Column="1"
+                                                              Content="{Binding Name}"
+                                                              FontSize="11"
+                                                              IsChecked="{Binding IsChecked, Mode=TwoWay}"
+                                                              Checked="ClassFilterCheckBox_Changed"
+                                                              Unchecked="ClassFilterCheckBox_Changed"/>
+                                                </Grid>
+                                            </DataTemplate>
+                                        </ItemsControl.ItemTemplate>
+                                    </ItemsControl>
+                                </ScrollViewer>
+                            </StackPanel>
                         </Expander>
                     </Grid>
+                    </ScrollViewer>
                 </Border>
 
                 <!-- Image List Card -->
-                <Border Grid.Row="2" Style="{StaticResource ModernCard}" Padding="0" Margin="0">
-                    <ListBox x:Name="ImageListBox" 
+                <Border Grid.Row="2" Style="{StaticResource ModernCard}" Padding="0" Margin="0" MinHeight="140">
+                    <ListBox x:Name="ImageListBox"
                              Style="{StaticResource ModernListBox}"
-                             SelectionMode="Single" 
+                             SelectionMode="Single"
                              SelectionChanged="ImageListBox_SelectionChanged"
+                             PreviewMouseRightButtonDown="ImageListBox_PreviewMouseRightButtonDown"
                              VirtualizingStackPanel.IsVirtualizing="True"
                              VirtualizingStackPanel.VirtualizationMode="Recycling"
                              ScrollViewer.IsDeferredScrollingEnabled="True">
+                        <ListBox.ContextMenu>
+                            <ContextMenu x:Name="ImageListContextMenu" Opened="ImageListContextMenu_Opened">
+                                <MenuItem Header="{DynamicResource Main_OpenImageLocation}" Click="OpenImageLocation_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xEB9F;" FontSize="14" Foreground="{StaticResource SuccessBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="{DynamicResource Main_OpenLabelLocation}" Click="OpenLabelLocation_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8A5;" FontSize="14" Foreground="{StaticResource GlyphBlueBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <Separator/>
+                                <MenuItem Header="{DynamicResource Main_DeleteImage}" Click="DeleteImage_Click">
+                                    <MenuItem.Icon>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE74D;" FontSize="14" Foreground="{StaticResource DangerBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                            </ContextMenu>
+                        </ListBox.ContextMenu>
                         <ListBox.ItemContainerStyle>
                             <Style TargetType="ListBoxItem" BasedOn="{StaticResource ImageListItemStyle}"/>
                         </ListBox.ItemContainerStyle>
@@ -493,16 +631,16 @@
                                             <Style TargetType="Border">
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding Status}" Value="NoLabel">
-                                                        <Setter Property="Background" Value="#FFE57373"/>
+                                                        <Setter Property="Background" Value="{StaticResource StatusNoLabelBrush}"/>
                                                     </DataTrigger>
                                                     <DataTrigger Binding="{Binding Status}" Value="Suggested">
-                                                        <Setter Property="Background" Value="#FF64B5F6"/>
+                                                        <Setter Property="Background" Value="{StaticResource StatusSuggestedBrush}"/>
                                                     </DataTrigger>
                                                     <DataTrigger Binding="{Binding Status}" Value="VerificationNeeded">
-                                                        <Setter Property="Background" Value="#FFFFB74D"/>
+                                                        <Setter Property="Background" Value="{StaticResource StatusReviewBrush}"/>
                                                     </DataTrigger>
                                                     <DataTrigger Binding="{Binding Status}" Value="Verified">
-                                                        <Setter Property="Background" Value="#FF81C784"/>
+                                                        <Setter Property="Background" Value="{StaticResource StatusVerifiedBrush}"/>
                                                     </DataTrigger>
                                                 </Style.Triggers>
                                             </Style>
@@ -551,26 +689,26 @@
                         <!-- Review Status -->
                         <Border Grid.Column="0" 
                                 Style="{StaticResource StatusCard}"
-                                Background="#44FFB74D"
+                                Background="{StaticResource StatusReviewSubtleBrush}"
                                 CornerRadius="6,0,0,6"
                                 Margin="0,0,1,0">
                             <StackPanel HorizontalAlignment="Center">
                                 <TextBlock FontFamily="Segoe MDL2 Assets" 
                                            Text="&#xE7BA;" 
                                            FontSize="20"
-                                           Foreground="#FFB74D"
+                                           Foreground="{StaticResource StatusReviewBrush}"
                                            HorizontalAlignment="Center"
                                            Margin="0,0,0,4"/>
                                 <TextBlock x:Name="NeedsReviewCount" 
                                            FontSize="18" 
                                            FontWeight="Bold"
-                                           Foreground="#FFB74D"
+                                           Foreground="{StaticResource StatusReviewBrush}"
                                            HorizontalAlignment="Center"
                                            Text="0"/>
                                 <TextBlock Text="{DynamicResource Main_StatusReview}" 
                                            FontSize="9" 
                                            FontWeight="SemiBold"
-                                           Foreground="#CC7A00"
+                                           Foreground="{StaticResource StatusReviewDeepBrush}"
                                            HorizontalAlignment="Center"
                                            Opacity="0.8"/>
                             </StackPanel>
@@ -579,26 +717,26 @@
                         <!-- Suggested Status -->
                         <Border Grid.Column="1" 
                                 Style="{StaticResource StatusCard}"
-                                Background="#4464B5F6"
+                                Background="{StaticResource StatusSuggestedSubtleBrush}"
                                 CornerRadius="0"
                                 Margin="0,0,1,0">
                             <StackPanel HorizontalAlignment="Center">
                                 <TextBlock FontFamily="Segoe MDL2 Assets" 
                                            Text="&#xEA80;" 
                                            FontSize="20"
-                                           Foreground="#64B5F6"
+                                           Foreground="{StaticResource StatusSuggestedBrush}"
                                            HorizontalAlignment="Center"
                                            Margin="0,0,0,4"/>
                                 <TextBlock x:Name="SuggestedCount" 
                                            FontSize="18" 
                                            FontWeight="Bold"
-                                           Foreground="#64B5F6"
+                                           Foreground="{StaticResource StatusSuggestedBrush}"
                                            HorizontalAlignment="Center"
                                            Text="0"/>
                                 <TextBlock Text="{DynamicResource Main_StatusSuggested}" 
                                            FontSize="9" 
                                            FontWeight="SemiBold"
-                                           Foreground="#1565C0"
+                                           Foreground="{StaticResource StatusSuggestedDeepBrush}"
                                            HorizontalAlignment="Center"
                                            Opacity="0.8"/>
                             </StackPanel>
@@ -607,26 +745,26 @@
                         <!-- No Label Status -->
                         <Border Grid.Column="2" 
                                 Style="{StaticResource StatusCard}"
-                                Background="#44E57373"
+                                Background="{StaticResource StatusNoLabelSubtleBrush}"
                                 CornerRadius="0"
                                 Margin="0">
                             <StackPanel HorizontalAlignment="Center">
                                 <TextBlock FontFamily="Segoe MDL2 Assets" 
                                            Text="&#xE783;" 
                                            FontSize="20"
-                                           Foreground="#E57373"
+                                           Foreground="{StaticResource StatusNoLabelBrush}"
                                            HorizontalAlignment="Center"
                                            Margin="0,0,0,4"/>
                                 <TextBlock x:Name="UnverifiedCount" 
                                            FontSize="18" 
                                            FontWeight="Bold"
-                                           Foreground="#E57373"
+                                           Foreground="{StaticResource StatusNoLabelBrush}"
                                            HorizontalAlignment="Center"
                                            Text="0"/>
                                 <TextBlock Text="{DynamicResource Main_StatusNoLabel}" 
                                            FontSize="9" 
                                            FontWeight="SemiBold"
-                                           Foreground="#CC3300"
+                                           Foreground="{StaticResource StatusNoLabelDeepBrush}"
                                            HorizontalAlignment="Center"
                                            Opacity="0.8"/>
                             </StackPanel>
@@ -635,26 +773,26 @@
                         <!-- Verified Status -->
                         <Border Grid.Column="3" 
                                 Style="{StaticResource StatusCard}"
-                                Background="#4481C784"
+                                Background="{StaticResource StatusVerifiedSubtleBrush}"
                                 CornerRadius="0,6,6,0"
                                 Margin="1,0,0,0">
                             <StackPanel HorizontalAlignment="Center">
                                 <TextBlock FontFamily="Segoe MDL2 Assets" 
                                            Text="&#xE73E;" 
                                            FontSize="20"
-                                           Foreground="#81C784"
+                                           Foreground="{StaticResource StatusVerifiedBrush}"
                                            HorizontalAlignment="Center"
                                            Margin="0,0,0,4"/>
                                 <TextBlock x:Name="VerifiedCount" 
                                            FontSize="18" 
                                            FontWeight="Bold"
-                                           Foreground="#81C784"
+                                           Foreground="{StaticResource StatusVerifiedBrush}"
                                            HorizontalAlignment="Center"
                                            Text="0"/>
                                 <TextBlock Text="{DynamicResource Main_StatusVerified}" 
                                            FontSize="9" 
                                            FontWeight="SemiBold"
-                                           Foreground="#2E7D32"
+                                           Foreground="{StaticResource StatusVerifiedDeepBrush}"
                                            HorizontalAlignment="Center"
                                            Opacity="0.8"/>
                             </StackPanel>
@@ -668,7 +806,7 @@
         </Border>
 
         <!-- Center Content Panel -->
-        <Border Grid.Row="1" Grid.Column="1" 
+        <Border Grid.Column="1"
                 Background="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"
                 Padding="12">
             <Border Style="{StaticResource ModernCard}" Padding="0" Margin="0">
@@ -681,7 +819,7 @@
         </Border>
 
         <!-- Right Panel - Labels & Classes -->
-        <Border Grid.Row="1" Grid.Column="2" 
+        <Border Grid.Column="2"
                 Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
                 Padding="12">
             <Grid>
@@ -721,6 +859,7 @@
                                  SelectionChanged="ClassListBox_SelectionChanged"
                                  BorderThickness="0"
                                  Background="Transparent"
+                                 VirtualizingPanel.ScrollUnit="Pixel"
                                  ScrollViewer.VerticalScrollBarVisibility="Auto"
                                  ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                             <ListBox.ItemContainerStyle>
@@ -842,11 +981,28 @@
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
                             <TextBlock Grid.Column="0" Text="{DynamicResource Main_ImageLabels}"
                                        FontSize="13" FontWeight="SemiBold"
                                        VerticalAlignment="Center"/>
                             <Button Grid.Column="1"
+                                    x:Name="AILabelCurrentImageButton"
+                                    Click="AILabelCurrentImage_Click"
+                                    Width="28"
+                                    Height="28"
+                                    Background="Transparent"
+                                    BorderThickness="0"
+                                    Padding="4"
+                                    Margin="8,0,0,0"
+                                    VerticalAlignment="Center"
+                                    ToolTip="{DynamicResource Menu_AILabelCurrentImage}">
+                                <TextBlock FontFamily="Segoe MDL2 Assets"
+                                           Text="&#xE8FE;"
+                                           FontSize="14"
+                                           Foreground="{StaticResource GlyphTealBrush}"/>
+                            </Button>
+                            <Button Grid.Column="2"
                                     x:Name="ClearImageClassesButton"
                                     Click="ClearImageClasses_Click"
                                     Background="Transparent"
@@ -858,12 +1014,12 @@
                                     <TextBlock FontFamily="Segoe MDL2 Assets"
                                                Text="&#xE74D;"
                                                FontSize="12"
-                                               Foreground="#E57373"
+                                               Foreground="{StaticResource StatusNoLabelBrush}"
                                                Margin="0,0,4,0"/>
                                     <TextBlock Text="{DynamicResource Main_ClearImageClasses}"
                                                FontSize="11"
                                                FontWeight="SemiBold"
-                                               Foreground="#E57373"/>
+                                               Foreground="{StaticResource StatusNoLabelBrush}"/>
                                 </StackPanel>
                                 <Button.ToolTip>
                                     <ToolTip Content="{DynamicResource Main_ClearImageClasses}"/>
@@ -874,7 +1030,7 @@
                         <!-- Suggestions Summary -->
                         <Border Grid.Row="1"
                                 x:Name="SuggestionSummaryPanel"
-                                Background="#2233A1FD"
+                                Background="{StaticResource StatusSuggestedSubtleBrush}"
                                 CornerRadius="4"
                                 Padding="10"
                                 Margin="12,0,12,8"
@@ -882,7 +1038,7 @@
                             <StackPanel>
                                 <TextBlock x:Name="SuggestionCountText"
                                            Text="{DynamicResource Main_SuggestionsCount}"
-                                           Foreground="#64B5F6"
+                                           Foreground="{StaticResource StatusSuggestedBrush}"
                                            FontWeight="SemiBold"/>
                                 <WrapPanel Margin="0,6,0,0">
                                     <Button Content="{DynamicResource Main_AcceptAllSuggestions}"
@@ -901,8 +1057,11 @@
                         <!-- Labels ListBox -->
                         <ListBox Grid.Row="2" x:Name="LabelListBox"
                                  Style="{StaticResource ModernListBox}"
-                                 SelectionMode="Single" 
-                                 SelectionChanged="LabelListBox_SelectionChanged">
+                                 SelectionMode="Single"
+                                 SelectionChanged="LabelListBox_SelectionChanged"
+                                 MouseDoubleClick="LabelListBox_MouseDoubleClick"
+                                 VirtualizingPanel.IsVirtualizing="True"
+                                 VirtualizingPanel.ScrollUnit="Pixel">
                             <ListBox.ItemContainerStyle>
                                 <Style TargetType="ListBoxItem" 
                                        BasedOn="{StaticResource ImageListItemStyle}"/>
@@ -915,16 +1074,35 @@
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="Auto"/>
                                         </Grid.RowDefinitions>
-                                        <StackPanel Orientation="Horizontal" Grid.Row="0">
-                                            <Border Width="4"
-                                                    Height="20"
-                                                    Background="{Binding ClassBrush}"
-                                                    Margin="0,0,8,0"
-                                                    CornerRadius="2"/>
-                                            <TextBlock Text="{Binding DisplayText}"
-                                                       VerticalAlignment="Center"
-                                                       TextTrimming="CharacterEllipsis"/>
-                                        </StackPanel>
+                                        <Grid Grid.Row="0">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*"/>
+                                                <ColumnDefinition Width="Auto"/>
+                                            </Grid.ColumnDefinitions>
+                                            <StackPanel Orientation="Horizontal" Grid.Column="0">
+                                                <Border Width="4"
+                                                        Height="20"
+                                                        Background="{Binding ClassBrush}"
+                                                        Margin="0,0,8,0"
+                                                        CornerRadius="2"/>
+                                                <TextBlock Text="{Binding DisplayText}"
+                                                           VerticalAlignment="Center"
+                                                           TextTrimming="CharacterEllipsis"/>
+                                            </StackPanel>
+                                            <Button Grid.Column="1"
+                                                    x:Name="ChangeClassButton"
+                                                    Style="{StaticResource IconButton}"
+                                                    Padding="4,0"
+                                                    Margin="8,0,0,0"
+                                                    VerticalAlignment="Center"
+                                                    Click="ChangeLabelClass_Click"
+                                                    Tag="{Binding}"
+                                                    ToolTip="{DynamicResource Main_ChangeClass}">
+                                                <TextBlock FontFamily="Segoe MDL2 Assets"
+                                                           Text="&#xE8AB;"
+                                                           FontSize="12"/>
+                                            </Button>
+                                        </Grid>
                                         <StackPanel Orientation="Horizontal"
                                                     Grid.Row="1"
                                                     x:Name="SuggestionMeta"
@@ -959,6 +1137,7 @@
                                         <DataTrigger Binding="{Binding IsSuggestion}" Value="True">
                                             <Setter TargetName="SuggestionActions" Property="Visibility" Value="Visible"/>
                                             <Setter TargetName="SuggestionMeta" Property="Visibility" Value="Visible"/>
+                                            <Setter TargetName="ChangeClassButton" Property="Visibility" Value="Collapsed"/>
                                         </DataTrigger>
                                     </DataTemplate.Triggers>
                                 </DataTemplate>
@@ -969,12 +1148,26 @@
             </Grid>
         </Border>
 
+                </Grid>
+            </TabItem>
+            <TabItem x:Name="DuplicateImagesTab"
+                     Header="{DynamicResource Main_TabDuplicates}">
+                <local:DuplicateImageReviewControl x:Name="DuplicateImageReview"/>
+            </TabItem>
+            <TabItem x:Name="RoiCropTab"
+                     Header="{DynamicResource Main_TabRoiCrop}">
+                <local:RoiCropControl x:Name="RoiCropReview"/>
+            </TabItem>
+            <TabItem x:Name="DatasetStatsTab"
+                     Header="{DynamicResource Main_TabStats}">
+                <local:DatasetStatisticsControl x:Name="DatasetStats"/>
+            </TabItem>
+        </TabControl>
+
 
         <!-- Status Bar -->
-        <Border Grid.Row="2" Grid.ColumnSpan="3" 
-                Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
-                BorderThickness="0,1,0,0"
-                BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+        <Border Grid.Row="2" Grid.ColumnSpan="2"
+                Style="{StaticResource AppStatusBar}"
                 Padding="12,6"
                 Height="32">
             <Grid>
@@ -986,10 +1179,10 @@
 
                 <!-- Left side: Project info -->
                 <StackPanel Grid.Column="0" Orientation="Horizontal">
-                    <TextBlock FontFamily="Segoe MDL2 Assets" 
-                               Text="&#xE8B7;" 
+                    <TextBlock FontFamily="Segoe MDL2 Assets"
+                               Text="&#xE8B7;"
                                FontSize="14"
-                               Foreground="#FF9C27B0"
+                               Foreground="{StaticResource GlyphPurpleBrush}"
                                VerticalAlignment="Center"
                                Margin="0,0,8,0"/>
                     <TextBlock x:Name="ProjectNameText" 
@@ -1000,14 +1193,13 @@
                                Margin="0,0,20,0"/>
 
                     <Border x:Name="SaveStatusBorder"
-                            Background="#4481C784"
-                            CornerRadius="10"
-                            Padding="8,3"
+                            Style="{StaticResource BadgePill}"
+                            Background="{StaticResource StatusVerifiedSubtleBrush}"
                             Margin="0,0,16,0">
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock x:Name="LastSaveText" 
-                                       Text="{DynamicResource Status_AllChangesSaved}" 
-                                       Foreground="#81C784"
+                            <TextBlock x:Name="LastSaveText"
+                                       Text="{DynamicResource Status_AllChangesSaved}"
+                                       Foreground="{StaticResource StatusVerifiedBrush}"
                                        FontSize="10"
                                        FontWeight="SemiBold"
                                        VerticalAlignment="Center"/>
@@ -1016,25 +1208,24 @@
 
                     <TextBlock x:Name="LastSaveTimeText"
                                Text="{DynamicResource Status_NotSavedYet}"
-                               Foreground="Gray"
+                               Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"
                                FontSize="11"
                                VerticalAlignment="Center"/>
                 </StackPanel>
 
                 <!-- Middle: Current Class Display -->
-                <Border Grid.Column="1" 
-                        x:Name="CurrentClassBorder" 
-                        Background="#44E57373" 
-                        BorderBrush="#E57373" 
+                <Border Grid.Column="1"
+                        x:Name="CurrentClassBorder"
+                        Style="{StaticResource BadgePill}"
+                        Background="{StaticResource StatusNoLabelSubtleBrush}"
+                        BorderBrush="{StaticResource StatusNoLabelBrush}"
                         BorderThickness="1"
-                        CornerRadius="10" 
-                        Padding="8,3"
                         Margin="0,0,16,0">
                     <StackPanel Orientation="Horizontal">
-                        <Border Width="3" 
-                                Height="12" 
-                                x:Name="CurrentClassColorIndicator" 
-                                Background="#E57373" 
+                        <Border Width="3"
+                                Height="12"
+                                x:Name="CurrentClassColorIndicator"
+                                Background="{StaticResource StatusNoLabelBrush}"
                                 CornerRadius="2"
                                 Margin="0,0,6,0" 
                                 VerticalAlignment="Center"/>
@@ -1053,19 +1244,18 @@
 
                 <!-- Right side: Auto-save indicator -->
                 <StackPanel Grid.Column="2" Orientation="Horizontal">
-                    <Border Background="#4400BCD4"
-                            CornerRadius="10"
-                            Padding="8,3">
+                    <Border Style="{StaticResource BadgePill}"
+                            Background="{StaticResource InfoSubtleBrush}">
                         <StackPanel Orientation="Horizontal">
                             <Ellipse x:Name="AutoSaveIndicator"
-                                     Width="6" 
+                                     Width="6"
                                      Height="6"
-                                     Fill="#4CAF50"
+                                     Fill="{StaticResource SuccessBrush}"
                                      VerticalAlignment="Center"
                                      Margin="0,0,6,0"/>
                             <TextBlock x:Name="AutoSaveText"
-                                       Text="{DynamicResource Status_AutoSaveEnabled}" 
-                                       Foreground="#00BCD4"
+                                       Text="{DynamicResource Status_AutoSaveEnabled}"
+                                       Foreground="{StaticResource InfoBrush}"
                                        FontSize="10"
                                        FontWeight="SemiBold"
                                        VerticalAlignment="Center"/>
@@ -1074,5 +1264,10 @@
                 </StackPanel>
             </Grid>
         </Border>
+
+        <!-- Overlay host: progress overlays are injected here by OverlayManager -->
+        <Grid x:Name="OverlayHost"
+              Grid.RowSpan="3" Grid.ColumnSpan="2"
+              Panel.ZIndex="1000"/>
     </Grid>
 </Window>
diff --git a/YoableWPF/MainWindow.xaml.cs b/YoableWPF/MainWindow.xaml.cs
index a21fa71..5137ee7 100644
--- a/YoableWPF/MainWindow.xaml.cs
+++ b/YoableWPF/MainWindow.xaml.cs
@@ -25,10 +25,16 @@ public partial class MainWindow : Window
         public ProjectManager projectManager;
         private UIStateManager uiStateManager;
         private PropagationManager propagationManager;
+        private readonly RoiCropManager roiCropManager = new();
+        private readonly DatasetExportManager datasetExportManager = new();
+        private readonly DatasetStatisticsManager datasetStatisticsManager = new();
+        private readonly AugmentationManager augmentationManager = new();
 
         // Class management
         private List<LabelClass> projectClasses = new List<LabelClass>();
         public IReadOnlyList<LabelClass> ProjectClasses => projectClasses;
+        // Suppresses class-filter re-application while several checkboxes are toggled at once.
+        private bool suppressClassFilterApply;
 
         // External Managers/Handlers (unchanged)
         public YoloAI yoloAI;
@@ -70,6 +76,19 @@ public MainWindow()
             labelManager = new LabelManager();
             uiStateManager = new UIStateManager(this);
             propagationManager = new PropagationManager(labelManager, imageManager);
+            DuplicateImageReview.Initialize(
+                imageManager,
+                labelManager,
+                RemoveDuplicateImageFromProject,
+                OpenDuplicateImageForEditing,
+                () => ProjectClasses);
+            RoiCropReview.Initialize(
+                GetRoiCropPreviewAsync,
+                ApplyCenterRoiCropAsync,
+                FindImagesSmallerThan,
+                RemoveSmallImagesFromProject);
+            DatasetStats.Initialize(
+                () => datasetStatisticsManager.Compute(imageManager, labelManager, projectClasses));
 
             // Apply batch size settings from user preferences
             imageManager.BatchSize = Properties.Settings.Default.ProcessingBatchSize;
@@ -101,6 +120,567 @@ public MainWindow()
             LanguageManager.Instance.LanguageChanged += LanguageManager_LanguageChanged;
         }
 
+        // Guards against re-entrancy between the nav rail and the workspace TabControl.
+        private bool syncingWorkspace;
+
+        private void NavRail_Checked(object sender, RoutedEventArgs e)
+        {
+            // Fires during InitializeComponent for the default-checked button,
+            // before MainWorkspaceTabs exists — guard both.
+            if (syncingWorkspace || MainWorkspaceTabs == null)
+                return;
+
+            if (sender is RadioButton rb && rb.Tag is string tag && int.TryParse(tag, out int index))
+            {
+                syncingWorkspace = true;
+                try { MainWorkspaceTabs.SelectedIndex = index; }
+                finally { syncingWorkspace = false; }
+            }
+        }
+
+        private void SyncNavRailToWorkspace()
+        {
+            if (NavAnnotateButton == null)
+                return;
+
+            RadioButton target = MainWorkspaceTabs.SelectedIndex switch
+            {
+                1 => NavDuplicatesButton,
+                2 => NavRoiCropButton,
+                3 => NavStatsButton,
+                _ => NavAnnotateButton
+            };
+
+            if (target.IsChecked != true)
+            {
+                syncingWorkspace = true;
+                try { target.IsChecked = true; }
+                finally { syncingWorkspace = false; }
+            }
+        }
+
+        private void ToolbarFlyout_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is Button btn && btn.ContextMenu != null)
+            {
+                btn.ContextMenu.PlacementTarget = btn;
+                btn.ContextMenu.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom;
+                btn.ContextMenu.IsOpen = true;
+            }
+        }
+
+        private async void MainWorkspaceTabs_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (e.Source == MainWorkspaceTabs)
+                SyncNavRailToWorkspace();
+
+            if (e.Source == MainWorkspaceTabs && DuplicateImagesTab.IsSelected)
+            {
+                if (!string.IsNullOrWhiteSpace(imageManager.CurrentImagePath))
+                {
+                    labelManager.SaveLabels(
+                        imageManager.CurrentImagePath,
+                        drawingCanvas.Labels);
+                }
+                await DuplicateImageReview.EnsureScannedAsync();
+            }
+            else if (e.Source == MainWorkspaceTabs && RoiCropTab.IsSelected)
+                await RoiCropReview.RefreshPreviewAsync();
+            else if (e.Source == MainWorkspaceTabs && DatasetStatsTab.IsSelected)
+            {
+                if (!string.IsNullOrWhiteSpace(imageManager.CurrentImagePath))
+                {
+                    labelManager.SaveLabels(
+                        imageManager.CurrentImagePath,
+                        drawingCanvas.Labels);
+                }
+                DatasetStats.Refresh();
+            }
+        }
+
+        private bool RemoveDuplicateImageFromProject(string fileName)
+        {
+            return RemoveImagesFromProject(new[] { fileName }) == 1;
+        }
+
+        private bool OpenDuplicateImageForEditing(string fileName)
+        {
+            ImageListItem? targetItem = ImageListBox.Items
+                .OfType<ImageListItem>()
+                .FirstOrDefault(item => string.Equals(
+                    item.FileName,
+                    fileName,
+                    StringComparison.OrdinalIgnoreCase));
+            if (targetItem == null)
+                return false;
+
+            MainWorkspaceTabs.SelectedItem = ImageAnnotationTab;
+            if (!ReferenceEquals(ImageListBox.SelectedItem, targetItem) ||
+                !string.Equals(
+                    imageManager.CurrentImagePath,
+                    fileName,
+                    StringComparison.OrdinalIgnoreCase))
+            {
+                ImageListBox.SelectedItem = null;
+                ImageListBox.SelectedItem = targetItem;
+            }
+
+            ImageListBox.ScrollIntoView(targetItem);
+            ImageListBox.Focus();
+            return true;
+        }
+
+        private IReadOnlyList<string> FindImagesSmallerThan(int minimumWidth, int minimumHeight)
+        {
+            return imageManager.ImagePathMap
+                .Where(pair =>
+                    pair.Value.OriginalDimensions.Width < minimumWidth ||
+                    pair.Value.OriginalDimensions.Height < minimumHeight)
+                .Select(pair => pair.Key)
+                .OrderBy(fileName => fileName, StringComparer.OrdinalIgnoreCase)
+                .ToArray();
+        }
+
+        private int RemoveSmallImagesFromProject(IReadOnlyCollection<string> fileNames)
+        {
+            int removedCount = RemoveImagesFromProject(fileNames);
+            if (removedCount > 0)
+                DuplicateImageReview.InvalidateResults();
+            return removedCount;
+        }
+
+        private int RemoveImagesFromProject(IReadOnlyCollection<string> fileNames)
+        {
+            if (fileNames.Count == 0)
+                return 0;
+
+            var requestedNames = new HashSet<string>(
+                fileNames,
+                StringComparer.OrdinalIgnoreCase);
+            string currentFileName = imageManager.CurrentImagePath;
+            string? selectedFileName = (ImageListBox.SelectedItem as ImageListItem)?.FileName;
+            int selectedIndex = ImageListBox.SelectedIndex;
+            var removedNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (string fileName in requestedNames)
+            {
+                if (!imageManager.RemoveImage(fileName))
+                    continue;
+
+                removedNames.Add(fileName);
+                labelManager.RemoveLabels(fileName);
+                uiStateManager.RemoveImage(fileName);
+            }
+
+            if (removedNames.Count == 0)
+                return 0;
+
+            ImageListBox.SelectionChanged -= ImageListBox_SelectionChanged;
+            try
+            {
+                for (int index = ImageListBox.Items.Count - 1; index >= 0; index--)
+                {
+                    if (ImageListBox.Items[index] is ImageListItem item &&
+                        removedNames.Contains(item.FileName))
+                    {
+                        ImageListBox.Items.RemoveAt(index);
+                    }
+                }
+            }
+            finally
+            {
+                ImageListBox.SelectionChanged += ImageListBox_SelectionChanged;
+            }
+
+            if (projectManager?.CurrentProject != null)
+            {
+                var project = projectManager.CurrentProject;
+                project.Images.RemoveAll(image => removedNames.Contains(image.FileName));
+                foreach (string fileName in removedNames)
+                {
+                    project.ImageStatuses.Remove(fileName);
+                    project.AppCreatedLabels.Remove(fileName);
+                    project.ImportedLabelPaths.Remove(fileName);
+                    project.SuggestedLabels.Remove(fileName);
+                }
+            }
+
+            bool removedDisplayedImage = removedNames.Contains(currentFileName) ||
+                                         (!string.IsNullOrWhiteSpace(selectedFileName) &&
+                                          removedNames.Contains(selectedFileName));
+            if (removedDisplayedImage)
+            {
+                drawingCanvas.Image = null!;
+                drawingCanvas.Labels.Clear();
+                drawingCanvas.SuggestedLabels.Clear();
+                LabelListBox.ItemsSource = null;
+
+                if (ImageListBox.Items.Count > 0)
+                {
+                    int nextIndex = Math.Min(Math.Max(selectedIndex, 0), ImageListBox.Items.Count - 1);
+                    ImageListBox.SelectedIndex = nextIndex;
+                }
+            }
+
+            uiStateManager.UpdateStatusCounts();
+            MarkProjectDirty();
+            return removedNames.Count;
+        }
+
+        // Right-clicking an image should target that image, so select the item under the cursor
+        // before its context menu opens. Right-clicking empty space suppresses the menu.
+        private void ImageListBox_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            DependencyObject? source = e.OriginalSource as DependencyObject;
+            while (source != null && source is not ListBoxItem)
+                source = VisualTreeHelper.GetParent(source);
+
+            if (source is ListBoxItem container)
+                container.IsSelected = true;
+            else
+                e.Handled = true;
+        }
+
+        // Safety net: never show the image context menu when there is no image to act on.
+        private void ImageListContextMenu_Opened(object sender, RoutedEventArgs e)
+        {
+            if (ImageListBox.SelectedItem is not ImageListItem)
+                ImageListContextMenu.IsOpen = false;
+        }
+
+        private ImageListItem? GetSelectedImageItem()
+        {
+            return ImageListBox.SelectedItem as ImageListItem;
+        }
+
+        private void OpenImageLocation_Click(object sender, RoutedEventArgs e)
+        {
+            ImageListItem? item = GetSelectedImageItem();
+            if (item == null)
+                return;
+
+            if (!imageManager.ImagePathMap.TryGetValue(item.FileName, out var info))
+                return;
+
+            RevealInExplorer(info.Path);
+        }
+
+        private void OpenLabelLocation_Click(object sender, RoutedEventArgs e)
+        {
+            ImageListItem? item = GetSelectedImageItem();
+            if (item == null)
+                return;
+
+            string? labelPath = ResolveLabelFilePath(item.FileName);
+            if (labelPath == null)
+            {
+                CustomMessageBox.Show(
+                    LanguageManager.Instance.GetString("Main_NoLabelFileOnDisk") ??
+                        "No label file exists on disk yet for this image. Save or export the project first.",
+                    LanguageManager.Instance.GetString("Main_Information") ?? "Information",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Information);
+                return;
+            }
+
+            RevealInExplorer(labelPath);
+        }
+
+        private void DeleteImage_Click(object sender, RoutedEventArgs e)
+        {
+            ImageListItem? item = GetSelectedImageItem();
+            if (item == null)
+                return;
+
+            var confirm = CustomMessageBox.Show(
+                string.Format(
+                    LanguageManager.Instance.GetString("Main_ConfirmDeleteImage") ??
+                        "Move '{0}' and its label file to the Recycle Bin and remove it from the project?",
+                    item.FileName),
+                LanguageManager.Instance.GetString("Msg_ConfirmDeletion") ?? "Confirm Deletion",
+                MessageBoxButton.YesNo,
+                MessageBoxImage.Warning);
+            if (confirm != MessageBoxResult.Yes)
+                return;
+
+            // Resolve the on-disk paths before removing the image clears its project entries.
+            string? imagePath = imageManager.ImagePathMap.TryGetValue(item.FileName, out var info)
+                ? info.Path
+                : null;
+            string? labelPath = ResolveLabelFilePath(item.FileName);
+
+            // Removing from the project also releases the cached bitmap so the file is not locked.
+            RemoveImagesFromProject(new[] { item.FileName });
+
+            var errors = new List<string>();
+            TryRecycleFile(imagePath, errors);
+            TryRecycleFile(labelPath, errors);
+
+            if (errors.Count > 0)
+            {
+                CustomMessageBox.Show(
+                    string.Format(
+                        LanguageManager.Instance.GetString("Main_DeleteImageFailed") ??
+                            "The image was removed from the project, but some files could not be deleted:\n\n{0}",
+                        string.Join("\n", errors)),
+                    LanguageManager.Instance.GetString("Main_Error") ?? "Error",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Warning);
+            }
+        }
+
+        // Resolves the label .txt file on disk for an image, or null if none exists yet.
+        private string? ResolveLabelFilePath(string fileName)
+        {
+            var project = projectManager?.CurrentProject;
+            if (project != null)
+            {
+                if (project.ImportedLabelPaths.TryGetValue(fileName, out var importedPath) &&
+                    File.Exists(importedPath))
+                {
+                    return importedPath;
+                }
+
+                if (!string.IsNullOrEmpty(project.ProjectFolder))
+                {
+                    if (project.AppCreatedLabels.TryGetValue(fileName, out var relativePath))
+                    {
+                        string appLabelPath = Path.Combine(project.ProjectFolder, relativePath);
+                        if (File.Exists(appLabelPath))
+                            return appLabelPath;
+                    }
+
+                    string conventionalPath = Path.Combine(
+                        project.ProjectFolder,
+                        "labels",
+                        Path.GetFileNameWithoutExtension(fileName) + ".txt");
+                    if (File.Exists(conventionalPath))
+                        return conventionalPath;
+                }
+            }
+
+            // Fall back to a label file sitting next to the image (common for imported datasets).
+            if (imageManager.ImagePathMap.TryGetValue(fileName, out var info))
+            {
+                string? imageDir = Path.GetDirectoryName(info.Path);
+                if (!string.IsNullOrEmpty(imageDir))
+                {
+                    string siblingPath = Path.Combine(
+                        imageDir,
+                        Path.GetFileNameWithoutExtension(fileName) + ".txt");
+                    if (File.Exists(siblingPath))
+                        return siblingPath;
+                }
+            }
+
+            return null;
+        }
+
+        // Opens Windows Explorer with the given file selected, or its folder when the file is missing.
+        private void RevealInExplorer(string path)
+        {
+            try
+            {
+                if (File.Exists(path))
+                {
+                    Process.Start(new ProcessStartInfo
+                    {
+                        FileName = "explorer.exe",
+                        Arguments = $"/select,\"{path}\"",
+                        UseShellExecute = true
+                    });
+                    return;
+                }
+
+                string? directory = Path.GetDirectoryName(path);
+                if (!string.IsNullOrEmpty(directory) && Directory.Exists(directory))
+                {
+                    Process.Start(new ProcessStartInfo
+                    {
+                        FileName = directory,
+                        UseShellExecute = true
+                    });
+                    return;
+                }
+
+                CustomMessageBox.Show(
+                    string.Format(
+                        LanguageManager.Instance.GetString("Msg_FileNotFound") ?? "File not found: {0}",
+                        path),
+                    LanguageManager.Instance.GetString("Main_Information") ?? "Information",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Information);
+            }
+            catch (Exception ex)
+            {
+                CustomMessageBox.Show(
+                    string.Format(
+                        LanguageManager.Instance.GetString("Msg_ErrorOccurred") ?? "An error occurred: {0}",
+                        ex.Message),
+                    LanguageManager.Instance.GetString("Main_Error") ?? "Error",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Error);
+            }
+        }
+
+        private static void TryRecycleFile(string? path, List<string> errors)
+        {
+            if (string.IsNullOrEmpty(path))
+                return;
+
+            try
+            {
+                if (File.Exists(path))
+                {
+                    Microsoft.VisualBasic.FileIO.FileSystem.DeleteFile(
+                        path,
+                        Microsoft.VisualBasic.FileIO.UIOption.OnlyErrorDialogs,
+                        Microsoft.VisualBasic.FileIO.RecycleOption.SendToRecycleBin);
+                }
+            }
+            catch (Exception ex)
+            {
+                errors.Add($"{Path.GetFileName(path)}: {ex.Message}");
+            }
+        }
+
+        private async Task<RoiCropPreviewData?> GetRoiCropPreviewAsync()
+        {
+            string? fileName = (ImageListBox.SelectedItem as ImageListItem)?.FileName;
+            if (string.IsNullOrWhiteSpace(fileName))
+                fileName = imageManager.CurrentImagePath;
+            if (string.IsNullOrWhiteSpace(fileName))
+                fileName = imageManager.ImagePathMap.Keys.FirstOrDefault();
+
+            if (string.IsNullOrWhiteSpace(fileName) ||
+                !imageManager.ImagePathMap.TryGetValue(fileName, out var imageInfo))
+            {
+                return null;
+            }
+
+            var bitmap = imageManager.Cache.TryGet(imageInfo.Path) ??
+                         await Task.Run(() => imageManager.Cache.GetOrLoad(imageInfo.Path));
+            if (bitmap == null)
+                return null;
+
+            return new RoiCropPreviewData(
+                bitmap,
+                imageInfo.OriginalDimensions,
+                fileName);
+        }
+
+        private async Task<RoiCropBatchResult> ApplyCenterRoiCropAsync(
+            int cropWidth,
+            int cropHeight,
+            RoiCropScope scope,
+            IProgress<(int current, int total, string fileName)> progress,
+            CancellationToken cancellationToken)
+        {
+            if (projectManager?.IsProjectOpen != true ||
+                string.IsNullOrWhiteSpace(projectManager.CurrentProject?.ProjectFolder))
+            {
+                throw new InvalidOperationException(
+                    LanguageManager.Instance.GetString("Roi_ProjectRequired") ??
+                    "Open or create a project before cropping images.");
+            }
+
+            if (!string.IsNullOrWhiteSpace(imageManager.CurrentImagePath))
+                labelManager.SaveLabels(imageManager.CurrentImagePath, drawingCanvas.Labels);
+
+            IEnumerable<KeyValuePair<string, ImageManager.ImageInfo>> selectedImages =
+                imageManager.ImagePathMap.ToArray();
+            if (scope == RoiCropScope.CurrentImage)
+            {
+                string? currentFileName = (ImageListBox.SelectedItem as ImageListItem)?.FileName;
+                if (string.IsNullOrWhiteSpace(currentFileName))
+                    currentFileName = imageManager.CurrentImagePath;
+
+                selectedImages = imageManager.ImagePathMap
+                    .Where(pair => string.Equals(
+                        pair.Key,
+                        currentFileName,
+                        StringComparison.OrdinalIgnoreCase))
+                    .ToArray();
+            }
+
+            var sourceItems = selectedImages
+                .Select(pair => new RoiCropSourceItem(
+                    pair.Key,
+                    pair.Value.Path,
+                    labelManager.GetLabels(pair.Key),
+                    labelManager.GetSuggestions(pair.Key)))
+                .ToArray();
+
+            if (sourceItems.Length == 0)
+                throw new InvalidOperationException(
+                    LanguageManager.Instance.GetString("Roi_NoImages") ??
+                    "No images are available to crop.");
+
+            string outputDirectory = Path.Combine(
+                projectManager.CurrentProject.ProjectFolder,
+                "roi_images");
+            var result = await roiCropManager.CropBatchAsync(
+                sourceItems,
+                outputDirectory,
+                cropWidth,
+                cropHeight,
+                progress,
+                cancellationToken);
+
+            foreach (var processed in result.ProcessedItems)
+            {
+                imageManager.ReplaceImage(
+                    processed.FileName,
+                    processed.OutputPath,
+                    processed.OutputSize);
+                labelManager.SaveLabels(processed.FileName, processed.Labels);
+                labelManager.SaveSuggestions(processed.FileName, processed.Suggestions);
+
+                var imageReference = projectManager.CurrentProject.Images.FirstOrDefault(image =>
+                    string.Equals(
+                        image.FileName,
+                        processed.FileName,
+                        StringComparison.OrdinalIgnoreCase));
+                if (imageReference != null)
+                {
+                    imageReference.FullPath = processed.OutputPath;
+                    imageReference.Width = processed.OutputSize.Width;
+                    imageReference.Height = processed.OutputSize.Height;
+                }
+
+                // The transformed labels now belong to the project, not the original
+                // external Roboflow label file.
+                projectManager.CurrentProject.ImportedLabelPaths.Remove(processed.FileName);
+
+                ImageStatus status = DetermineImageStatus(processed.FileName);
+                imageManager.UpdateImageStatusValue(processed.FileName, status);
+                if (uiStateManager.TryGetFromCache(processed.FileName, out var imageItem))
+                    imageItem.Status = status;
+            }
+
+            if (result.ProcessedItems.Count > 0)
+            {
+                uiStateManager.UpdateStatusCounts();
+                DuplicateImageReview.InvalidateResults();
+
+                string? selectedFileName = (ImageListBox.SelectedItem as ImageListItem)?.FileName;
+                bool refreshSelectedImage = result.ProcessedItems.Any(item => string.Equals(
+                    item.FileName,
+                    selectedFileName,
+                    StringComparison.OrdinalIgnoreCase));
+                if (refreshSelectedImage && ImageListBox.SelectedItem is ImageListItem selectedItem)
+                {
+                    imageManager.CurrentImagePath = "";
+                    ImageListBox.SelectedItem = null;
+                    ImageListBox.SelectedItem = selectedItem;
+                }
+
+                MarkProjectDirty();
+            }
+
+            return result;
+        }
+
         private void LanguageManager_LanguageChanged(object sender, EventArgs e)
         {
             // Reload window resources when language changes
@@ -365,7 +945,7 @@ private async void SaveProject_Click(object sender, RoutedEventArgs e)
             // Save classes before saving project
             if (projectManager?.CurrentProject != null)
             {
-                projectManager.CurrentProject.Classes = projectClasses;
+                projectManager.CurrentProject.Classes = new List<LabelClass>(projectClasses);
             }
 
             // Use async save with progress
@@ -393,6 +973,8 @@ private async void SaveProjectAs_Click(object sender, RoutedEventArgs e)
             var saveFileDialog = new SaveFileDialog
             {
                 Filter = "Yoable Project Files (*.yoable)|*.yoable",
+                DefaultExt = ".yoable",
+                AddExtension = true,
                 Title = "Save Project As",
                 FileName = projectManager.CurrentProject.ProjectName
             };
@@ -407,14 +989,11 @@ private async void SaveProjectAs_Click(object sender, RoutedEventArgs e)
                     // Save classes before saving project
                     if (projectManager?.CurrentProject != null)
                     {
-                        projectManager.CurrentProject.Classes = projectClasses;
+                        projectManager.CurrentProject.Classes = new List<LabelClass>(projectClasses);
                     }
 
-                    // Export current state to project
-                    projectManager.ExportProjectData();
-
                     // Save to new location
-                    if (projectManager.SaveProjectAs(saveFileDialog.FileName))
+                    if (await projectManager.SaveProjectAsAsync(saveFileDialog.FileName))
                     {
                         ProjectNameText.Text = projectManager.CurrentProject.ProjectName;
                         UpdateProjectUI();
@@ -440,31 +1019,34 @@ private void CloseProject_Click(object sender, RoutedEventArgs e)
                 return;
             }
 
+            // CloseProject prompts for unsaved changes (Yes=save, Cancel=false)
             if (projectManager.CloseProject())
             {
-                // Clear UI completely
-                ProjectNameText.Text = LanguageManager.Instance.GetString("Status_NoProject");
-                LastSaveText.Text = LanguageManager.Instance.GetString("Status_NotSaved");
-                LastSaveTimeText.Text = "";
+                ReturnToStartup();
+            }
+        }
 
-                // Clear all data
-                ImageListBox.Items.Clear();
-                LabelListBox.ItemsSource = null;
-                drawingCanvas.Labels.Clear();
-                drawingCanvas.SuggestedLabels.Clear();
-                drawingCanvas.Image = null;
-                drawingCanvas.InvalidateVisual();
-                uiStateManager.ClearCache();
-                uiStateManager.RefreshAllImagesList();
+        // Suppresses shutdown/prompt logic in Window_Closing while switching back to the startup window.
+        private bool returningToStartup;
 
-                // Update project UI
-                UpdateProjectUI();
+        private void ReturnToStartup()
+        {
+            returningToStartup = true;
+            var startup = new StartupWindow();
+            startup.Show();   // MUST show before Close(): ShutdownMode is OnLastWindowClose
+            Close();
+        }
 
-                // Update status counts
-                uiStateManager.UpdateStatusCounts();
-                UpdateSuggestionSummaryUI();
-                propagationManager.SetProjectFolder(null);
+        private void BackToStart_Click(object sender, RoutedEventArgs e)
+        {
+            if (projectManager != null && projectManager.IsProjectOpen)
+            {
+                // Prompts for unsaved changes; user can cancel
+                if (!projectManager.CloseProject())
+                    return;
             }
+
+            ReturnToStartup();
         }
 
         /// <summary>
@@ -555,18 +1137,18 @@ public async Task RefreshUIAfterProjectLoadAsync()
                 { 
                     new LabelClass("default", "#E57373", 0) 
                 };
-                projectManager.CurrentProject.Classes = projectClasses;
+                projectManager.CurrentProject.Classes = new List<LabelClass>(projectClasses);
             }
             RefreshClassList();
 
             // Restore model class mappings from project
-            if (projectManager?.CurrentProject?.ModelClassMappings != null && yoloAI != null)
+            if (projectManager?.CurrentProject?.ModelClassMappingSets != null && yoloAI != null)
             {
                 foreach (var model in yoloAI.GetLoadedModels())
                 {
-                    if (projectManager.CurrentProject.ModelClassMappings.TryGetValue(model.ModelPath, out var savedMapping))
+                    if (projectManager.CurrentProject.ModelClassMappingSets.TryGetValue(model.ModelPath, out var savedMapping))
                     {
-                        model.ClassMapping = new Dictionary<int, int>(savedMapping);
+                        model.ClassMapping = YoloAI.CloneClassMapping(savedMapping);
                     }
                 }
             }
@@ -631,26 +1213,23 @@ await Task.Run(() =>
             if (projectManager?.CurrentProject != null)
             {
                 // Set the sort combobox to match saved mode
-                if (SortComboBox != null)
+                int sortIndex = projectManager.CurrentProject.CurrentSortMode switch
                 {
-                    if (projectManager.CurrentProject.CurrentSortMode == "ByStatus")
-                    {
-                        SortComboBox.SelectedIndex = 1;
-                        uiStateManager.SortImagesByStatus();
-                    }
-                    else
-                    {
-                        SortComboBox.SelectedIndex = 0;
-                        uiStateManager.SortImagesByName();
-                    }
-                }
-                else
+                    "ByStatus" => 1,
+                    "ByDateNewest" => 2,
+                    "ByDateOldest" => 3,
+                    _ => 0
+                };
+
+                if (SortComboBox != null)
+                    SortComboBox.SelectedIndex = sortIndex;
+
+                switch (sortIndex)
                 {
-                    // Fallback if combobox not available
-                    if (projectManager.CurrentProject.CurrentSortMode == "ByStatus")
-                        uiStateManager.SortImagesByStatus();
-                    else
-                        uiStateManager.SortImagesByName();
+                    case 1: uiStateManager.SortImagesByStatus(); break;
+                    case 2: uiStateManager.SortImagesByDate(newestFirst: true); break;
+                    case 3: uiStateManager.SortImagesByDate(newestFirst: false); break;
+                    default: uiStateManager.SortImagesByName(); break;
                 }
 
                 // Apply saved filter mode (currently always "All", but prepared for future)
@@ -690,6 +1269,19 @@ private void MarkProjectDirty()
 
         private async void Window_Closing(object sender, CancelEventArgs e)
         {
+            // Returning to the startup window: project already closed (prompt handled),
+            // a StartupWindow is open, so just clean up — and critically, do NOT Shutdown().
+            if (returningToStartup)
+            {
+                projectManager?.Dispose();
+                yoloAI?.Dispose();
+                if (LanguageManager.Instance != null)
+                {
+                    LanguageManager.Instance.LanguageChanged -= LanguageManager_LanguageChanged;
+                }
+                return;
+            }
+
             // Check for unsaved changes
             if (projectManager != null && projectManager.IsProjectOpen && projectManager.HasUnsavedChanges)
             {
@@ -710,8 +1302,8 @@ private async void Window_Closing(object sender, CancelEventArgs e)
                     // Cancel the close temporarily
                     e.Cancel = true;
 
-                    // Save synchronously (blocking) since we're closing
-                    projectManager.ExportProjectData();
+                    // Save synchronously (blocking) since we're closing.
+                    // SaveProjectSync exports internally — no separate export needed.
                     bool saved = projectManager.SaveProjectSync();
 
                     if (saved)
@@ -785,12 +1377,24 @@ public void OnLabelsChanged()
             MarkProjectDirty();
         }
 
-        public void ImageListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        public async void ImageListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (ImageListBox.SelectedItem is ImageListItem selected &&
                 imageManager.ImagePathMap.TryGetValue(selected.FileName, out ImageManager.ImageInfo imageInfo))
             {
-                // Save existing labels
+                // Decode off the UI thread on a cache miss; a newer selection abandons this one
+                int loadGeneration = ++imageLoadGeneration;
+                var bitmap = imageManager.Cache.TryGet(imageInfo.Path);
+                if (bitmap == null)
+                {
+                    bitmap = await Task.Run(() => imageManager.Cache.GetOrLoad(imageInfo.Path));
+                    if (loadGeneration != imageLoadGeneration) return;
+                    if (bitmap == null) return; // File unreadable
+                }
+
+                // Save labels of the image currently in the canvas. Kept after the await so
+                // CurrentImagePath always matches the canvas content, even when selections
+                // change faster than images decode.
                 if (!string.IsNullOrEmpty(imageManager.CurrentImagePath))
                 {
                     labelManager.SaveLabels(imageManager.CurrentImagePath, drawingCanvas.Labels);
@@ -799,7 +1403,7 @@ public void ImageListBox_SelectionChanged(object sender, SelectionChangedEventAr
 
                 imageManager.CurrentImagePath = selected.FileName;
 
-                drawingCanvas.LoadImage(imageInfo.Path, imageInfo.OriginalDimensions);
+                drawingCanvas.LoadImage(bitmap, imageInfo.OriginalDimensions);
 
                 // Reset zoom on image change
                 drawingCanvas.ResetZoom();
@@ -843,9 +1447,41 @@ public void ImageListBox_SelectionChanged(object sender, SelectionChangedEventAr
 
                 // CRITICAL FIX: Force canvas redraw after loading labels
                 drawingCanvas.InvalidateVisual();
+
+                // Warm the cache with neighboring images for instant navigation
+                PrefetchNeighboringImages();
             }
         }
 
+        // Bumped on every image selection so stale async decodes can be abandoned
+        private int imageLoadGeneration = 0;
+
+        private void PrefetchNeighboringImages()
+        {
+            int index = ImageListBox.SelectedIndex;
+            if (index < 0) return;
+
+            // Favor forward navigation: prefetch more items ahead than behind
+            const int aheadCount = 12;
+            const int behindCount = 4;
+
+            var paths = new List<string>(aheadCount + behindCount);
+            void AddPath(int i)
+            {
+                if (i < 0 || i >= ImageListBox.Items.Count || i == index) return;
+                if (ImageListBox.Items[i] is ImageListItem item &&
+                    imageManager.ImagePathMap.TryGetValue(item.FileName, out var info))
+                {
+                    paths.Add(info.Path);
+                }
+            }
+
+            for (int offset = 1; offset <= aheadCount; offset++) AddPath(index + offset);
+            for (int offset = 1; offset <= behindCount; offset++) AddPath(index - offset);
+
+            imageManager.Cache.Prefetch(paths);
+        }
+
         private void LabelListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (LabelListBox.SelectedItem is LabelListItemView selectedItem)
@@ -909,6 +1545,67 @@ private void RejectSuggestion_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        private void ChangeLabelClass_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is not Button button || button.Tag is not LabelListItemView item || item.Label == null)
+                return;
+
+            ShowChangeClassMenu(item.Label, button);
+        }
+
+        private void LabelListBox_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if (LabelListBox.SelectedItem is not LabelListItemView item || item.Label == null)
+                return;
+
+            // Open the class picker anchored on the clicked item container
+            var placement = LabelListBox.ItemContainerGenerator.ContainerFromItem(item) as UIElement ?? LabelListBox;
+            ShowChangeClassMenu(item.Label, placement);
+            e.Handled = true;
+        }
+
+        private void ShowChangeClassMenu(LabelData label, UIElement placementTarget)
+        {
+            if (label == null || projectClasses == null || projectClasses.Count == 0)
+                return;
+
+            var menu = new ContextMenu();
+
+            foreach (var cls in projectClasses)
+            {
+                var menuItem = new MenuItem
+                {
+                    Header = cls.DisplayText,
+                    IsCheckable = true,
+                    IsChecked = cls.ClassId == label.ClassId,
+                    Icon = new System.Windows.Shapes.Rectangle
+                    {
+                        Width = 12,
+                        Height = 12,
+                        Fill = cls.ColorBrush
+                    }
+                };
+
+                int targetClassId = cls.ClassId;
+                menuItem.Click += (s, args) =>
+                {
+                    if (label.ClassId == targetClassId)
+                        return;
+
+                    label.ClassId = targetClassId;
+                    uiStateManager.RefreshLabelList();
+                    drawingCanvas.InvalidateVisual();
+                    OnLabelsChanged();
+                    MarkProjectDirty();
+                };
+
+                menu.Items.Add(menuItem);
+            }
+
+            menu.PlacementTarget = placementTarget;
+            menu.IsOpen = true;
+        }
+
         private void AcceptAllSuggestions_Click(object sender, RoutedEventArgs e)
         {
             string currentFile = GetCurrentFileName();
@@ -1218,16 +1915,17 @@ private async void ImportLabelsAndImage_Click(object sender, RoutedEventArgs e)
                 var progress = CreateProgressReporter();
 
                 // Load images asynchronously
-                var files = await imageManager.LoadImagesFromDirectoryAsync(
+                await imageManager.LoadImagesFromDirectoryAsync(
                     imagesFolderPath,
                     progress,
                     tokenSource.Token,
                     Properties.Settings.Default.EnableParallelProcessing);
 
                 // Update UI in batches
-                await UpdateImageListInBatchesAsync(files, tokenSource.Token);
+                var loadedFiles = imageManager.ImagePathMap.Values.Select(image => image.Path).ToArray();
+                await UpdateImageListInBatchesAsync(loadedFiles, tokenSource.Token);
 
-                if (ImageListBox.Items.Count > 0)
+                if (ImageListBox.Items.Count > 0 && ImageListBox.SelectedItem == null)
                 {
                     ImageListBox.SelectedIndex = 0;
                 }
@@ -1356,6 +2054,185 @@ private async void ExportLabels_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        private async void ExportTrainingDataset_Click(object sender, RoutedEventArgs e)
+        {
+            if (imageManager.ImagePathMap.IsEmpty)
+            {
+                CustomMessageBox.Show(
+                    LanguageManager.Instance.GetString("Msg_NoImagesToExport") ?? "There are no images to export.",
+                    LanguageManager.Instance.GetString("Msg_Error") ?? "Error",
+                    MessageBoxButton.OK, MessageBoxImage.Warning);
+                return;
+            }
+
+            if (projectClasses == null || !projectClasses.Any(c => c.ClassId >= 0))
+            {
+                CustomMessageBox.Show(
+                    LanguageManager.Instance.GetString("Msg_NoClassesToExport") ?? "Define at least one class before exporting a training dataset.",
+                    LanguageManager.Instance.GetString("Msg_Error") ?? "Error",
+                    MessageBoxButton.OK, MessageBoxImage.Warning);
+                return;
+            }
+
+            var dialog = new TrainingExportDialog(
+                Properties.Settings.Default.LastTrainingExportDirectory,
+                (int)Math.Round(Properties.Settings.Default.TrainingSplitTrain),
+                (int)Math.Round(Properties.Settings.Default.TrainingSplitVal),
+                (int)Math.Round(Properties.Settings.Default.TrainingSplitTest),
+                Properties.Settings.Default.TrainingSplitSeed)
+            {
+                Owner = this
+            };
+
+            if (dialog.ShowDialog() != true || dialog.Options == null)
+                return;
+
+            var options = dialog.Options;
+
+            // Persist choices for next time.
+            Properties.Settings.Default.LastTrainingExportDirectory = options.OutputDirectory;
+            Properties.Settings.Default.TrainingSplitTrain = options.TrainRatio * 100;
+            Properties.Settings.Default.TrainingSplitVal = options.ValRatio * 100;
+            Properties.Settings.Default.TrainingSplitTest = options.TestRatio * 100;
+            Properties.Settings.Default.TrainingSplitSeed = options.Seed;
+            Properties.Settings.Default.Save();
+
+            await RunTrainingExportAsync(options);
+        }
+
+        private async Task RunTrainingExportAsync(TrainingExportOptions options)
+        {
+            var tokenSource = new CancellationTokenSource();
+            overlayManager.ShowOverlayWithProgress(
+                LanguageManager.Instance.GetString("Msg_ExportingTrainingDataset") ?? "Exporting training dataset...",
+                tokenSource);
+
+            try
+            {
+                var progress = CreateProgressReporter();
+
+                var result = await datasetExportManager.ExportAsync(
+                    options,
+                    imageManager,
+                    labelManager,
+                    projectClasses,
+                    progress,
+                    tokenSource.Token);
+
+                overlayManager.HideOverlay();
+
+                string template = LanguageManager.Instance.GetString("Msg_TrainingDatasetExported")
+                    ?? "Training dataset exported.\nTrain: {0}  Val: {1}  Test: {2}\nSkipped: {3}";
+                CustomMessageBox.Show(
+                    string.Format(template, result.TrainCount, result.ValCount, result.TestCount, result.SkippedCount),
+                    LanguageManager.Instance.GetString("Msg_ExportComplete") ?? "Export Complete",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+            catch (OperationCanceledException)
+            {
+                overlayManager.HideOverlay();
+                CustomMessageBox.Show(
+                    LanguageManager.Instance.GetString("Msg_ExportCanceled") ?? "Export canceled.",
+                    LanguageManager.Instance.GetString("Msg_Canceled") ?? "Canceled",
+                    MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+            catch (Exception ex)
+            {
+                overlayManager.HideOverlay();
+                CustomMessageBox.Show(
+                    string.Format(LanguageManager.Instance.GetString("Msg_ExportFailed") ?? "Export failed: {0}", ex.Message),
+                    LanguageManager.Instance.GetString("Msg_Error") ?? "Error",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private async void DataAugmentation_Click(object sender, RoutedEventArgs e)
+        {
+            if (imageManager.ImagePathMap.IsEmpty)
+            {
+                CustomMessageBox.Show(
+                    LanguageManager.Instance.GetString("Msg_NoImagesToExport") ?? "There are no images to export.",
+                    LanguageManager.Instance.GetString("Msg_Error") ?? "Error",
+                    MessageBoxButton.OK, MessageBoxImage.Warning);
+                return;
+            }
+
+            string currentFile = GetCurrentFileName();
+            string defaultOutputDirectory = Properties.Settings.Default.LastAugmentationDirectory;
+            if (string.IsNullOrWhiteSpace(defaultOutputDirectory))
+            {
+                ImageManager.ImageInfo sourceInfo = null;
+                if (!string.IsNullOrEmpty(currentFile))
+                    imageManager.ImagePathMap.TryGetValue(currentFile, out sourceInfo);
+
+                sourceInfo ??= imageManager.ImagePathMap.Values.FirstOrDefault();
+                defaultOutputDirectory = sourceInfo == null
+                    ? string.Empty
+                    : Path.GetDirectoryName(sourceInfo.Path) ?? string.Empty;
+            }
+
+            var dialog = new AugmentationDialog(
+                defaultOutputDirectory,
+                Properties.Settings.Default.AugmentationVariants,
+                Properties.Settings.Default.AugmentationSeed,
+                !string.IsNullOrEmpty(currentFile))
+            {
+                Owner = this
+            };
+
+            if (dialog.ShowDialog() != true || dialog.Options == null)
+                return;
+
+            var options = dialog.Options;
+
+            Properties.Settings.Default.LastAugmentationDirectory = options.OutputDirectory;
+            Properties.Settings.Default.AugmentationVariants = options.VariantsPerImage;
+            Properties.Settings.Default.AugmentationSeed = options.Seed;
+            Properties.Settings.Default.Save();
+
+            await RunAugmentationAsync(options, currentFile);
+        }
+
+        private async Task RunAugmentationAsync(AugmentationOptions options, string currentFile)
+        {
+            var tokenSource = new CancellationTokenSource();
+            overlayManager.ShowOverlayWithProgress(
+                LanguageManager.Instance.GetString("Msg_Augmenting") ?? "Augmenting images...",
+                tokenSource);
+
+            try
+            {
+                var progress = CreateProgressReporter();
+                var result = await augmentationManager.AugmentAsync(
+                    options, imageManager, labelManager, currentFile, progress, tokenSource.Token);
+
+                overlayManager.HideOverlay();
+
+                string template = LanguageManager.Instance.GetString("Msg_AugmentationComplete")
+                    ?? "Augmentation complete.\nSource images: {0}\nGenerated images: {1}\nSkipped: {2}";
+                CustomMessageBox.Show(
+                    string.Format(template, result.SourceImages, result.GeneratedImages, result.SkippedImages),
+                    LanguageManager.Instance.GetString("Msg_ExportComplete") ?? "Export Complete",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+            catch (OperationCanceledException)
+            {
+                overlayManager.HideOverlay();
+                CustomMessageBox.Show(
+                    LanguageManager.Instance.GetString("Msg_ExportCanceled") ?? "Export canceled.",
+                    LanguageManager.Instance.GetString("Msg_Canceled") ?? "Canceled",
+                    MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+            catch (Exception ex)
+            {
+                overlayManager.HideOverlay();
+                CustomMessageBox.Show(
+                    string.Format(LanguageManager.Instance.GetString("Msg_AugmentationFailed") ?? "Augmentation failed: {0}", ex.Message),
+                    LanguageManager.Instance.GetString("Msg_Error") ?? "Error",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
         private async Task UpdateAllImageStatusesAsync()
         {
             var cancellationToken = new CancellationTokenSource();
@@ -1416,8 +2293,137 @@ await Dispatcher.InvokeAsync(() =>
                         }
                     }
 
-                    uiStateManager.UpdateStatusCounts();
+                    uiStateManager.UpdateStatusCounts();
+                });
+            }
+            finally
+            {
+                overlayManager.HideOverlay();
+            }
+        }
+
+        private void ClearAll_Click(object sender, RoutedEventArgs e)
+        {
+            imageManager.ClearAll();
+            labelManager.ClearAll();
+            drawingCanvas.Labels.Clear(); // Clear labels inside DrawingCanvas
+            drawingCanvas.SuggestedLabels.Clear();
+            ImageListBox.Items.Clear();
+            LabelListBox.ItemsSource = null;
+            drawingCanvas.Image = null; // Clear the image in DrawingCanvas
+            drawingCanvas.InvalidateVisual(); // Force a redraw
+            uiStateManager.UpdateStatusCounts();
+            uiStateManager.RefreshAllImagesList(); // Clear the filter cache
+            uiStateManager.ClearCache();
+            UpdateSuggestionSummaryUI();
+
+            MarkProjectDirty();
+        }
+
+        /// <summary>
+        /// Project team pairings as (body, head) class-id tuples for the inference engine,
+        /// or null when none are configured.
+        /// </summary>
+        private IReadOnlyList<(int BodyClassId, int HeadClassId)> GetClassTeamPairs()
+        {
+            var pairs = projectManager?.CurrentProject?.ClassTeamPairs;
+            if (pairs == null || pairs.Count == 0)
+                return null;
+
+            return pairs
+                .Where(pair => pair.BodyClassId >= 0 && pair.HeadClassId >= 0)
+                .Select(pair => (pair.BodyClassId, pair.HeadClassId))
+                .ToList();
+        }
+
+        private void ManageModels_Click(object sender, RoutedEventArgs e)
+        {
+            var savedMappings = projectManager?.CurrentProject?.ModelClassMappingSets;
+            yoloAI.OpenModelManager(projectClasses, savedMappings);
+        }
+
+        private async void AILabelCurrentImage_Click(object sender, RoutedEventArgs e)
+        {
+            if (yoloAI.GetLoadedModelsCount() == 0)
+            {
+                var loadResult = CustomMessageBox.Show(
+                    LanguageManager.Instance.GetString("Msg_NoModelsLoaded") ??
+                    "No models loaded. Would you like to load models now?",
+                    LanguageManager.Instance.GetString("Msg_NoModels") ?? "No Models",
+                    MessageBoxButton.YesNo,
+                    MessageBoxImage.Question);
+
+                if (loadResult == MessageBoxResult.Yes)
+                    ManageModels_Click(sender, e);
+
+                return;
+            }
+
+            string currentFileName = GetCurrentFileName();
+            if (string.IsNullOrEmpty(currentFileName) ||
+                !imageManager.ImagePathMap.TryGetValue(currentFileName, out var imageEntry) ||
+                !File.Exists(imageEntry.Path))
+            {
+                CustomMessageBox.Show(
+                    LanguageManager.Instance.GetString("Main_NoImageSelected") ??
+                    "No image selected.",
+                    LanguageManager.Instance.GetString("Main_Error") ?? "Error",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Warning);
+                return;
+            }
+
+            // Thresholds are configured up-front in Settings > AI, so labeling runs immediately.
+            Dictionary<int, float> confidenceThresholds =
+                projectManager?.CurrentProject?.AIClassConfidenceThresholds ??
+                new Dictionary<int, float>();
+            var teamPairs = GetClassTeamPairs();
+
+            labelManager.SaveLabels(currentFileName, drawingCanvas.Labels);
+            overlayManager.ShowOverlay(
+                LanguageManager.Instance.GetString("AIClassConfidence_Running") ??
+                "Running AI detection on the current image...");
+
+            try
+            {
+                List<(Rectangle box, int classId)> detections = await Task.Run(() =>
+                {
+                    using Bitmap image = new Bitmap(imageEntry.Path);
+                    return yoloAI.RunInferenceWithClasses(image, confidenceThresholds, teamPairs);
                 });
+
+                if (Properties.Settings.Default.AIReplaceExistingLabels)
+                    labelManager.ReplaceAILabels(currentFileName, detections);
+                else
+                    labelManager.AddAILabels(currentFileName, detections);
+
+                drawingCanvas.Labels = labelManager.GetLabels(currentFileName);
+                drawingCanvas.SelectedLabel = null;
+                drawingCanvas.SelectedLabels.Clear();
+                uiStateManager.RefreshLabelList();
+                drawingCanvas.InvalidateVisual();
+                OnLabelsChanged();
+
+                CustomMessageBox.Show(
+                    string.Format(
+                        LanguageManager.Instance.GetString("AIClassConfidence_Complete") ??
+                        "Current image labeling complete. Added {0} detection(s).",
+                        detections.Count),
+                    LanguageManager.Instance.GetString("Msg_AILabels") ?? "AI Labels",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Information);
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Current image AI labeling failed: {ex}");
+                CustomMessageBox.Show(
+                    string.Format(
+                        LanguageManager.Instance.GetString("AIClassConfidence_Failed") ??
+                        "Failed to label the current image: {0}",
+                        ex.Message),
+                    LanguageManager.Instance.GetString("Main_Error") ?? "Error",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Error);
             }
             finally
             {
@@ -1425,30 +2431,6 @@ await Dispatcher.InvokeAsync(() =>
             }
         }
 
-        private void ClearAll_Click(object sender, RoutedEventArgs e)
-        {
-            imageManager.ClearAll();
-            labelManager.ClearAll();
-            drawingCanvas.Labels.Clear(); // Clear labels inside DrawingCanvas
-            drawingCanvas.SuggestedLabels.Clear();
-            ImageListBox.Items.Clear();
-            LabelListBox.ItemsSource = null;
-            drawingCanvas.Image = null; // Clear the image in DrawingCanvas
-            drawingCanvas.InvalidateVisual(); // Force a redraw
-            uiStateManager.UpdateStatusCounts();
-            uiStateManager.RefreshAllImagesList(); // Clear the filter cache
-            uiStateManager.ClearCache();
-            UpdateSuggestionSummaryUI();
-
-            MarkProjectDirty();
-        }
-
-        private void ManageModels_Click(object sender, RoutedEventArgs e)
-        {
-            var savedMappings = projectManager?.CurrentProject?.ModelClassMappings;
-            yoloAI.OpenModelManager(projectClasses, savedMappings);
-        }
-
         private async void AutoLabelImages_Click(object sender, RoutedEventArgs e)
         {
             // Check if any models are loaded
@@ -1469,8 +2451,42 @@ private async void AutoLabelImages_Click(object sender, RoutedEventArgs e)
             string processingMode = modelCount == 1 ?
                 (LanguageManager.Instance.GetString("Msg_SingleModel") ?? "single model") :
                 string.Format(LanguageManager.Instance.GetString("Msg_EnsembleModels") ?? "ensemble ({0} models)", modelCount);
+            processingMode = $"{processingMode}, {yoloAI.GetExecutionProviderSummary()}";
+
+            if (!string.IsNullOrWhiteSpace(imageManager.CurrentImagePath))
+                labelManager.SaveLabels(imageManager.CurrentImagePath, drawingCanvas.Labels);
+
+            bool onlyUnlabeled = Properties.Settings.Default.AIAutoLabelOnlyUnlabeled;
+            var imagesToProcess = imageManager.ImagePathMap
+                .Where(pair => !onlyUnlabeled || labelManager.GetLabels(pair.Key).Count == 0)
+                .Select(pair => (FileName: pair.Key, ImagePath: pair.Value.Path))
+                .ToArray();
+            int skippedLabeledImages = imageManager.ImagePathMap.Count - imagesToProcess.Length;
+
+            if (imagesToProcess.Length == 0)
+            {
+                string emptyMessage = onlyUnlabeled
+                    ? LanguageManager.Instance.GetString("Msg_NoUnlabeledImages") ??
+                      "There are no unlabeled images to process."
+                    : LanguageManager.Instance.GetString("Main_NoImageSelected") ??
+                      "No images loaded.";
+                CustomMessageBox.Show(
+                    emptyMessage,
+                    LanguageManager.Instance.GetString("Msg_AILabels") ?? "AI Labels",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Information);
+                return;
+            }
+
+            string scopeMessage = onlyUnlabeled
+                ? "\n\n" + string.Format(
+                    LanguageManager.Instance.GetString("Msg_OnlyUnlabeledSummary") ??
+                    "Only unlabeled images will be processed; {0} labeled image(s) will be skipped.",
+                    skippedLabeledImages)
+                : "";
             var continueResult = CustomMessageBox.Show(
-                string.Format(LanguageManager.Instance.GetString("Msg_ProcessImagesPrompt") ?? "Process {0} images using {1} detection?", imageManager.ImagePathMap.Count, processingMode) +
+                string.Format(LanguageManager.Instance.GetString("Msg_ProcessImagesPrompt") ?? "Process {0} images using {1} detection?", imagesToProcess.Length, processingMode) +
+                scopeMessage +
                 (modelCount > 3 ? "\n\n" + (LanguageManager.Instance.GetString("Msg_ManyModelsWarning") ?? "Note: Processing with many models may take considerable time.") : ""),
                 LanguageManager.Instance.GetString("Msg_StartDetection") ?? "Start Detection",
                 MessageBoxButton.YesNo,
@@ -1480,65 +2496,96 @@ private async void AutoLabelImages_Click(object sender, RoutedEventArgs e)
 
             // Store current selection
             var currentSelection = ImageListBox.SelectedItem as ImageListItem;
+            var teamPairs = GetClassTeamPairs();
 
             CancellationTokenSource tokenSource = new CancellationTokenSource();
             overlayManager.ShowOverlayWithProgress($"Running AI Detections ({processingMode})...", tokenSource);
 
             int totalDetections = 0;
-            int totalImages = imageManager.ImagePathMap.Count;
+            int totalImages = imagesToProcess.Length;
+            int completedImages = 0;
             int processedImages = 0;
+            int failedImages = 0;
+            // DirectML serializes the actual GPU Run call behind a single lock, so extra workers
+            // do not run inference in parallel. Their value is keeping CPU-side preprocessing
+            // (decode, resize, tensor build) far enough ahead that the GPU rarely waits for the
+            // next image. A few workers per model input covers even the ensemble case; cap it so
+            // memory (one decoded bitmap + float buffer per worker) stays bounded.
+            int workerCount = yoloAI.UsesDirectMl
+                ? Math.Min(totalImages, Math.Clamp(Environment.ProcessorCount / 2, 3, 6))
+                : Math.Min(totalImages, Math.Clamp(Environment.ProcessorCount / 2, 2, 8));
+            var parallelOptions = new ParallelOptions
+            {
+                CancellationToken = tokenSource.Token,
+                MaxDegreeOfParallelism = Math.Max(1, workerCount)
+            };
 
-            await Task.Run(() =>
+            try
             {
-                foreach (var imagePath in imageManager.ImagePathMap.Values)
+                await Parallel.ForEachAsync(imagesToProcess, parallelOptions, (imageEntry, cancellationToken) =>
                 {
-                    if (tokenSource.Token.IsCancellationRequested) break;
+                    cancellationToken.ThrowIfCancellationRequested();
 
-                    if (!File.Exists(imagePath.Path))
+                    try
                     {
-                        Dispatcher.Invoke(() =>
+                        if (!File.Exists(imageEntry.ImagePath))
                         {
-                            CustomMessageBox.Show(string.Format(LanguageManager.Instance.GetString("Msg_FileNotFound") ?? "File not found: {0}", imagePath.Path), LanguageManager.Instance.GetString("Msg_Error") ?? "Error", MessageBoxButton.OK, MessageBoxImage.Warning);
-                        });
-                        continue;
-                    }
-
-                    using Bitmap image = new Bitmap(imagePath.Path);
-                    string fileName = Path.GetFileName(imagePath.Path);
+                            Interlocked.Increment(ref failedImages);
+                            return ValueTask.CompletedTask;
+                        }
 
-                    // Use inference method with ClassId
-                    var boxesWithClasses = yoloAI.RunInferenceWithClasses(image);
-                    labelManager.AddAILabels(fileName, boxesWithClasses);
-                    totalDetections += boxesWithClasses.Count;
+                        using Bitmap image = new Bitmap(imageEntry.ImagePath);
 
-                    // Only update UI if this is the current image
-                    Dispatcher.Invoke(() =>
+                        var boxesWithClasses = yoloAI.RunInferenceWithClasses(image, null, teamPairs);
+                        labelManager.AddAILabels(imageEntry.FileName, boxesWithClasses);
+                        Interlocked.Add(ref totalDetections, boxesWithClasses.Count);
+                        Interlocked.Increment(ref processedImages);
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.WriteLine($"AI labeling failed for {imageEntry.FileName}: {ex.Message}");
+                        Interlocked.Increment(ref failedImages);
+                    }
+                    finally
                     {
-                        if (drawingCanvas != null && drawingCanvas.Image != null &&
-                            drawingCanvas.Image.ToString().Contains(fileName))
+                        int completed = Interlocked.Increment(ref completedImages);
+                        _ = Dispatcher.BeginInvoke(() =>
                         {
-                            drawingCanvas.Labels = labelManager.GetLabels(fileName);
-                            uiStateManager.RefreshLabelList();
-                            drawingCanvas.InvalidateVisual();
-                        }
-                    });
+                            overlayManager.UpdateProgress((completed * 100) / totalImages);
+                            overlayManager.UpdateMessage(
+                                $"Processing image {completed}/{totalImages} ({processingMode}, {workerCount} workers)...");
+                        });
+                    }
 
-                    processedImages++;
-                    Dispatcher.Invoke(() =>
-                    {
-                        overlayManager.UpdateProgress((processedImages * 100) / totalImages);
-                        overlayManager.UpdateMessage($"Processing image {processedImages}/{totalImages} ({processingMode})...");
-                    });
-                }
-            }, tokenSource.Token);
+                    return ValueTask.CompletedTask;
+                });
+            }
+            catch (OperationCanceledException)
+            {
+                Debug.WriteLine("AI auto-labeling was cancelled.");
+            }
+            finally
+            {
+                overlayManager.HideOverlay();
+                tokenSource.Dispose();
+            }
+
+            string currentFileName = GetCurrentFileName();
+            if (!string.IsNullOrEmpty(currentFileName) &&
+                imagesToProcess.Any(item => string.Equals(
+                    item.FileName,
+                    currentFileName,
+                    StringComparison.OrdinalIgnoreCase)))
+            {
+                drawingCanvas.Labels = labelManager.GetLabels(currentFileName);
+                uiStateManager.RefreshLabelList();
+                drawingCanvas.InvalidateVisual();
+            }
 
-            overlayManager.HideOverlay();
             await UpdateAllImageStatusesAsync();
 
             Dispatcher.Invoke(() =>
             {
-                uiStateManager.RefreshAllImagesList(); // Refresh for filtering
-
                 // Restore selection if it was lost
                 if (ImageListBox.SelectedItem == null)
                 {
@@ -1548,10 +2595,32 @@ await Task.Run(() =>
                 OnLabelsChanged();
 
                 string modeInfo = modelCount == 1 ? "" : string.Format(LanguageManager.Instance.GetString("Msg_UsingModels") ?? " using {0} models", modelCount);
-                CustomMessageBox.Show(string.Format(LanguageManager.Instance.GetString("Msg_AutoLabelComplete") ?? "Auto-labeling complete{0}.\nTotal detections: {1}", modeInfo, totalDetections),
+                string completionMessage = string.Format(
+                    LanguageManager.Instance.GetString("Msg_AutoLabelComplete") ??
+                    "Auto-labeling complete{0}.\nTotal detections: {1}",
+                    modeInfo,
+                    totalDetections);
+                if (onlyUnlabeled)
+                {
+                    completionMessage += "\n" + string.Format(
+                        LanguageManager.Instance.GetString("Msg_AutoLabelScopeComplete") ??
+                        "Processed: {0}; skipped labeled: {1}.",
+                        processedImages,
+                        skippedLabeledImages);
+                }
+                if (failedImages > 0)
+                {
+                    completionMessage += "\n" + string.Format(
+                        LanguageManager.Instance.GetString("Msg_AutoLabelFailedImages") ??
+                        "{0} image(s) failed or were missing.",
+                        failedImages);
+                }
+
+                CustomMessageBox.Show(completionMessage,
                     LanguageManager.Instance.GetString("Msg_AILabels") ?? "AI Labels", MessageBoxButton.OK, MessageBoxImage.Information);
 
-                MarkProjectDirty();
+                if (processedImages > 0)
+                    MarkProjectDirty();
             });
         }
 
@@ -1902,7 +2971,7 @@ await imageManager.LoadImagesFromDirectoryAsync(
                 // Warn about duplicate file names that were skipped
                 ShowDuplicateImagesWarning(imageManager.ConsumeDuplicateImageFiles());
 
-                if (ImageListBox.Items.Count > 0)
+                if (ImageListBox.Items.Count > 0 && ImageListBox.SelectedItem == null)
                 {
                     ImageListBox.SelectedIndex = 0;
                 }
@@ -1936,13 +3005,27 @@ private async Task UpdateImageListInBatchesAsync(string[] files, CancellationTok
                 batchSize = 100;
             }
 
-            await Dispatcher.InvokeAsync(() => ImageListBox.Items.Clear());
+            // Folder imports are incremental. Keep existing UI items and only append
+            // filenames that are not already represented in the list.
+            var existingFileNames = await Dispatcher.InvokeAsync(() =>
+                ImageListBox.Items
+                    .OfType<ImageListItem>()
+                    .Select(item => item.FileName)
+                    .ToHashSet(StringComparer.OrdinalIgnoreCase));
+
+            var filesToAdd = new List<string>();
+            foreach (var file in files)
+            {
+                string fileName = Path.GetFileName(file);
+                if (existingFileNames.Add(fileName))
+                    filesToAdd.Add(file);
+            }
 
-            for (int i = 0; i < files.Length; i += batchSize)
+            for (int i = 0; i < filesToAdd.Count; i += batchSize)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                var batch = files.Skip(i).Take(batchSize).ToArray();
+                var batch = filesToAdd.Skip(i).Take(batchSize).ToArray();
 
                 await Dispatcher.InvokeAsync(() =>
                 {
@@ -1952,14 +3035,14 @@ await Dispatcher.InvokeAsync(() =>
                     foreach (string file in batch)
                     {
                         string fileName = Path.GetFileName(file);
-                        ImageListBox.Items.Add(new ImageListItem(fileName, ImageStatus.NoLabel));
+                        ImageListBox.Items.Add(new ImageListItem(fileName, imageManager.GetImageStatus(fileName)));
                     }
 
                     ImageListBox.SelectionChanged += ImageListBox_SelectionChanged;
                 });
 
                 // Update progress
-                overlayManager.UpdateMessage($"Updating UI... {Math.Min(i + batchSize, files.Length)}/{files.Length}");
+                overlayManager.UpdateMessage($"Updating UI... {Math.Min(i + batchSize, filesToAdd.Count)}/{filesToAdd.Count}");
             }
         }
 
@@ -2037,7 +3120,7 @@ private async Task LoadYOLOLabelsFromDirectory(string directoryPath)
                         // Update project data
                         if (projectManager?.CurrentProject != null)
                         {
-                            projectManager.CurrentProject.Classes = projectClasses;
+                            projectManager.CurrentProject.Classes = new List<LabelClass>(projectClasses);
                         }
 
                         // Refresh UI
@@ -2098,6 +3181,11 @@ await labelManager.ExportLabelsBatchAsync(
                     progress,
                     tokenSource.Token);
 
+                // Export class names file (classes.txt) so training keeps the class names.
+                // YOLO label .txt files only store numeric class ids; without this file the
+                // class names are lost.
+                ExportClassesFile(exportDirectory);
+
                 overlayManager.HideOverlay();
                 CustomMessageBox.Show(LanguageManager.Instance.GetString("Msg_LabelsExported") ?? "Labels exported successfully!", LanguageManager.Instance.GetString("Msg_ExportComplete") ?? "Export Complete",
                     MessageBoxButton.OK, MessageBoxImage.Information);
@@ -2116,6 +3204,43 @@ await labelManager.ExportLabelsBatchAsync(
             }
         }
 
+        /// <summary>
+        /// Writes the project's class names to disk alongside the YOLO labels.
+        /// Produces classes.txt (one name per ClassId line, indexed so line N == class N)
+        /// and a data.yaml for direct use in YOLO training.
+        /// </summary>
+        private void ExportClassesFile(string exportDirectory)
+        {
+            try
+            {
+                // Shared with the training-dataset export so both produce identical class ordering.
+                // Skips the "nan"/ -1 placeholder and fills id gaps with class_N.
+                var names = DatasetExportManager.BuildClassNames(projectClasses);
+
+                if (names.Length == 0)
+                    return;
+
+                // classes.txt
+                System.IO.File.WriteAllLines(
+                    System.IO.Path.Combine(exportDirectory, "classes.txt"),
+                    names);
+
+                // data.yaml (YOLO format)
+                var yaml = new System.Text.StringBuilder();
+                yaml.AppendLine($"nc: {names.Length}");
+                yaml.Append("names: [");
+                yaml.Append(string.Join(", ", names.Select(n => $"'{n.Replace("'", "''")}'")));
+                yaml.AppendLine("]");
+                System.IO.File.WriteAllText(
+                    System.IO.Path.Combine(exportDirectory, "data.yaml"),
+                    yaml.ToString());
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"Failed to export classes file: {ex.Message}");
+            }
+        }
+
         private void RestoreImageSelection(ImageListItem previousSelection)
         {
             if (previousSelection == null) return;
@@ -2138,6 +3263,11 @@ private ImageStatus DetermineImageStatus(string fileName)
             if (!labelManager.LabelStorage.TryGetValue(fileName, out var labels) || labels.Count == 0)
                 return ImageStatus.NoLabel;
 
+            // Imported/AI labels at or before the saved manual checkpoint have already
+            // been reviewed by the user and must stay verified after another import.
+            if (IsAtOrBeforeManualProgress(fileName))
+                return ImageStatus.Verified;
+
             //if we are working on the image, don't mark it as review
             string currentFile = GetCurrentFileName();
             bool isCurrentImage = string.Equals(fileName, currentFile, StringComparison.OrdinalIgnoreCase);
@@ -2163,6 +3293,75 @@ private ImageStatus DetermineImageStatus(string fileName)
             return ImageStatus.Verified;
         }
 
+        public bool IsAtOrBeforeManualProgress(string fileName)
+        {
+            string? checkpoint = projectManager?.CurrentProject?.ManualProgressImageFile;
+            return !string.IsNullOrWhiteSpace(checkpoint) &&
+                   StringComparer.OrdinalIgnoreCase.Compare(fileName, checkpoint) <= 0;
+        }
+
+        private async void SetManualProgress_Click(object sender, RoutedEventArgs e)
+        {
+            if (projectManager?.CurrentProject == null)
+            {
+                CustomMessageBox.Show(
+                    LanguageManager.Instance.GetString("Msg_ManualProgress_ProjectRequired") ?? "Open or create a project before setting a manual progress point.",
+                    LanguageManager.Instance.GetString("Msg_ManualProgress_Title") ?? "Manual Labeling Progress",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+
+            if (ImageListBox.SelectedItem is not ImageListItem selected)
+            {
+                CustomMessageBox.Show(
+                    LanguageManager.Instance.GetString("Msg_ManualProgress_SelectImage") ?? "Select an image first.",
+                    LanguageManager.Instance.GetString("Msg_ManualProgress_Title") ?? "Manual Labeling Progress",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+
+            projectManager.CurrentProject.ManualProgressImageFile = selected.FileName;
+            await UpdateAllImageStatusesAsync();
+            uiStateManager.RefreshAllImagesList();
+            MarkProjectDirty();
+
+            CustomMessageBox.Show(
+                string.Format(LanguageManager.Instance.GetString("Msg_ManualProgress_Set") ?? "Manual progress point set to: {0}", selected.FileName),
+                LanguageManager.Instance.GetString("Msg_ManualProgress_Title") ?? "Manual Labeling Progress",
+                MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
+        private void JumpToManualProgress_Click(object sender, RoutedEventArgs e)
+        {
+            string? checkpoint = projectManager?.CurrentProject?.ManualProgressImageFile;
+            if (string.IsNullOrWhiteSpace(checkpoint))
+            {
+                CustomMessageBox.Show(
+                    LanguageManager.Instance.GetString("Msg_ManualProgress_NotSet") ?? "No manual progress point has been set yet.",
+                    LanguageManager.Instance.GetString("Msg_ManualProgress_Title") ?? "Manual Labeling Progress",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+
+            // Ensure the target is visible even when a status filter is active.
+            FilterAll_Click(sender, e);
+            var target = ImageListBox.Items.Cast<ImageListItem>()
+                .FirstOrDefault(item => string.Equals(item.FileName, checkpoint, StringComparison.OrdinalIgnoreCase));
+
+            if (target == null)
+            {
+                CustomMessageBox.Show(
+                    string.Format(LanguageManager.Instance.GetString("Msg_ManualProgress_Missing") ?? "The progress image is not currently loaded: {0}", checkpoint),
+                    LanguageManager.Instance.GetString("Msg_ManualProgress_Title") ?? "Manual Labeling Progress",
+                    MessageBoxButton.OK, MessageBoxImage.Warning);
+                return;
+            }
+
+            ImageListBox.SelectedItem = target;
+            ImageListBox.ScrollIntoView(target);
+            ImageListBox.Focus();
+        }
+
         private void UpdateImageStatus(string fileName)
         {
             if (!imageManager.ImagePathMap.ContainsKey(fileName)) return;
@@ -2519,6 +3718,21 @@ private void Window_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
                 return; // Let other handlers (like zoom) handle it
             }
 
+            // If the pointer is over the class list, scroll that list instead of
+            // navigating images. The window-level Preview handler would otherwise
+            // swallow every wheel event, so we forward it to the ClassListBox here.
+            if (e.OriginalSource is DependencyObject src && IsDescendantOf(src, ClassListBox))
+            {
+                var scrollViewer = FindVisualChild<ScrollViewer>(ClassListBox);
+                if (scrollViewer != null)
+                {
+                    scrollViewer.ScrollToVerticalOffset(
+                        scrollViewer.VerticalOffset - e.Delta / 3.0);
+                    e.Handled = true;
+                }
+                return;
+            }
+
             // Only navigate if we have images loaded
             if (ImageListBox.Items.Count == 0)
             {
@@ -2550,6 +3764,48 @@ private void Window_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
                 }
             }
         }
+        // Returns true if 'node' is (or is contained within) 'ancestor' in the visual tree.
+        private static bool IsDescendantOf(DependencyObject node, DependencyObject ancestor)
+        {
+            while (node != null)
+            {
+                if (node == ancestor)
+                    return true;
+
+                // VisualTreeHelper.GetParent throws for non-visual nodes such as
+                // System.Windows.Documents.Run (inline text inside a TextBlock),
+                // which can appear as e.OriginalSource. Only walk the visual tree
+                // for actual Visual/Visual3D nodes; otherwise fall back to the
+                // logical tree.
+                DependencyObject parent = null;
+                if (node is Visual || node is System.Windows.Media.Media3D.Visual3D)
+                    parent = VisualTreeHelper.GetParent(node);
+
+                node = parent
+                    ?? LogicalTreeHelper.GetParent(node)
+                    ?? (node as FrameworkElement)?.Parent
+                    ?? (node as FrameworkContentElement)?.Parent;
+            }
+            return false;
+        }
+
+        // Depth-first search for the first visual child of type T.
+        private static T FindVisualChild<T>(DependencyObject parent) where T : DependencyObject
+        {
+            int count = VisualTreeHelper.GetChildrenCount(parent);
+            for (int i = 0; i < count; i++)
+            {
+                var child = VisualTreeHelper.GetChild(parent, i);
+                if (child is T typed)
+                    return typed;
+
+                var result = FindVisualChild<T>(child);
+                if (result != null)
+                    return result;
+            }
+            return null;
+        }
+
         private void SortByName_Click(object sender, RoutedEventArgs e)
         {
             uiStateManager.SortImagesByName();
@@ -2573,13 +3829,29 @@ private void SortComboBox_SelectionChanged(object sender, SelectionChangedEventA
                 case 1:
                     uiStateManager.SortImagesByStatus();
                     break;
+                case 2:
+                    uiStateManager.SortImagesByDate(newestFirst: true);
+                    break;
+                case 3:
+                    uiStateManager.SortImagesByDate(newestFirst: false);
+                    break;
             }
         }
 
+        // Maps the current sort combobox selection to the string persisted in the project file.
+        public string GetCurrentSortModeString() => SortComboBox?.SelectedIndex switch
+        {
+            1 => "ByStatus",
+            2 => "ByDateNewest",
+            3 => "ByDateOldest",
+            _ => "ByName"
+        };
+
         private void FilterAll_Click(object sender, RoutedEventArgs e)
         {
             uiStateManager.UpdateFilterButtonStyles(
-                FilterAllButton, FilterReviewButton, FilterSuggestedButton, FilterNoLabelButton, FilterVerifiedButton,
+                FilterAllButton, FilterReviewButton, FilterSuggestedButton, FilterNoLabelButton,
+                FilterVerifiedButton, FilterAiLabelsButton,
                 activeButton: FilterAllButton);
             uiStateManager.FilterImagesByStatus(null);
         }
@@ -2587,7 +3859,8 @@ private void FilterAll_Click(object sender, RoutedEventArgs e)
         private void FilterReview_Click(object sender, RoutedEventArgs e)
         {
             uiStateManager.UpdateFilterButtonStyles(
-                FilterAllButton, FilterReviewButton, FilterSuggestedButton, FilterNoLabelButton, FilterVerifiedButton,
+                FilterAllButton, FilterReviewButton, FilterSuggestedButton, FilterNoLabelButton,
+                FilterVerifiedButton, FilterAiLabelsButton,
                 activeButton: FilterReviewButton);
             uiStateManager.FilterImagesByStatus(ImageStatus.VerificationNeeded);
         }
@@ -2595,7 +3868,8 @@ private void FilterReview_Click(object sender, RoutedEventArgs e)
         private void FilterSuggested_Click(object sender, RoutedEventArgs e)
         {
             uiStateManager.UpdateFilterButtonStyles(
-                FilterAllButton, FilterReviewButton, FilterSuggestedButton, FilterNoLabelButton, FilterVerifiedButton,
+                FilterAllButton, FilterReviewButton, FilterSuggestedButton, FilterNoLabelButton,
+                FilterVerifiedButton, FilterAiLabelsButton,
                 activeButton: FilterSuggestedButton);
             uiStateManager.FilterImagesByStatus(ImageStatus.Suggested);
         }
@@ -2603,7 +3877,8 @@ private void FilterSuggested_Click(object sender, RoutedEventArgs e)
         private void FilterNoLabel_Click(object sender, RoutedEventArgs e)
         {
             uiStateManager.UpdateFilterButtonStyles(
-                FilterAllButton, FilterReviewButton, FilterSuggestedButton, FilterNoLabelButton, FilterVerifiedButton,
+                FilterAllButton, FilterReviewButton, FilterSuggestedButton, FilterNoLabelButton,
+                FilterVerifiedButton, FilterAiLabelsButton,
                 activeButton: FilterNoLabelButton);
             uiStateManager.FilterImagesByStatus(ImageStatus.NoLabel);
         }
@@ -2611,17 +3886,48 @@ private void FilterNoLabel_Click(object sender, RoutedEventArgs e)
         private void FilterVerified_Click(object sender, RoutedEventArgs e)
         {
             uiStateManager.UpdateFilterButtonStyles(
-                FilterAllButton, FilterReviewButton, FilterSuggestedButton, FilterNoLabelButton, FilterVerifiedButton,
+                FilterAllButton, FilterReviewButton, FilterSuggestedButton, FilterNoLabelButton,
+                FilterVerifiedButton, FilterAiLabelsButton,
                 activeButton: FilterVerifiedButton);
             uiStateManager.FilterImagesByStatus(ImageStatus.Verified);
         }
 
-        private void SettingsMenuItem_Click(object sender, RoutedEventArgs e)
+        private void FilterAiLabels_Click(object sender, RoutedEventArgs e)
         {
-            var settingsWindow = new SettingsWindow(yoloAI);
+            uiStateManager.UpdateFilterButtonStyles(
+                FilterAllButton, FilterReviewButton, FilterSuggestedButton, FilterNoLabelButton,
+                FilterVerifiedButton, FilterAiLabelsButton,
+                activeButton: FilterAiLabelsButton);
+            uiStateManager.FilterImagesWithAiLabels();
+        }
+
+        private async void SettingsMenuItem_Click(object sender, RoutedEventArgs e)
+        {
+            bool previousUseGpu = Properties.Settings.Default.UseGPU;
+            var settingsWindow = new SettingsWindow(
+                yoloAI,
+                projectClasses,
+                projectManager?.CurrentProject?.AIClassConfidenceThresholds,
+                projectManager?.CurrentProject?.ClassTeamPairs);
             settingsWindow.Owner = this;
             if (settingsWindow.ShowDialog() == true)
             {
+                if (settingsWindow.ClassConfidenceThresholdsChanged &&
+                    projectManager?.CurrentProject != null)
+                {
+                    projectManager.CurrentProject.AIClassConfidenceThresholds =
+                        new Dictionary<int, float>(settingsWindow.ClassConfidenceThresholds);
+                    MarkProjectDirty();
+                }
+
+                if (settingsWindow.ClassTeamPairsChanged &&
+                    projectManager?.CurrentProject != null)
+                {
+                    projectManager.CurrentProject.ClassTeamPairs =
+                        settingsWindow.ClassTeamPairs;
+                    MarkProjectDirty();
+                }
+
                 // Settings were saved, reapply batch sizes
                 imageManager.BatchSize = Properties.Settings.Default.ProcessingBatchSize;
                 labelManager.LabelLoadBatchSize = Properties.Settings.Default.LabelLoadBatchSize;
@@ -2633,6 +3939,57 @@ private void SettingsMenuItem_Click(object sender, RoutedEventArgs e)
                     LoadHotkeys();
                 }
 
+                bool processingDeviceChanged =
+                    previousUseGpu != Properties.Settings.Default.UseGPU;
+                bool providerDoesNotMatchSetting = Properties.Settings.Default.UseGPU
+                    ? !yoloAI.AllModelsUseDirectMl
+                    : yoloAI.UsesDirectMl;
+                if ((processingDeviceChanged || providerDoesNotMatchSetting) &&
+                    yoloAI.GetLoadedModelsCount() > 0)
+                {
+                    overlayManager.ShowOverlay(
+                        LanguageManager.Instance.GetString("Msg_ReloadingModelsForDevice") ??
+                        "Reloading AI models for the selected device...");
+
+                    ExecutionProviderReloadResult reloadResult;
+                    string reloadError;
+                    try
+                    {
+                        (reloadResult, reloadError) = await Task.Run(() =>
+                        {
+                            var result = yoloAI.ReloadExecutionProviders(out string error);
+                            return (result, error);
+                        });
+                    }
+                    finally
+                    {
+                        overlayManager.HideOverlay();
+                    }
+
+                    if (reloadResult == ExecutionProviderReloadResult.Failed)
+                    {
+                        CustomMessageBox.Show(
+                            string.Format(
+                                LanguageManager.Instance.GetString("Msg_ModelInitFailed") ??
+                                "Failed to initialize model: {0}",
+                                reloadError),
+                            LanguageManager.Instance.GetString("Msg_Error") ?? "Error",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Error);
+                    }
+                    else if (reloadResult == ExecutionProviderReloadResult.FallbackToCpu)
+                    {
+                        CustomMessageBox.Show(
+                            string.Format(
+                                LanguageManager.Instance.GetString("Msg_GPUInitFailed") ??
+                                "GPU initialization failed: {0}\nFalling back to CPU.",
+                                reloadError),
+                            LanguageManager.Instance.GetString("Msg_GPUWarning") ?? "GPU Warning",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Warning);
+                    }
+                }
+
                 // Update the UI to reflect any changes
                 UpdateProjectUI();
             }
@@ -2687,97 +4044,113 @@ private void RefreshClassList()
             RefreshClassFilterCheckBoxes();
         }
 
+        // Backing list for ClassFilterItemsControl
+        private List<ClassFilterItem> classFilterItems = new();
+
         /// <summary>
-        /// Refreshes the class filter checkboxes in the Expander
+        /// Rebuilds the class filter list from projectClasses, preserving prior selection by ClassId.
         /// </summary>
         private void RefreshClassFilterCheckBoxes()
         {
-            if (ClassFilterCheckBoxPanel == null)
+            if (ClassFilterItemsControl == null)
                 return;
 
-            // Clear existing checkboxes
-            ClassFilterCheckBoxPanel.Children.Clear();
-
-            // Create checkbox for each class
-            foreach (var labelClass in projectClasses)
+            var previous = classFilterItems.ToDictionary(i => i.ClassId, i => i.IsChecked);
+            classFilterItems = projectClasses.Select(c => new ClassFilterItem
             {
-                var checkBox = new CheckBox
-                {
-                    Content = labelClass.Name,
-                    Tag = labelClass.ClassId,
-                    IsChecked = true, // Default: all classes are selected
-                    Margin = new Thickness(0, 4, 0, 4),
-                    FontSize = 11
-                };
+                ClassId = c.ClassId,
+                Name = c.Name,
+                ColorBrush = c.ColorBrush,
+                IsChecked = !previous.TryGetValue(c.ClassId, out var wasChecked) || wasChecked
+            }).ToList();
 
-                // Add color indicator
-                var stackPanel = new StackPanel { Orientation = Orientation.Horizontal };
-                
-                // Color bar
-                var colorBar = new Border
-                {
-                    Width = 4,
-                    Height = 16,
-                    Background = new SolidColorBrush(
-                        (Color)ColorConverter.ConvertFromString(labelClass.ColorHex)),
-                    Margin = new Thickness(0, 0, 8, 0),
-                    CornerRadius = new CornerRadius(2),
-                    VerticalAlignment = VerticalAlignment.Center
-                };
-                stackPanel.Children.Add(colorBar);
+            ClassFilterItemsControl.ItemsSource = classFilterItems;
+        }
+
+        /// <summary>
+        /// Handles class filter checkbox changes
+        /// </summary>
+        private void ClassFilterCheckBox_Changed(object sender, RoutedEventArgs e)
+        {
+            ApplyClassFilter();
+        }
+
+        /// <summary>
+        /// Handles switching between the Include / Only class-filter modes.
+        /// </summary>
+        private void ClassFilterMode_Changed(object sender, RoutedEventArgs e)
+        {
+            ApplyClassFilter();
+        }
 
-                // Checkbox
-                stackPanel.Children.Add(checkBox);
+        private ClassFilterMode GetClassFilterMode()
+        {
+            if (ClassFilterModeOnly?.IsChecked == true)
+                return ClassFilterMode.Only;
+            if (ClassFilterModeAll?.IsChecked == true)
+                return ClassFilterMode.All;
+            if (ClassFilterModeExclude?.IsChecked == true)
+                return ClassFilterMode.Exclude;
+            return ClassFilterMode.Include;
+        }
 
-                // Wrap in a container
-                var container = new StackPanel { Orientation = Orientation.Horizontal };
-                container.Children.Add(stackPanel);
+        // Bulk-sets every class filter item with the filter re-applied only once at the end.
+        private void SetAllClassCheckBoxes(Func<ClassFilterItem, bool> valueSelector)
+        {
+            if (classFilterItems.Count == 0)
+                return;
 
-                // Subscribe to checkbox change event
-                checkBox.Checked += ClassFilterCheckBox_Changed;
-                checkBox.Unchecked += ClassFilterCheckBox_Changed;
+            suppressClassFilterApply = true;
+            foreach (var item in classFilterItems)
+                item.IsChecked = valueSelector(item);
+            suppressClassFilterApply = false;
 
-                ClassFilterCheckBoxPanel.Children.Add(container);
-            }
+            ApplyClassFilter();
         }
 
+        private void ClassFilterSelectAll_Click(object sender, RoutedEventArgs e) =>
+            SetAllClassCheckBoxes(_ => true);
+
+        private void ClassFilterClear_Click(object sender, RoutedEventArgs e) =>
+            SetAllClassCheckBoxes(_ => false);
+
+        private void ClassFilterInvert_Click(object sender, RoutedEventArgs e) =>
+            SetAllClassCheckBoxes(item => !item.IsChecked);
+
         /// <summary>
-        /// Handles class filter checkbox changes
+        /// Applies the current class-filter selection and mode to the image list.
         /// </summary>
-        private void ClassFilterCheckBox_Changed(object sender, RoutedEventArgs e)
+        private void ApplyClassFilter()
         {
-            // Get all checked class IDs
-            var checkedClassIds = new HashSet<int>();
-            
-            foreach (var container in ClassFilterCheckBoxPanel.Children.OfType<StackPanel>())
-            {
-                var stackPanel = container.Children.OfType<StackPanel>().FirstOrDefault();
-                if (stackPanel != null)
-                {
-                    var checkBox = stackPanel.Children.OfType<CheckBox>().FirstOrDefault();
-                    if (checkBox != null && checkBox.IsChecked == true && checkBox.Tag is int classId)
-                    {
-                        checkedClassIds.Add(classId);
-                    }
-                }
-            }
+            if (suppressClassFilterApply)
+                return;
+
+            // The mode radio's Checked fires during XAML init before the class list is
+            // populated; bail out so we don't clear the list with an empty selection.
+            if (classFilterItems.Count == 0)
+                return;
+
+            var checkedClassIds = classFilterItems
+                .Where(i => i.IsChecked)
+                .Select(i => i.ClassId)
+                .ToHashSet();
+
+            ClassFilterMode mode = GetClassFilterMode();
 
-            // Apply filter
             if (checkedClassIds.Count == 0)
             {
-                // If no classes are selected, show nothing
+                // Nothing selected: show no images.
                 ImageListBox.Items.Clear();
                 uiStateManager.UpdateStatusCounts();
             }
-            else if (checkedClassIds.Count == projectClasses.Count)
+            else if (mode == ClassFilterMode.Include && checkedClassIds.Count == projectClasses.Count)
             {
-                // If all classes are selected, show all images (no class filter)
+                // Include + every class selected is equivalent to no class filter (show all images).
                 uiStateManager.FilterImagesByClasses(null);
             }
             else
             {
-                // Filter by selected classes
-                uiStateManager.FilterImagesByClasses(checkedClassIds);
+                uiStateManager.FilterImagesByClasses(checkedClassIds, mode);
             }
         }
 
@@ -2909,6 +4282,7 @@ private void EditClass_Click(object sender, RoutedEventArgs e)
 
                         // Remove the merged class
                         projectClasses.Remove(classToEdit);
+                        projectManager?.CurrentProject?.AIClassConfidenceThresholds?.Remove(sourceClassId);
 
                         // If current class was the merged one, switch to target class
                         if (drawingCanvas.CurrentClassId == sourceClassId)
@@ -3035,6 +4409,7 @@ private void RemoveClass_Click(object sender, RoutedEventArgs e)
             
             // Remove the class
             projectClasses.Remove(classToRemove);
+            projectManager?.CurrentProject?.AIClassConfidenceThresholds?.Remove(classToRemove.ClassId);
             
             // If current drawing class was removed, switch to first class
             if (drawingCanvas.CurrentClassId == classToRemove.ClassId)
diff --git a/YoableWPF/Managers/AugmentationManager.cs b/YoableWPF/Managers/AugmentationManager.cs
new file mode 100644
index 0000000..45ec422
--- /dev/null
+++ b/YoableWPF/Managers/AugmentationManager.cs
@@ -0,0 +1,318 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using OpenCvSharp;
+
+namespace YoableWPF.Managers
+{
+    public enum AugmentationScope
+    {
+        AllImages,
+        CurrentImage
+    }
+
+    /// <summary>
+    /// Options for an offline data-augmentation run.
+    /// </summary>
+    public sealed class AugmentationOptions
+    {
+        public string OutputDirectory { get; set; }
+        public AugmentationScope Scope { get; set; } = AugmentationScope.AllImages;
+
+        // Number of augmented variants generated per source image.
+        public int VariantsPerImage { get; set; } = 3;
+        public int Seed { get; set; } = 0;
+
+        // Also copy the untouched source image + labels into the output set.
+        public bool IncludeOriginals { get; set; } = true;
+        // Only process images that have labels (background/unlabeled images are skipped).
+        public bool LabeledOnly { get; set; } = true;
+
+        public bool EnableFlip { get; set; } = true;
+        public bool EnableBrightnessContrast { get; set; } = true;
+        public bool EnableHsv { get; set; } = true;
+        public bool EnableNoise { get; set; } = false;
+        public bool EnableBlur { get; set; } = false;
+
+        public bool AnyAugmentationEnabled =>
+            EnableFlip || EnableBrightnessContrast || EnableHsv || EnableNoise || EnableBlur;
+    }
+
+    public sealed class AugmentationResult
+    {
+        public int SourceImages { get; set; }
+        public int GeneratedImages { get; set; }
+        public int SkippedImages { get; set; }
+        public string OutputDirectory { get; set; }
+    }
+
+    /// <summary>
+    /// Generates augmented image/label copies for YOLO training. Pixel-only augmentations
+    /// (brightness, HSV, noise, blur) leave boxes unchanged; horizontal flip remaps box
+    /// coordinates. Output goes to images/ and labels/ subfolders of the chosen directory.
+    /// Label serialization reuses <see cref="LabelManager.ExportLabelsToYolo"/>.
+    /// </summary>
+    public sealed class AugmentationManager
+    {
+        private const int MaxParallelWorkers = 4;
+
+        public async Task<AugmentationResult> AugmentAsync(
+            AugmentationOptions options,
+            ImageManager imageManager,
+            LabelManager labelManager,
+            string currentFileName,
+            IProgress<(int current, int total, string message)> progress = null,
+            CancellationToken cancellationToken = default)
+        {
+            if (options == null) throw new ArgumentNullException(nameof(options));
+            if (!options.AnyAugmentationEnabled)
+                throw new ArgumentException("At least one augmentation must be enabled.", nameof(options));
+
+            string outputDirectory = ResolveOutputDirectory(
+                options.OutputDirectory, imageManager, currentFileName);
+            string imagesDir = Path.Combine(outputDirectory, "images");
+            string labelsDir = Path.Combine(outputDirectory, "labels");
+            Directory.CreateDirectory(imagesDir);
+            Directory.CreateDirectory(labelsDir);
+
+            // Build the work list.
+            var sources = new List<(string fileName, ImageManager.ImageInfo info, List<LabelData> labels)>();
+            foreach (var kvp in imageManager.ImagePathMap)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                string fileName = kvp.Key;
+                var info = kvp.Value;
+                if (info == null) continue;
+
+                if (options.Scope == AugmentationScope.CurrentImage &&
+                    !string.Equals(fileName, currentFileName, StringComparison.OrdinalIgnoreCase))
+                    continue;
+
+                labelManager.LabelStorage.TryGetValue(fileName, out var labels);
+                bool hasLabels = labels != null && labels.Count > 0;
+                if (options.LabeledOnly && !hasLabels)
+                    continue;
+
+                sources.Add((fileName, info, labels ?? new List<LabelData>()));
+            }
+
+            var result = new AugmentationResult { OutputDirectory = outputDirectory };
+            result.SourceImages = sources.Count;
+            if (sources.Count == 0)
+                return result;
+
+            int total = sources.Count;
+            int processed = 0;
+            int generated = 0;
+            int skipped = 0;
+
+            await Task.Run(() =>
+            {
+                Parallel.ForEach(sources,
+                    new ParallelOptions
+                    {
+                        CancellationToken = cancellationToken,
+                        MaxDegreeOfParallelism = MaxParallelWorkers
+                    },
+                    (item) =>
+                    {
+                        try
+                        {
+                            int made = ProcessImage(item.fileName, item.info, item.labels, options,
+                                imagesDir, labelsDir, labelManager);
+                            Interlocked.Add(ref generated, made);
+                        }
+                        catch (OperationCanceledException)
+                        {
+                            throw;
+                        }
+                        catch (Exception ex)
+                        {
+                            Interlocked.Increment(ref skipped);
+                            Debug.WriteLine($"Augmentation error for {item.fileName}: {ex.Message}");
+                        }
+                        finally
+                        {
+                            int done = Interlocked.Increment(ref processed);
+                            progress?.Report((done, total, $"Augmenting... {done}/{total}"));
+                        }
+                    });
+            }, cancellationToken);
+
+            result.GeneratedImages = generated;
+            result.SkippedImages = skipped;
+            return result;
+        }
+
+        private static string ResolveOutputDirectory(
+            string configuredDirectory,
+            ImageManager imageManager,
+            string currentFileName)
+        {
+            if (!string.IsNullOrWhiteSpace(configuredDirectory))
+                return configuredDirectory;
+
+            ImageManager.ImageInfo sourceInfo = null;
+            if (!string.IsNullOrWhiteSpace(currentFileName))
+                imageManager.ImagePathMap.TryGetValue(currentFileName, out sourceInfo);
+
+            sourceInfo ??= imageManager.ImagePathMap.Values.FirstOrDefault();
+            string sourceDirectory = sourceInfo == null
+                ? null
+                : Path.GetDirectoryName(sourceInfo.Path);
+
+            if (string.IsNullOrWhiteSpace(sourceDirectory))
+                throw new ArgumentException(
+                    "Output directory is required when no image source directory is available.",
+                    nameof(configuredDirectory));
+
+            return sourceDirectory;
+        }
+
+        private int ProcessImage(
+            string fileName,
+            ImageManager.ImageInfo info,
+            List<LabelData> labels,
+            AugmentationOptions options,
+            string imagesDir,
+            string labelsDir,
+            LabelManager labelManager)
+        {
+            if (string.IsNullOrEmpty(info.Path) || !File.Exists(info.Path))
+                return 0;
+
+            byte[] bytes = File.ReadAllBytes(info.Path);
+            using var source = Cv2.ImDecode(bytes, ImreadModes.Color);
+            if (source.Empty())
+                return 0;
+
+            string ext = Path.GetExtension(fileName);
+            if (string.IsNullOrEmpty(ext)) ext = ".jpg";
+            string stem = Path.GetFileNameWithoutExtension(fileName);
+            var imageSize = new System.Windows.Size(source.Width, source.Height);
+
+            int made = 0;
+
+            // Optionally keep the untouched original in the augmented set.
+            if (options.IncludeOriginals)
+            {
+                WriteImage(source, Path.Combine(imagesDir, fileName), ext);
+                labelManager.ExportLabelsToYolo(Path.Combine(labelsDir, stem + ".txt"), imageSize, labels);
+                made++;
+            }
+
+            // Reproducible per-image RNG so the split/params don't depend on thread scheduling.
+            var rng = new Random(options.Seed ^ StableHash(fileName));
+
+            for (int v = 1; v <= options.VariantsPerImage; v++)
+            {
+                using var variant = source.Clone();
+                bool flipped = false;
+
+                if (options.EnableFlip && rng.NextDouble() < 0.5)
+                {
+                    Cv2.Flip(variant, variant, FlipMode.Y);
+                    flipped = true;
+                }
+
+                if (options.EnableBrightnessContrast)
+                {
+                    double alpha = 0.8 + rng.NextDouble() * 0.4; // contrast 0.8..1.2
+                    double beta = (rng.NextDouble() * 60) - 30;   // brightness -30..+30
+                    variant.ConvertTo(variant, MatType.CV_8UC3, alpha, beta);
+                }
+
+                if (options.EnableHsv)
+                    ApplyHsvJitter(variant, rng);
+
+                if (options.EnableBlur && rng.NextDouble() < 0.5)
+                {
+                    int k = rng.Next(0, 2) == 0 ? 3 : 5;
+                    Cv2.GaussianBlur(variant, variant, new OpenCvSharp.Size(k, k), 0);
+                }
+
+                if (options.EnableNoise && rng.NextDouble() < 0.5)
+                    ApplyGaussianNoise(variant, rng);
+
+                string variantName = $"{stem}_aug{v}{ext}";
+                WriteImage(variant, Path.Combine(imagesDir, variantName), ext);
+
+                var variantLabels = flipped
+                    ? FlipLabels(labels, source.Width)
+                    : labels;
+                labelManager.ExportLabelsToYolo(
+                    Path.Combine(labelsDir, $"{stem}_aug{v}.txt"), imageSize, variantLabels);
+
+                made++;
+            }
+
+            return made;
+        }
+
+        private static void ApplyHsvJitter(Mat bgr, Random rng)
+        {
+            using var hsv = new Mat();
+            Cv2.CvtColor(bgr, hsv, ColorConversionCodes.BGR2HSV);
+            Mat[] channels = Cv2.Split(hsv);
+            try
+            {
+                double hueShift = (rng.NextDouble() * 20) - 10;   // +/-10 (OpenCV hue is 0..180)
+                double satScale = 0.7 + rng.NextDouble() * 0.6;    // 0.7..1.3
+                Cv2.Add(channels[0], new Scalar(hueShift), channels[0]);
+                channels[1].ConvertTo(channels[1], MatType.CV_8UC1, satScale, 0);
+                Cv2.Merge(channels, hsv);
+                Cv2.CvtColor(hsv, bgr, ColorConversionCodes.HSV2BGR);
+            }
+            finally
+            {
+                foreach (var c in channels)
+                    c.Dispose();
+            }
+        }
+
+        private static void ApplyGaussianNoise(Mat bgr, Random rng)
+        {
+            using var noise = new Mat(bgr.Size(), bgr.Type());
+            double sigma = 5 + rng.NextDouble() * 15; // 5..20
+            Cv2.Randn(noise, new Scalar(0, 0, 0), new Scalar(sigma, sigma, sigma));
+            Cv2.Add(bgr, noise, bgr);
+        }
+
+        private static List<LabelData> FlipLabels(List<LabelData> labels, double imageWidth)
+        {
+            var flipped = new List<LabelData>(labels.Count);
+            foreach (var label in labels)
+            {
+                var r = label.Rect;
+                // Mirror both horizontal edges so the label follows the flipped object.
+                double newX = imageWidth - (r.X + r.Width);
+                flipped.Add(new LabelData(
+                    label.Name,
+                    new System.Windows.Rect(newX, r.Y, r.Width, r.Height),
+                    label.ClassId));
+            }
+            return flipped;
+        }
+
+        private static void WriteImage(Mat mat, string path, string ext)
+        {
+            if (Cv2.ImEncode(ext, mat, out byte[] buffer))
+                File.WriteAllBytes(path, buffer);
+        }
+
+        private static int StableHash(string s)
+        {
+            unchecked
+            {
+                int hash = 17;
+                foreach (char c in s)
+                    hash = hash * 31 + c;
+                return hash;
+            }
+        }
+    }
+}
diff --git a/YoableWPF/Managers/DatasetExportManager.cs b/YoableWPF/Managers/DatasetExportManager.cs
new file mode 100644
index 0000000..f91c96d
--- /dev/null
+++ b/YoableWPF/Managers/DatasetExportManager.cs
@@ -0,0 +1,278 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace YoableWPF.Managers
+{
+    /// <summary>
+    /// Options controlling a training-dataset export.
+    /// </summary>
+    public class TrainingExportOptions
+    {
+        public string OutputDirectory { get; set; }
+
+        // Split ratios expressed as fractions (0-1). Normalized defensively at export time,
+        // so callers may pass either fractions or any proportional weights.
+        public double TrainRatio { get; set; } = 0.8;
+        public double ValRatio { get; set; } = 0.2;
+        public double TestRatio { get; set; } = 0.0;
+
+        // Fixed seed so the same dataset always splits the same way.
+        public int Seed { get; set; } = 0;
+
+        // Include images that have no labels as background samples (image copied, empty .txt written).
+        public bool IncludeUnlabeledAsBackground { get; set; } = false;
+
+        // Only export images the user has marked Verified.
+        public bool VerifiedOnly { get; set; } = false;
+    }
+
+    /// <summary>
+    /// Outcome of a training-dataset export, used to build the completion message.
+    /// </summary>
+    public class TrainingExportResult
+    {
+        public int TrainCount { get; set; }
+        public int ValCount { get; set; }
+        public int TestCount { get; set; }
+        public int SkippedCount { get; set; }
+        public string OutputDirectory { get; set; }
+
+        public int TotalExported => TrainCount + ValCount + TestCount;
+    }
+
+    /// <summary>
+    /// Produces an Ultralytics-style training dataset (images/{train,val,test} + labels/{...} +
+    /// classes.txt + data.yaml) from the current project's images and labels. Reuses
+    /// <see cref="LabelManager.ExportLabelsToYolo(string, System.Windows.Size, List{LabelData})"/>
+    /// for the actual label serialization so YOLO coordinate normalization stays in one place.
+    /// </summary>
+    public class DatasetExportManager
+    {
+        public async Task<TrainingExportResult> ExportAsync(
+            TrainingExportOptions options,
+            ImageManager imageManager,
+            LabelManager labelManager,
+            IReadOnlyList<LabelClass> projectClasses,
+            IProgress<(int current, int total, string message)> progress = null,
+            CancellationToken cancellationToken = default)
+        {
+            if (options == null) throw new ArgumentNullException(nameof(options));
+            if (string.IsNullOrWhiteSpace(options.OutputDirectory))
+                throw new ArgumentException("Output directory is required.", nameof(options));
+
+            // 1. Collect the images that qualify for export.
+            var candidates = new List<(string fileName, ImageManager.ImageInfo info, List<LabelData> labels)>();
+            foreach (var kvp in imageManager.ImagePathMap)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                string fileName = kvp.Key;
+                var info = kvp.Value;
+                if (info == null) continue;
+
+                if (options.VerifiedOnly)
+                {
+                    if (!imageManager.ImageStatuses.TryGetValue(fileName, out var status) ||
+                        status != ImageStatus.Verified)
+                        continue;
+                }
+
+                bool hasLabels = labelManager.LabelStorage.TryGetValue(fileName, out var labels) &&
+                                 labels != null && labels.Count > 0;
+                if (!hasLabels)
+                {
+                    if (!options.IncludeUnlabeledAsBackground)
+                        continue;
+                    labels = new List<LabelData>();
+                }
+
+                candidates.Add((fileName, info, labels));
+            }
+
+            var result = new TrainingExportResult { OutputDirectory = options.OutputDirectory };
+            if (candidates.Count == 0)
+                return result;
+
+            // 2. Deterministic order, then seeded Fisher-Yates shuffle so Seed fully determines the split.
+            var ordered = candidates
+                .OrderBy(c => c.fileName, StringComparer.OrdinalIgnoreCase)
+                .ToList();
+
+            var rng = new Random(options.Seed);
+            for (int i = ordered.Count - 1; i > 0; i--)
+            {
+                int j = rng.Next(i + 1);
+                (ordered[i], ordered[j]) = (ordered[j], ordered[i]);
+            }
+
+            int total = ordered.Count;
+
+            // Normalize ratios; guard against a degenerate all-zero configuration.
+            double sum = options.TrainRatio + options.ValRatio + options.TestRatio;
+            double valFrac, testFrac;
+            if (sum <= 0)
+            {
+                valFrac = 0;
+                testFrac = 0;
+            }
+            else
+            {
+                valFrac = options.ValRatio / sum;
+                testFrac = options.TestRatio / sum;
+            }
+
+            int valCount = (int)Math.Floor(total * valFrac);
+            int testCount = (int)Math.Floor(total * testFrac);
+            int trainCount = total - valCount - testCount;
+            // Train must never be empty; if rounding ever left it non-positive, fold everything back into train.
+            if (trainCount <= 0)
+            {
+                trainCount = total;
+                valCount = 0;
+                testCount = 0;
+            }
+
+            bool useTest = testCount > 0;
+
+            var assignments = new List<(string fileName, ImageManager.ImageInfo info, List<LabelData> labels, string split)>(total);
+            for (int i = 0; i < total; i++)
+            {
+                string split = i < trainCount ? "train"
+                    : i < trainCount + valCount ? "val"
+                    : "test";
+                assignments.Add((ordered[i].fileName, ordered[i].info, ordered[i].labels, split));
+            }
+
+            // 3. Create the folder structure. train/val always exist; test only when used.
+            var splits = new List<string> { "train", "val" };
+            if (useTest) splits.Add("test");
+            foreach (var split in splits)
+            {
+                Directory.CreateDirectory(Path.Combine(options.OutputDirectory, "images", split));
+                Directory.CreateDirectory(Path.Combine(options.OutputDirectory, "labels", split));
+            }
+
+            // 4. Copy images and write labels in parallel (mirrors LabelManager.ExportLabelsBatchAsync).
+            int processed = 0;
+            int skipped = 0;
+            await Task.Run(() =>
+            {
+                Parallel.ForEach(assignments,
+                    new ParallelOptions { CancellationToken = cancellationToken },
+                    (item) =>
+                    {
+                        try
+                        {
+                            string srcImage = item.info.Path;
+                            if (string.IsNullOrEmpty(srcImage) || !File.Exists(srcImage))
+                            {
+                                Interlocked.Increment(ref skipped);
+                                return;
+                            }
+
+                            string destImage = Path.Combine(options.OutputDirectory, "images", item.split, item.fileName);
+                            File.Copy(srcImage, destImage, overwrite: true);
+
+                            string labelName = Path.GetFileNameWithoutExtension(item.fileName) + ".txt";
+                            string destLabel = Path.Combine(options.OutputDirectory, "labels", item.split, labelName);
+
+                            if (item.labels.Count > 0)
+                                labelManager.ExportLabelsToYolo(destLabel, item.info.OriginalDimensions, item.labels);
+                            else
+                                File.WriteAllText(destLabel, string.Empty); // background sample
+
+                            int done = Interlocked.Increment(ref processed);
+                            progress?.Report((done, total, $"Exporting training dataset... {done}/{total}"));
+                        }
+                        catch (OperationCanceledException)
+                        {
+                            throw;
+                        }
+                        catch (Exception ex)
+                        {
+                            Interlocked.Increment(ref skipped);
+                            Debug.WriteLine($"Training export error for {item.fileName}: {ex.Message}");
+                        }
+                    });
+            }, cancellationToken);
+
+            // 5. classes.txt + data.yaml (with split paths).
+            WriteClassFiles(options.OutputDirectory, projectClasses, useTest);
+
+            // 6. Report intended split sizes; source files that went missing are counted as skipped.
+            result.TrainCount = assignments.Count(a => a.split == "train");
+            result.ValCount = assignments.Count(a => a.split == "val");
+            result.TestCount = assignments.Count(a => a.split == "test");
+            result.SkippedCount = skipped;
+            return result;
+        }
+
+        /// <summary>
+        /// Builds a class-name array indexed so that array index == ClassId. Gaps in the id
+        /// sequence are filled with "class_N" placeholders. Shared by the flat label export and
+        /// the training-dataset export so both produce identical class ordering/naming.
+        /// </summary>
+        public static string[] BuildClassNames(IReadOnlyList<LabelClass> classes)
+        {
+            var real = (classes ?? Array.Empty<LabelClass>() as IReadOnlyList<LabelClass>)
+                .Where(c => c != null && c.ClassId >= 0)
+                .OrderBy(c => c.ClassId)
+                .ToList();
+
+            if (real.Count == 0)
+                return Array.Empty<string>();
+
+            int maxClassId = real.Max(c => c.ClassId);
+            var names = new string[maxClassId + 1];
+            for (int i = 0; i < names.Length; i++)
+                names[i] = $"class_{i}";
+
+            foreach (var c in real)
+                names[c.ClassId] = string.IsNullOrWhiteSpace(c.Name) ? $"class_{c.ClassId}" : c.Name.Trim();
+
+            return names;
+        }
+
+        /// <summary>
+        /// Writes classes.txt and a training-ready data.yaml (with path/train/val[/test]) to the
+        /// output directory.
+        /// </summary>
+        private static void WriteClassFiles(string outputDirectory, IReadOnlyList<LabelClass> projectClasses, bool useTest)
+        {
+            try
+            {
+                var names = BuildClassNames(projectClasses);
+                if (names.Length == 0)
+                    return;
+
+                File.WriteAllLines(Path.Combine(outputDirectory, "classes.txt"), names);
+
+                var yaml = new StringBuilder();
+                // Absolute path with forward slashes keeps the config portable to Linux training boxes.
+                string absPath = Path.GetFullPath(outputDirectory).Replace('\\', '/');
+                yaml.AppendLine($"path: {absPath}");
+                yaml.AppendLine("train: images/train");
+                yaml.AppendLine("val: images/val");
+                if (useTest)
+                    yaml.AppendLine("test: images/test");
+                yaml.AppendLine();
+                yaml.AppendLine($"nc: {names.Length}");
+                yaml.Append("names: [");
+                yaml.Append(string.Join(", ", names.Select(n => $"'{n.Replace("'", "''")}'")));
+                yaml.AppendLine("]");
+
+                File.WriteAllText(Path.Combine(outputDirectory, "data.yaml"), yaml.ToString());
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Failed to write class files: {ex.Message}");
+            }
+        }
+    }
+}
diff --git a/YoableWPF/Managers/DatasetStatisticsManager.cs b/YoableWPF/Managers/DatasetStatisticsManager.cs
new file mode 100644
index 0000000..14d93e3
--- /dev/null
+++ b/YoableWPF/Managers/DatasetStatisticsManager.cs
@@ -0,0 +1,159 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Media;
+
+namespace YoableWPF.Managers
+{
+    /// <summary>
+    /// Per-class aggregate used by the dataset statistics dashboard.
+    /// </summary>
+    public sealed class ClassStat
+    {
+        public int ClassId { get; set; }
+        public string Name { get; set; }
+        public Brush ColorBrush { get; set; }
+        public int BoxCount { get; set; }
+        public int ImageCount { get; set; }
+        public double BoxPercent { get; set; }
+        // Highest per-class box count in the dataset, so a per-row bar can size itself.
+        public int BarMax { get; set; }
+
+        public string DisplayName => $"{Name} (ID: {ClassId})";
+        public string CountText => $"{BoxCount}  ({BoxPercent:F1}%)  ·  {ImageCount} img";
+    }
+
+    /// <summary>
+    /// Snapshot of dataset statistics computed from the current project's images and labels.
+    /// </summary>
+    public sealed class DatasetStatistics
+    {
+        public int TotalImages { get; set; }
+        public int LabeledImages { get; set; }
+        public int UnlabeledImages { get; set; }
+        public int TotalBoxes { get; set; }
+        public double AvgBoxesPerLabeledImage { get; set; }
+
+        public List<ClassStat> ClassStats { get; } = new();
+
+        // Box-size buckets by fraction of image area (small < 1%, medium < 5%, large otherwise).
+        public int SmallBoxes { get; set; }
+        public int MediumBoxes { get; set; }
+        public int LargeBoxes { get; set; }
+        public int SizedBoxes => SmallBoxes + MediumBoxes + LargeBoxes;
+
+        // Image review status breakdown.
+        public int VerifiedCount { get; set; }
+        public int NeedsReviewCount { get; set; }
+        public int NoLabelCount { get; set; }
+        public int SuggestedCount { get; set; }
+    }
+
+    /// <summary>
+    /// Computes dataset statistics from in-memory image and label state. Pure aggregation over
+    /// <see cref="LabelManager.LabelStorage"/> and <see cref="ImageManager.ImagePathMap"/>; no I/O.
+    /// </summary>
+    public sealed class DatasetStatisticsManager
+    {
+        public DatasetStatistics Compute(
+            ImageManager imageManager,
+            LabelManager labelManager,
+            IReadOnlyList<LabelClass> projectClasses)
+        {
+            var stats = new DatasetStatistics();
+            if (imageManager == null || labelManager == null)
+                return stats;
+
+            var images = imageManager.ImagePathMap;
+            stats.TotalImages = images.Count;
+
+            var boxCountByClass = new Dictionary<int, int>();
+            var imagesByClass = new Dictionary<int, int>();
+            int totalBoxes = 0;
+            int labeledImages = 0;
+
+            foreach (var kvp in images)
+            {
+                string fileName = kvp.Key;
+                var info = kvp.Value;
+                double imgArea = info != null
+                    ? info.OriginalDimensions.Width * info.OriginalDimensions.Height
+                    : 0;
+
+                if (!labelManager.LabelStorage.TryGetValue(fileName, out var labels) ||
+                    labels == null || labels.Count == 0)
+                    continue;
+
+                labeledImages++;
+                var classesInImage = new HashSet<int>();
+
+                foreach (var label in labels)
+                {
+                    totalBoxes++;
+                    boxCountByClass.TryGetValue(label.ClassId, out int existing);
+                    boxCountByClass[label.ClassId] = existing + 1;
+                    classesInImage.Add(label.ClassId);
+
+                    if (imgArea > 0)
+                    {
+                        double frac = (label.Rect.Width * label.Rect.Height) / imgArea;
+                        if (frac < 0.01) stats.SmallBoxes++;
+                        else if (frac < 0.05) stats.MediumBoxes++;
+                        else stats.LargeBoxes++;
+                    }
+                }
+
+                foreach (int classId in classesInImage)
+                {
+                    imagesByClass.TryGetValue(classId, out int imgCount);
+                    imagesByClass[classId] = imgCount + 1;
+                }
+            }
+
+            stats.TotalBoxes = totalBoxes;
+            stats.LabeledImages = labeledImages;
+            stats.UnlabeledImages = stats.TotalImages - labeledImages;
+            stats.AvgBoxesPerLabeledImage = labeledImages > 0
+                ? (double)totalBoxes / labeledImages
+                : 0;
+
+            foreach (var status in imageManager.ImageStatuses.Values)
+            {
+                switch (status)
+                {
+                    case ImageStatus.Verified: stats.VerifiedCount++; break;
+                    case ImageStatus.VerificationNeeded: stats.NeedsReviewCount++; break;
+                    case ImageStatus.Suggested: stats.SuggestedCount++; break;
+                    case ImageStatus.NoLabel: stats.NoLabelCount++; break;
+                }
+            }
+
+            // Build one row per real project class (ordered by id), keeping zero-count classes so
+            // an under-represented class is visible rather than silently missing.
+            var classRows = (projectClasses ?? new List<LabelClass>())
+                .Where(c => c != null && c.ClassId >= 0)
+                .OrderBy(c => c.ClassId)
+                .Select(c =>
+                {
+                    boxCountByClass.TryGetValue(c.ClassId, out int bc);
+                    imagesByClass.TryGetValue(c.ClassId, out int ic);
+                    return new ClassStat
+                    {
+                        ClassId = c.ClassId,
+                        Name = string.IsNullOrWhiteSpace(c.Name) ? $"class_{c.ClassId}" : c.Name,
+                        ColorBrush = c.ColorBrush,
+                        BoxCount = bc,
+                        ImageCount = ic,
+                        BoxPercent = totalBoxes > 0 ? (double)bc / totalBoxes * 100 : 0
+                    };
+                })
+                .ToList();
+
+            int barMax = classRows.Count > 0 ? classRows.Max(r => r.BoxCount) : 0;
+            foreach (var row in classRows)
+                row.BarMax = barMax > 0 ? barMax : 1;
+
+            stats.ClassStats.AddRange(classRows);
+            return stats;
+        }
+    }
+}
diff --git a/YoableWPF/Managers/DuplicateImageDetector.cs b/YoableWPF/Managers/DuplicateImageDetector.cs
new file mode 100644
index 0000000..2d0cea4
--- /dev/null
+++ b/YoableWPF/Managers/DuplicateImageDetector.cs
@@ -0,0 +1,98 @@
+using System.Collections.Concurrent;
+using System.IO;
+using System.Security.Cryptography;
+using YoableWPF.Models;
+
+namespace YoableWPF.Managers
+{
+    public sealed class DuplicateImageDetector
+    {
+        private const int MaxConcurrentReads = 4;
+
+        public async Task<List<DuplicateImageGroup>> FindDuplicatesAsync(
+            IEnumerable<KeyValuePair<string, ImageManager.ImageInfo>> images,
+            IProgress<(int current, int total)>? progress = null,
+            CancellationToken cancellationToken = default)
+        {
+            var candidates = images
+                .Select(pair => CreateCandidate(pair.Key, pair.Value.Path))
+                .Where(candidate => candidate != null)
+                .Cast<DuplicateImageCandidate>()
+                .GroupBy(candidate => candidate.FileSize)
+                .Where(group => group.Count() > 1)
+                .SelectMany(group => group)
+                .ToArray();
+
+            if (candidates.Length == 0)
+                return new List<DuplicateImageGroup>();
+
+            int processed = 0;
+            var byHash = new ConcurrentDictionary<string, ConcurrentBag<DuplicateImageCandidate>>(
+                StringComparer.Ordinal);
+            var options = new ParallelOptions
+            {
+                CancellationToken = cancellationToken,
+                MaxDegreeOfParallelism = MaxConcurrentReads
+            };
+
+            await Parallel.ForEachAsync(candidates, options, async (candidate, token) =>
+            {
+                try
+                {
+                    await using var stream = new FileStream(
+                        candidate.FullPath,
+                        FileMode.Open,
+                        FileAccess.Read,
+                        FileShare.Read,
+                        bufferSize: 1024 * 128,
+                        useAsync: true);
+                    byte[] hash = await SHA256.HashDataAsync(stream, token);
+                    string hashText = Convert.ToHexString(hash);
+                    byHash.GetOrAdd(hashText, _ => new ConcurrentBag<DuplicateImageCandidate>())
+                        .Add(candidate);
+                }
+                catch (IOException)
+                {
+                    // A file may disappear while the project is open. Skip it and keep scanning.
+                }
+                catch (UnauthorizedAccessException)
+                {
+                    // Unreadable images are ignored by duplicate detection.
+                }
+                finally
+                {
+                    int current = Interlocked.Increment(ref processed);
+                    progress?.Report((current, candidates.Length));
+                }
+            });
+
+            return byHash
+                .Where(pair => pair.Value.Count > 1)
+                .Select(pair => new DuplicateImageGroup(
+                    pair.Key,
+                    pair.Value.OrderBy(candidate => candidate.FileName, StringComparer.OrdinalIgnoreCase)))
+                .OrderBy(group => group.Candidates[0].FileName, StringComparer.OrdinalIgnoreCase)
+                .ToList();
+        }
+
+        private static DuplicateImageCandidate? CreateCandidate(string fileName, string fullPath)
+        {
+            try
+            {
+                var fileInfo = new FileInfo(fullPath);
+                if (!fileInfo.Exists)
+                    return null;
+
+                return new DuplicateImageCandidate(fileName, fullPath, fileInfo.Length);
+            }
+            catch (IOException)
+            {
+                return null;
+            }
+            catch (UnauthorizedAccessException)
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/YoableWPF/Managers/ImageCacheManager.cs b/YoableWPF/Managers/ImageCacheManager.cs
new file mode 100644
index 0000000..b1c0b05
--- /dev/null
+++ b/YoableWPF/Managers/ImageCacheManager.cs
@@ -0,0 +1,197 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Media.Imaging;
+
+namespace YoableWPF.Managers
+{
+    /// <summary>
+    /// In-memory LRU cache of decoded (and frozen) bitmaps, with background prefetching
+    /// of neighboring images so switching images feels instant on large datasets.
+    /// All public members are thread-safe; cached bitmaps are frozen so they can be
+    /// decoded on background threads and rendered on the UI thread.
+    /// </summary>
+    public class ImageCacheManager
+    {
+        // Memory budget for cached bitmaps (estimated as width * height * 4 bytes).
+        public long MaxCacheBytes { get; set; } = 512L * 1024 * 1024;
+
+        // Hard cap on entry count regardless of size, protects against tiny-image datasets.
+        public int MaxCacheEntries { get; set; } = 512;
+
+        private class CacheEntry
+        {
+            public string Path;
+            public BitmapImage Bitmap;
+            public long SizeBytes;
+        }
+
+        private readonly object cacheLock = new();
+        private readonly Dictionary<string, LinkedListNode<CacheEntry>> cacheMap = new(StringComparer.OrdinalIgnoreCase);
+        private readonly LinkedList<CacheEntry> lruList = new(); // Most recently used at the front
+        private long currentCacheBytes = 0;
+
+        private CancellationTokenSource prefetchCts;
+
+        /// <summary>
+        /// Returns the cached bitmap for the given path, or null on a cache miss.
+        /// </summary>
+        public BitmapImage TryGet(string imagePath)
+        {
+            if (string.IsNullOrEmpty(imagePath)) return null;
+
+            lock (cacheLock)
+            {
+                if (cacheMap.TryGetValue(imagePath, out var node))
+                {
+                    lruList.Remove(node);
+                    lruList.AddFirst(node);
+                    return node.Value.Bitmap;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the cached bitmap, decoding and caching it on a miss.
+        /// Safe to call from any thread. Returns null if the file cannot be decoded.
+        /// </summary>
+        public BitmapImage GetOrLoad(string imagePath)
+        {
+            var cached = TryGet(imagePath);
+            if (cached != null) return cached;
+
+            var bitmap = DecodeFrozen(imagePath);
+            if (bitmap != null)
+            {
+                Add(imagePath, bitmap);
+            }
+            return bitmap;
+        }
+
+        /// <summary>
+        /// Kicks off background decoding of the given paths (typically neighbors of the
+        /// currently displayed image). Cancels any prefetch batch still in flight.
+        /// </summary>
+        public void Prefetch(IEnumerable<string> imagePaths)
+        {
+            var paths = imagePaths?.Where(p => !string.IsNullOrEmpty(p)).ToList();
+            if (paths == null || paths.Count == 0) return;
+
+            CancellationTokenSource cts;
+            lock (cacheLock)
+            {
+                prefetchCts?.Cancel();
+                prefetchCts = new CancellationTokenSource();
+                cts = prefetchCts;
+            }
+            var token = cts.Token;
+
+            Task.Run(() =>
+            {
+                var options = new ParallelOptions
+                {
+                    CancellationToken = token,
+                    MaxDegreeOfParallelism = Math.Clamp(Environment.ProcessorCount / 2, 1, 4)
+                };
+
+                try
+                {
+                    Parallel.ForEach(paths, options, path =>
+                    {
+                        if (token.IsCancellationRequested) return;
+                        if (TryGet(path) != null) return; // Already cached
+
+                        var bitmap = DecodeFrozen(path);
+                        if (bitmap != null && !token.IsCancellationRequested)
+                        {
+                            Add(path, bitmap);
+                        }
+                    });
+                }
+                catch (OperationCanceledException)
+                {
+                    // A newer prefetch batch superseded this one
+                }
+            }, token);
+        }
+
+        public void Clear()
+        {
+            lock (cacheLock)
+            {
+                prefetchCts?.Cancel();
+                prefetchCts = null;
+                cacheMap.Clear();
+                lruList.Clear();
+                currentCacheBytes = 0;
+            }
+        }
+
+        /// <summary>
+        /// Removes a single decoded image when the source file has changed on disk.
+        /// </summary>
+        public void Remove(string imagePath)
+        {
+            if (string.IsNullOrEmpty(imagePath)) return;
+
+            lock (cacheLock)
+            {
+                if (!cacheMap.TryGetValue(imagePath, out var node)) return;
+
+                cacheMap.Remove(imagePath);
+                lruList.Remove(node);
+                currentCacheBytes -= node.Value.SizeBytes;
+            }
+        }
+
+        private void Add(string imagePath, BitmapImage bitmap)
+        {
+            long sizeBytes = (long)bitmap.PixelWidth * bitmap.PixelHeight * 4;
+
+            lock (cacheLock)
+            {
+                if (cacheMap.ContainsKey(imagePath)) return;
+
+                // Evict least recently used entries until the new bitmap fits
+                while (lruList.Count > 0 &&
+                       (currentCacheBytes + sizeBytes > MaxCacheBytes || lruList.Count >= MaxCacheEntries))
+                {
+                    var lru = lruList.Last;
+                    lruList.RemoveLast();
+                    cacheMap.Remove(lru.Value.Path);
+                    currentCacheBytes -= lru.Value.SizeBytes;
+                }
+
+                var entry = new CacheEntry { Path = imagePath, Bitmap = bitmap, SizeBytes = sizeBytes };
+                var node = lruList.AddFirst(entry);
+                cacheMap[imagePath] = node;
+                currentCacheBytes += sizeBytes;
+            }
+        }
+
+        private static BitmapImage DecodeFrozen(string imagePath)
+        {
+            try
+            {
+                if (!File.Exists(imagePath)) return null;
+
+                var bitmap = new BitmapImage();
+                bitmap.BeginInit();
+                bitmap.UriSource = new Uri(imagePath, UriKind.Absolute);
+                bitmap.CacheOption = BitmapCacheOption.OnLoad;
+                bitmap.CreateOptions = BitmapCreateOptions.IgnoreImageCache;
+                bitmap.EndInit();
+                bitmap.Freeze(); // Allows cross-thread use and avoids WPF cloning costs
+                return bitmap;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/YoableWPF/Managers/ImageManager.cs b/YoableWPF/Managers/ImageManager.cs
index 759aa7f..f228a41 100644
--- a/YoableWPF/Managers/ImageManager.cs
+++ b/YoableWPF/Managers/ImageManager.cs
@@ -18,6 +18,9 @@ public class ImageManager
         private ConcurrentQueue<string> duplicateImageFiles = new();
         private string currentImagePath = "";
 
+        // Decoded bitmap cache shared by the canvas and prefetcher
+        public ImageCacheManager Cache { get; } = new ImageCacheManager();
+
         // Add settings for performance
         public int BatchSize { get; set; } = 100; // Configurable batch size for processing
 
@@ -59,11 +62,6 @@ public string[] LoadImagesFromDirectory(string directoryPath)
                                       .Where(IsSupportedImage)
                                       .ToArray();
 
-            // Clear collections just like original
-            imagePathMap.Clear();
-            imageStatuses.Clear();
-            while (duplicateImageFiles.TryDequeue(out _)) { }
-
             foreach (string file in files)
             {
                 AddImage(file);
@@ -86,7 +84,14 @@ public async Task<string[]> LoadImagesFromDirectoryAsync(
                                 .Where(IsSupportedImage)
                                 .ToArray();
 
-            await LoadImagesFromPathsAsync(files, progress, cancellationToken, enableParallelProcessing);
+            // Directory imports are incremental: images already loaded from the same
+            // unchanged file are skipped before their headers are opened.
+            await LoadImagesFromPathsAsync(
+                files,
+                progress,
+                cancellationToken,
+                enableParallelProcessing,
+                clearExisting: false);
 
             return files;
         }
@@ -96,14 +101,18 @@ public async Task LoadImagesFromPathsAsync(
             IEnumerable<string> files,
             IProgress<(int current, int total, string message)> progress = null,
             CancellationToken cancellationToken = default,
-            bool enableParallelProcessing = true)
+            bool enableParallelProcessing = true,
+            bool clearExisting = true)
         {
             var fileArray = files?.Where(f => !string.IsNullOrWhiteSpace(f)).ToArray() ?? Array.Empty<string>();
 
-            // Clear collections
-            imagePathMap.Clear();
-            imageStatuses.Clear();
-            while (duplicateImageFiles.TryDequeue(out _)) { }
+            if (clearExisting)
+            {
+                imagePathMap.Clear();
+                imageStatuses.Clear();
+                Cache.Clear();
+                while (duplicateImageFiles.TryDequeue(out _)) { }
+            }
 
             int totalFiles = fileArray.Length;
             int processedFiles = 0;
@@ -151,6 +160,10 @@ public bool AddImage(string filePath)
 
             string fileName = Path.GetFileName(filePath);
 
+            if (TrySkipExistingImage(fileName, filePath))
+                return false;
+            bool isExistingFile = imagePathMap.ContainsKey(fileName);
+
             try
             {
                 using (var imageStream = File.OpenRead(filePath))
@@ -161,19 +174,15 @@ public bool AddImage(string filePath)
                         BitmapCacheOption.None);
 
                     var dimensions = new Size(decoder.Frames[0].PixelWidth, decoder.Frames[0].PixelHeight);
-                    if (!imagePathMap.TryAdd(fileName, new ImageInfo(filePath, dimensions)))
+                    var imageInfo = new ImageInfo(filePath, dimensions);
+                    if (!AddOrUpdateImage(fileName, imageInfo))
                     {
-                        if (imagePathMap.TryGetValue(fileName, out var existing) &&
-                            !string.Equals(existing.Path, filePath, StringComparison.OrdinalIgnoreCase))
-                        {
-                            duplicateImageFiles.Enqueue($"{fileName} -> {filePath}");
-                        }
                         return false;
                     }
                     imageStatuses.TryAdd(fileName, ImageStatus.NoLabel);
                 }
 
-                return true;
+                return !isExistingFile;
             }
             catch
             {
@@ -182,6 +191,26 @@ public bool AddImage(string filePath)
             }
         }
 
+        /// <summary>
+        /// Adds an image whose dimensions are already known (e.g. stored in the project file),
+        /// skipping the expensive per-file header decode. Caller is responsible for existence checks.
+        /// </summary>
+        public bool AddImageWithKnownSize(string filePath, Size dimensions)
+        {
+            string fileName = Path.GetFileName(filePath);
+
+            if (TrySkipExistingImage(fileName, filePath))
+                return false;
+            bool isExistingFile = imagePathMap.ContainsKey(fileName);
+
+            if (!AddOrUpdateImage(fileName, new ImageInfo(filePath, dimensions)))
+            {
+                return false;
+            }
+            imageStatuses.TryAdd(fileName, ImageStatus.NoLabel);
+            return !isExistingFile;
+        }
+
         // Thread-safe version for parallel processing
         private bool AddImageThreadSafe(string filePath)
         {
@@ -189,6 +218,9 @@ private bool AddImageThreadSafe(string filePath)
 
             string fileName = Path.GetFileName(filePath);
 
+            if (TrySkipExistingImage(fileName, filePath))
+                return false;
+
             try
             {
                 using (var imageStream = File.OpenRead(filePath))
@@ -199,13 +231,9 @@ private bool AddImageThreadSafe(string filePath)
                         BitmapCacheOption.None);
 
                     var dimensions = new Size(decoder.Frames[0].PixelWidth, decoder.Frames[0].PixelHeight);
-                    if (!imagePathMap.TryAdd(fileName, new ImageInfo(filePath, dimensions)))
+                    var imageInfo = new ImageInfo(filePath, dimensions);
+                    if (!AddOrUpdateImage(fileName, imageInfo))
                     {
-                        if (imagePathMap.TryGetValue(fileName, out var existing) &&
-                            !string.Equals(existing.Path, filePath, StringComparison.OrdinalIgnoreCase))
-                        {
-                            duplicateImageFiles.Enqueue($"{fileName} -> {filePath}");
-                        }
                         return false;
                     }
                     imageStatuses.TryAdd(fileName, ImageStatus.NoLabel);
@@ -220,6 +248,46 @@ private bool AddImageThreadSafe(string filePath)
             }
         }
 
+        /// <summary>
+        /// Fast path for repeated folder imports. Returns true for an unchanged file or
+        /// for a conflicting file name, so neither case opens an image decoder.
+        /// A file changed in place is allowed through and replaces its cached dimensions.
+        /// </summary>
+        private bool TrySkipExistingImage(string fileName, string filePath)
+        {
+            if (!imagePathMap.TryGetValue(fileName, out var existing))
+                return false;
+
+            if (!string.Equals(existing.Path, filePath, StringComparison.OrdinalIgnoreCase))
+            {
+                duplicateImageFiles.Enqueue($"{fileName} -> {filePath}");
+                return true;
+            }
+
+            return existing.MatchesFile(filePath);
+        }
+
+        private bool AddOrUpdateImage(string fileName, ImageInfo imageInfo)
+        {
+            while (true)
+            {
+                if (!imagePathMap.TryGetValue(fileName, out var existing))
+                    return imagePathMap.TryAdd(fileName, imageInfo);
+
+                if (!string.Equals(existing.Path, imageInfo.Path, StringComparison.OrdinalIgnoreCase))
+                {
+                    duplicateImageFiles.Enqueue($"{fileName} -> {imageInfo.Path}");
+                    return false;
+                }
+
+                if (imagePathMap.TryUpdate(fileName, imageInfo, existing))
+                {
+                    Cache.Remove(imageInfo.Path);
+                    return true;
+                }
+            }
+        }
+
         // Direct port of UpdateImageStatus
         public void UpdateImageStatus(string fileName)
         {
@@ -243,10 +311,43 @@ public void ClearAll()
         {
             imagePathMap.Clear();
             imageStatuses.Clear();
+            Cache.Clear();
             currentImagePath = "";
             while (duplicateImageFiles.TryDequeue(out _)) { }
         }
 
+        /// <summary>
+        /// Removes an image from the current project without deleting the source file.
+        /// </summary>
+        public bool RemoveImage(string fileName)
+        {
+            if (!imagePathMap.TryRemove(fileName, out var imageInfo))
+                return false;
+
+            imageStatuses.TryRemove(fileName, out _);
+            Cache.Remove(imageInfo.Path);
+
+            if (string.Equals(currentImagePath, fileName, StringComparison.OrdinalIgnoreCase))
+                currentImagePath = "";
+
+            return true;
+        }
+
+        /// <summary>
+        /// Replaces an image reference after a non-destructive image transformation.
+        /// </summary>
+        public bool ReplaceImage(string fileName, string newPath, Size newDimensions)
+        {
+            if (!imagePathMap.TryGetValue(fileName, out var previous))
+                return false;
+
+            var replacement = new ImageInfo(newPath, newDimensions);
+            imagePathMap[fileName] = replacement;
+            Cache.Remove(previous.Path);
+            Cache.Remove(newPath);
+            return true;
+        }
+
         public List<string> GetAllImagePaths()
         {
             return imagePathMap.Values.Select(img => img.Path).ToList();
@@ -257,11 +358,40 @@ public class ImageInfo
         {
             public string Path { get; set; }
             public Size OriginalDimensions { get; set; }
+            public long FileLength { get; set; }
+            public long LastWriteTimeUtcTicks { get; set; }
 
             public ImageInfo(string path, Size dimensions)
             {
                 Path = path;
                 OriginalDimensions = dimensions;
+
+                try
+                {
+                    var fileInfo = new FileInfo(path);
+                    FileLength = fileInfo.Length;
+                    LastWriteTimeUtcTicks = fileInfo.LastWriteTimeUtc.Ticks;
+                }
+                catch
+                {
+                    FileLength = -1;
+                    LastWriteTimeUtcTicks = -1;
+                }
+            }
+
+            public bool MatchesFile(string path)
+            {
+                try
+                {
+                    var fileInfo = new FileInfo(path);
+                    return FileLength >= 0 &&
+                           FileLength == fileInfo.Length &&
+                           LastWriteTimeUtcTicks == fileInfo.LastWriteTimeUtc.Ticks;
+                }
+                catch
+                {
+                    return false;
+                }
             }
         }
     }
diff --git a/YoableWPF/Managers/LabelManager.cs b/YoableWPF/Managers/LabelManager.cs
index 8fcf918..34f5642 100644
--- a/YoableWPF/Managers/LabelManager.cs
+++ b/YoableWPF/Managers/LabelManager.cs
@@ -17,6 +17,15 @@ public class LabelManager
         // Use thread-safe dictionary for concurrent label loading
         private ConcurrentDictionary<string, List<LabelData>> labelStorage = new();
         private ConcurrentDictionary<string, List<SuggestedLabel>> suggestionStorage = new();
+        private readonly ConcurrentDictionary<string, LabelImportCacheEntry> importedLabelCache =
+            new(StringComparer.OrdinalIgnoreCase);
+
+        private readonly record struct LabelFileStamp(long Length, long LastWriteTimeUtcTicks);
+        private sealed record LabelImportCacheEntry(
+            LabelFileStamp Stamp,
+            int ImageWidth,
+            int ImageHeight,
+            int[] ClassIds);
 
         public ConcurrentDictionary<string, List<LabelData>> LabelStorage => labelStorage;
         public ConcurrentDictionary<string, List<SuggestedLabel>> SuggestionStorage => suggestionStorage;
@@ -27,15 +36,58 @@ public class LabelManager
         // Track valid class IDs for orphan detection
         private HashSet<int> validClassIds = new HashSet<int> { 0 }; // Always include default class
         private int defaultClassId = 0;
+        // Until the project explicitly registers its classes, we must NOT treat any
+        // ClassId as orphaned. Otherwise labels drawn with classes 2..N get silently
+        // collapsed to the default class (0) before SetValidClassIds runs.
+        private bool validClassIdsInitialized = false;
         private static readonly CultureInfo CommaCulture = CultureInfo.GetCultureInfo("de-DE"); // Comma decimal separator
 
+        // YOLO coordinates are commonly rounded during export.  Treat sub-pixel
+        // differences as the same box so re-importing an exported dataset is idempotent.
+        private const double ImportedLabelCoordinateTolerance = 0.01;
+
+        private static bool IsSameImportedLabel(LabelData left, LabelData right)
+        {
+            return left.ClassId == right.ClassId &&
+                   Math.Abs(left.Rect.X - right.Rect.X) <= ImportedLabelCoordinateTolerance &&
+                   Math.Abs(left.Rect.Y - right.Rect.Y) <= ImportedLabelCoordinateTolerance &&
+                   Math.Abs(left.Rect.Width - right.Rect.Width) <= ImportedLabelCoordinateTolerance &&
+                   Math.Abs(left.Rect.Height - right.Rect.Height) <= ImportedLabelCoordinateTolerance;
+        }
+
+        private static List<LabelData> MergeImportedLabels(
+            IEnumerable<LabelData> existing,
+            IEnumerable<LabelData> imported,
+            out int addedCount)
+        {
+            var merged = new List<LabelData>();
+
+            // Also collapse duplicates left behind by older versions of the importer.
+            foreach (var label in existing)
+            {
+                if (!merged.Any(candidate => IsSameImportedLabel(candidate, label)))
+                    merged.Add(label);
+            }
+
+            int countBeforeImport = merged.Count;
+            foreach (var label in imported)
+            {
+                if (!merged.Any(candidate => IsSameImportedLabel(candidate, label)))
+                    merged.Add(label);
+            }
+
+            addedCount = merged.Count - countBeforeImport;
+            return merged;
+        }
+
         /// <summary>
         /// Sets the valid class IDs from the project. Call this when project classes change.
         /// </summary>
         public void SetValidClassIds(IEnumerable<int> classIds)
         {
             validClassIds = new HashSet<int>(classIds);
-            
+            validClassIdsInitialized = true;
+
             // Ensure we always have at least one valid class (default)
             if (validClassIds.Count == 0)
             {
@@ -51,6 +103,12 @@ public void SetValidClassIds(IEnumerable<int> classIds)
         /// </summary>
         private bool ValidateAndFixClassId(LabelData label)
         {
+            // Never reassign ClassIds until the project's class list has been registered.
+            // This prevents legitimately-drawn labels (classes 2..N) from being collapsed
+            // to the default class when the valid-id set is still stale.
+            if (!validClassIdsInitialized)
+                return false;
+
             if (!validClassIds.Contains(label.ClassId))
             {
                 label.ClassId = defaultClassId;
@@ -129,6 +187,7 @@ public void ClearAll()
         {
             labelStorage.Clear();
             suggestionStorage.Clear();
+            importedLabelCache.Clear();
         }
 
         public bool RemoveLabels(string fileName)
@@ -137,6 +196,20 @@ public bool RemoveLabels(string fileName)
             return labelStorage.TryRemove(fileName, out _);
         }
 
+        public void SaveSuggestions(string fileName, List<SuggestedLabel> suggestions)
+        {
+            if (suggestions.Count == 0)
+            {
+                suggestionStorage.TryRemove(fileName, out _);
+                return;
+            }
+
+            suggestionStorage.AddOrUpdate(
+                fileName,
+                suggestions,
+                (_, _) => suggestions);
+        }
+
         public List<SuggestedLabel> GetSuggestions(string fileName)
         {
             if (!suggestionStorage.TryGetValue(fileName, out var suggestions))
@@ -531,7 +604,39 @@ private int LoadYoloLabelsOptimized(string labelFile, ImageManager imageManager,
             if (imageInfo == null)
                 return 0; // No matching image found
 
+            string cacheKey;
+            LabelFileStamp fileStamp;
+            try
+            {
+                cacheKey = Path.GetFullPath(labelFile);
+                var fileInfo = new FileInfo(cacheKey);
+                fileStamp = new LabelFileStamp(fileInfo.Length, fileInfo.LastWriteTimeUtc.Ticks);
+            }
+            catch
+            {
+                return 0;
+            }
+
+            // Repeated imports of an unchanged label file should not pay the cost of
+            // opening and parsing every line again. Preserve its class-id result so the
+            // batch API behaves the same on a cache hit.
+            int cachedImageWidth = (int)imageInfo.OriginalDimensions.Width;
+            int cachedImageHeight = (int)imageInfo.OriginalDimensions.Height;
+            if (importedLabelCache.TryGetValue(cacheKey, out var cached) &&
+                cached.Stamp == fileStamp &&
+                cached.ImageWidth == cachedImageWidth &&
+                cached.ImageHeight == cachedImageHeight)
+            {
+                if (foundClassIds != null)
+                {
+                    foreach (var classId in cached.ClassIds)
+                        foundClassIds.TryAdd(classId, true);
+                }
+                return 0;
+            }
+
             int labelsAdded = 0;
+            var fileClassIds = new HashSet<int>();
 
             try
             {
@@ -581,9 +686,9 @@ private int LoadYoloLabelsOptimized(string labelFile, ImageManager imageManager,
                         }
                         
                         // Track found class ID (before validation)
-                        if (foundClassIds != null && originalClassId >= 0)
+                        if (originalClassId >= 0)
                         {
-                            foundClassIds.TryAdd(originalClassId, true);
+                            fileClassIds.Add(originalClassId);
                         }
                         
                         // During import, keep original class ID even if it doesn't exist yet
@@ -610,7 +715,6 @@ private int LoadYoloLabelsOptimized(string labelFile, ImageManager imageManager,
                             new Rect(x, y, width, height),
                             classId);
                         newLabels.Add(label);
-                        labelsAdded++;
                     }
                     catch (FormatException)
                     {
@@ -622,17 +726,25 @@ private int LoadYoloLabelsOptimized(string labelFile, ImageManager imageManager,
                 // Add all labels at once (thread-safe)
                 if (newLabels.Count > 0)
                 {
+                    int actuallyAdded = 0;
                     labelStorage.AddOrUpdate(
                         matchingImageFile,
-                        new List<LabelData>(newLabels),
+                        _ => MergeImportedLabels(Array.Empty<LabelData>(), newLabels, out actuallyAdded),
                         (k, existing) =>
                         {
-                            var merged = new List<LabelData>(existing.Count + newLabels.Count);
-                            merged.AddRange(existing);
-                            merged.AddRange(newLabels);
-                            return merged;
+                            return MergeImportedLabels(existing, newLabels, out actuallyAdded);
                         });
+                    labelsAdded = actuallyAdded;
                 }
+
+                foreach (var classId in fileClassIds)
+                    foundClassIds?.TryAdd(classId, true);
+
+                importedLabelCache[cacheKey] = new LabelImportCacheEntry(
+                    fileStamp,
+                    imgWidth,
+                    imgHeight,
+                    fileClassIds.ToArray());
             }
             catch (Exception ex)
             {
@@ -706,7 +818,6 @@ public int LoadYoloLabels(string labelFile, string imagePath, ImageManager image
                             var label = new LabelData($"Imported Label {labelCount}", new Rect(x, y, width, height), classId);
                             newLabels.Add(label);
 
-                            labelsAdded++;
                         }
                         catch (FormatException)
                         {
@@ -717,16 +828,15 @@ public int LoadYoloLabels(string labelFile, string imagePath, ImageManager image
 
                     if (newLabels.Count > 0)
                     {
+                        int actuallyAdded = 0;
                         labelStorage.AddOrUpdate(
                             fileName,
-                            new List<LabelData>(newLabels),
+                            _ => MergeImportedLabels(Array.Empty<LabelData>(), newLabels, out actuallyAdded),
                             (k, existing) =>
                             {
-                                var merged = new List<LabelData>(existing.Count + newLabels.Count);
-                                merged.AddRange(existing);
-                                merged.AddRange(newLabels);
-                                return merged;
+                                return MergeImportedLabels(existing, newLabels, out actuallyAdded);
                             });
+                        labelsAdded = actuallyAdded;
                     }
                 }
             }
@@ -908,5 +1018,21 @@ public void AddAILabels(string fileName, List<(Rectangle box, int classId)> dete
                 new List<LabelData>(existingLabels),
                 (k, existing) => new List<LabelData>(existingLabels));
         }
+
+        public void ReplaceAILabels(string fileName, List<(Rectangle box, int classId)> detectedBoxes)
+        {
+            var labelsToKeep = labelStorage.TryGetValue(fileName, out var labels)
+                ? labels
+                    .Where(label => !label.Name.StartsWith("AI", StringComparison.OrdinalIgnoreCase))
+                    .Select(label => new LabelData(label))
+                    .ToList()
+                : new List<LabelData>();
+
+            labelStorage.AddOrUpdate(
+                fileName,
+                labelsToKeep,
+                (key, existing) => labelsToKeep);
+            AddAILabels(fileName, detectedBoxes);
+        }
     }
 }
diff --git a/YoableWPF/Managers/LanguageManager.cs b/YoableWPF/Managers/LanguageManager.cs
index e093e35..89cb822 100644
--- a/YoableWPF/Managers/LanguageManager.cs
+++ b/YoableWPF/Managers/LanguageManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Windows;
 
@@ -30,16 +31,67 @@ private LanguageManager()
             // Load English as fallback
             _fallbackDictionary = LoadLanguageResource("en-US");
 
-            // Load saved language preference
+            // Load saved language preference; if none, auto-detect from the system UI language
             var savedLanguage = Properties.Settings.Default.Language;
             if (!string.IsNullOrEmpty(savedLanguage) && SupportedLanguages.Any(l => l.Code == savedLanguage))
             {
                 _currentLanguage = savedLanguage;
             }
+            else
+            {
+                _currentLanguage = DetectSystemLanguage();
+            }
 
             LoadLanguage(_currentLanguage);
         }
 
+        /// <summary>
+        /// Picks the best supported language for the current OS UI culture.
+        /// Chinese maps by script: Simplified (zh-Hans) -> zh-CN, Traditional (zh-Hant) -> zh-TW.
+        /// Falls back to English when the system language isn't supported.
+        /// </summary>
+        private static string DetectSystemLanguage()
+        {
+            try
+            {
+                var culture = CultureInfo.CurrentUICulture;
+
+                // Chinese: distinguish Simplified vs Traditional by script/region rather than exact code
+                if (culture.TwoLetterISOLanguageName.Equals("zh", StringComparison.OrdinalIgnoreCase))
+                {
+                    var name = culture.Name; // e.g. zh-CN, zh-TW, zh-HK, zh-Hans, zh-Hant-TW
+                    if (name.IndexOf("Hant", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                        name.IndexOf("TW", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                        name.IndexOf("HK", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                        name.IndexOf("MO", StringComparison.OrdinalIgnoreCase) >= 0)
+                    {
+                        return "zh-TW";
+                    }
+                    return "zh-CN";
+                }
+
+                // Exact match (e.g. ja-JP, ru-RU)
+                if (SupportedLanguages.Any(l => l.Code.Equals(culture.Name, StringComparison.OrdinalIgnoreCase)))
+                {
+                    return SupportedLanguages.First(l => l.Code.Equals(culture.Name, StringComparison.OrdinalIgnoreCase)).Code;
+                }
+
+                // Two-letter match (e.g. system "ja" -> ja-JP, "ru" -> ru-RU)
+                var byLanguage = SupportedLanguages.FirstOrDefault(l =>
+                    l.Code.StartsWith(culture.TwoLetterISOLanguageName + "-", StringComparison.OrdinalIgnoreCase));
+                if (byLanguage != null)
+                {
+                    return byLanguage.Code;
+                }
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"DetectSystemLanguage failed: {ex.Message}");
+            }
+
+            return "en-US";
+        }
+
         public List<LanguageInfo> GetAvailableLanguages() => SupportedLanguages.ToList();
 
         public string CurrentLanguage => _currentLanguage;
diff --git a/YoableWPF/Managers/OverlayManager.cs b/YoableWPF/Managers/OverlayManager.cs
index cdc62d2..e1b1a29 100644
--- a/YoableWPF/Managers/OverlayManager.cs
+++ b/YoableWPF/Managers/OverlayManager.cs
@@ -27,11 +27,6 @@ private void InitializeOverlayUI()
                 Visibility = Visibility.Collapsed
             };
 
-            // Set the overlay to span all columns and rows
-            Grid.SetColumnSpan(overlayGrid, 3); // Span all three columns
-            Grid.SetRowSpan(overlayGrid, 3);    // Span all three rows
-            Grid.SetZIndex(overlayGrid, 1000);  // Ensure overlay appears above other controls
-
             // Center content within overlay
             overlayGrid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
             overlayGrid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
@@ -77,8 +72,17 @@ private void InitializeOverlayUI()
             overlayGrid.Children.Add(overlayProgressBar);
             overlayGrid.Children.Add(cancelButton);
 
-            if (mainWindow.Content is Grid mainGrid)
+            // Prefer the dedicated OverlayHost element defined in the window's XAML;
+            // fall back to injecting into the root Grid for windows without one.
+            if (mainWindow.FindName("OverlayHost") is Panel host)
+            {
+                host.Children.Add(overlayGrid);
+            }
+            else if (mainWindow.Content is Grid mainGrid)
             {
+                Grid.SetColumnSpan(overlayGrid, Math.Max(1, mainGrid.ColumnDefinitions.Count));
+                Grid.SetRowSpan(overlayGrid, Math.Max(1, mainGrid.RowDefinitions.Count));
+                Grid.SetZIndex(overlayGrid, 1000);
                 mainGrid.Children.Add(overlayGrid);
             }
             else
diff --git a/YoableWPF/Managers/ProjectManager.cs b/YoableWPF/Managers/ProjectManager.cs
index 48e6115..02be71a 100644
--- a/YoableWPF/Managers/ProjectManager.cs
+++ b/YoableWPF/Managers/ProjectManager.cs
@@ -239,7 +239,8 @@ public bool CloseProject(bool checkForUnsavedChanges = true)
                 switch (result)
                 {
                     case MessageBoxResult.Yes:
-                        ExportProjectData();
+                        // SaveProjectSync exports internally; a separate un-guarded export
+                        // here would race a concurrently running debounced save.
                         if (!SaveProjectSync())
                             return false;
                         break;
@@ -289,8 +290,10 @@ public async Task<bool> SaveProjectAsync(IProgress<(int current, int total, stri
             {
                 progress?.Report((0, 100, "Preparing project data..."));
 
-                // Export current state from main window - async to prevent UI lag
-                await ExportProjectDataAsync();
+                // Export current state from main window - async to prevent UI lag.
+                // ConfigureAwait(false) throughout so SaveProjectSync can block the UI
+                // thread without deadlocking on continuations.
+                await ExportProjectDataAsync().ConfigureAwait(false);
 
                 progress?.Report((30, 100, "Saving project file..."));
 
@@ -301,14 +304,14 @@ public async Task<bool> SaveProjectAsync(IProgress<(int current, int total, stri
                 string json = JsonSerializer.Serialize(CurrentProject, jsonOptions);
 
                 // Create backup before saving
-                await CreateBackupAsync();
+                await CreateBackupAsync().ConfigureAwait(false);
 
                 progress?.Report((60, 100, "Writing project file..."));
 
                 // Write to temp file then replace for atomic save
                 string tempPath = Path.Combine(CurrentProject.ProjectFolder,
                     Path.GetFileName(CurrentProject.ProjectPath) + ".tmp");
-                await File.WriteAllTextAsync(tempPath, json);
+                await File.WriteAllTextAsync(tempPath, json).ConfigureAwait(false);
                 File.Move(tempPath, CurrentProject.ProjectPath, true);
 
                 progress?.Report((100, 100, "Project saved successfully"));
@@ -322,14 +325,16 @@ public async Task<bool> SaveProjectAsync(IProgress<(int current, int total, stri
             catch (Exception ex)
             {
                 Debug.WriteLine($"Error saving project: {ex.Message}");
-                await mainWindow.Dispatcher.InvokeAsync(() =>
+                // Fire-and-forget: awaiting InvokeAsync would deadlock when the UI thread
+                // is blocked inside SaveProjectSync.
+                mainWindow.Dispatcher.BeginInvoke(new Action(() =>
                 {
                     CustomMessageBox.Show(
                         string.Format(LanguageManager.Instance.GetString("Msg_FailedToSaveProject") ?? "Failed to save project:\n\n{0}", ex.Message),
                         LanguageManager.Instance.GetString("Msg_SaveError") ?? "Save Error",
                         MessageBoxButton.OK,
                         MessageBoxImage.Error);
-                });
+                }));
                 return false;
             }
             finally
@@ -339,48 +344,80 @@ await mainWindow.Dispatcher.InvokeAsync(() =>
         }
 
         /// <summary>
-        /// Synchronous save for backward compatibility
+        /// Synchronous save for backward compatibility. Safe to call from the UI thread:
+        /// waits for any in-flight debounced/auto save (pumping the dispatcher so that
+        /// save can finish its UI-thread capture), then saves synchronously.
         /// </summary>
         public bool SaveProjectSync()
         {
+            bool onUiThread = mainWindow?.Dispatcher.CheckAccess() == true;
+            var deadline = DateTime.UtcNow.AddSeconds(10);
+
+            while (Volatile.Read(ref isSaving) == 1 && DateTime.UtcNow < deadline)
+            {
+                if (onUiThread)
+                    PumpDispatcher();
+                Thread.Sleep(25);
+            }
+
             return SaveProjectAsync().GetAwaiter().GetResult();
         }
 
+        /// <summary>
+        /// Processes pending dispatcher work so a background save waiting on the UI thread
+        /// (for its snapshot capture) can proceed while we wait for it.
+        /// </summary>
+        private static void PumpDispatcher()
+        {
+            var frame = new System.Windows.Threading.DispatcherFrame();
+            System.Windows.Threading.Dispatcher.CurrentDispatcher.BeginInvoke(
+                System.Windows.Threading.DispatcherPriority.Background,
+                new Action(() => frame.Continue = false));
+            System.Windows.Threading.Dispatcher.PushFrame(frame);
+        }
+
         /// <summary>
         /// Saves the project to a new location
         /// </summary>
-        public bool SaveProjectAs(string newPath)
+        public async Task<bool> SaveProjectAsAsync(string newPath)
         {
             if (CurrentProject == null)
                 return false;
 
+            string oldProjectName = CurrentProject.ProjectName;
+            string oldProjectPath = CurrentProject.ProjectPath;
+            string oldProjectFolder = CurrentProject.ProjectFolder;
+            DateTime oldLastModified = CurrentProject.LastModified;
+
             try
             {
                 // Update project info
                 string newFolder = Path.GetDirectoryName(newPath);
                 string newName = Path.GetFileNameWithoutExtension(newPath);
 
-                // Create new project folder structure
                 string newProjectFolder = Path.Combine(newFolder, newName);
-                Directory.CreateDirectory(newProjectFolder);
-
                 string newLabelsFolder = Path.Combine(newProjectFolder, LABELS_FOLDER);
-                Directory.CreateDirectory(newLabelsFolder);
-
                 string newBackupFolder = Path.Combine(newProjectFolder, BACKUP_FOLDER);
-                Directory.CreateDirectory(newBackupFolder);
+                string oldLabelsFolder = Path.Combine(oldProjectFolder, LABELS_FOLDER);
 
-                // Copy all label files to new location
-                string oldLabelsFolder = Path.Combine(CurrentProject.ProjectFolder, LABELS_FOLDER);
-                if (Directory.Exists(oldLabelsFolder))
+                // Folder creation and label copying can be slow for large
+                // projects, so keep that work off the UI thread.
+                await Task.Run(() =>
                 {
-                    foreach (string file in Directory.GetFiles(oldLabelsFolder))
+                    Directory.CreateDirectory(newProjectFolder);
+                    Directory.CreateDirectory(newLabelsFolder);
+                    Directory.CreateDirectory(newBackupFolder);
+
+                    if (Directory.Exists(oldLabelsFolder))
                     {
-                        string fileName = Path.GetFileName(file);
-                        string destFile = Path.Combine(newLabelsFolder, fileName);
-                        File.Copy(file, destFile, true);
+                        foreach (string file in Directory.GetFiles(oldLabelsFolder))
+                        {
+                            string fileName = Path.GetFileName(file);
+                            string destFile = Path.Combine(newLabelsFolder, fileName);
+                            File.Copy(file, destFile, true);
+                        }
                     }
-                }
+                });
 
                 // Update project paths
                 CurrentProject.ProjectName = newName;
@@ -398,16 +435,27 @@ public bool SaveProjectAs(string newPath)
                 CurrentProject.AppCreatedLabels = updatedAppLabels;
 
                 // Save to new location
-                if (SaveProjectSync())
+                if (await SaveProjectAsync())
                 {
                     AddToRecentProjects(CurrentProject.ProjectPath);
                     return true;
                 }
 
+                // A failed save must not leave the live project pointing at a
+                // destination where no project file was created.
+                CurrentProject.ProjectName = oldProjectName;
+                CurrentProject.ProjectPath = oldProjectPath;
+                CurrentProject.ProjectFolder = oldProjectFolder;
+                CurrentProject.LastModified = oldLastModified;
                 return false;
             }
             catch (Exception ex)
             {
+                CurrentProject.ProjectName = oldProjectName;
+                CurrentProject.ProjectPath = oldProjectPath;
+                CurrentProject.ProjectFolder = oldProjectFolder;
+                CurrentProject.LastModified = oldLastModified;
+
                 CustomMessageBox.Show(
                     string.Format(LanguageManager.Instance.GetString("Msg_FailedToSaveProjectAs") ?? "Failed to save project as:\n\n{0}", ex.Message),
                     LanguageManager.Instance.GetString("Msg_SaveAsError") ?? "Save As Error",
@@ -515,12 +563,12 @@ private async Task CreateBackupAsync()
                 // Copy current project file to backup
                 if (File.Exists(CurrentProject.ProjectPath))
                 {
-                    await Task.Run(() => File.Copy(CurrentProject.ProjectPath, backupPath, true));
+                    await Task.Run(() => File.Copy(CurrentProject.ProjectPath, backupPath, true)).ConfigureAwait(false);
                     Debug.WriteLine($"Backup created: {backupPath}");
                 }
 
                 // Clean up old backups
-                await CleanupOldBackupsAsync(backupFolder);
+                await CleanupOldBackupsAsync(backupFolder).ConfigureAwait(false);
             }
             catch (Exception ex)
             {
@@ -571,74 +619,73 @@ await Task.Run(() =>
         /// <summary>
         /// Exports project data asynchronously - only blocks UI thread for minimal UI access
         /// </summary>
-        private void ExportProjectDataCore(int? selectedIndex, string sortMode)
+        /// <summary>
+        /// Immutable copy of everything the export needs, captured on the UI thread so the
+        /// background export/serialization never enumerates live collections the UI can mutate
+        /// (which throws "Collection was modified; enumeration operation may not execute").
+        /// </summary>
+        private sealed class ExportSnapshot
         {
-            // Clear existing data
-            CurrentProject.Images.Clear();
-            CurrentProject.ImageStatuses.Clear();
-            CurrentProject.AppCreatedLabels.Clear();
-            CurrentProject.ImportedLabelPaths.Clear();
-            CurrentProject.SuggestedLabels ??= new Dictionary<string, List<SuggestedLabel>>();
-            CurrentProject.SuggestedLabels.Clear();
-            CurrentProject.LoadedModelPaths ??= new List<string>();
-            CurrentProject.ModelClassMappings ??= new Dictionary<string, Dictionary<int, int>>();
-            CurrentProject.LoadedModelPaths.Clear();
-            CurrentProject.ModelClassMappings.Clear();
-
-            // Export images
-            foreach (var kvp in mainWindow.imageManager.ImagePathMap)
+            public List<ImageReference> Images = new();
+            public Dictionary<string, ImageStatus> Statuses = new();
+            public List<(string FileName, Size Dimensions, List<LabelData> Labels)> LabelExports = new();
+            public Dictionary<string, List<SuggestedLabel>> Suggestions = new();
+            public List<LabelClass> Classes = new();
+            public List<(string ModelPath, Dictionary<int, List<int>> Mapping, int Role)> Models = new();
+            public int? SelectedIndex;
+            public string SortMode;
+        }
+
+        /// <summary>
+        /// Builds the export snapshot. Must be called on the UI thread — it is the only thread
+        /// that mutates these collections, so copying here is race-free.
+        /// </summary>
+        private ExportSnapshot CaptureExportSnapshot()
+        {
+            var snap = new ExportSnapshot
             {
-                string fileName = kvp.Key;
-                string fullPath = kvp.Value.Path;
+                SelectedIndex = mainWindow.ImageListBox.SelectedIndex >= 0
+                    ? mainWindow.ImageListBox.SelectedIndex
+                    : (int?)null,
+                SortMode = mainWindow.GetCurrentSortModeString()
+            };
 
-                CurrentProject.Images.Add(new ImageReference
+            foreach (var kvp in mainWindow.imageManager.ImagePathMap)
+            {
+                // Store dimensions so project load can skip decoding every image header
+                snap.Images.Add(new ImageReference
                 {
-                    FileName = fileName,
-                    FullPath = fullPath
+                    FileName = kvp.Key,
+                    FullPath = kvp.Value.Path,
+                    Width = kvp.Value.OriginalDimensions.Width,
+                    Height = kvp.Value.OriginalDimensions.Height
                 });
             }
 
-            // Export image statuses
             foreach (var kvp in mainWindow.imageManager.ImageStatuses)
             {
-                CurrentProject.ImageStatuses[kvp.Key] = kvp.Value;
+                snap.Statuses[kvp.Key] = kvp.Value;
             }
 
-            // Export labels to project's labels folder
-            string labelsFolder = Path.Combine(CurrentProject.ProjectFolder, LABELS_FOLDER);
-            if (!Directory.Exists(labelsFolder))
-                Directory.CreateDirectory(labelsFolder);
-
             foreach (var kvp in mainWindow.labelManager.LabelStorage)
             {
-                string fileName = kvp.Key;
-                var labels = kvp.Value;
-
-                if (labels.Count == 0)
+                if (kvp.Value.Count == 0)
                     continue;
 
-                // Get the corresponding image to export labels
-                if (mainWindow.imageManager.ImagePathMap.TryGetValue(fileName, out var imageInfo))
+                if (mainWindow.imageManager.ImagePathMap.TryGetValue(kvp.Key, out var imageInfo))
                 {
-                    string labelFileName = Path.GetFileNameWithoutExtension(fileName) + ".txt";
-                    string labelPath = Path.Combine(labelsFolder, labelFileName);
-
-                    // Export labels using LabelManager
-                    mainWindow.labelManager.ExportLabelsToYolo(labelPath, imageInfo.OriginalDimensions, labels);
-
-                    // Store relative path in project
-                    string relativePath = Path.Combine(LABELS_FOLDER, labelFileName);
-                    CurrentProject.AppCreatedLabels[fileName] = relativePath;
+                    // Deep-copy: label rects can be mutated mid-drag on the UI thread
+                    snap.LabelExports.Add((kvp.Key, imageInfo.OriginalDimensions,
+                        kvp.Value.Select(l => new LabelData(l)).ToList()));
                 }
             }
 
-            // Export suggested labels (in-project only)
             foreach (var kvp in mainWindow.labelManager.SuggestionStorage)
             {
                 if (kvp.Value.Count == 0)
                     continue;
 
-                CurrentProject.SuggestedLabels[kvp.Key] = kvp.Value
+                snap.Suggestions[kvp.Key] = kvp.Value
                     .Select(s => new SuggestedLabel
                     {
                         Id = s.Id,
@@ -655,33 +702,82 @@ private void ExportProjectDataCore(int? selectedIndex, string sortMode)
                     .ToList();
             }
 
-            // Export model paths and class mappings
+            if (mainWindow.ProjectClasses != null)
+                snap.Classes = new List<LabelClass>(mainWindow.ProjectClasses);
+
             if (mainWindow.yoloAI != null)
             {
-                CurrentProject.LoadedModelPaths = new List<string>();
                 foreach (var model in mainWindow.yoloAI.GetLoadedModels())
                 {
-                    CurrentProject.LoadedModelPaths.Add(model.ModelPath);
-
-                    if (model.ClassMapping != null && model.ClassMapping.Count > 0)
-                    {
-                        CurrentProject.ModelClassMappings[model.ModelPath] = new Dictionary<int, int>(model.ClassMapping);
-                    }
+                    snap.Models.Add((
+                        model.ModelPath,
+                        model.ClassMapping != null ? YoloAI.CloneClassMapping(model.ClassMapping) : null,
+                        (int)model.Role));
                 }
             }
 
+            return snap;
+        }
+
+        private void ExportProjectDataCore(ExportSnapshot snap)
+        {
+            // Replace project collections with the snapshot copies. Assigning fresh
+            // collections (instead of mutating shared ones) also means a concurrent
+            // reader can never observe a half-cleared list.
+            CurrentProject.Images = snap.Images;
+            CurrentProject.ImageStatuses = snap.Statuses;
+            CurrentProject.AppCreatedLabels.Clear();
+            CurrentProject.ImportedLabelPaths.Clear();
+            CurrentProject.SuggestedLabels = snap.Suggestions;
+            // Replacing the live shared reference from MainWindow.projectClasses with a copy
+            // prevents "Collection was modified" during JSON serialization when the user
+            // edits classes while a debounced save is running.
+            CurrentProject.Classes = snap.Classes;
+            CurrentProject.LoadedModelPaths = new List<string>();
+            // The legacy map is never written back; clearing it drops it from the saved project.
+            CurrentProject.ModelClassMappings = new Dictionary<string, Dictionary<int, int>>();
+            CurrentProject.ModelClassMappingSets = new Dictionary<string, Dictionary<int, List<int>>>();
+            CurrentProject.ModelRoles = new Dictionary<string, int>();
+
+            // Export labels to project's labels folder (file I/O stays on the background thread)
+            string labelsFolder = Path.Combine(CurrentProject.ProjectFolder, LABELS_FOLDER);
+            if (!Directory.Exists(labelsFolder))
+                Directory.CreateDirectory(labelsFolder);
+
+            foreach (var (fileName, dimensions, labels) in snap.LabelExports)
+            {
+                string labelFileName = Path.GetFileNameWithoutExtension(fileName) + ".txt";
+                string labelPath = Path.Combine(labelsFolder, labelFileName);
+
+                mainWindow.labelManager.ExportLabelsToYolo(labelPath, dimensions, labels);
+
+                string relativePath = Path.Combine(LABELS_FOLDER, labelFileName);
+                CurrentProject.AppCreatedLabels[fileName] = relativePath;
+            }
+
+            // Export model paths and class mappings
+            foreach (var (modelPath, mapping, role) in snap.Models)
+            {
+                CurrentProject.LoadedModelPaths.Add(modelPath);
+
+                if (mapping != null)
+                    CurrentProject.ModelClassMappingSets[modelPath] = mapping;
+
+                CurrentProject.ModelRoles[modelPath] = role;
+            }
+
             // Save UI state (captured earlier)
-            if (selectedIndex.HasValue && selectedIndex.Value >= 0)
+            if (snap.SelectedIndex.HasValue)
             {
-                CurrentProject.LastSelectedImageIndex = selectedIndex.Value;
+                CurrentProject.LastSelectedImageIndex = snap.SelectedIndex.Value;
             }
 
-            if (!string.IsNullOrWhiteSpace(sortMode))
+            if (!string.IsNullOrWhiteSpace(snap.SortMode))
             {
-                CurrentProject.CurrentSortMode = sortMode;
+                CurrentProject.CurrentSortMode = snap.SortMode;
             }
 
-            Debug.WriteLine($"Export complete: {CurrentProject.Images.Count} images, {CurrentProject.AppCreatedLabels.Count} label files, {CurrentProject.LoadedModelPaths.Count} models, {CurrentProject.ModelClassMappings.Count} model mappings");
+            Debug.WriteLine($"Export complete: {CurrentProject.Images.Count} images, {CurrentProject.AppCreatedLabels.Count} label files, {CurrentProject.LoadedModelPaths.Count} models");
         }
 
         private async Task ExportProjectDataAsync()
@@ -689,33 +785,31 @@ private async Task ExportProjectDataAsync()
             if (CurrentProject == null || mainWindow == null)
                 return;
 
-            // Quickly capture UI state on UI thread
-            int selectedIndex = -1;
-            string sortMode = "ByName";
-
-            await mainWindow.Dispatcher.InvokeAsync(() =>
+            // Capture on the UI thread; avoid the dispatcher round-trip when already there
+            // (SaveProjectSync blocks the UI thread, so InvokeAsync would deadlock).
+            ExportSnapshot snap = null;
+            if (mainWindow.Dispatcher.CheckAccess())
             {
-                selectedIndex = mainWindow.ImageListBox.SelectedIndex;
-                sortMode = mainWindow.SortComboBox?.SelectedIndex == 1 ? "ByStatus" : "ByName";
-            });
+                snap = CaptureExportSnapshot();
+            }
+            else
+            {
+                await mainWindow.Dispatcher.InvokeAsync(() => snap = CaptureExportSnapshot());
+            }
 
-            // Do all heavy processing on background thread
-            await Task.Run(() => ExportProjectDataCore(selectedIndex, sortMode));
+            // Do the file I/O on a background thread
+            await Task.Run(() => ExportProjectDataCore(snap)).ConfigureAwait(false);
         }
 
         /// <summary>
-        /// Synchronous version for backward compatibility (used in CloseProject)
+        /// Synchronous version for backward compatibility. Must be called on the UI thread.
         /// </summary>
         public void ExportProjectData()
         {
             if (CurrentProject == null || mainWindow == null)
                 return;
-            int selectedIndex = mainWindow.ImageListBox.SelectedIndex;
-            string sortMode = mainWindow.SortComboBox != null && mainWindow.SortComboBox.SelectedIndex == 1
-                ? "ByStatus"
-                : "ByName";
 
-            ExportProjectDataCore(selectedIndex >= 0 ? selectedIndex : null, sortMode);
+            ExportProjectDataCore(CaptureExportSnapshot());
         }
 
         /// <summary>
@@ -753,13 +847,18 @@ await mainWindow.Dispatcher.InvokeAsync(() =>
                 // Set batch size for image processing (separate from UI batching)
                 mainWindow.imageManager.BatchSize = processingBatchSize;
 
-                // Build list of image paths and log missing files
-                var imagePaths = new List<string>(CurrentProject.Images.Count);
+                // Split image references: those with stored dimensions skip the expensive
+                // per-file header decode; legacy entries (0x0) fall back to decoding.
+                var knownSizeRefs = new List<Models.ImageReference>(CurrentProject.Images.Count);
+                var unknownSizePaths = new List<string>();
                 foreach (var imageRef in CurrentProject.Images)
                 {
                     if (File.Exists(imageRef.FullPath))
                     {
-                        imagePaths.Add(imageRef.FullPath);
+                        if (imageRef.Width > 0 && imageRef.Height > 0)
+                            knownSizeRefs.Add(imageRef);
+                        else
+                            unknownSizePaths.Add(imageRef.FullPath);
                     }
                     else
                     {
@@ -767,19 +866,38 @@ await mainWindow.Dispatcher.InvokeAsync(() =>
                     }
                 }
 
-                if (imagePaths.Count > 0)
+                if (knownSizeRefs.Count > 0 || unknownSizePaths.Count > 0)
                 {
-                    var imageProgress = new Progress<(int current, int total, string message)>(report =>
+                    if (knownSizeRefs.Count > 0)
                     {
-                        int overallProgress = 10 + (int)((report.current / (double)report.total) * 30);
-                        progress?.Report((overallProgress, 100, report.message));
-                    });
+                        await Task.Run(() =>
+                        {
+                            foreach (var imageRef in knownSizeRefs)
+                            {
+                                cancellationToken.ThrowIfCancellationRequested();
+                                mainWindow.imageManager.AddImageWithKnownSize(imageRef.FullPath, imageRef.GetSize());
+                            }
+                        }, cancellationToken);
 
-                    await mainWindow.imageManager.LoadImagesFromPathsAsync(
-                        imagePaths,
-                        imageProgress,
-                        cancellationToken,
-                        enableParallel);
+                        progress?.Report((unknownSizePaths.Count > 0 ? 20 : 40, 100,
+                            $"Loaded {knownSizeRefs.Count} images from project cache"));
+                    }
+
+                    if (unknownSizePaths.Count > 0)
+                    {
+                        var imageProgress = new Progress<(int current, int total, string message)>(report =>
+                        {
+                            int overallProgress = 10 + (int)((report.current / (double)report.total) * 30);
+                            progress?.Report((overallProgress, 100, report.message));
+                        });
+
+                        await mainWindow.imageManager.LoadImagesFromPathsAsync(
+                            unknownSizePaths,
+                            imageProgress,
+                            cancellationToken,
+                            enableParallel,
+                            clearExisting: knownSizeRefs.Count == 0);
+                    }
 
                     // Warn about duplicate file names that were skipped
                     var duplicates = mainWindow.imageManager.ConsumeDuplicateImageFiles();
@@ -893,6 +1011,9 @@ await mainWindow.Dispatcher.InvokeAsync(() =>
 
                 progress?.Report((95, 100, "Restoring models..."));
 
+                // Projects saved before multi-target mappings store them in the legacy field.
+                CurrentProject.MigrateLegacyModelClassMappings();
+
                 // Restore loaded models
                 if (CurrentProject.LoadedModelPaths != null && CurrentProject.LoadedModelPaths.Count > 0 && mainWindow.yoloAI != null)
                 {
@@ -909,10 +1030,16 @@ await mainWindow.Dispatcher.InvokeAsync(() =>
                                     if (loadedModel != null)
                                     {
                                         // Restore saved mapping if available
-                                        if (CurrentProject.ModelClassMappings != null && 
-                                            CurrentProject.ModelClassMappings.TryGetValue(modelPath, out var savedMapping))
+                                        if (CurrentProject.ModelClassMappingSets != null &&
+                                            CurrentProject.ModelClassMappingSets.TryGetValue(modelPath, out var savedMapping))
+                                        {
+                                            loadedModel.ClassMapping = YoloAI.CloneClassMapping(savedMapping);
+                                        }
+
+                                        if (CurrentProject.ModelRoles != null &&
+                                            CurrentProject.ModelRoles.TryGetValue(modelPath, out int savedRole))
                                         {
-                                            loadedModel.ClassMapping = new Dictionary<int, int>(savedMapping);
+                                            loadedModel.Role = (ModelRole)savedRole;
                                         }
                                     }
                                 }
@@ -1326,7 +1453,8 @@ await Task.Run(() =>
                         }
                         else
                         {
-                            if (savedStatus == ImageStatus.Verified)
+                            if (savedStatus == ImageStatus.Verified ||
+                                mainWindow.IsAtOrBeforeManualProgress(fileName))
                             {
                                 correctedStatus = ImageStatus.Verified;
                             }
diff --git a/YoableWPF/Managers/RoiCropManager.cs b/YoableWPF/Managers/RoiCropManager.cs
new file mode 100644
index 0000000..0e736f5
--- /dev/null
+++ b/YoableWPF/Managers/RoiCropManager.cs
@@ -0,0 +1,279 @@
+using System.Collections.Concurrent;
+using System.IO;
+using System.Windows;
+using System.Windows.Media.Imaging;
+
+namespace YoableWPF.Managers
+{
+    public enum RoiCropScope
+    {
+        AllImages,
+        CurrentImage
+    }
+
+    public sealed record RoiCropSourceItem(
+        string FileName,
+        string SourcePath,
+        List<LabelData> Labels,
+        List<SuggestedLabel> Suggestions);
+
+    public sealed record RoiCropProcessedItem(
+        string FileName,
+        string OutputPath,
+        Size OutputSize,
+        List<LabelData> Labels,
+        List<SuggestedLabel> Suggestions,
+        int RemovedLabelCount,
+        int ClippedLabelCount);
+
+    public sealed class RoiCropBatchResult
+    {
+        public List<RoiCropProcessedItem> ProcessedItems { get; } = new();
+        public int SkippedImageCount { get; set; }
+        public int RemovedLabelCount => ProcessedItems.Sum(item => item.RemovedLabelCount);
+        public int ClippedLabelCount => ProcessedItems.Sum(item => item.ClippedLabelCount);
+    }
+
+public sealed class RoiCropManager
+{
+    private const int MaxParallelWorkers = 8;
+
+    public async Task<RoiCropBatchResult> CropBatchAsync(
+        IReadOnlyCollection<RoiCropSourceItem> images,
+        string outputDirectory,
+        int cropWidth,
+            int cropHeight,
+        IProgress<(int current, int total, string fileName)>? progress = null,
+        CancellationToken cancellationToken = default)
+    {
+        Directory.CreateDirectory(outputDirectory);
+
+        var processedItems = new ConcurrentBag<RoiCropProcessedItem>();
+        int skippedImageCount = 0;
+        int completedImageCount = 0;
+        int workerCount = Math.Clamp(Environment.ProcessorCount / 2, 2, MaxParallelWorkers);
+        var parallelOptions = new ParallelOptions
+        {
+            CancellationToken = cancellationToken,
+            MaxDegreeOfParallelism = workerCount
+        };
+
+        await Parallel.ForEachAsync(images, parallelOptions, (image, token) =>
+        {
+            token.ThrowIfCancellationRequested();
+
+            var processed = CropImage(image, outputDirectory, cropWidth, cropHeight);
+            if (processed == null)
+            {
+                Interlocked.Increment(ref skippedImageCount);
+            }
+            else
+            {
+                processedItems.Add(processed);
+            }
+
+            int completed = Interlocked.Increment(ref completedImageCount);
+            progress?.Report((completed, images.Count, image.FileName));
+
+            return ValueTask.CompletedTask;
+        });
+
+        var result = new RoiCropBatchResult
+        {
+            SkippedImageCount = skippedImageCount
+        };
+        result.ProcessedItems.AddRange(
+            processedItems.OrderBy(item => item.FileName, StringComparer.OrdinalIgnoreCase));
+
+        return result;
+    }
+
+        private static RoiCropProcessedItem? CropImage(
+            RoiCropSourceItem image,
+            string outputDirectory,
+            int cropWidth,
+            int cropHeight)
+        {
+            try
+            {
+                BitmapFrame frame;
+                using (var input = new FileStream(
+                           image.SourcePath,
+                           FileMode.Open,
+                           FileAccess.Read,
+                           FileShare.Read,
+                           1024 * 128,
+                           FileOptions.SequentialScan))
+                {
+                    var decoder = BitmapDecoder.Create(
+                        input,
+                        BitmapCreateOptions.PreservePixelFormat,
+                        BitmapCacheOption.OnLoad);
+                    frame = decoder.Frames[0];
+                }
+
+                if (frame.PixelWidth < cropWidth || frame.PixelHeight < cropHeight)
+                    return null;
+
+                int cropX = (frame.PixelWidth - cropWidth) / 2;
+                int cropY = (frame.PixelHeight - cropHeight) / 2;
+                string outputPath = Path.Combine(outputDirectory, image.FileName);
+                bool alreadyTargetSize = frame.PixelWidth == cropWidth &&
+                                         frame.PixelHeight == cropHeight;
+                bool alreadyInOutputDirectory = string.Equals(
+                    Path.GetFullPath(image.SourcePath),
+                    Path.GetFullPath(outputPath),
+                    StringComparison.OrdinalIgnoreCase);
+
+                if (!alreadyTargetSize || !alreadyInOutputDirectory)
+                {
+                    string tempPath = outputPath + "." + Guid.NewGuid().ToString("N") + ".tmp";
+                    try
+                    {
+                        if (alreadyTargetSize)
+                        {
+                            File.Copy(image.SourcePath, tempPath);
+                        }
+                        else
+                        {
+                            var croppedBitmap = new CroppedBitmap(
+                                frame,
+                                new Int32Rect(cropX, cropY, cropWidth, cropHeight));
+                            croppedBitmap.Freeze();
+
+                            using var output = new FileStream(
+                                tempPath,
+                                FileMode.CreateNew,
+                                FileAccess.Write,
+                                FileShare.None);
+                            BitmapEncoder encoder = CreateEncoder(Path.GetExtension(image.FileName));
+                            encoder.Frames.Add(BitmapFrame.Create(croppedBitmap));
+                            encoder.Save(output);
+                        }
+
+                        File.Move(tempPath, outputPath, overwrite: true);
+                    }
+                    finally
+                    {
+                        if (File.Exists(tempPath))
+                            File.Delete(tempPath);
+                    }
+                }
+
+                var roi = new Rect(cropX, cropY, cropWidth, cropHeight);
+                var labels = TransformLabels(image.Labels, roi, out int removed, out int clipped);
+                var suggestions = TransformSuggestions(image.Suggestions, roi);
+
+                return new RoiCropProcessedItem(
+                    image.FileName,
+                    outputPath,
+                    new Size(cropWidth, cropHeight),
+                    labels,
+                    suggestions,
+                    removed,
+                    clipped);
+            }
+            catch (Exception ex) when (
+                ex is IOException or
+                UnauthorizedAccessException or
+                NotSupportedException or
+                FileFormatException)
+            {
+                System.Diagnostics.Debug.WriteLine($"ROI crop skipped {image.SourcePath}: {ex.Message}");
+                return null;
+            }
+        }
+
+        private static BitmapEncoder CreateEncoder(string extension)
+        {
+            if (extension.Equals(".png", StringComparison.OrdinalIgnoreCase))
+                return new PngBitmapEncoder();
+
+            return new JpegBitmapEncoder { QualityLevel = 95 };
+        }
+
+        private static List<LabelData> TransformLabels(
+            IEnumerable<LabelData> labels,
+            Rect roi,
+            out int removedCount,
+            out int clippedCount)
+        {
+            var transformed = new List<LabelData>();
+            removedCount = 0;
+            clippedCount = 0;
+
+            foreach (var label in labels)
+            {
+                if (!TryTransformRect(label.Rect, roi, out var transformedRect, out bool clipped))
+                {
+                    removedCount++;
+                    continue;
+                }
+
+                if (clipped)
+                    clippedCount++;
+
+                transformed.Add(new LabelData(label.Name, transformedRect, label.ClassId));
+            }
+
+            return transformed;
+        }
+
+        private static List<SuggestedLabel> TransformSuggestions(
+            IEnumerable<SuggestedLabel> suggestions,
+            Rect roi)
+        {
+            var transformed = new List<SuggestedLabel>();
+            foreach (var suggestion in suggestions)
+            {
+                if (!TryTransformRect(suggestion.ToRect(), roi, out var rect, out _))
+                    continue;
+
+                transformed.Add(new SuggestedLabel
+                {
+                    Id = suggestion.Id,
+                    X = rect.X,
+                    Y = rect.Y,
+                    Width = rect.Width,
+                    Height = rect.Height,
+                    ClassId = suggestion.ClassId,
+                    Score = suggestion.Score,
+                    Source = suggestion.Source,
+                    SourceImage = suggestion.SourceImage,
+                    SourceLabelId = suggestion.SourceLabelId
+                });
+            }
+            return transformed;
+        }
+
+        private static bool TryTransformRect(
+            Rect source,
+            Rect roi,
+            out Rect transformed,
+            out bool clipped)
+        {
+            double left = Math.Max(source.Left, roi.Left);
+            double top = Math.Max(source.Top, roi.Top);
+            double right = Math.Min(source.Right, roi.Right);
+            double bottom = Math.Min(source.Bottom, roi.Bottom);
+
+            if (right <= left || bottom <= top)
+            {
+                transformed = Rect.Empty;
+                clipped = false;
+                return false;
+            }
+
+            clipped = left > source.Left ||
+                      top > source.Top ||
+                      right < source.Right ||
+                      bottom < source.Bottom;
+            transformed = new Rect(
+                left - roi.Left,
+                top - roi.Top,
+                right - left,
+                bottom - top);
+            return true;
+        }
+    }
+}
diff --git a/YoableWPF/Managers/UIStateManager.cs b/YoableWPF/Managers/UIStateManager.cs
index 8e956bf..80631f0 100644
--- a/YoableWPF/Managers/UIStateManager.cs
+++ b/YoableWPF/Managers/UIStateManager.cs
@@ -18,27 +18,26 @@ public class UIStateManager
         private readonly Brush verifiedDefaultForeground;
         private readonly Brush suggestedDefaultForeground;
 
-        private static SolidColorBrush CreateFrozenBrush(byte a, byte r, byte g, byte b)
-        {
-            var brush = new SolidColorBrush(Color.FromArgb(a, r, g, b));
-            brush.Freeze();
-            return brush;
-        }
-
-        private static readonly SolidColorBrush NeedsReviewBrush = CreateFrozenBrush(0xFF, 0xFF, 0xB7, 0x4D);
-        private static readonly SolidColorBrush UnverifiedBrush = CreateFrozenBrush(0xFF, 0xE5, 0x73, 0x73);
-        private static readonly SolidColorBrush VerifiedBrush = CreateFrozenBrush(0xFF, 0x81, 0xC7, 0x84);
-        private static readonly SolidColorBrush SuggestedBrush = CreateFrozenBrush(0xFF, 0x64, 0xB5, 0xF6);
-
-        private static readonly SolidColorBrush OrangeInactive = CreateFrozenBrush(0x44, 0xFF, 0xB7, 0x4D);
-        private static readonly SolidColorBrush OrangeActive = CreateFrozenBrush(0xFF, 0xFF, 0xB7, 0x4D);
-        private static readonly SolidColorBrush RedInactive = CreateFrozenBrush(0x44, 0xE5, 0x73, 0x73);
-        private static readonly SolidColorBrush RedActive = CreateFrozenBrush(0xFF, 0xE5, 0x73, 0x73);
-        private static readonly SolidColorBrush GreenInactive = CreateFrozenBrush(0x44, 0x81, 0xC7, 0x84);
-        private static readonly SolidColorBrush GreenActive = CreateFrozenBrush(0xFF, 0x81, 0xC7, 0x84);
-        private static readonly SolidColorBrush BlueInactive = CreateFrozenBrush(0x44, 0x64, 0xB5, 0xF6);
-        private static readonly SolidColorBrush BlueActive = CreateFrozenBrush(0xFF, 0x64, 0xB5, 0xF6);
-        private static readonly SolidColorBrush DefaultLabelBrush = CreateFrozenBrush(0xFF, 0xE5, 0x73, 0x73);
+        // Semantic status brushes sourced from the shared palette (Themes/Palette.xaml).
+        // Palette brushes are frozen and theme-invariant, so a one-time lookup is safe.
+        private static SolidColorBrush Pal(string key) => (SolidColorBrush)Application.Current.FindResource(key);
+
+        private static readonly SolidColorBrush NeedsReviewBrush = Pal("StatusReviewBrush");
+        private static readonly SolidColorBrush UnverifiedBrush = Pal("StatusNoLabelBrush");
+        private static readonly SolidColorBrush VerifiedBrush = Pal("StatusVerifiedBrush");
+        private static readonly SolidColorBrush SuggestedBrush = Pal("StatusSuggestedBrush");
+
+        private static readonly SolidColorBrush OrangeInactive = Pal("StatusReviewSubtleBrush");
+        private static readonly SolidColorBrush OrangeActive = Pal("StatusReviewBrush");
+        private static readonly SolidColorBrush RedInactive = Pal("StatusNoLabelSubtleBrush");
+        private static readonly SolidColorBrush RedActive = Pal("StatusNoLabelBrush");
+        private static readonly SolidColorBrush GreenInactive = Pal("StatusVerifiedSubtleBrush");
+        private static readonly SolidColorBrush GreenActive = Pal("StatusVerifiedBrush");
+        private static readonly SolidColorBrush BlueInactive = Pal("StatusSuggestedSubtleBrush");
+        private static readonly SolidColorBrush BlueActive = Pal("StatusSuggestedBrush");
+        private static readonly SolidColorBrush PurpleInactive = Pal("StatusAiSubtleBrush");
+        private static readonly SolidColorBrush PurpleActive = Pal("StatusAiBrush");
+        private static readonly SolidColorBrush DefaultLabelBrush = Pal("StatusNoLabelBrush");
 
         public UIStateManager(MainWindow mainWindow)
         {
@@ -126,6 +125,37 @@ public void UpdateStatusCounts()
             mainWindow.VerifiedCount.Foreground = verified > 0
                 ? VerifiedBrush
                 : verifiedDefaultForeground;
+
+            UpdateFilterChipCounts();
+        }
+
+        /// <summary>
+        /// Updates the small counters on the status filter chips. Counts the unfiltered
+        /// master list so an active filter never zeroes the other chips' counts.
+        /// </summary>
+        public void UpdateFilterChipCounts()
+        {
+            var source = (allImages != null && allImages.Count > 0)
+                ? allImages
+                : mainWindow.ImageListBox.Items.Cast<ImageListItem>().ToList();
+
+            int total = source.Count, review = 0, suggested = 0, noLabel = 0, verified = 0;
+            foreach (var item in source)
+            {
+                switch (item.Status)
+                {
+                    case ImageStatus.VerificationNeeded: review++; break;
+                    case ImageStatus.Suggested: suggested++; break;
+                    case ImageStatus.NoLabel: noLabel++; break;
+                    case ImageStatus.Verified: verified++; break;
+                }
+            }
+
+            mainWindow.FilterAllCountText.Text = total.ToString();
+            mainWindow.FilterReviewCountText.Text = review.ToString();
+            mainWindow.FilterSuggestedCountText.Text = suggested.ToString();
+            mainWindow.FilterNoLabelCountText.Text = noLabel.ToString();
+            mainWindow.FilterVerifiedCountText.Text = verified.ToString();
         }
 
         // Updated RefreshLabelList with class color indicators
@@ -215,6 +245,51 @@ public void SortImagesByName()
             mainWindow.ImageListBox.SelectionChanged += mainWindow.ImageListBox_SelectionChanged;
         }
 
+        public void SortImagesByDate(bool newestFirst)
+        {
+            // Get source list - use allImages if populated (filter-aware), otherwise use current items
+            var sourceItems = (allImages != null && allImages.Count > 0)
+                ? allImages
+                : mainWindow.ImageListBox.Items.Cast<ImageListItem>().ToList();
+            var selectedItem = mainWindow.ImageListBox.SelectedItem as ImageListItem;
+
+            long Ticks(ImageListItem x) =>
+                mainWindow.imageManager.ImagePathMap.TryGetValue(x.FileName, out var info)
+                    ? info.LastWriteTimeUtcTicks
+                    : long.MinValue;
+
+            var sorted = (newestFirst
+                ? sourceItems.OrderByDescending(Ticks)
+                : sourceItems.OrderBy(Ticks)).ThenBy(x => x.FileName).ToList();
+
+            // Update allImages to maintain sort order for filters
+            allImages = new List<ImageListItem>(sorted);
+
+            // Update ListBox while preserving selection
+            mainWindow.ImageListBox.SelectionChanged -= mainWindow.ImageListBox_SelectionChanged;
+            mainWindow.ImageListBox.Items.Clear();
+            foreach (var item in sorted)
+            {
+                mainWindow.ImageListBox.Items.Add(item);
+            }
+
+            // Restore selection
+            if (selectedItem != null)
+            {
+                for (int i = 0; i < mainWindow.ImageListBox.Items.Count; i++)
+                {
+                    if (mainWindow.ImageListBox.Items[i] is ImageListItem item &&
+                        item.FileName == selectedItem.FileName)
+                    {
+                        mainWindow.ImageListBox.SelectedIndex = i;
+                        mainWindow.ImageListBox.ScrollIntoView(mainWindow.ImageListBox.SelectedItem);
+                        break;
+                    }
+                }
+            }
+            mainWindow.ImageListBox.SelectionChanged += mainWindow.ImageListBox_SelectionChanged;
+        }
+
         public void SortImagesByStatus()
         {
             // Get source list - use allImages if populated (filter-aware), otherwise use current items
@@ -320,6 +395,52 @@ public void FilterImagesByStatus(ImageStatus? status)
             UpdateStatusCounts();
         }
 
+        public void FilterImagesWithAiLabels()
+        {
+            if (allImages == null || allImages.Count == 0)
+            {
+                allImages = mainWindow.ImageListBox.Items
+                    .Cast<ImageListItem>()
+                    .ToList();
+            }
+
+            var selectedItem = mainWindow.ImageListBox.SelectedItem as ImageListItem;
+            mainWindow.ImageListBox.SelectionChanged -= mainWindow.ImageListBox_SelectionChanged;
+            mainWindow.ImageListBox.Items.Clear();
+
+            foreach (var item in allImages)
+            {
+                if (mainWindow.labelManager.LabelStorage.TryGetValue(item.FileName, out var labels) &&
+                    labels.Any(label => label.Name.StartsWith(
+                        "AI Label",
+                        StringComparison.OrdinalIgnoreCase)))
+                {
+                    mainWindow.ImageListBox.Items.Add(item);
+                }
+            }
+
+            if (selectedItem != null)
+            {
+                for (int index = 0; index < mainWindow.ImageListBox.Items.Count; index++)
+                {
+                    if (mainWindow.ImageListBox.Items[index] is ImageListItem item &&
+                        string.Equals(item.FileName, selectedItem.FileName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        mainWindow.ImageListBox.SelectedIndex = index;
+                        mainWindow.ImageListBox.ScrollIntoView(item);
+                        break;
+                    }
+                }
+            }
+            else if (mainWindow.ImageListBox.Items.Count > 0)
+            {
+                mainWindow.ImageListBox.SelectedIndex = 0;
+            }
+
+            mainWindow.ImageListBox.SelectionChanged += mainWindow.ImageListBox_SelectionChanged;
+            UpdateStatusCounts();
+        }
+
         public void RefreshAllImagesList()
         {
             // Refresh the complete list of images (call this when images are added/removed)
@@ -330,11 +451,20 @@ public void RefreshAllImagesList()
             }
         }
 
+        public void RemoveImage(string fileName)
+        {
+            allImages.RemoveAll(item => string.Equals(
+                item.FileName,
+                fileName,
+                StringComparison.OrdinalIgnoreCase));
+            imageListItemCache.Remove(fileName);
+        }
+
         /// <summary>
         /// Filters images by selected class IDs. Shows images that contain at least one label with a selected class.
         /// </summary>
         /// <param name="selectedClassIds">Set of class IDs to filter by. If null, shows all images.</param>
-        public void FilterImagesByClasses(HashSet<int> selectedClassIds)
+        public void FilterImagesByClasses(HashSet<int> selectedClassIds, ClassFilterMode mode = ClassFilterMode.Include)
         {
             // Store all images if not already stored
             if (allImages == null || allImages.Count == 0)
@@ -361,23 +491,30 @@ public void FilterImagesByClasses(HashSet<int> selectedClassIds)
             }
             else
             {
-                // Filter images that contain at least one label with a selected class
+                // Filter images by the selected classes according to the chosen mode.
+                //   Include: image has at least one label whose class is selected (OR).
+                //   All:     image contains every selected class at least once (AND).
+                //   Only:    every label in the image is one of the selected classes.
+                //   Exclude: image contains none of the selected classes.
+                // Images with no labels are never shown when a class filter is active.
                 foreach (var item in allImages)
                 {
-                    // Check if this image has labels with any of the selected classes
-                    if (mainWindow.labelManager.LabelStorage.TryGetValue(item.FileName, out var labels))
+                    if (mainWindow.labelManager.LabelStorage.TryGetValue(item.FileName, out var labels) &&
+                        labels.Count > 0)
                     {
-                        bool hasSelectedClass = labels.Any(label => selectedClassIds.Contains(label.ClassId));
-                        if (hasSelectedClass)
+                        bool matches = mode switch
+                        {
+                            ClassFilterMode.Only => labels.All(label => selectedClassIds.Contains(label.ClassId)),
+                            ClassFilterMode.All => selectedClassIds.All(classId => labels.Any(label => label.ClassId == classId)),
+                            ClassFilterMode.Exclude => !labels.Any(label => selectedClassIds.Contains(label.ClassId)),
+                            _ => labels.Any(label => selectedClassIds.Contains(label.ClassId)),
+                        };
+
+                        if (matches)
                         {
                             mainWindow.ImageListBox.Items.Add(item);
                         }
                     }
-                    else
-                    {
-                        // If image has no labels, don't show it when filtering by class
-                        // (unless we want to show images with no labels, but that doesn't make sense for class filtering)
-                    }
                 }
             }
 
@@ -410,6 +547,7 @@ public void UpdateFilterButtonStyles(
             Button suggestedButton,
             Button noLabelButton,
             Button verifiedButton,
+            Button aiLabelsButton,
             Button activeButton = null)
         {
             // Define colors once
@@ -444,6 +582,9 @@ public void UpdateFilterButtonStyles(
 
             verifiedButton.Background = activeButton == verifiedButton ? GreenActive : GreenInactive;
             verifiedButton.Foreground = activeButton == verifiedButton ? white : greenFore;
+
+            aiLabelsButton.Background = activeButton == aiLabelsButton ? PurpleActive : PurpleInactive;
+            aiLabelsButton.Foreground = activeButton == aiLabelsButton ? white : PurpleActive;
         }
     }
 }
diff --git a/YoableWPF/Managers/YoloAi.cs b/YoableWPF/Managers/YoloAi.cs
index 04bf984..c7921a3 100644
--- a/YoableWPF/Managers/YoloAi.cs
+++ b/YoableWPF/Managers/YoloAi.cs
@@ -24,6 +24,9 @@ public class YoloDetection
         public int ClassId { get; set; }
         public float Score => Confidence * ClassConfidence;
         public int ModelIndex { get; set; } = -1;
+        // Project classes this detection is allowed to be reported as, from the model's mapping.
+        // Null when the model has no mapping configured.
+        public List<int> AllowedClassIds { get; set; }
 
         public Rectangle ToRectangle()
         {
@@ -76,8 +79,26 @@ public enum YoloFormat
 
     public enum EnsembleDetectionMode
     {
-        Voting,      // Voting mode (requires consensus from multiple models)
-        Union        // Union mode (mark if any model detects it)
+        Voting,       // Voting mode (requires consensus from multiple models)
+        Union,        // Union mode (mark if any model detects it)
+        ClassTransfer // Detector models own the boxes; classifier models only vote on the class
+    }
+
+    /// <summary>
+    /// What a model contributes in <see cref="EnsembleDetectionMode.ClassTransfer"/>.
+    /// Ignored by the other ensemble modes.
+    /// </summary>
+    public enum ModelRole
+    {
+        Detector,   // Supplies the boxes; its coordinates are used verbatim
+        Classifier  // Boxes are discarded; detections only vote on the class of a detector box
+    }
+
+    public enum ExecutionProviderReloadResult
+    {
+        Success,
+        FallbackToCpu,
+        Failed
     }
 
     public class YoloModelInfo
@@ -97,9 +118,15 @@ public class YoloModel
         public YoloModelInfo ModelInfo { get; set; }
         public List<string> OutputNames { get; set; }
         public string Name { get; set; }
-        // Class mapping: Model Class ID -> Project Class ID
-        // null = not configured, empty = all classes set to "nan", non-empty = configured with mappings
-        public Dictionary<int, int> ClassMapping { get; set; } = null;
+        public bool UsesDirectMl { get; set; }
+        public int DirectMlDeviceId { get; set; } = -1;
+        // Class mapping: Model Class ID -> allowed Project Class IDs.
+        // null = not configured (model class IDs are used as-is). Once configured, a model class
+        // that is absent from the dictionary is never detected. A class may map to several project
+        // classes, which declares the set a detection is allowed to be classified as.
+        public Dictionary<int, List<int>> ClassMapping { get; set; } = null;
+        // Only consulted in ClassTransfer mode.
+        public ModelRole Role { get; set; } = ModelRole.Detector;
     }
 
     public class YoloAI
@@ -108,9 +135,38 @@ public class YoloAI
         private const int DEFAULT_MODEL_INPUT_SIZE = 640;
         private const int DEFAULT_DETECTION_COUNT = 8400;
         private const int SEGMENTATION_THRESHOLD = 84; // 4 box coords + typical class count threshold
+        private const int MaxDirectMlAdaptersToProbe = 16;
 
         private List<YoloModel> loadedModels = new List<YoloModel>();
-        public int TotalDetections { get; private set; } = 0;
+        // DirectML permits only one thread to call Run at a time, including across loaded models.
+        private readonly object directMlInferenceLock = new object();
+        private int totalDetections;
+        public int TotalDetections => Volatile.Read(ref totalDetections);
+        public bool UsesDirectMl => loadedModels.Any(model => model.UsesDirectMl);
+        public bool AllModelsUseDirectMl =>
+            loadedModels.Count > 0 && loadedModels.All(model => model.UsesDirectMl);
+
+        public string GetExecutionProviderSummary()
+        {
+            if (loadedModels.Count == 0)
+                return "CPU";
+
+            int directMlModels = loadedModels.Count(model => model.UsesDirectMl);
+            if (directMlModels == 0)
+                return "CPU";
+            if (directMlModels == loadedModels.Count)
+            {
+                string deviceIds = string.Join(
+                    ", ",
+                    loadedModels
+                        .Select(model => model.DirectMlDeviceId)
+                        .Distinct()
+                        .OrderBy(deviceId => deviceId));
+                return $"DirectML GPU (device {deviceIds})";
+            }
+
+            return "DirectML GPU + CPU";
+        }
 
         // Legacy single model support
         public InferenceSession yoloSession => loadedModels.FirstOrDefault()?.Session;
@@ -320,6 +376,166 @@ private float ComputeIoUYolo(YoloDetection a, YoloDetection b)
             return union == 0 ? 0 : intersection / union;
         }
 
+        /// <summary>
+        /// Fraction of the smaller box that lies inside the larger one. Unlike IoU this stays high
+        /// for a small box fully nested in a large box, which is how a box-wraps-box duplicate is
+        /// detected (IoU is low there because the union is dominated by the large box).
+        /// </summary>
+        private float ComputeContainmentYolo(YoloDetection a, YoloDetection b)
+        {
+            float x1_a = a.CenterX - a.Width / 2;
+            float y1_a = a.CenterY - a.Height / 2;
+            float x2_a = a.CenterX + a.Width / 2;
+            float y2_a = a.CenterY + a.Height / 2;
+
+            float x1_b = b.CenterX - b.Width / 2;
+            float y1_b = b.CenterY - b.Height / 2;
+            float x2_b = b.CenterX + b.Width / 2;
+            float y2_b = b.CenterY + b.Height / 2;
+
+            float intersection =
+                Math.Max(0, Math.Min(x2_a, x2_b) - Math.Max(x1_a, x1_b)) *
+                Math.Max(0, Math.Min(y2_a, y2_b) - Math.Max(y1_a, y1_b));
+
+            float areaA = a.Width * a.Height;
+            float areaB = b.Width * b.Height;
+            float smallerArea = Math.Min(areaA, areaB);
+
+            return smallerArea <= 0 ? 0 : intersection / smallerArea;
+        }
+
+        /// <summary>
+        /// Removes box-wraps-box duplicates that IoU-based NMS leaves behind: when one detection
+        /// sits almost entirely inside another and the two are of comparable size, the lower-scoring
+        /// one is dropped. A size-ratio guard preserves the legitimate case of a small part box (a
+        /// head) nested in a much larger box (a body), which differ in area by far more than the
+        /// guard allows.
+        /// </summary>
+        private List<YoloDetection> ApplyContainmentSuppression(List<YoloDetection> detections)
+        {
+            const float ContainmentThreshold = 0.80f; // 80% of the smaller box inside the larger
+            const float SizeRatioGuard = 0.55f;        // only treat comparably sized boxes as dupes
+
+            if (detections.Count < 2) return detections;
+
+            var ordered = detections.OrderByDescending(d => d.Score).ToList();
+            var kept = new List<YoloDetection>();
+
+            foreach (YoloDetection candidate in ordered)
+            {
+                bool isDuplicate = false;
+                float candidateArea = candidate.Width * candidate.Height;
+
+                foreach (YoloDetection keptDetection in kept)
+                {
+                    float keptArea = keptDetection.Width * keptDetection.Height;
+                    float sizeRatio = Math.Min(candidateArea, keptArea) /
+                                      Math.Max(candidateArea, keptArea);
+
+                    // Very different sizes (head-in-body) are a valid nesting, not a duplicate.
+                    if (sizeRatio < SizeRatioGuard)
+                        continue;
+
+                    if (ComputeContainmentYolo(candidate, keptDetection) >= ContainmentThreshold)
+                    {
+                        isDuplicate = true;
+                        break;
+                    }
+                }
+
+                if (!isDuplicate)
+                    kept.Add(candidate);
+            }
+
+            return kept;
+        }
+
+        /// <summary>
+        /// Forces each body box's team to agree with the head box sitting inside it. When they
+        /// disagree the higher-scoring detection wins: a confident head reclassifies the body, and
+        /// a confident body reclassifies the head. This fixes the common case where the head team
+        /// is read reliably but the body team flips between frames.
+        /// </summary>
+        /// <param name="teamPairs">Body/head class pairs that share a team.</param>
+        private List<YoloDetection> ApplyTeamConsistency(
+            List<YoloDetection> detections,
+            IReadOnlyList<(int BodyClassId, int HeadClassId)> teamPairs)
+        {
+            const float HeadInBodyContainment = 0.6f; // how much of the head must sit in the body
+
+            if (detections.Count == 0 || teamPairs == null || teamPairs.Count == 0)
+                return detections;
+
+            // Look up a class's team, and the body/head class for a given team. Team index is the
+            // pair's position; a class appearing in several pairs keeps its first team.
+            var teamOfClass = new Dictionary<int, int>();
+            var bodyClassOfTeam = new Dictionary<int, int>();
+            var headClassOfTeam = new Dictionary<int, int>();
+            var headClasses = new HashSet<int>();
+            var bodyClasses = new HashSet<int>();
+
+            for (int team = 0; team < teamPairs.Count; team++)
+            {
+                (int bodyClassId, int headClassId) = teamPairs[team];
+                if (bodyClassId < 0 || headClassId < 0)
+                    continue;
+
+                bodyClassOfTeam[team] = bodyClassId;
+                headClassOfTeam[team] = headClassId;
+                bodyClasses.Add(bodyClassId);
+                headClasses.Add(headClassId);
+                teamOfClass.TryAdd(bodyClassId, team);
+                teamOfClass.TryAdd(headClassId, team);
+            }
+
+            var bodyBoxes = detections.Where(d => bodyClasses.Contains(d.ClassId)).ToList();
+            var headBoxes = detections.Where(d => headClasses.Contains(d.ClassId)).ToList();
+
+            foreach (YoloDetection head in headBoxes)
+            {
+                // Pair the head with the body that best encloses it.
+                YoloDetection bestBody = null;
+                float bestContainment = HeadInBodyContainment;
+
+                foreach (YoloDetection body in bodyBoxes)
+                {
+                    if (body.Width * body.Height <= head.Width * head.Height)
+                        continue; // A body must be larger than the head it contains.
+
+                    float containment = ComputeContainmentYolo(head, body);
+                    if (containment >= bestContainment)
+                    {
+                        bestContainment = containment;
+                        bestBody = body;
+                    }
+                }
+
+                if (bestBody == null)
+                    continue;
+
+                if (!teamOfClass.TryGetValue(head.ClassId, out int headTeam) ||
+                    !teamOfClass.TryGetValue(bestBody.ClassId, out int bodyTeam) ||
+                    headTeam == bodyTeam)
+                {
+                    continue; // Already consistent or not part of a configured team.
+                }
+
+                // Higher score decides the shared team.
+                if (head.Score >= bestBody.Score)
+                {
+                    if (bodyClassOfTeam.TryGetValue(headTeam, out int correctedBodyClass))
+                        bestBody.ClassId = correctedBodyClass;
+                }
+                else
+                {
+                    if (headClassOfTeam.TryGetValue(bodyTeam, out int correctedHeadClass))
+                        head.ClassId = correctedHeadClass;
+                }
+            }
+
+            return detections;
+        }
+
         private List<Detection> ApplyImprovedNMS(List<Detection> detections, float iouThreshold = 0.5f)
         {
             if (detections.Count == 0) return new List<Detection>();
@@ -415,14 +631,28 @@ private float GetDistance(Point p1, Point p2)
             return (float)Math.Sqrt(Math.Pow(p2.X - p1.X, 2) + Math.Pow(p2.Y - p1.Y, 2));
         }
 
-        private List<YoloDetection> ApplyEnsembleConsensus(List<YoloDetection> allDetections)
+        private static float GetConfidenceThresholdForClass(
+            int classId,
+            IReadOnlyDictionary<int, float>? classConfidenceThresholds)
+        {
+            if (classConfidenceThresholds != null &&
+                classConfidenceThresholds.TryGetValue(classId, out float threshold))
+            {
+                return Math.Clamp(threshold, 0f, 1f);
+            }
+
+            return Properties.Settings.Default.AIConfidence;
+        }
+
+        private List<YoloDetection> ApplyEnsembleConsensus(
+            List<YoloDetection> allDetections,
+            IReadOnlyDictionary<int, float>? classConfidenceThresholds = null)
         {
             if (allDetections.Count == 0) return new List<YoloDetection>();
 
             float consensusIoUThreshold = Properties.Settings.Default.ConsensusIoUThreshold;
             int minimumConsensus = Properties.Settings.Default.MinimumConsensus;
             bool useWeightedAverage = Properties.Settings.Default.UseWeightedAverage;
-            float confidenceThreshold = Properties.Settings.Default.AIConfidence;
 
             var clusters = new List<List<YoloDetection>>();
             var processed = new bool[allDetections.Count];
@@ -472,6 +702,9 @@ private List<YoloDetection> ApplyEnsembleConsensus(List<YoloDetection> allDetect
             foreach (var cluster in clusters)
             {
                 var modelIndices = cluster.Select(d => d.ModelIndex).Distinct().ToList();
+                float confidenceThreshold = GetConfidenceThresholdForClass(
+                    cluster[0].ClassId,
+                    classConfidenceThresholds);
 
                 if (modelIndices.Count >= effectiveMinConsensus ||
                     (cluster[0].Score > confidenceThreshold + 0.2f) ||
@@ -502,17 +735,20 @@ private List<YoloDetection> ApplyEnsembleConsensus(List<YoloDetection> allDetect
             return ApplyNMSYolo(consensusDetections, ensembleIoUThreshold);
         }
 
-        private List<YoloDetection> ApplyEnsembleUnion(List<YoloDetection> allDetections)
+        private List<YoloDetection> ApplyEnsembleUnion(
+            List<YoloDetection> allDetections,
+            IReadOnlyDictionary<int, float>? classConfidenceThresholds = null)
         {
             if (allDetections.Count == 0) return new List<YoloDetection>();
             
             float mergeIoUThreshold = Properties.Settings.Default.EnsembleIoUThreshold;
             bool useWeightedAverage = Properties.Settings.Default.UseWeightedAverage;
-            float confidenceThreshold = Properties.Settings.Default.AIConfidence;
 
             // Filter low confidence detections
             var validDetections = allDetections
-                .Where(d => d.Score >= confidenceThreshold)
+                .Where(d => d.Score >= GetConfidenceThresholdForClass(
+                    d.ClassId,
+                    classConfidenceThresholds))
                 .OrderByDescending(d => d.Score)
                 .ToList();
 
@@ -558,6 +794,114 @@ private List<YoloDetection> ApplyEnsembleUnion(List<YoloDetection> allDetections
             return ApplyNMSYolo(mergedDetections, mergeIoUThreshold);
         }
 
+        private ModelRole GetModelRole(int modelIndex)
+        {
+            if (modelIndex < 0 || modelIndex >= loadedModels.Count)
+                return ModelRole.Detector;
+
+            return loadedModels[modelIndex].Role;
+        }
+
+        /// <summary>
+        /// Keeps the boxes produced by detector models verbatim and lets classifier models decide
+        /// only what class each box is, by score-weighted vote among the detections that overlap it.
+        /// This is for ensembles where one model localises well but lacks the classes you need,
+        /// while others know the classes but localise poorly.
+        /// </summary>
+        private List<YoloDetection> ApplyClassTransfer(
+            List<YoloDetection> allDetections,
+            IReadOnlyDictionary<int, float>? classConfidenceThresholds)
+        {
+            if (allDetections.Count == 0) return new List<YoloDetection>();
+
+            var detectorBoxes = allDetections
+                .Where(detection => GetModelRole(detection.ModelIndex) == ModelRole.Detector)
+                .ToList();
+
+            // Without a detector there are no boxes to keep, so rather than returning nothing fall
+            // back to Union, which is the closest behaviour that still produces labels.
+            if (detectorBoxes.Count == 0)
+            {
+                Debug.WriteLine("ClassTransfer: no detector-role model produced boxes; using Union.");
+                return ApplyEnsembleUnion(allDetections, classConfidenceThresholds);
+            }
+
+            float voteIoUThreshold = Properties.Settings.Default.ClassTransferIoUThreshold;
+            bool keepUnvotedBoxes = Properties.Settings.Default.ClassTransferKeepUnvoted;
+
+            var classifierVotes = allDetections
+                .Where(detection => GetModelRole(detection.ModelIndex) == ModelRole.Classifier)
+                .ToList();
+
+            detectorBoxes = detectorBoxes
+                .Where(detection => detection.Score >= GetConfidenceThresholdForClass(
+                    detection.ClassId,
+                    classConfidenceThresholds))
+                .ToList();
+
+            // Detector models may overlap each other, so collapse duplicates before voting.
+            detectorBoxes = ApplyNMSYolo(
+                detectorBoxes,
+                Properties.Settings.Default.EnsembleIoUThreshold);
+
+            var results = new List<YoloDetection>();
+
+            foreach (YoloDetection box in detectorBoxes)
+            {
+                List<int> allowedClassIds = box.AllowedClassIds;
+                var voteWeights = new Dictionary<int, float>();
+
+                foreach (YoloDetection vote in classifierVotes)
+                {
+                    // A box only accepts votes for classes its mapping permits, which is what
+                    // stops a head box from being classified as a body class.
+                    if (allowedClassIds != null &&
+                        allowedClassIds.Count > 0 &&
+                        !allowedClassIds.Contains(vote.ClassId))
+                    {
+                        continue;
+                    }
+
+                    if (vote.Score < GetConfidenceThresholdForClass(
+                        vote.ClassId,
+                        classConfidenceThresholds))
+                    {
+                        continue;
+                    }
+
+                    if (ComputeIoUYolo(box, vote) < voteIoUThreshold)
+                        continue;
+
+                    voteWeights.TryGetValue(vote.ClassId, out float weight);
+                    voteWeights[vote.ClassId] = weight + vote.Score;
+                }
+
+                if (voteWeights.Count > 0)
+                {
+                    box.ClassId = voteWeights
+                        .OrderByDescending(pair => pair.Value)
+                        .First()
+                        .Key;
+                }
+                else
+                {
+                    if (!keepUnvotedBoxes)
+                        continue;
+
+                    // No classifier recognised this box. Keeping it costs one class correction,
+                    // whereas dropping it costs redrawing the box by hand.
+                    box.ClassId = allowedClassIds != null && allowedClassIds.Count > 0
+                        ? allowedClassIds[0]
+                        : box.ClassId;
+                }
+
+                box.ModelIndex = -1;
+                results.Add(box);
+            }
+
+            return results;
+        }
+
         private YoloDetection MergeYoloDetections(List<YoloDetection> detections, bool useWeightedAverage)
         {
             if (detections.Count == 0) return null;
@@ -606,11 +950,53 @@ private YoloDetection MergeYoloDetections(List<YoloDetection> detections, bool u
             }
         }
 
-        private List<YoloDetection> PostProcessYoloOutputDynamic(Tensor<float> outputTensor, YoloModel model, int imgWidth, int imgHeight)
+        /// <summary>
+        /// Resolves a model class ID to the project class a detection should be reported as.
+        /// Returns false when the model's mapping excludes that class entirely.
+        /// </summary>
+        /// <remarks>
+        /// A model class may map to several project classes (for example a "body" class that is
+        /// allowed to be either team). The first allowed class becomes the reported class, which
+        /// matches the previous behaviour for single-target mappings; ClassTransfer mode later
+        /// replaces it using <paramref name="allowedClassIds"/>.
+        /// </remarks>
+        private static bool TryMapModelClass(
+            YoloModel model,
+            int modelClassId,
+            out int projectClassId,
+            out List<int> allowedClassIds)
+        {
+            // An unconfigured mapping means model class IDs double as project class IDs.
+            if (model.ClassMapping == null)
+            {
+                projectClassId = modelClassId;
+                allowedClassIds = null;
+                return true;
+            }
+
+            if (!model.ClassMapping.TryGetValue(modelClassId, out List<int> allowedClasses) ||
+                allowedClasses == null ||
+                allowedClasses.Count == 0)
+            {
+                projectClassId = -1;
+                allowedClassIds = null;
+                return false;
+            }
+
+            projectClassId = allowedClasses[0];
+            allowedClassIds = allowedClasses;
+            return true;
+        }
+
+        private List<YoloDetection> PostProcessYoloOutputDynamic(
+            Tensor<float> outputTensor,
+            YoloModel model,
+            int imgWidth,
+            int imgHeight,
+            IReadOnlyDictionary<int, float>? classConfidenceThresholds = null)
         {
             var modelInfo = model.ModelInfo;
             List<YoloDetection> detections = new();
-            float confidenceThreshold = Properties.Settings.Default.AIConfidence;
 
             float scaleX = (float)imgWidth / modelInfo.ModelInputSize;
             float scaleY = (float)imgHeight / modelInfo.ModelInputSize;
@@ -622,7 +1008,6 @@ private List<YoloDetection> PostProcessYoloOutputDynamic(Tensor<float> outputTen
                 for (int i = 0; i < modelInfo.NumDetections; i++)
                 {
                     float objectness = outputTensor[0, i, 4];
-                    if (objectness < confidenceThreshold) continue;
 
                     float maxClassConf = 0;
                     int modelClassId = 0;
@@ -636,18 +1021,16 @@ private List<YoloDetection> PostProcessYoloOutputDynamic(Tensor<float> outputTen
                         }
                     }
 
-                    // Apply class mapping: Model Class ID -> Project Class ID
-                    // Skip detection if class is not mapped (user selected "nan")
-                    // Only skip if ClassMapping has been configured (not null and not empty)
-                    if (model.ClassMapping != null && model.ClassMapping.Count > 0 && !model.ClassMapping.ContainsKey(modelClassId))
+                    if (!TryMapModelClass(model, modelClassId, out int projectClassId, out List<int> allowedClassIds))
                     {
-                        continue; // Skip this detection - class is set to "nan"
+                        continue; // Class is excluded by the model's mapping.
                     }
 
-                    int projectClassId = modelClassId;
-                    if (model.ClassMapping != null && model.ClassMapping.ContainsKey(modelClassId))
+                    if (objectness < GetConfidenceThresholdForClass(
+                        projectClassId,
+                        classConfidenceThresholds))
                     {
-                        projectClassId = model.ClassMapping[modelClassId];
+                        continue;
                     }
 
                     float centerX = outputTensor[0, i, 0] * scaleX;
@@ -663,7 +1046,8 @@ private List<YoloDetection> PostProcessYoloOutputDynamic(Tensor<float> outputTen
                         Height = height,
                         Confidence = objectness,
                         ClassConfidence = maxClassConf,
-                        ClassId = projectClassId  // Use mapped project class ID
+                        ClassId = projectClassId,  // Use mapped project class ID
+                        AllowedClassIds = allowedClassIds
                     });
                 }
             }
@@ -686,21 +1070,17 @@ private List<YoloDetection> PostProcessYoloOutputDynamic(Tensor<float> outputTen
                         }
                     }
 
-                    // YOLOv8 uses class confidence as the score (no separate objectness)
-                    if (maxClassConf < confidenceThreshold) continue;
-
-                    // Apply class mapping: Model Class ID -> Project Class ID
-                    // Skip detection if class is not mapped (user selected "nan")
-                    // Only skip if ClassMapping has been configured (not null and not empty)
-                    if (model.ClassMapping != null && model.ClassMapping.Count > 0 && !model.ClassMapping.ContainsKey(modelClassId))
+                    if (!TryMapModelClass(model, modelClassId, out int projectClassId, out List<int> allowedClassIds))
                     {
-                        continue; // Skip this detection - class is set to "nan"
+                        continue; // Class is excluded by the model's mapping.
                     }
 
-                    int projectClassId = modelClassId;
-                    if (model.ClassMapping != null && model.ClassMapping.ContainsKey(modelClassId))
+                    // YOLOv8 uses class confidence as the score (no separate objectness).
+                    if (maxClassConf < GetConfidenceThresholdForClass(
+                        projectClassId,
+                        classConfidenceThresholds))
                     {
-                        projectClassId = model.ClassMapping[modelClassId];
+                        continue;
                     }
 
                     float centerX = outputTensor[0, 0, i] * scaleX;
@@ -716,7 +1096,8 @@ private List<YoloDetection> PostProcessYoloOutputDynamic(Tensor<float> outputTen
                         Height = height,
                         Confidence = maxClassConf, // YOLOv8 uses class conf as confidence
                         ClassConfidence = 1.0f,
-                        ClassId = projectClassId  // Use mapped project class ID
+                        ClassId = projectClassId,  // Use mapped project class ID
+                        AllowedClassIds = allowedClassIds
                     });
                 }
             }
@@ -743,17 +1124,55 @@ public List<Rectangle> RunInference(Bitmap image)
         }
 
         // New method: Returns detection results with ClassId
-        public List<(Rectangle box, int classId)> RunInferenceWithClasses(Bitmap image)
+        public List<(Rectangle box, int classId)> RunInferenceWithClasses(
+            Bitmap image,
+            IReadOnlyDictionary<int, float>? classConfidenceThresholds = null,
+            IReadOnlyList<(int BodyClassId, int HeadClassId)>? teamPairs = null)
         {
             if (loadedModels.Count == 0) return new List<(Rectangle, int)>();
 
             if (loadedModels.Count == 1)
             {
-                var detections = RunSingleModelInferenceWithClasses(image, loadedModels[0]);
+                var detections = RunSingleModelInferenceWithClasses(
+                    image,
+                    loadedModels[0],
+                    classConfidenceThresholds);
                 return detections.Select(d => (d.Box, d.ClassId)).ToList();
             }
 
-            return RunEnsembleInferenceWithClasses(image);
+            return RunEnsembleInferenceWithClasses(image, classConfidenceThresholds, teamPairs);
+        }
+
+        private T RunModelSession<T>(
+            YoloModel model,
+            List<NamedOnnxValue> inputs,
+            Func<Tensor<float>, T> processOutput)
+        {
+            // Hold the DirectML lock only around the GPU Run call. Postprocessing (tensor decode,
+            // NMS) is CPU work; running it unlocked lets another worker start its Run immediately,
+            // so GPU inference from multiple models/images stays back-to-back instead of stalling
+            // while one thread decodes results. Concurrent Run is still prevented by the lock.
+            IDisposableReadOnlyCollection<DisposableNamedOnnxValue> results = null;
+            try
+            {
+                if (model.UsesDirectMl)
+                {
+                    lock (directMlInferenceLock)
+                    {
+                        results = model.Session.Run(inputs, model.OutputNames);
+                    }
+                }
+                else
+                {
+                    results = model.Session.Run(inputs, model.OutputNames);
+                }
+
+                return processOutput(results.First().AsTensor<float>());
+            }
+            finally
+            {
+                results?.Dispose();
+            }
         }
 
         private List<Rectangle> RunSingleModelInference(Bitmap image, YoloModel model)
@@ -775,14 +1194,12 @@ private List<Rectangle> RunSingleModelInference(Bitmap image, YoloModel model)
 
                 var inputs = new List<NamedOnnxValue> { NamedOnnxValue.CreateFromTensor("images", inputTensor) };
 
-                // Run inference with error handling
-                using var results = model.Session.Run(inputs, model.OutputNames);
-                var outputTensor = results.First().AsTensor<float>();
-
-                // Post-process using original image dimensions for proper scaling
-                var detections = PostProcessYoloOutput(outputTensor, model, image.Width, image.Height);
-                var finalDetections = ApplyImprovedNMS(detections);
-                TotalDetections += finalDetections.Count;
+                var finalDetections = RunModelSession(
+                    model,
+                    inputs,
+                    outputTensor => ApplyImprovedNMS(
+                        PostProcessYoloOutput(outputTensor, model, image.Width, image.Height)));
+                Interlocked.Add(ref totalDetections, finalDetections.Count);
 
                 // Clean up temporary bitmaps
                 if (processedImage != image) processedImage.Dispose();
@@ -801,15 +1218,18 @@ private List<Rectangle> RunSingleModelInference(Bitmap image, YoloModel model)
             }
         }
 
-        private List<Detection> RunSingleModelInferenceWithClasses(Bitmap image, YoloModel model)
+        private List<Detection> RunSingleModelInferenceWithClasses(
+            Bitmap image,
+            YoloModel model,
+            IReadOnlyDictionary<int, float>? classConfidenceThresholds)
         {
             try
             {
                 // Convert to 24bpp first
-                Bitmap processedImage = ConvertTo24bpp(image);
+                using Bitmap processedImage = ConvertTo24bpp(image);
 
                 // Resize image to match model's expected input size
-                Bitmap resizedImage = ResizeImageForModel(processedImage, model.ModelInfo.ModelInputSize);
+                using Bitmap resizedImage = ResizeImageForModel(processedImage, model.ModelInfo.ModelInputSize);
 
                 // Convert resized image to float array
                 float[] inputArray = BitmapToFloatArray(resizedImage);
@@ -820,29 +1240,32 @@ private List<Detection> RunSingleModelInferenceWithClasses(Bitmap image, YoloMod
 
                 var inputs = new List<NamedOnnxValue> { NamedOnnxValue.CreateFromTensor("images", inputTensor) };
 
-                // Run inference with error handling
-                using var results = model.Session.Run(inputs, model.OutputNames);
-                var outputTensor = results.First().AsTensor<float>();
-
-                // Post-process using original image dimensions for proper scaling
-                var detections = PostProcessYoloOutput(outputTensor, model, image.Width, image.Height);
-                var finalDetections = ApplyImprovedNMS(detections);
-                TotalDetections += finalDetections.Count;
-
-                // Clean up temporary bitmaps
-                if (processedImage != image) processedImage.Dispose();
-                resizedImage.Dispose();
+                var finalDetections = RunModelSession(
+                    model,
+                    inputs,
+                    outputTensor => ApplyImprovedNMS(
+                        PostProcessYoloOutputDynamic(
+                            outputTensor,
+                            model,
+                            image.Width,
+                            image.Height,
+                            classConfidenceThresholds)
+                        .Select(detection => new Detection(
+                            detection.ToRectangle(),
+                            detection.Confidence,
+                            detection.ClassConfidence,
+                            detection.ClassId))
+                        .ToList()));
+                Interlocked.Add(ref totalDetections, finalDetections.Count);
 
                 return finalDetections;
             }
             catch (Exception ex)
             {
-                CustomMessageBox.Show(
-                    string.Format(LanguageManager.Instance.GetString("Msg_AIInferenceError") ?? "Error running AI inference on image:\n\n{0}\n\nImage size: {1}x{2}\nModel expected size: {3}x{3}\n\nPlease ensure your model is compatible with the image.", ex.Message, image.Width, image.Height, model.ModelInfo.ModelInputSize),
-                    LanguageManager.Instance.GetString("Msg_AIInferenceErrorTitle") ?? "AI Inference Error",
-                    MessageBoxButton.OK,
-                    MessageBoxImage.Error);
-                return new List<Detection>();
+                throw new InvalidOperationException(
+                    $"Inference failed for {image.Width}x{image.Height} image with " +
+                    $"{model.ModelInfo.ModelInputSize}x{model.ModelInfo.ModelInputSize} model input.",
+                    ex);
             }
         }
 
@@ -873,13 +1296,16 @@ public List<Rectangle> RunEnsembleInference(Bitmap image)
 
                         var inputs = new List<NamedOnnxValue> { NamedOnnxValue.CreateFromTensor("images", inputTensor) };
 
-                        // Run inference
-                        using var results = model.Session.Run(inputs, model.OutputNames);
-                        var outputTensor = results.First().AsTensor<float>();
-
-                        // Post-process using original image dimensions for proper scaling
-                        var detections = PostProcessYoloOutputDynamic(outputTensor, model, image.Width, image.Height);
-                        detections = ApplyNMSYolo(detections, 0.5f);
+                        var detections = RunModelSession(
+                            model,
+                            inputs,
+                            outputTensor => ApplyNMSYolo(
+                                PostProcessYoloOutputDynamic(
+                                    outputTensor,
+                                    model,
+                                    image.Width,
+                                    image.Height),
+                                0.5f));
 
                         foreach (var det in detections)
                         {
@@ -921,7 +1347,11 @@ public List<Rectangle> RunEnsembleInference(Bitmap image)
                 EnsembleDetectionMode mode = (EnsembleDetectionMode)Properties.Settings.Default.EnsembleDetectionMode;
                 List<YoloDetection> finalDetections;
                 
-                if (mode == EnsembleDetectionMode.Union)
+                if (mode == EnsembleDetectionMode.ClassTransfer)
+                {
+                    finalDetections = ApplyClassTransfer(allYoloDetections, null);
+                }
+                else if (mode == EnsembleDetectionMode.Union)
                 {
                     finalDetections = ApplyEnsembleUnion(allYoloDetections);
                 }
@@ -929,8 +1359,9 @@ public List<Rectangle> RunEnsembleInference(Bitmap image)
                 {
                     finalDetections = ApplyEnsembleConsensus(allYoloDetections);
                 }
-                
-                TotalDetections += finalDetections.Count;
+
+                finalDetections = ApplyContainmentSuppression(finalDetections);
+                Interlocked.Add(ref totalDetections, finalDetections.Count);
 
                 return finalDetections.Select(d => d.ToRectangle()).ToList();
             }
@@ -945,14 +1376,18 @@ public List<Rectangle> RunEnsembleInference(Bitmap image)
             }
         }
 
-        private List<(Rectangle box, int classId)> RunEnsembleInferenceWithClasses(Bitmap image)
+        private List<(Rectangle box, int classId)> RunEnsembleInferenceWithClasses(
+            Bitmap image,
+            IReadOnlyDictionary<int, float>? classConfidenceThresholds,
+            IReadOnlyList<(int BodyClassId, int HeadClassId)>? teamPairs = null)
         {
             try
             {
                 var allYoloDetections = new List<YoloDetection>();
+                int successfulModelRuns = 0;
 
                 // Convert to 24bpp first
-                Bitmap processedImage = ConvertTo24bpp(image);
+                using Bitmap processedImage = ConvertTo24bpp(image);
 
                 for (int modelIdx = 0; modelIdx < loadedModels.Count; modelIdx++)
                 {
@@ -961,7 +1396,7 @@ public List<Rectangle> RunEnsembleInference(Bitmap image)
                     try
                     {
                         // Resize image to match this model's expected input size
-                        Bitmap resizedImage = ResizeImageForModel(processedImage, model.ModelInfo.ModelInputSize);
+                        using Bitmap resizedImage = ResizeImageForModel(processedImage, model.ModelInfo.ModelInputSize);
 
                         // Convert resized image to float array
                         float[] inputArray = BitmapToFloatArray(resizedImage);
@@ -972,13 +1407,17 @@ public List<Rectangle> RunEnsembleInference(Bitmap image)
 
                         var inputs = new List<NamedOnnxValue> { NamedOnnxValue.CreateFromTensor("images", inputTensor) };
 
-                        // Run inference
-                        using var results = model.Session.Run(inputs, model.OutputNames);
-                        var outputTensor = results.First().AsTensor<float>();
-
-                        // Post-process using original image dimensions for proper scaling
-                        var detections = PostProcessYoloOutputDynamic(outputTensor, model, image.Width, image.Height);
-                        detections = ApplyNMSYolo(detections, 0.5f);
+                        var detections = RunModelSession(
+                            model,
+                            inputs,
+                            outputTensor => ApplyNMSYolo(
+                                PostProcessYoloOutputDynamic(
+                                    outputTensor,
+                                    model,
+                                    image.Width,
+                                    image.Height,
+                                    classConfidenceThresholds),
+                                0.5f));
 
                         foreach (var det in detections)
                         {
@@ -986,9 +1425,8 @@ public List<Rectangle> RunEnsembleInference(Bitmap image)
                         }
 
                         allYoloDetections.AddRange(detections);
+                        successfulModelRuns++;
 
-                        // Clean up resized image
-                        resizedImage.Dispose();
                     }
                     catch (Exception modelEx)
                     {
@@ -996,20 +1434,13 @@ public List<Rectangle> RunEnsembleInference(Bitmap image)
                         System.Diagnostics.Debug.WriteLine(
                             $"Error running model {model.Name}: {modelEx.Message}");
 
-                        // If this is a critical error (like wrong dimensions), show warning
-                        if (modelEx.Message.Contains("dimension") || modelEx.Message.Contains("shape"))
-                        {
-                            CustomMessageBox.Show(
-                                string.Format(LanguageManager.Instance.GetString("Msg_ModelProcessingWarning") ?? "Warning: Model '{0}' failed to process the image.\n\nError: {1}\n\nContinuing with remaining models...", model.Name, modelEx.Message),
-                                LanguageManager.Instance.GetString("Msg_ModelProcessingWarningTitle") ?? "Model Processing Warning",
-                                MessageBoxButton.OK,
-                                MessageBoxImage.Warning);
-                        }
+                        // Continue with remaining models; the batch reports this image
+                        // as failed when no model can complete inference.
                     }
                 }
 
-                // Clean up processed image
-                if (processedImage != image) processedImage.Dispose();
+                if (successfulModelRuns == 0)
+                    throw new InvalidOperationException("All loaded models failed inference.");
 
                 if (allYoloDetections.Count == 0)
                 {
@@ -1020,27 +1451,44 @@ public List<Rectangle> RunEnsembleInference(Bitmap image)
                 EnsembleDetectionMode mode = (EnsembleDetectionMode)Properties.Settings.Default.EnsembleDetectionMode;
                 List<YoloDetection> finalDetections;
                 
-                if (mode == EnsembleDetectionMode.Union)
+                if (mode == EnsembleDetectionMode.ClassTransfer)
                 {
-                    finalDetections = ApplyEnsembleUnion(allYoloDetections);
+                    finalDetections = ApplyClassTransfer(
+                        allYoloDetections,
+                        classConfidenceThresholds);
+                }
+                else if (mode == EnsembleDetectionMode.Union)
+                {
+                    finalDetections = ApplyEnsembleUnion(
+                        allYoloDetections,
+                        classConfidenceThresholds);
                 }
                 else // Voting mode (default)
                 {
-                    finalDetections = ApplyEnsembleConsensus(allYoloDetections);
+                    finalDetections = ApplyEnsembleConsensus(
+                        allYoloDetections,
+                        classConfidenceThresholds);
                 }
-                
-                TotalDetections += finalDetections.Count;
+
+                finalDetections = ApplyContainmentSuppression(finalDetections);
+
+                // Reconcile a body box's team with the head inside it (ClassTransfer only).
+                if (mode == EnsembleDetectionMode.ClassTransfer &&
+                    Properties.Settings.Default.ClassTransferTeamConsistency &&
+                    teamPairs != null)
+                {
+                    finalDetections = ApplyTeamConsistency(finalDetections, teamPairs);
+                }
+
+                Interlocked.Add(ref totalDetections, finalDetections.Count);
 
                 return finalDetections.Select(d => (d.ToRectangle(), d.ClassId)).ToList();
             }
             catch (Exception ex)
             {
-                CustomMessageBox.Show(
-                    string.Format(LanguageManager.Instance.GetString("Msg_EnsembleInferenceError") ?? "Error running ensemble AI inference:\n\n{0}\n\nImage size: {1}x{2}\n\nPlease check your models and image compatibility.", ex.Message, image.Width, image.Height),
-                    LanguageManager.Instance.GetString("Msg_EnsembleInferenceErrorTitle") ?? "Ensemble Inference Error",
-                    MessageBoxButton.OK,
-                    MessageBoxImage.Error);
-                return new List<(Rectangle, int)>();
+                throw new InvalidOperationException(
+                    $"Ensemble inference failed for {image.Width}x{image.Height} image.",
+                    ex);
             }
         }
 
@@ -1049,7 +1497,7 @@ public void LoadYoloModel()
             OpenModelManager();
         }
 
-        public void OpenModelManager(List<LabelClass> projectClasses = null, Dictionary<string, Dictionary<int, int>> savedMappings = null)
+        public void OpenModelManager(List<LabelClass> projectClasses = null, Dictionary<string, Dictionary<int, List<int>>> savedMappings = null)
         {
             var dialog = new ModelManagerDialog(this, projectClasses, savedMappings);
 
@@ -1072,6 +1520,79 @@ public List<YoloModel> GetLoadedModels()
             return new List<YoloModel>(loadedModels);
         }
 
+        public ExecutionProviderReloadResult ReloadExecutionProviders(out string errorMessage)
+        {
+            bool requestedGpu = Properties.Settings.Default.UseGPU;
+            var replacements = new List<(YoloModel Original, YoloModel Replacement)>();
+            var gpuErrors = new List<string>();
+
+            foreach (YoloModel original in loadedModels)
+            {
+                var replacement = new YoloModel
+                {
+                    ModelPath = original.ModelPath,
+                    Name = original.Name,
+                    ModelInfo = original.ModelInfo,
+                    ClassMapping = CloneClassMapping(original.ClassMapping)
+                };
+
+                if (!TryInitializeSession(replacement, requestedGpu, out string providerError))
+                {
+                    if (!requestedGpu)
+                    {
+                        replacement.Session?.Dispose();
+                        foreach (var pending in replacements)
+                            pending.Replacement.Session?.Dispose();
+
+                        errorMessage = providerError;
+                        return ExecutionProviderReloadResult.Failed;
+                    }
+
+                    if (!TryInitializeSession(replacement, false, out string cpuError))
+                    {
+                        replacement.Session?.Dispose();
+                        foreach (var pending in replacements)
+                            pending.Replacement.Session?.Dispose();
+
+                        errorMessage = $"{GetFriendlyGpuError(providerError)}; CPU: {cpuError}";
+                        return ExecutionProviderReloadResult.Failed;
+                    }
+
+                    gpuErrors.Add($"{original.Name}: {GetFriendlyGpuError(providerError)}");
+                }
+
+                replacements.Add((original, replacement));
+            }
+
+            foreach (var pair in replacements)
+            {
+                pair.Original.Session?.Dispose();
+                pair.Original.Session = pair.Replacement.Session;
+                pair.Original.OutputNames = pair.Replacement.OutputNames;
+                pair.Original.UsesDirectMl = pair.Replacement.UsesDirectMl;
+                pair.Original.DirectMlDeviceId = pair.Replacement.DirectMlDeviceId;
+            }
+
+            errorMessage = string.Join(Environment.NewLine, gpuErrors);
+            return gpuErrors.Count == 0
+                ? ExecutionProviderReloadResult.Success
+                : ExecutionProviderReloadResult.FallbackToCpu;
+        }
+
+        /// <summary>
+        /// Deep-copies a class mapping so the clone's per-class lists are not shared.
+        /// </summary>
+        public static Dictionary<int, List<int>> CloneClassMapping(
+            IReadOnlyDictionary<int, List<int>> mapping)
+        {
+            if (mapping == null)
+                return null;
+
+            return mapping.ToDictionary(
+                pair => pair.Key,
+                pair => new List<int>(pair.Value ?? new List<int>()));
+        }
+
         public void RemoveModel(string modelName)
         {
             var model = loadedModels.FirstOrDefault(m =>
@@ -1125,23 +1646,51 @@ private YoloModel LoadModelFromPath(string modelPath, bool silent)
                     Name = Path.GetFileNameWithoutExtension(modelPath)
                 };
 
-                if (!TryInitializeSession(model, Properties.Settings.Default.UseGPU, out string errorMessage))
+                bool requestedGpu = Properties.Settings.Default.UseGPU;
+                if (!TryInitializeSession(model, requestedGpu, out string errorMessage))
                 {
-                    if (!silent)
+                    if (!requestedGpu)
                     {
-                        CustomMessageBox.Show(string.Format(LanguageManager.Instance.GetString("Msg_GPUInitFailed") ?? "GPU initialization failed: {0}\nFalling back to CPU.", errorMessage),
-                                      LanguageManager.Instance.GetString("Msg_GPUWarning") ?? "GPU Warning", MessageBoxButton.OK, MessageBoxImage.Warning);
+                        if (!silent)
+                        {
+                            CustomMessageBox.Show(
+                                string.Format(
+                                    LanguageManager.Instance.GetString("Msg_ModelInitFailed") ??
+                                    "Failed to initialize model: {0}",
+                                    errorMessage),
+                                LanguageManager.Instance.GetString("Msg_Error") ?? "Error",
+                                MessageBoxButton.OK,
+                                MessageBoxImage.Error);
+                        }
+                        return null;
                     }
 
-                    if (!TryInitializeSession(model, false, out errorMessage))
+                    string gpuErrorMessage = GetFriendlyGpuError(errorMessage);
+                    if (!TryInitializeSession(model, false, out string cpuErrorMessage))
                     {
                         if (!silent)
                         {
-                            CustomMessageBox.Show(string.Format(LanguageManager.Instance.GetString("Msg_ModelInitFailed") ?? "Failed to initialize model: {0}", errorMessage),
+                            CustomMessageBox.Show(string.Format(LanguageManager.Instance.GetString("Msg_ModelInitFailed") ?? "Failed to initialize model: {0}", cpuErrorMessage),
                                           LanguageManager.Instance.GetString("Msg_Error") ?? "Error", MessageBoxButton.OK, MessageBoxImage.Error);
                         }
                         return null;
                     }
+
+                    if (!silent)
+                    {
+                        CustomMessageBox.Show(
+                            string.Format(
+                                LanguageManager.Instance.GetString("Msg_GPUInitFailed") ??
+                                "GPU initialization failed: {0}\nFalling back to CPU.",
+                                gpuErrorMessage),
+                            LanguageManager.Instance.GetString("Msg_GPUWarning") ?? "GPU Warning",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Warning);
+                    }
+                    else
+                    {
+                        Debug.WriteLine($"DirectML initialization failed; switched to CPU: {gpuErrorMessage}");
+                    }
                 }
 
                 YoloModelInfo modelInfo = DetectYoloFormat(model.Session);
@@ -1238,36 +1787,85 @@ private YoloModel LoadModelFromPath(string modelPath, bool silent)
         }
 
         private bool TryInitializeSession(YoloModel model, bool useGPU, out string errorMessage)
+        {
+            if (!useGPU)
+                return TryInitializeSessionCore(model, false, -1, out errorMessage);
+
+            var adapterErrors = new List<string>();
+            for (int deviceId = 0; deviceId < MaxDirectMlAdaptersToProbe; deviceId++)
+            {
+                if (TryInitializeSessionCore(model, true, deviceId, out string adapterError))
+                {
+                    Debug.WriteLine(
+                        $"DirectML initialized for '{model.Name}' on device {deviceId}.");
+                    errorMessage = string.Empty;
+                    return true;
+                }
+
+                adapterErrors.Add($"device {deviceId}: {adapterError}");
+                Debug.WriteLine(
+                    $"DirectML device {deviceId} rejected '{model.Name}': {adapterError}");
+            }
+
+            errorMessage = adapterErrors.FirstOrDefault() ??
+                           "No compatible DirectML adapter was found.";
+            return false;
+        }
+
+        private bool TryInitializeSessionCore(
+            YoloModel model,
+            bool useGPU,
+            int directMlDeviceId,
+            out string errorMessage)
         {
             try
             {
-                var sessionOptions = new SessionOptions
+                using var sessionOptions = new SessionOptions
                 {
                     EnableCpuMemArena = true,
-                    EnableMemoryPattern = true,
+                    // DirectML requires memory patterns to be disabled and does not
+                    // support ORT_PARALLEL execution mode.
+                    EnableMemoryPattern = !useGPU,
                     GraphOptimizationLevel = GraphOptimizationLevel.ORT_ENABLE_ALL,
-                    ExecutionMode = ExecutionMode.ORT_PARALLEL
+                    ExecutionMode = useGPU
+                        ? ExecutionMode.ORT_SEQUENTIAL
+                        : ExecutionMode.ORT_PARALLEL
                 };
 
                 if (useGPU)
                 {
-                    sessionOptions.AppendExecutionProvider_DML();
+                    sessionOptions.AppendExecutionProvider_DML(directMlDeviceId);
                 }
                 sessionOptions.AppendExecutionProvider_CPU();
 
                 model.Session = new InferenceSession(model.ModelPath, sessionOptions);
                 model.OutputNames = new List<string>(model.Session.OutputMetadata.Keys);
+                model.UsesDirectMl = useGPU;
+                model.DirectMlDeviceId = useGPU ? directMlDeviceId : -1;
 
                 errorMessage = string.Empty;
                 return true;
             }
             catch (Exception ex)
             {
+                model.UsesDirectMl = false;
+                model.DirectMlDeviceId = -1;
                 errorMessage = ex.Message;
                 return false;
             }
         }
 
+        private static string GetFriendlyGpuError(string errorMessage)
+        {
+            if (errorMessage.Contains("887A0004", StringComparison.OrdinalIgnoreCase))
+            {
+                return LanguageManager.Instance.GetString("Msg_DirectMLUnsupported") ??
+                       "This GPU or its current driver does not support DirectML.";
+            }
+
+            return errorMessage;
+        }
+
         public void ClearAllModels()
         {
             foreach (var model in loadedModels)
@@ -1915,4 +2513,4 @@ public static List<string> GetModelClassNames(string modelPath, int numClasses)
                 .ToList();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/YoableWPF/Managers/YoutubeDownloader.cs b/YoableWPF/Managers/YoutubeDownloader.cs
index 2dac635..fdba0b0 100644
--- a/YoableWPF/Managers/YoutubeDownloader.cs
+++ b/YoableWPF/Managers/YoutubeDownloader.cs
@@ -1,15 +1,30 @@
 using OpenCvSharp;
 using System.IO;
+using System.Net.Http;
 using System.Windows;
 using YoableWPF.Managers;
 using YoableWPF;
 using YoutubeExplode;
+using YoutubeExplode.Videos.Streams;
 using Size = OpenCvSharp.Size;
 using Rect = OpenCvSharp.Rect;
 
 public class YoutubeDownloader
 {
-    private readonly YoutubeClient youtube = new YoutubeClient();
+    // Shared HttpClient with a browser-like User-Agent. YouTube's streaming CDN
+    // returns 403 Forbidden for some requests that don't look like they come from
+    // a real client, so we set a desktop User-Agent to reduce those rejections.
+    private static readonly HttpClient httpClient = CreateHttpClient();
+    private readonly YoutubeClient youtube = new YoutubeClient(httpClient);
+
+    private static HttpClient CreateHttpClient()
+    {
+        var client = new HttpClient();
+        client.DefaultRequestHeaders.UserAgent.ParseAdd(
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
+            "(KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36");
+        return client;
+    }
     private MainWindow mainWindow;
     private OverlayManager overlayManager;
     private CancellationTokenSource downloadCancellationToken;
@@ -42,21 +57,24 @@ public async Task<bool> DownloadAndProcessVideo(string videoUrl, int desiredFps
             var video = await youtube.Videos.GetAsync(videoUrl);
             var streamManifest = await youtube.Videos.Streams.GetManifestAsync(videoUrl);
 
-            // Prefer H.264 (avc1) codec for best OpenCV compatibility
-            // AV1 and HEVC codecs often fail with OpenCV's bundled FFmpeg
-            var streamInfo = streamManifest.GetVideoStreams()
+            // Build an ordered list of candidate streams. We try them in order and
+            // fall back to the next one if a stream URL returns 403 Forbidden
+            // (YouTube sometimes rejects individual stream URLs even when the
+            // manifest succeeds).
+            var avc1Streams = streamManifest.GetVideoStreams()
                 .Where(s => s.Container == YoutubeExplode.Videos.Streams.Container.Mp4)
                 .Where(s => s.VideoCodec.Contains("avc1", StringComparison.OrdinalIgnoreCase))
-                .OrderByDescending(s => s.VideoQuality)
-                .FirstOrDefault();
+                .OrderByDescending(s => s.VideoQuality);
 
-            // Fall back to any MP4 stream if no H.264 available
-            streamInfo ??= streamManifest.GetVideoStreams()
+            // Then any remaining MP4 streams (non-avc1) as a fallback.
+            var otherMp4Streams = streamManifest.GetVideoStreams()
                 .Where(s => s.Container == YoutubeExplode.Videos.Streams.Container.Mp4)
-                .OrderByDescending(s => s.VideoQuality)
-                .FirstOrDefault();
+                .Where(s => !s.VideoCodec.Contains("avc1", StringComparison.OrdinalIgnoreCase))
+                .OrderByDescending(s => s.VideoQuality);
 
-            if (streamInfo == null)
+            var candidateStreams = avc1Streams.Concat(otherMp4Streams).ToList();
+
+            if (candidateStreams.Count == 0)
             {
                 CustomMessageBox.Show(string.Format(LanguageManager.Instance.GetString("Msg_YouTube_NoCompatibleStream") ?? "No compatible video streams found for {0}", video.Title),
                     LanguageManager.Instance.GetString("Msg_YouTube_DownloadError") ?? "Download Error", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -69,25 +87,57 @@ public async Task<bool> DownloadAndProcessVideo(string videoUrl, int desiredFps
             Directory.CreateDirectory(Path.Combine(videoDirectory, "frames"));
 
             videoPath = Path.Combine(videoDirectory, $"{video.Id}.mp4");
-            long totalBytes = streamInfo.Size.Bytes;
-            long downloadedBytes = 0;
 
-            var progress = new Progress<double>(p =>
+            // Try each candidate stream until one downloads successfully.
+            HttpRequestException lastDownloadError = null;
+            bool downloaded = false;
+
+            for (int i = 0; i < candidateStreams.Count; i++)
             {
-                if (!isDownloading) return;
-                downloadProgress = p * 100;
-                downloadedBytes = (long)(totalBytes * p);
+                IStreamInfo streamInfo = candidateStreams[i];
+                long totalBytes = streamInfo.Size.Bytes;
+                long downloadedBytes = 0;
+                isDownloading = true;
 
-                mainWindow.Dispatcher.Invoke(() =>
+                var progress = new Progress<double>(p =>
                 {
-                    overlayManager.UpdateMessage($"Downloading {video.Title}... {downloadProgress:F2}% ({FormatFileSize(downloadedBytes)} / {FormatFileSize(totalBytes)})");
-                    overlayManager.UpdateProgress((int)downloadProgress);
+                    if (!isDownloading) return;
+                    downloadProgress = p * 100;
+                    downloadedBytes = (long)(totalBytes * p);
+
+                    mainWindow.Dispatcher.Invoke(() =>
+                    {
+                        overlayManager.UpdateMessage($"Downloading {video.Title}... {downloadProgress:F2}% ({FormatFileSize(downloadedBytes)} / {FormatFileSize(totalBytes)})");
+                        overlayManager.UpdateProgress((int)downloadProgress);
+                    });
                 });
-            });
 
-            await youtube.Videos.Streams.DownloadAsync(streamInfo, videoPath, progress, downloadCancellationToken.Token);
+                try
+                {
+                    await youtube.Videos.Streams.DownloadAsync(streamInfo, videoPath, progress, downloadCancellationToken.Token);
+                    downloaded = true;
+                    break;
+                }
+                catch (HttpRequestException ex)
+                {
+                    // 403 Forbidden (or similar) on this stream URL: try the next candidate.
+                    lastDownloadError = ex;
+                    mainWindow.Dispatcher.Invoke(() =>
+                    {
+                        overlayManager.UpdateMessage($"Stream failed, trying alternative ({i + 1}/{candidateStreams.Count})...");
+                        overlayManager.UpdateProgress(0);
+                    });
+                }
+            }
+
             isDownloading = false;
 
+            if (!downloaded)
+            {
+                // All candidate streams failed. Surface the underlying error.
+                throw lastDownloadError ?? new Exception("All video streams failed to download.");
+            }
+
             mainWindow.Dispatcher.Invoke(() => {
                 overlayManager.UpdateMessage("Preparing to extract frames...");
                 overlayManager.UpdateProgress(0);
diff --git a/YoableWPF/ModelClassMappingDialog.xaml b/YoableWPF/ModelClassMappingDialog.xaml
index 993dbf8..d068b9b 100644
--- a/YoableWPF/ModelClassMappingDialog.xaml
+++ b/YoableWPF/ModelClassMappingDialog.xaml
@@ -12,38 +12,7 @@
         MinWidth="700">
     
     <Window.Resources>
-        <SolidColorBrush x:Key="AccentButtonBrush" Color="{DynamicResource SystemAccentColor}"/>
         
-        <Style x:Key="ModernButton" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource AccentButtonBrush}"/>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="16,8"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.9"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
     </Window.Resources>
 
     <Grid Margin="20">
@@ -106,7 +75,7 @@
                                     <StackPanel Grid.Column="0" Orientation="Horizontal" Margin="0,0,16,0">
                                         <Border Width="4" 
                                                 Height="20" 
-                                                Background="#FF9C27B0"
+                                                Background="{StaticResource GlyphPurpleBrush}"
                                                 CornerRadius="2"
                                                 Margin="0,0,8,0"
                                                 VerticalAlignment="Center"/>
@@ -126,29 +95,42 @@
                                                FontSize="20"
                                                HorizontalAlignment="Center"
                                                VerticalAlignment="Center"
-                                               Foreground="#FF9C27B0"/>
+                                               Foreground="{StaticResource GlyphPurpleBrush}"/>
 
-                                    <!-- Project Class ComboBox -->
-                                    <ComboBox Grid.Column="2"
-                                              ItemsSource="{Binding ProjectClasses}"
-                                              SelectedItem="{Binding SelectedProjectClass, Mode=TwoWay}"
-                                              DisplayMemberPath="Name"
-                                              MinWidth="200"
-                                              Margin="16,0,0,0">
-                                        <ComboBox.ItemTemplate>
-                                            <DataTemplate>
-                                                <StackPanel Orientation="Horizontal">
-                                                    <Border Width="4" 
-                                                            Height="16" 
-                                                            Background="{Binding ColorBrush}"
-                                                            CornerRadius="2"
-                                                            Margin="0,0,8,0"
-                                                            VerticalAlignment="Center"/>
-                                                    <TextBlock Text="{Binding DisplayText}"/>
-                                                </StackPanel>
-                                            </DataTemplate>
-                                        </ComboBox.ItemTemplate>
-                                    </ComboBox>
+                                    <!-- Allowed project classes (tick none to exclude the class) -->
+                                    <StackPanel Grid.Column="2"
+                                                MinWidth="240"
+                                                Margin="16,0,0,0">
+                                        <ItemsControl ItemsSource="{Binding ProjectClasses}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <WrapPanel Orientation="Horizontal"/>
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                            <ItemsControl.ItemTemplate>
+                                                <DataTemplate>
+                                                    <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}"
+                                                              Margin="0,2,14,2"
+                                                              VerticalContentAlignment="Center">
+                                                        <StackPanel Orientation="Horizontal">
+                                                            <Border Width="4"
+                                                                    Height="16"
+                                                                    Background="{Binding ColorBrush}"
+                                                                    CornerRadius="2"
+                                                                    Margin="0,0,6,0"
+                                                                    VerticalAlignment="Center"/>
+                                                            <TextBlock Text="{Binding DisplayText}"/>
+                                                        </StackPanel>
+                                                    </CheckBox>
+                                                </DataTemplate>
+                                            </ItemsControl.ItemTemplate>
+                                        </ItemsControl>
+                                        <TextBlock Text="{Binding SelectionSummary}"
+                                                   FontSize="11"
+                                                   Foreground="Gray"
+                                                   TextWrapping="Wrap"
+                                                   Margin="0,4,0,0"/>
+                                    </StackPanel>
                                 </Grid>
                             </Border>
                         </DataTemplate>
diff --git a/YoableWPF/ModelClassMappingDialog.xaml.cs b/YoableWPF/ModelClassMappingDialog.xaml.cs
index 9000222..c2246f6 100644
--- a/YoableWPF/ModelClassMappingDialog.xaml.cs
+++ b/YoableWPF/ModelClassMappingDialog.xaml.cs
@@ -9,14 +9,53 @@
 
 namespace YoableWPF
 {
+    /// <summary>
+    /// One project class a model class may be mapped to, with its checkbox state.
+    /// </summary>
+    public class ProjectClassOption : INotifyPropertyChanged
+    {
+        private bool _isSelected;
+
+        public LabelClass ProjectClass { get; set; }
+        public int ClassId => ProjectClass.ClassId;
+        public string DisplayText => ProjectClass.DisplayText;
+        public object ColorBrush => ProjectClass.ColorBrush;
+
+        public bool IsSelected
+        {
+            get => _isSelected;
+            set
+            {
+                if (_isSelected == value)
+                    return;
+
+                _isSelected = value;
+                OnPropertyChanged();
+                SelectionChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        public void NotifyDisplayTextChanged() => OnPropertyChanged(nameof(DisplayText));
+
+        public event EventHandler SelectionChanged;
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+
     public class ClassMappingItem : INotifyPropertyChanged
     {
-        private LabelClass _selectedProjectClass;
+        // Guards the mutual exclusion between "not detected" and the real classes so that
+        // clearing sibling checkboxes does not recurse back into this handler.
+        private bool isSyncingSelection;
 
         public int ModelClassId { get; set; }
         public string ModelClassName { get; set; }
-        public List<LabelClass> ProjectClasses { get; set; }
-        
+        public List<ProjectClassOption> ProjectClasses { get; set; }
+
         public string ModelIdDisplayText
         {
             get
@@ -24,18 +63,87 @@ public string ModelIdDisplayText
                 return string.Format(LanguageManager.Instance.GetString("Mapping_ModelID"), ModelClassId);
             }
         }
-        
-        public LabelClass SelectedProjectClass
+
+        /// <summary>
+        /// The project classes this model class may be reported as. Empty when the row is set to
+        /// "not detected", which is also how an untouched row reads.
+        /// </summary>
+        public List<int> SelectedClassIds => ProjectClasses
+            .Where(option => option.IsSelected && option.ClassId != NotDetectedClassId)
+            .Select(option => option.ClassId)
+            .ToList();
+
+        public const int NotDetectedClassId = -1;
+
+        public string SelectionSummary
         {
-            get => _selectedProjectClass;
-            set
+            get
+            {
+                var selected = ProjectClasses
+                    .Where(option => option.IsSelected && option.ClassId != NotDetectedClassId)
+                    .ToList();
+
+                if (selected.Count == 0)
+                    return LanguageManager.Instance.GetString("Mapping_NotDetected") ?? "nan (not detected)";
+
+                return string.Join(", ", selected.Select(option => option.ProjectClass.Name));
+            }
+        }
+
+        public void AttachSelectionHandlers()
+        {
+            foreach (ProjectClassOption option in ProjectClasses)
+                option.SelectionChanged += Option_SelectionChanged;
+        }
+
+        private void Option_SelectionChanged(object sender, EventArgs e)
+        {
+            if (!isSyncingSelection && sender is ProjectClassOption changed && changed.IsSelected)
             {
-                if (_selectedProjectClass != value)
+                isSyncingSelection = true;
+                try
+                {
+                    // "Not detected" and a concrete class list are mutually exclusive.
+                    bool notDetectedPicked = changed.ClassId == NotDetectedClassId;
+                    foreach (ProjectClassOption option in ProjectClasses)
+                    {
+                        if (ReferenceEquals(option, changed))
+                            continue;
+
+                        bool isNotDetected = option.ClassId == NotDetectedClassId;
+                        if (notDetectedPicked || isNotDetected)
+                            option.IsSelected = false;
+                    }
+                }
+                finally
                 {
-                    _selectedProjectClass = value;
-                    OnPropertyChanged();
+                    isSyncingSelection = false;
                 }
             }
+
+            OnPropertyChanged(nameof(SelectionSummary));
+        }
+
+        /// <summary>
+        /// Ticks "not detected" when no real class is selected, so a row always shows an
+        /// explicit state rather than looking merely untouched.
+        /// </summary>
+        public void SyncNotDetectedOption()
+        {
+            ProjectClassOption notDetected =
+                ProjectClasses.FirstOrDefault(option => option.ClassId == NotDetectedClassId);
+            if (notDetected == null)
+                return;
+
+            isSyncingSelection = true;
+            try
+            {
+                notDetected.IsSelected = SelectedClassIds.Count == 0;
+            }
+            finally
+            {
+                isSyncingSelection = false;
+            }
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
@@ -59,7 +167,7 @@ public partial class ModelClassMappingDialog : Window
         private List<ClassMappingItem> mappingItems;
         private List<string> storedModelClassNames;
 
-        public Dictionary<int, int> ClassMapping { get; private set; }
+        public Dictionary<int, List<int>> ClassMapping { get; private set; }
 
         public ModelClassMappingDialog(YoloModel model, List<LabelClass> projectClasses)
         {
@@ -67,7 +175,7 @@ public ModelClassMappingDialog(YoloModel model, List<LabelClass> projectClasses)
             this.model = model;
             this.projectClasses = projectClasses ?? new List<LabelClass>();
             mappingItems = new List<ClassMappingItem>();
-            ClassMapping = new Dictionary<int, int>();
+            ClassMapping = new Dictionary<int, List<int>>();
 
             // Subscribe to language changes
             LanguageManager.Instance.LanguageChanged += LanguageManager_LanguageChanged;
@@ -84,13 +192,12 @@ private void LanguageManager_LanguageChanged(object sender, EventArgs e)
                 // Update nan option name in all mapping items
                 foreach (var item in mappingItems)
                 {
-                    if (item.ProjectClasses != null && item.ProjectClasses.Any())
+                    var nanOption = item.ProjectClasses?
+                        .FirstOrDefault(option => option.ClassId == ClassMappingItem.NotDetectedClassId);
+                    if (nanOption != null)
                     {
-                        var nanOption = item.ProjectClasses.FirstOrDefault(c => c.ClassId == -1);
-                        if (nanOption != null)
-                        {
-                            nanOption.Name = LanguageManager.Instance.GetString("Mapping_NotDetected");
-                        }
+                        nanOption.ProjectClass.Name = LanguageManager.Instance.GetString("Mapping_NotDetected");
+                        nanOption.NotifyDisplayTextChanged();
                     }
                     // Trigger property change for ModelIdDisplayText
                     item.NotifyModelIdDisplayTextChanged();
@@ -159,62 +266,50 @@ private void InitializeMappingWithClassNames(List<string> customClassNames)
             }
 
             // Create "nan" option (ClassId = -1 means skip detection)
-            var nanOption = new LabelClass(LanguageManager.Instance.GetString("Mapping_NotDetected"), "#808080", -1);
+            var nanOption = new LabelClass(LanguageManager.Instance.GetString("Mapping_NotDetected"), "#808080", ClassMappingItem.NotDetectedClassId);
 
             // Create mapping items
             for (int i = 0; i < actualNumClasses; i++)
             {
                 string className = i < modelClassNames.Count ? modelClassNames[i] : $"class_{i}";
-                
-                // Build project classes list with "nan" option at the beginning
-                var availableClasses = new List<LabelClass> { nanOption };
-                if (projectClasses != null && projectClasses.Any())
-                {
-                    availableClasses.AddRange(projectClasses);
-                }
 
-                // Check if there's an existing mapping
-                LabelClass selectedClass = null;
-                if (model.ClassMapping != null && model.ClassMapping.ContainsKey(i))
+                // "Not detected" leads each row, followed by every project class.
+                var options = new List<ProjectClassOption>
                 {
-                    // Mapping exists - use the mapped class
-                    int mappedProjectClassId = model.ClassMapping[i];
-                    selectedClass = availableClasses.FirstOrDefault(c => c.ClassId == mappedProjectClassId);
-                }
-                else if (model.ClassMapping != null && model.ClassMapping.Count > 0)
-                {
-                    // Mapping has been configured but this class is not in mapping
-                    // This means it was set to "nan" (not detected)
-                    selectedClass = nanOption;
-                }
-                else if (projectClasses != null && projectClasses.Any())
+                    new ProjectClassOption { ProjectClass = nanOption }
+                };
+                options.AddRange((projectClasses ?? new List<LabelClass>())
+                    .Select(projectClass => new ProjectClassOption { ProjectClass = projectClass }));
+
+                if (model.ClassMapping != null)
                 {
-                    // No mapping configured yet - try to find a matching class by name
-                    var matchingClass = projectClasses.FirstOrDefault(c => 
-                        c.Name.Equals(className, System.StringComparison.OrdinalIgnoreCase));
-                    if (matchingClass != null)
-                    {
-                        selectedClass = matchingClass;
-                    }
-                    else
+                    // Mapping already configured: tick exactly what it contains. A model class that
+                    // is absent stays unticked, which preserves its "not detected" state.
+                    if (model.ClassMapping.TryGetValue(i, out List<int> mappedClassIds) &&
+                        mappedClassIds != null)
                     {
-                        // Default to "nan" (not detected) for new mappings
-                        selectedClass = nanOption;
+                        foreach (ProjectClassOption option in options)
+                            option.IsSelected = mappedClassIds.Contains(option.ClassId);
                     }
                 }
                 else
                 {
-                    // No project classes, default to "nan"
-                    selectedClass = nanOption;
+                    // First time through: pre-tick a project class whose name matches the model's.
+                    ProjectClassOption matchingOption = options.FirstOrDefault(option =>
+                        option.ProjectClass.Name.Equals(className, System.StringComparison.OrdinalIgnoreCase));
+                    if (matchingOption != null)
+                        matchingOption.IsSelected = true;
                 }
 
-                mappingItems.Add(new ClassMappingItem
+                var item = new ClassMappingItem
                 {
                     ModelClassId = i,
                     ModelClassName = className,
-                    ProjectClasses = availableClasses,
-                    SelectedProjectClass = selectedClass ?? nanOption
-                });
+                    ProjectClasses = options
+                };
+                item.SyncNotDetectedOption();
+                item.AttachSelectionHandlers();
+                mappingItems.Add(item);
             }
 
             MappingList.ItemsSource = mappingItems;
@@ -228,14 +323,15 @@ private void InitializeMappingWithClassNames(List<string> customClassNames)
 
         private void OKButton_Click(object sender, RoutedEventArgs e)
         {
-            // Build mapping dictionary
-            // Only add mappings for classes that are not "nan" (ClassId != -1)
+            // Build mapping dictionary. Model classes with nothing ticked are left out entirely,
+            // which is what marks them as "not detected".
             ClassMapping.Clear();
             foreach (var item in mappingItems)
             {
-                if (item.SelectedProjectClass != null && item.SelectedProjectClass.ClassId != -1)
+                List<int> selectedClassIds = item.SelectedClassIds;
+                if (selectedClassIds.Count > 0)
                 {
-                    ClassMapping[item.ModelClassId] = item.SelectedProjectClass.ClassId;
+                    ClassMapping[item.ModelClassId] = selectedClassIds;
                 }
             }
 
diff --git a/YoableWPF/ModelManagerDialog.xaml b/YoableWPF/ModelManagerDialog.xaml
index 2d5ccbe..89d0617 100644
--- a/YoableWPF/ModelManagerDialog.xaml
+++ b/YoableWPF/ModelManagerDialog.xaml
@@ -13,114 +13,12 @@
 
     <Window.Resources>
         <!-- Accent color for buttons (uses system accent) -->
-        <SolidColorBrush x:Key="AccentButtonBrush" Color="{DynamicResource SystemAccentColor}"/>
 
         <!-- Modern Button Style -->
-        <Style x:Key="ModernButton" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource AccentButtonBrush}"/>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="16,8"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.9"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.5"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
 
         <!-- Secondary Button Style -->
-        <Style x:Key="SecondaryButton" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"/>
-            <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="16,8"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.5"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
 
         <!-- Danger Button Style -->
-        <Style x:Key="DangerButton" TargetType="Button">
-            <Setter Property="Background" Value="#44E57373"/>
-            <Setter Property="Foreground" Value="#E57373"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="16,8"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="#FFE57373"/>
-                                <Setter Property="Foreground" Value="White"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="#FFD32F2F"/>
-                                <Setter Property="Foreground" Value="White"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.5"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
 
         <!-- Model Card Style -->
         <Style x:Key="ModelCard" TargetType="Border">
@@ -149,7 +47,7 @@
                     <TextBlock FontFamily="Segoe MDL2 Assets" 
                                Text="&#xE950;" 
                                FontSize="24"
-                               Foreground="#FF9C27B0"
+                               Foreground="{StaticResource GlyphPurpleBrush}"
                                VerticalAlignment="Center"
                                Margin="0,0,12,0"/>
                     <TextBlock Text="{DynamicResource ModelManager_Title}" 
@@ -218,7 +116,7 @@
                                                FontFamily="Segoe MDL2 Assets"
                                                Text="&#xE82D;"
                                                FontSize="16"
-                                               Foreground="#FF9C27B0"
+                                               Foreground="{StaticResource GlyphPurpleBrush}"
                                                VerticalAlignment="Center"
                                                Margin="0,0,12,0"/>
 
@@ -228,11 +126,11 @@
                                                VerticalAlignment="Center"/>
 
                                     <Border Grid.Column="2"
-                                            Background="#4400BCD4"
+                                            Background="{StaticResource InfoSubtleBrush}"
                                             CornerRadius="10"
                                             Padding="8,4">
                                         <TextBlock Text="{Binding ModelType}"
-                                                   Foreground="#00BCD4"
+                                                   Foreground="{StaticResource InfoBrush}"
                                                    FontSize="11"
                                                    FontWeight="SemiBold"
                                                    VerticalAlignment="Center"/>
@@ -244,18 +142,18 @@
                 </Border>
 
                 <!-- Warning Card -->
-                <Border Background="#44FFB74D"
+                <Border Background="{StaticResource StatusReviewSubtleBrush}"
                         CornerRadius="6"
                         Padding="16">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock FontFamily="Segoe MDL2 Assets"
                                    Text="&#xE7BA;"
                                    FontSize="16"
-                                   Foreground="#FFB74D"
+                                   Foreground="{StaticResource StatusReviewBrush}"
                                    VerticalAlignment="Center"
                                    Margin="0,0,10,0"/>
                         <TextBlock Text="{DynamicResource ModelManager_WarningMessage}"
-                                   Foreground="#CC7A00"
+                                   Foreground="{StaticResource StatusReviewDeepBrush}"
                                    FontSize="12"
                                    TextWrapping="Wrap"
                                    VerticalAlignment="Center"/>
diff --git a/YoableWPF/ModelManagerDialog.xaml.cs b/YoableWPF/ModelManagerDialog.xaml.cs
index 32a6564..3ca1d55 100644
--- a/YoableWPF/ModelManagerDialog.xaml.cs
+++ b/YoableWPF/ModelManagerDialog.xaml.cs
@@ -58,14 +58,14 @@ public partial class ModelManagerDialog : Window
         private YoloAI yoloAI;
         private ObservableCollection<ModelListItem> modelItems;
         private List<LabelClass> projectClasses;
-        private Dictionary<string, Dictionary<int, int>> savedMappings;
+        private Dictionary<string, Dictionary<int, List<int>>> savedMappings;
 
-        public ModelManagerDialog(YoloAI ai, List<LabelClass> projectClasses = null, Dictionary<string, Dictionary<int, int>> savedMappings = null)
+        public ModelManagerDialog(YoloAI ai, List<LabelClass> projectClasses = null, Dictionary<string, Dictionary<int, List<int>>> savedMappings = null)
         {
             InitializeComponent();
             yoloAI = ai;
             this.projectClasses = projectClasses ?? new List<LabelClass>();
-            this.savedMappings = savedMappings ?? new Dictionary<string, Dictionary<int, int>>();
+            this.savedMappings = savedMappings ?? new Dictionary<string, Dictionary<int, List<int>>>();
             modelItems = new ObservableCollection<ModelListItem>();
             ModelListBox.ItemsSource = modelItems;
 
@@ -148,7 +148,7 @@ private void AddButton_Click(object sender, RoutedEventArgs e)
                         // Restore saved mapping if available
                         if (savedMappings != null && savedMappings.TryGetValue(file, out var savedMapping))
                         {
-                            loadedModel.ClassMapping = new Dictionary<int, int>(savedMapping);
+                            loadedModel.ClassMapping = YoloAI.CloneClassMapping(savedMapping);
                         }
 
                         // Open class mapping dialog if project classes exist
diff --git a/YoableWPF/Models/DuplicateImageGroup.cs b/YoableWPF/Models/DuplicateImageGroup.cs
new file mode 100644
index 0000000..c866d0f
--- /dev/null
+++ b/YoableWPF/Models/DuplicateImageGroup.cs
@@ -0,0 +1,19 @@
+namespace YoableWPF.Models
+{
+    public sealed record DuplicateImageCandidate(
+        string FileName,
+        string FullPath,
+        long FileSize);
+
+    public sealed class DuplicateImageGroup
+    {
+        public DuplicateImageGroup(string contentHash, IEnumerable<DuplicateImageCandidate> candidates)
+        {
+            ContentHash = contentHash;
+            Candidates = candidates.ToList();
+        }
+
+        public string ContentHash { get; }
+        public List<DuplicateImageCandidate> Candidates { get; }
+    }
+}
diff --git a/YoableWPF/Models/Models.cs b/YoableWPF/Models/Models.cs
index 357a8ef..1b7b641 100644
--- a/YoableWPF/Models/Models.cs
+++ b/YoableWPF/Models/Models.cs
@@ -15,6 +15,48 @@ public enum ImageStatus
         Suggested = 3
     }
 
+    /// <summary>
+    /// How the image-list class filter matches an image against the selected classes.
+    /// Include: image has at least one of the selected classes (OR).
+    /// All: image contains every selected class at least once (AND).
+    /// Only: every label in the image belongs to the selected set (no other class present).
+    /// Exclude: image contains none of the selected classes.
+    /// </summary>
+    public enum ClassFilterMode
+    {
+        Include = 0,
+        All = 2,
+        Only = 1,
+        Exclude = 3
+    }
+
+    /// <summary>
+    /// View item for the class-filter checkbox list in the annotate tab's left panel.
+    /// </summary>
+    public class ClassFilterItem : INotifyPropertyChanged
+    {
+        private bool _isChecked = true;
+
+        public int ClassId { get; init; }
+        public string Name { get; init; }
+        public Brush ColorBrush { get; init; }
+
+        public bool IsChecked
+        {
+            get => _isChecked;
+            set
+            {
+                if (_isChecked != value)
+                {
+                    _isChecked = value;
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsChecked)));
+                }
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+    }
+
     public class ImageListItem : INotifyPropertyChanged
     {
         private ImageStatus _status;
diff --git a/YoableWPF/Models/ProjectData.cs b/YoableWPF/Models/ProjectData.cs
index 8f836e4..65d7259 100644
--- a/YoableWPF/Models/ProjectData.cs
+++ b/YoableWPF/Models/ProjectData.cs
@@ -5,6 +5,16 @@
 
 namespace YoableWPF.Models
 {
+    /// <summary>
+    /// A body class and the head class that belong to the same team (e.g. police body + police
+    /// head). Lets ClassTransfer reconcile a body box's team with the head box inside it.
+    /// </summary>
+    public class ClassTeamPair
+    {
+        public int BodyClassId { get; set; } = -1;
+        public int HeadClassId { get; set; } = -1;
+    }
+
     /// <summary>
     /// Represents all data for a Yoable project
     /// </summary>
@@ -56,18 +66,55 @@ public int GetNextClassId()
         // UI State
         public Dictionary<string, ImageStatus> ImageStatuses { get; set; } = new Dictionary<string, ImageStatus>();
         public int LastSelectedImageIndex { get; set; } = -1;
+        // Inclusive filename checkpoint for the user's manual labeling progress.
+        public string ManualProgressImageFile { get; set; } = string.Empty;
         public string CurrentSortMode { get; set; } = "ByName";
         public string CurrentFilterMode { get; set; } = "All";
 
         // Model configurations
         // List of loaded model paths
         public List<string> LoadedModelPaths { get; set; } = new List<string>();
-        // Key: model path, Value: class mapping (Model Class ID -> Project Class ID)
+        // Legacy single-target mapping, only read from projects saved before a model class could map
+        // to several project classes. MigrateLegacyModelClassMappings folds it into
+        // ModelClassMappingSets on load and it is never written back.
         public Dictionary<string, Dictionary<int, int>> ModelClassMappings { get; set; } = new Dictionary<string, Dictionary<int, int>>();
+        // Key: model path, Value: model class ID -> allowed project class IDs.
+        public Dictionary<string, Dictionary<int, List<int>>> ModelClassMappingSets { get; set; } = new Dictionary<string, Dictionary<int, List<int>>>();
+        // Key: model path, Value: ModelRole. Only used by the ClassTransfer ensemble mode.
+        public Dictionary<string, int> ModelRoles { get; set; } = new Dictionary<string, int>();
+        // Body/head class pairs that belong to the same team, used to keep a body box's team
+        // consistent with the head box inside it. Only used by the ClassTransfer ensemble mode.
+        public List<ClassTeamPair> ClassTeamPairs { get; set; } = new List<ClassTeamPair>();
+        // Project class ID -> confidence threshold used when labeling the current image.
+        public Dictionary<int, float> AIClassConfidenceThresholds { get; set; } = new Dictionary<int, float>();
 
         // Statistics (optional, for display purposes)
         public int TotalImages => Images?.Count ?? 0;
         public int TotalLabels => (AppCreatedLabels?.Count ?? 0) + (ImportedLabelPaths?.Count ?? 0);
+
+        /// <summary>
+        /// Converts any legacy one-to-one model class mappings into the multi-target format.
+        /// Safe to call repeatedly; entries already present in the new format win.
+        /// </summary>
+        public void MigrateLegacyModelClassMappings()
+        {
+            ModelClassMappingSets ??= new Dictionary<string, Dictionary<int, List<int>>>();
+
+            if (ModelClassMappings == null || ModelClassMappings.Count == 0)
+                return;
+
+            foreach (var modelMapping in ModelClassMappings)
+            {
+                if (modelMapping.Value == null || ModelClassMappingSets.ContainsKey(modelMapping.Key))
+                    continue;
+
+                ModelClassMappingSets[modelMapping.Key] = modelMapping.Value.ToDictionary(
+                    classMapping => classMapping.Key,
+                    classMapping => new List<int> { classMapping.Value });
+            }
+
+            ModelClassMappings.Clear();
+        }
     }
 
     /// <summary>
diff --git a/YoableWPF/NewProjectDialog.xaml b/YoableWPF/NewProjectDialog.xaml
index aa935df..8177b9e 100644
--- a/YoableWPF/NewProjectDialog.xaml
+++ b/YoableWPF/NewProjectDialog.xaml
@@ -13,88 +13,13 @@
 
     <Window.Resources>
         <!-- Modern Button Style -->
-        <Style x:Key="ModernButton" TargetType="Button">
-            <Setter Property="Background" Value="#FF0078D4"/>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="20,10"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.9"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.5"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
 
         <!-- Secondary Button Style -->
-        <Style x:Key="SecondaryButton" TargetType="Button">
-            <Setter Property="Background">
-                <Setter.Value>
-                    <SolidColorBrush Color="#33FFFFFF"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="20,10"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background">
-                                    <Setter.Value>
-                                        <SolidColorBrush Color="#44FFFFFF"/>
-                                    </Setter.Value>
-                                </Setter>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
 
         <!-- Icon Button Style (for browse button) -->
         <Style x:Key="IconButton" TargetType="Button">
-            <Setter Property="Background">
-                <Setter.Value>
-                    <SolidColorBrush Color="#33FFFFFF"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}"/>
+            <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
             <Setter Property="BorderThickness" Value="0"/>
             <Setter Property="Padding" Value="10,8"/>
             <Setter Property="Cursor" Value="Hand"/>
@@ -106,16 +31,12 @@
                                 BorderThickness="0"
                                 CornerRadius="4"
                                 Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
+                            <ContentPresenter HorizontalAlignment="Center"
                                             VerticalAlignment="Center"/>
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background">
-                                    <Setter.Value>
-                                        <SolidColorBrush Color="#44FFFFFF"/>
-                                    </Setter.Value>
-                                </Setter>
+                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource SystemControlBackgroundBaseMediumLowBrush}"/>
                             </Trigger>
                             <Trigger Property="IsPressed" Value="True">
                                 <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
@@ -156,7 +77,7 @@
                     <TextBlock FontFamily="Segoe MDL2 Assets" 
                                Text="&#xE710;" 
                                FontSize="24"
-                               Foreground="#FF9C27B0"
+                               Foreground="{StaticResource GlyphPurpleBrush}"
                                VerticalAlignment="Center"
                                Margin="0,0,12,0"/>
                     <TextBlock Text="Create New Project" 
@@ -216,7 +137,7 @@
                 </Grid>
 
                 <!-- Info Card -->
-                <Border Background="#4400BCD4"
+                <Border Background="{StaticResource InfoSubtleBrush}"
                         CornerRadius="6"
                         Padding="16"
                         Margin="0,8,0,0">
@@ -224,16 +145,16 @@
                         <TextBlock FontFamily="Segoe MDL2 Assets"
                                    Text="&#xE946;"
                                    FontSize="16"
-                                   Foreground="#00BCD4"
+                                   Foreground="{StaticResource InfoBrush}"
                                    VerticalAlignment="Top"
                                    Margin="0,0,10,0"/>
                         <StackPanel>
                             <TextBlock Text="Project Folder Structure"
-                                     Foreground="#00BCD4"
+                                     Foreground="{StaticResource InfoBrush}"
                                      FontWeight="SemiBold"
                                      FontSize="13"
                                      Margin="0,0,0,4"/>
-                            <TextBlock Foreground="#00BCD4"
+                            <TextBlock Foreground="{StaticResource InfoBrush}"
                                      FontSize="12"
                                      TextWrapping="Wrap"
                                      Opacity="0.9">
diff --git a/YoableWPF/Properties/Settings.Designer.cs b/YoableWPF/Properties/Settings.Designer.cs
index 5abac8d..10570e1 100644
--- a/YoableWPF/Properties/Settings.Designer.cs
+++ b/YoableWPF/Properties/Settings.Designer.cs
@@ -46,7 +46,67 @@ public float AIConfidence {
                 this["AIConfidence"] = value;
             }
         }
-        
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool AIAutoLabelOnlyUnlabeled {
+            get {
+                return ((bool)(this["AIAutoLabelOnlyUnlabeled"]));
+            }
+            set {
+                this["AIAutoLabelOnlyUnlabeled"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool AIReplaceExistingLabels {
+            get {
+                return ((bool)(this["AIReplaceExistingLabels"]));
+            }
+            set {
+                this["AIReplaceExistingLabels"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0.5")]
+        public float ClassTransferIoUThreshold {
+            get {
+                return ((float)(this["ClassTransferIoUThreshold"]));
+            }
+            set {
+                this["ClassTransferIoUThreshold"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool ClassTransferKeepUnvoted {
+            get {
+                return ((bool)(this["ClassTransferKeepUnvoted"]));
+            }
+            set {
+                this["ClassTransferKeepUnvoted"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool ClassTransferTeamConsistency {
+            get {
+                return ((bool)(this["ClassTransferTeamConsistency"]));
+            }
+            set {
+                this["ClassTransferTeamConsistency"] = value;
+            }
+        }
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("True")]
@@ -706,5 +766,101 @@ public bool SettingsUpgradeRequired {
                 this["SettingsUpgradeRequired"] = value;
             }
         }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string LastTrainingExportDirectory {
+            get {
+                return ((string)(this["LastTrainingExportDirectory"]));
+            }
+            set {
+                this["LastTrainingExportDirectory"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("80")]
+        public double TrainingSplitTrain {
+            get {
+                return ((double)(this["TrainingSplitTrain"]));
+            }
+            set {
+                this["TrainingSplitTrain"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("20")]
+        public double TrainingSplitVal {
+            get {
+                return ((double)(this["TrainingSplitVal"]));
+            }
+            set {
+                this["TrainingSplitVal"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double TrainingSplitTest {
+            get {
+                return ((double)(this["TrainingSplitTest"]));
+            }
+            set {
+                this["TrainingSplitTest"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public int TrainingSplitSeed {
+            get {
+                return ((int)(this["TrainingSplitSeed"]));
+            }
+            set {
+                this["TrainingSplitSeed"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string LastAugmentationDirectory {
+            get {
+                return ((string)(this["LastAugmentationDirectory"]));
+            }
+            set {
+                this["LastAugmentationDirectory"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("3")]
+        public int AugmentationVariants {
+            get {
+                return ((int)(this["AugmentationVariants"]));
+            }
+            set {
+                this["AugmentationVariants"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public int AugmentationSeed {
+            get {
+                return ((int)(this["AugmentationSeed"]));
+            }
+            set {
+                this["AugmentationSeed"] = value;
+            }
+        }
     }
 }
diff --git a/YoableWPF/Properties/Settings.settings b/YoableWPF/Properties/Settings.settings
index 7c2cd10..da890db 100644
--- a/YoableWPF/Properties/Settings.settings
+++ b/YoableWPF/Properties/Settings.settings
@@ -8,6 +8,21 @@
     <Setting Name="AIConfidence" Type="System.Single" Scope="User">
       <Value Profile="(Default)">0.5</Value>
     </Setting>
+    <Setting Name="AIAutoLabelOnlyUnlabeled" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="AIReplaceExistingLabels" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="ClassTransferIoUThreshold" Type="System.Single" Scope="User">
+      <Value Profile="(Default)">0.5</Value>
+    </Setting>
+    <Setting Name="ClassTransferKeepUnvoted" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="ClassTransferTeamConsistency" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
     <Setting Name="UseGPU" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
@@ -173,5 +188,29 @@
     <Setting Name="SettingsUpgradeRequired" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="LastTrainingExportDirectory" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="TrainingSplitTrain" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">80</Value>
+    </Setting>
+    <Setting Name="TrainingSplitVal" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">20</Value>
+    </Setting>
+    <Setting Name="TrainingSplitTest" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="TrainingSplitSeed" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="LastAugmentationDirectory" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="AugmentationVariants" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">3</Value>
+    </Setting>
+    <Setting Name="AugmentationSeed" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/YoableWPF/Resources/Languages/Strings.en-US.xaml b/YoableWPF/Resources/Languages/Strings.en-US.xaml
index 88837ac..22894b2 100644
--- a/YoableWPF/Resources/Languages/Strings.en-US.xaml
+++ b/YoableWPF/Resources/Languages/Strings.en-US.xaml
@@ -54,6 +54,7 @@
     <system:String x:Key="Settings_CrosshairSettings_Section">Crosshair Settings</system:String>
     <system:String x:Key="Settings_DarkMode">Dark Mode</system:String>
     <system:String x:Key="Settings_AccentColor">Accent Color (Hex)</system:String>
+    <system:String x:Key="Settings_AccentCustomHex">Custom color (Hex)</system:String>
     <system:String x:Key="Settings_AccentColor_Tooltip">Enter a hexadecimal color value (e.g., #FF0000 for red)</system:String>
     <system:String x:Key="Settings_AccentColor_Help">Changes the accent color used throughout the application.</system:String>
     <system:String x:Key="Settings_General_Section">General</system:String>
@@ -86,9 +87,16 @@
     <system:String x:Key="Settings_Detection_Section">Detection</system:String>
     <system:String x:Key="Settings_ProcessingDevice">Processing Device</system:String>
     <system:String x:Key="Settings_Device_CPU">CPU</system:String>
-    <system:String x:Key="Settings_Device_GPU">GPU (CUDA)</system:String>
+    <system:String x:Key="Settings_Device_GPU">GPU (DirectML)</system:String>
     <system:String x:Key="Settings_ConfidenceThreshold">Confidence Threshold</system:String>
     <system:String x:Key="Settings_ConfidenceThreshold_Help">Minimum confidence required to display AI detections.</system:String>
+    <system:String x:Key="Settings_AI_OnlyUnlabeled">Only auto-label unlabeled images</system:String>
+    <system:String x:Key="Settings_AI_OnlyUnlabeled_Help">Skip every image that already has one or more confirmed labels.</system:String>
+    <system:String x:Key="Settings_PerClassConfidence">Per-Class Thresholds...</system:String>
+    <system:String x:Key="Settings_PerClassConfidence_Help">Override the confidence threshold for individual classes. Classes left at the global value follow the slider above.</system:String>
+    <system:String x:Key="Settings_PerClassConfidence_NoClasses">Open a project with defined classes to set per-class thresholds.</system:String>
+    <system:String x:Key="Settings_AI_ReplaceExisting">Replace existing AI labels when labeling</system:String>
+    <system:String x:Key="Settings_AI_ReplaceExisting_Help">When off, new detections are added alongside the AI labels already on the image.</system:String>
     <system:String x:Key="Settings_EnsembleMode_Section">Ensemble Mode</system:String>
     <system:String x:Key="Settings_NoModelsLoaded">No models loaded</system:String>
     <system:String x:Key="Settings_ModelLoaded_Single">1 model loaded (single model mode)</system:String>
@@ -96,6 +104,24 @@
     <system:String x:Key="Settings_DetectionMode">Detection Mode</system:String>
     <system:String x:Key="Settings_DetectionMode_Voting">Voting Mode (requires consensus from multiple models)</system:String>
     <system:String x:Key="Settings_DetectionMode_Union">Union Mode (any model detection is marked)</system:String>
+    <system:String x:Key="Settings_DetectionMode_ClassTransfer">Class Transfer (detector models place boxes, classifier models vote on the class)</system:String>
+    <system:String x:Key="Settings_ClassTransfer_Help">Use one accurate model to place the boxes and other models only to decide each box's class. Ideal when your best model lacks the classes you need, while models that know the classes localize poorly.</system:String>
+    <system:String x:Key="Settings_ClassTransfer_Roles">Model roles</system:String>
+    <system:String x:Key="Settings_ModelRole_Detector">Detector (places boxes)</system:String>
+    <system:String x:Key="Settings_ModelRole_Classifier">Classifier (votes on class)</system:String>
+    <system:String x:Key="Settings_ClassTransfer_NeedDetector">Select at least one detector model, otherwise there are no boxes to keep.</system:String>
+    <system:String x:Key="Settings_ClassTransfer_VoteIoU">Vote overlap threshold (IoU)</system:String>
+    <system:String x:Key="Settings_ClassTransfer_KeepUnvoted">Keep boxes no classifier recognized</system:String>
+    <system:String x:Key="Settings_ClassTransfer_KeepUnvoted_Help">When on, a detector box with no classifier vote is kept and labeled with its first allowed class, so you only fix the class instead of redrawing the box. When off, such boxes are discarded.</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamConsistency">Keep a body's team consistent with the head inside it</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamConsistency_Help">When a head box and the body box around it disagree on team, the higher-confidence one wins and the other is corrected. Needs the class pairings below.</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamPairing">Team pairings...</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamPairing_Help">Pair each body class with the head class of the same team (e.g. police body with police head).</system:String>
+    <system:String x:Key="TeamPairing_Title">Team Pairings</system:String>
+    <system:String x:Key="TeamPairing_Subtitle">Pair a body class with the head class of the same team. Used to keep body and head classifications consistent.</system:String>
+    <system:String x:Key="TeamPairing_Body">Body class</system:String>
+    <system:String x:Key="TeamPairing_Head">Head class</system:String>
+    <system:String x:Key="TeamPairing_AddPair">Add pair</system:String>
     <system:String x:Key="Settings_MinConsensus">Minimum Consensus Required</system:String>
     <system:String x:Key="Settings_ConsensusIoU">Consensus IoU Threshold</system:String>
     <system:String x:Key="Settings_EnsembleIoU">Final Ensemble IoU Threshold</system:String>
@@ -145,11 +171,18 @@
     <!-- Main Window - Menu -->
     <system:String x:Key="Menu_Project">Project</system:String>
     <system:String x:Key="Menu_Settings">Settings</system:String>
+    <system:String x:Key="Toolbar_Import">Import</system:String>
+    <system:String x:Key="Toolbar_AITools">AI Tools</system:String>
+    <system:String x:Key="Toolbar_More">More</system:String>
+    <system:String x:Key="Toolbar_MoreTooltip">More commands</system:String>
+    <system:String x:Key="Toolbar_SaveTooltip">Save Project (Ctrl+S)</system:String>
+    <system:String x:Key="Nav_WorkspacesTooltip">Switch workspace</system:String>
     <system:String x:Key="Menu_NewProject">New Project...</system:String>
     <system:String x:Key="Menu_OpenProject">Open Project...</system:String>
     <system:String x:Key="Menu_SaveProject">Save Project</system:String>
     <system:String x:Key="Menu_SaveProjectAs">Save Project As...</system:String>
     <system:String x:Key="Menu_CloseProject">Close Project</system:String>
+    <system:String x:Key="Menu_BackToStart">Back to Start</system:String>
     <system:String x:Key="Menu_File">File</system:String>
     <system:String x:Key="Menu_ImportDirectory">Import Directory</system:String>
     <system:String x:Key="Menu_ImportLabelsAndImage">Import Labels&amp;Image</system:String>
@@ -158,7 +191,15 @@
     <system:String x:Key="Menu_YoutubeToImages">YouTube To Images</system:String>
     <system:String x:Key="Menu_ExportLabels">Export Labels</system:String>
     <system:String x:Key="Menu_ClearAll">Clear All</system:String>
+    <system:String x:Key="Menu_SetManualProgress">Set Current as Manual Progress</system:String>
+    <system:String x:Key="Menu_JumpManualProgress">Jump to Manual Progress</system:String>
     <system:String x:Key="Menu_AI">AI</system:String>
+    <system:String x:Key="Msg_ManualProgress_Title">Manual Labeling Progress</system:String>
+    <system:String x:Key="Msg_ManualProgress_ProjectRequired">Open or create a project before setting a manual progress point.</system:String>
+    <system:String x:Key="Msg_ManualProgress_SelectImage">Select an image first.</system:String>
+    <system:String x:Key="Msg_ManualProgress_Set">Manual progress point set to: {0}</system:String>
+    <system:String x:Key="Msg_ManualProgress_NotSet">No manual progress point has been set yet.</system:String>
+    <system:String x:Key="Msg_ManualProgress_Missing">The progress image is not currently loaded: {0}</system:String>
     <system:String x:Key="Menu_ManageModels">Manage Models</system:String>
     <system:String x:Key="Menu_AutoLabelImages">Auto Label Images</system:String>
     <system:String x:Key="Menu_AutoSuggestLabels">Suggest Labels</system:String>
@@ -169,13 +210,23 @@
     <system:String x:Key="Main_Sort">Sort</system:String>
     <system:String x:Key="Main_SortByName">By Name</system:String>
     <system:String x:Key="Main_SortByStatus">By Status</system:String>
+    <system:String x:Key="Main_SortByDateNewest">By Date (Newest)</system:String>
+    <system:String x:Key="Main_SortByDateOldest">By Date (Oldest)</system:String>
     <system:String x:Key="Main_Filter">Filter</system:String>
     <system:String x:Key="Main_FilterAll">All</system:String>
     <system:String x:Key="Main_FilterReview">Review</system:String>
     <system:String x:Key="Main_FilterSuggested">Suggested</system:String>
     <system:String x:Key="Main_FilterNone">None</system:String>
     <system:String x:Key="Main_FilterDone">Done</system:String>
+    <system:String x:Key="Main_FilterAiLabels">AI Labels</system:String>
     <system:String x:Key="Main_FilterByClass">Filter by Class</system:String>
+    <system:String x:Key="Main_FilterModeInclude">Include</system:String>
+    <system:String x:Key="Main_FilterModeAll">All</system:String>
+    <system:String x:Key="Main_FilterModeOnly">Only</system:String>
+    <system:String x:Key="Main_FilterModeExclude">Exclude</system:String>
+    <system:String x:Key="Main_FilterSelectAll">Select all</system:String>
+    <system:String x:Key="Main_FilterClear">Clear</system:String>
+    <system:String x:Key="Main_FilterInvert">Invert</system:String>
     <system:String x:Key="Main_StatusReview">REVIEW</system:String>
     <system:String x:Key="Main_StatusSuggested">SUGGESTED</system:String>
     <system:String x:Key="Main_StatusNoLabel">NO LABEL</system:String>
@@ -194,6 +245,7 @@
     <system:String x:Key="Main_Accept">Accept</system:String>
     <system:String x:Key="Main_Reject">Reject</system:String>
     <system:String x:Key="Main_EditClass">Edit class</system:String>
+    <system:String x:Key="Main_ChangeClass">Change class</system:String>
     <system:String x:Key="Main_RemoveSelectedClass">Remove selected class</system:String>
     <system:String x:Key="Main_NoImageSelected">No image selected.</system:String>
     <system:String x:Key="Main_NoLabelsToClear">No labels to clear.</system:String>
@@ -201,6 +253,12 @@
     <system:String x:Key="Main_ConfirmClear">Confirm Clear</system:String>
     <system:String x:Key="Main_Error">Error</system:String>
     <system:String x:Key="Main_Information">Information</system:String>
+    <system:String x:Key="Main_OpenImageLocation">Open Image File Location</system:String>
+    <system:String x:Key="Main_OpenLabelLocation">Open Label File Location</system:String>
+    <system:String x:Key="Main_DeleteImage">Delete Image</system:String>
+    <system:String x:Key="Main_ConfirmDeleteImage">Move '{0}' and its label file to the Recycle Bin and remove it from the project?</system:String>
+    <system:String x:Key="Main_NoLabelFileOnDisk">No label file exists on disk yet for this image. Save or export the project first.</system:String>
+    <system:String x:Key="Main_DeleteImageFailed">The image was removed from the project, but some files could not be deleted:&#x0a;&#x0a;{0}</system:String>
     
     <!-- Main Window - Status Bar -->
     <system:String x:Key="Status_NoProject">No Project</system:String>
@@ -242,10 +300,10 @@
     
     <!-- Model Class Mapping Dialog -->
     <system:String x:Key="Mapping_Title">Configure Model Class Mapping</system:String>
-    <system:String x:Key="Mapping_Description">Please select the corresponding project class for each model class</system:String>
+    <system:String x:Key="Mapping_Description">Tick every project class each model class is allowed to map to</system:String>
     <system:String x:Key="Mapping_LoadClassFile">Load Class File</system:String>
     <system:String x:Key="Mapping_ModelID">Model ID: {0}</system:String>
-    <system:String x:Key="Mapping_InfoFormat">Model: {0}&#x0a;Number of Classes: {1}&#x0a;Number of Project Classes: {2}&#x0a;Hint: Select 'nan (not detected)' to skip detection for this class</system:String>
+    <system:String x:Key="Mapping_InfoFormat">Model: {0}&#x0a;Number of Classes: {1}&#x0a;Number of Project Classes: {2}&#x0a;Hint: tick 'nan (not detected)' to skip a class. Ticking several classes declares the set a detection may be classified as.</system:String>
     <system:String x:Key="Mapping_WarningGeneric">⚠ Warning: Class file not found, displaying generic class names.&#x0a;Please click the 'Load Class File' button in the top right corner to manually load the correct class names.</system:String>
     <system:String x:Key="Mapping_SelectClassFile">Select Class File</system:String>
     <system:String x:Key="Mapping_ClassFileEmpty">Class file is empty or incorrectly formatted.</system:String>
@@ -397,6 +455,8 @@
     <system:String x:Key="Msg_SingleModel">single model</system:String>
     <system:String x:Key="Msg_EnsembleModels">ensemble ({0} models)</system:String>
     <system:String x:Key="Msg_ProcessImagesPrompt">Process {0} images using {1} detection?</system:String>
+    <system:String x:Key="Msg_OnlyUnlabeledSummary">Only unlabeled images will be processed; {0} labeled image(s) will be skipped.</system:String>
+    <system:String x:Key="Msg_NoUnlabeledImages">There are no unlabeled images to process.</system:String>
     <system:String x:Key="Msg_ManyModelsWarning">Note: Processing with many models may take considerable time.</system:String>
     <system:String x:Key="Msg_StartDetection">Start Detection</system:String>
     <system:String x:Key="Msg_UsingModels"> using {0} models</system:String>
@@ -453,15 +513,19 @@
     <system:String x:Key="Msg_ModelAlreadyLoadedTitle">Model Already Loaded</system:String>
     <system:String x:Key="Msg_GPUInitFailed">GPU initialization failed: {0}\nFalling back to CPU.</system:String>
     <system:String x:Key="Msg_GPUWarning">GPU Warning</system:String>
+    <system:String x:Key="Msg_DirectMLUnsupported">This GPU or its current driver does not support DirectML.</system:String>
     <system:String x:Key="Msg_ModelInitFailed">Failed to initialize model: {0}</system:String>
     <system:String x:Key="Msg_UnsupportedModel">Failed to detect YOLO model format or unsupported model type.\n\nSupported formats:\n- YOLOv5: [batch, detections, 5+classes]\n- YOLOv8: [batch, 4+classes, detections]\n\nNote: Segmentation models are not supported.</system:String>
     <system:String x:Key="Msg_UnsupportedModelTitle">Unsupported Model</system:String>
     <system:String x:Key="Msg_ModelLoadedSuccess">Model '{0}' loaded successfully.\nFormat: {1}\nClasses: {2}\nDetections: {3}\nInput Size: {4}x{4}\nTotal models: {5}</system:String>
     <system:String x:Key="Msg_ModelLoaded">Model Loaded</system:String>
     <system:String x:Key="Msg_ErrorLoadingModel">Error loading model: {0}</system:String>
+    <system:String x:Key="Msg_ReloadingModelsForDevice">Reloading AI models for the selected device...</system:String>
     <system:String x:Key="Msg_YouTube_NoCompatibleStream">No compatible video streams found for {0}</system:String>
     <system:String x:Key="Msg_YouTube_DownloadError">Download Error</system:String>
     <system:String x:Key="Msg_AutoLabelComplete">Auto-labeling complete{0}.\nTotal detections: {1}</system:String>
+    <system:String x:Key="Msg_AutoLabelScopeComplete">Processed: {0}; skipped labeled: {1}.</system:String>
+    <system:String x:Key="Msg_AutoLabelFailedImages">{0} image(s) failed or were missing.</system:String>
 
     <!-- Import Labels and Image Dialog -->
     <system:String x:Key="Dialog_ImportLabelsAndImage_Title">Import Labels &amp; Images</system:String>
@@ -481,6 +545,149 @@
     <system:String x:Key="Dialog_ImportLabelsAndImage_InvalidImagesPath">Please select a valid images folder.</system:String>
     <system:String x:Key="Dialog_ImportLabelsAndImage_InvalidLabelsPath">Please select a valid labels folder.</system:String>
     
+    <!-- Duplicate image review -->
+    <system:String x:Key="Main_TabAnnotate">Annotate</system:String>
+    <system:String x:Key="Main_TabDuplicates">Duplicate Images</system:String>
+    <system:String x:Key="Duplicate_Title">Duplicate Images</system:String>
+    <system:String x:Key="Duplicate_Scan">Scan Again</system:String>
+    <system:String x:Key="Duplicate_NoScan">Scan the current project for duplicate images.</system:String>
+    <system:String x:Key="Duplicate_Scanning">Scanning images...</system:String>
+    <system:String x:Key="Duplicate_NoImages">Add at least two images before scanning.</system:String>
+    <system:String x:Key="Duplicate_NoMatches">No duplicate images found.</system:String>
+    <system:String x:Key="Duplicate_ScanFailed">Could not scan duplicate images.</system:String>
+    <system:String x:Key="Duplicate_Resolved">All duplicate images have been resolved.</system:String>
+    <system:String x:Key="Duplicate_Summary">{0} duplicate group(s), {1} extra image(s) remaining</system:String>
+    <system:String x:Key="Duplicate_GroupProgress">Group {0} of {1}</system:String>
+    <system:String x:Key="Duplicate_LabelCount">{0} label(s)</system:String>
+    <system:String x:Key="Duplicate_KeepLeft">Keep Left Image + Labels</system:String>
+    <system:String x:Key="Duplicate_KeepRight">Keep Right Image + Labels</system:String>
+    <system:String x:Key="Duplicate_RemoveFailed">The duplicate image could not be removed from the project.</system:String>
+    <system:String x:Key="Duplicate_AllGroups">All Duplicate Groups</system:String>
+    <system:String x:Key="Duplicate_PreviousGroup">Previous group</system:String>
+    <system:String x:Key="Duplicate_NextGroup">Next group</system:String>
+    <system:String x:Key="Duplicate_GroupTitle">Group {0}</system:String>
+    <system:String x:Key="Duplicate_ExtraCount">{0} extra image(s)</system:String>
+
+    <!-- Center ROI crop -->
+    <system:String x:Key="Main_TabRoiCrop">Center ROI</system:String>
+    <system:String x:Key="Roi_Title">Center ROI Crop</system:String>
+    <system:String x:Key="Roi_OutputSize">Output pixel size</system:String>
+    <system:String x:Key="Roi_Width">Width (px)</system:String>
+    <system:String x:Key="Roi_Height">Height (px)</system:String>
+    <system:String x:Key="Roi_Scope">Apply to</system:String>
+    <system:String x:Key="Roi_AllImages">All project images</system:String>
+    <system:String x:Key="Roi_CurrentImage">Current image</system:String>
+    <system:String x:Key="Roi_OutputFolder">Output folder</system:String>
+    <system:String x:Key="Roi_Apply">Create Custom-sized Crops</system:String>
+    <system:String x:Key="Roi_RemoveSmall">Remove Images Smaller Than ROI</system:String>
+    <system:String x:Key="Roi_RemoveSmallConfirm">Found {0} image(s) smaller than the {1} x {2} ROI. Remove them and their labels from this project? Original files will remain on disk.</system:String>
+    <system:String x:Key="Roi_RemoveSmallComplete">Removed {0} undersized image(s) and their labels from the project.</system:String>
+    <system:String x:Key="Roi_NoSmallImages">No project images are smaller than the {0} x {1} ROI.</system:String>
+    <system:String x:Key="Roi_Preview">Center ROI Preview</system:String>
+    <system:String x:Key="Roi_NoPreview">No image available</system:String>
+    <system:String x:Key="Roi_InvalidSize">The ROI size is invalid.</system:String>
+    <system:String x:Key="Roi_Confirm">Create centered {0} x {1} pixel crops and update labels?</system:String>
+    <system:String x:Key="Roi_Processing">Cropping images...</system:String>
+    <system:String x:Key="Roi_Progress">{0} / {1} - {2}</system:String>
+    <system:String x:Key="Roi_Complete">Cropped {0} image(s), removed {1} label(s), clipped {2} label(s), skipped {3} image(s).</system:String>
+    <system:String x:Key="Roi_Cancelled">ROI crop cancelled.</system:String>
+    <system:String x:Key="Roi_ProjectRequired">Open or create a project before cropping images.</system:String>
+    <system:String x:Key="Roi_Failed">ROI crop failed.</system:String>
+    <system:String x:Key="Roi_NoImages">No images are available to crop.</system:String>
+
+    <system:String x:Key="Menu_AILabelCurrentImage">AI Label Current Image</system:String>
+    <system:String x:Key="AIClassConfidence_Title">Per-Class Confidence</system:String>
+    <system:String x:Key="AIClassConfidence_Subtitle">Set the minimum confidence for each class used by AI labeling.</system:String>
+    <system:String x:Key="AIClassConfidence_Class">Class</system:String>
+    <system:String x:Key="AIClassConfidence_Threshold">Minimum confidence</system:String>
+    <system:String x:Key="AIClassConfidence_Reset">Reset to global value</system:String>
+    <system:String x:Key="AIClassConfidence_Running">Running AI detection on the current image...</system:String>
+    <system:String x:Key="AIClassConfidence_Complete">Current image labeling complete. Detected {0} object(s).</system:String>
+    <system:String x:Key="AIClassConfidence_Failed">Failed to label the current image: {0}</system:String>
+    <system:String x:Key="Duplicate_AutoResolvedSummary">Automatically resolved: {0}</system:String>
+    <system:String x:Key="Duplicate_AutoResolvedOnly">Automatically removed {0} duplicate image(s) with identical labels from the project.</system:String>
+    <system:String x:Key="Duplicate_OpenEdit">Inspect / Edit</system:String>
+    <system:String x:Key="Duplicate_OpenEditFailed">Could not open the image for editing.</system:String>
+
+
+    <!-- Training Dataset Export -->
+    <system:String x:Key="Menu_ExportTrainingDataset">Export Training Dataset...</system:String>
+    <system:String x:Key="TrainingExport_Title">Export Training Dataset</system:String>
+    <system:String x:Key="TrainingExport_Subtitle">Copy images and labels into a YOLO train/val/test folder structure with a data.yaml ready for training.</system:String>
+    <system:String x:Key="TrainingExport_OutputFolder">Output folder</system:String>
+    <system:String x:Key="TrainingExport_Browse">Browse...</system:String>
+    <system:String x:Key="TrainingExport_SplitRatios">Split ratios (%)</system:String>
+    <system:String x:Key="TrainingExport_Train">Train</system:String>
+    <system:String x:Key="TrainingExport_Val">Validation</system:String>
+    <system:String x:Key="TrainingExport_Test">Test</system:String>
+    <system:String x:Key="TrainingExport_SumFormat">Total: {0}% (must equal 100%)</system:String>
+    <system:String x:Key="TrainingExport_Seed">Random seed</system:String>
+    <system:String x:Key="TrainingExport_IncludeBackground">Include unlabeled images as background samples</system:String>
+    <system:String x:Key="TrainingExport_VerifiedOnly">Only export verified images</system:String>
+    <system:String x:Key="Msg_ExportingTrainingDataset">Exporting training dataset...</system:String>
+    <system:String x:Key="Msg_TrainingDatasetExported">Training dataset exported.&#10;Train: {0}   Val: {1}   Test: {2}&#10;Skipped: {3}</system:String>
+    <system:String x:Key="Msg_NoImagesToExport">There are no images to export.</system:String>
+    <system:String x:Key="Msg_NoClassesToExport">Define at least one class before exporting a training dataset.</system:String>
+
+    <!-- Dataset Statistics -->
+    <system:String x:Key="Main_TabStats">Dataset Stats</system:String>
+    <system:String x:Key="Stats_Title">Dataset Statistics</system:String>
+    <system:String x:Key="Stats_Subtitle">Class balance, box sizes and review status for the current project.</system:String>
+    <system:String x:Key="Stats_Refresh">Refresh</system:String>
+    <system:String x:Key="Stats_Empty">No images loaded.</system:String>
+    <system:String x:Key="Stats_TotalImages">Total images</system:String>
+    <system:String x:Key="Stats_LabeledImages">Labeled</system:String>
+    <system:String x:Key="Stats_UnlabeledImages">Unlabeled</system:String>
+    <system:String x:Key="Stats_TotalBoxes">Total boxes</system:String>
+    <system:String x:Key="Stats_AvgBoxes">Avg boxes / image</system:String>
+    <system:String x:Key="Stats_ClassBalance">Class balance</system:String>
+    <system:String x:Key="Stats_SizeDistribution">Box size distribution</system:String>
+    <system:String x:Key="Stats_SizeSmall">Small (&lt;1% area)</system:String>
+    <system:String x:Key="Stats_SizeMedium">Medium (1-5%)</system:String>
+    <system:String x:Key="Stats_SizeLarge">Large (&gt;5%)</system:String>
+    <system:String x:Key="Stats_ReviewStatus">Review status</system:String>
+    <system:String x:Key="Stats_Verified">Verified</system:String>
+    <system:String x:Key="Stats_NeedsReview">Needs review</system:String>
+    <system:String x:Key="Stats_Suggested">Suggested</system:String>
+    <system:String x:Key="Stats_NoLabelStatus">No label</system:String>
+
+    <!-- Data Augmentation -->
+    <system:String x:Key="Menu_DataAugmentation">Data Augmentation...</system:String>
+    <system:String x:Key="Aug_Title">Data Augmentation</system:String>
+    <system:String x:Key="Aug_Subtitle">Generate augmented image and label copies for training. Boxes are remapped on flip; other effects change only pixels.</system:String>
+    <system:String x:Key="Aug_OutputFolder">Output folder</system:String>
+    <system:String x:Key="Aug_Browse">Browse...</system:String>
+    <system:String x:Key="Aug_Scope">Scope</system:String>
+    <system:String x:Key="Aug_ScopeAll">All images</system:String>
+    <system:String x:Key="Aug_ScopeCurrent">Current image</system:String>
+    <system:String x:Key="Aug_Variants">Variants per image</system:String>
+    <system:String x:Key="Aug_Seed">Random seed</system:String>
+    <system:String x:Key="Aug_Augmentations">Augmentations</system:String>
+    <system:String x:Key="Aug_Flip">Horizontal flip</system:String>
+    <system:String x:Key="Aug_Brightness">Brightness / contrast</system:String>
+    <system:String x:Key="Aug_Hsv">Hue / saturation</system:String>
+    <system:String x:Key="Aug_Noise">Gaussian noise</system:String>
+    <system:String x:Key="Aug_Blur">Blur</system:String>
+    <system:String x:Key="Aug_OutputOptions">Output options</system:String>
+    <system:String x:Key="Aug_IncludeOriginals">Include original images</system:String>
+    <system:String x:Key="Aug_LabeledOnly">Only augment labeled images</system:String>
+    <system:String x:Key="Aug_NeedAugmentation">Enable at least one augmentation.</system:String>
+    <system:String x:Key="Msg_Augmenting">Augmenting images...</system:String>
+    <system:String x:Key="Msg_AugmentationComplete">Augmentation complete.&#10;Source images: {0}&#10;Generated images: {1}&#10;Skipped: {2}</system:String>
+    <system:String x:Key="Msg_AugmentationFailed">Augmentation failed: {0}</system:String>
+
+
+    <!-- Startup Window -->
+    <system:String x:Key="Startup_Title">Yoable - Get Started</system:String>
+    <system:String x:Key="Startup_Subtitle">Object Detection Labeling Tool</system:String>
+    <system:String x:Key="Startup_RecentProjects">Recent Projects</system:String>
+    <system:String x:Key="Startup_NoRecent">No recent projects</system:String>
+    <system:String x:Key="Startup_NoRecentHint">Create a new project or open an existing one to get started</system:String>
+    <system:String x:Key="Startup_NewProject">New Project</system:String>
+    <system:String x:Key="Startup_OpenProject">Open Project</system:String>
+    <system:String x:Key="Startup_ContinueWithout">Continue Without Project</system:String>
+    <system:String x:Key="Startup_OpenFolderTooltip">Open project folder</system:String>
+    <system:String x:Key="Startup_DeleteTooltip">Delete project</system:String>
 </ResourceDictionary>
 
 
diff --git a/YoableWPF/Resources/Languages/Strings.ja-JP.xaml b/YoableWPF/Resources/Languages/Strings.ja-JP.xaml
index b7f0b32..952839d 100644
--- a/YoableWPF/Resources/Languages/Strings.ja-JP.xaml
+++ b/YoableWPF/Resources/Languages/Strings.ja-JP.xaml
@@ -30,6 +30,7 @@
     <system:String x:Key="Settings_CrosshairSettings_Section">十字線設定</system:String>
     <system:String x:Key="Settings_DarkMode">ダークモード</system:String>
     <system:String x:Key="Settings_AccentColor">アクセントカラー（16進数）</system:String>
+    <system:String x:Key="Settings_AccentCustomHex">カスタムカラー（16進数）</system:String>
     <system:String x:Key="Settings_AccentColor_Tooltip">16進数の色の値を入力してください（例：#FF0000 は赤色）</system:String>
     <system:String x:Key="Settings_AccentColor_Help">アプリケーション全体で使用されるアクセントカラーを変更します。</system:String>
     <system:String x:Key="Settings_General_Section">一般</system:String>
@@ -58,9 +59,16 @@
     <system:String x:Key="Settings_Detection_Section">検出</system:String>
     <system:String x:Key="Settings_ProcessingDevice">処理デバイス</system:String>
     <system:String x:Key="Settings_Device_CPU">CPU</system:String>
-    <system:String x:Key="Settings_Device_GPU">GPU (CUDA)</system:String>
+    <system:String x:Key="Settings_Device_GPU">GPU (DirectML)</system:String>
     <system:String x:Key="Settings_ConfidenceThreshold">信頼度しきい値</system:String>
     <system:String x:Key="Settings_ConfidenceThreshold_Help">AI検出を表示するために必要な最小信頼度。</system:String>
+    <system:String x:Key="Settings_AI_OnlyUnlabeled">未ラベル画像のみ自動ラベル付け</system:String>
+    <system:String x:Key="Settings_AI_OnlyUnlabeled_Help">確定済みラベルが 1 件以上ある画像をすべてスキップします。</system:String>
+    <system:String x:Key="Settings_PerClassConfidence">クラス別しきい値設定…</system:String>
+    <system:String x:Key="Settings_PerClassConfidence_Help">個々のクラスの信頼度しきい値を上書きします。調整していないクラスは上のグローバル値に従います。</system:String>
+    <system:String x:Key="Settings_PerClassConfidence_NoClasses">クラス別しきい値を設定するには、クラスが定義されたプロジェクトを開いてください。</system:String>
+    <system:String x:Key="Settings_AI_ReplaceExisting">ラベル付け時に既存の AI ラベルを置き換える</system:String>
+    <system:String x:Key="Settings_AI_ReplaceExisting_Help">オフの場合、新しい検出結果は画像上の既存の AI ラベルに追加されます。</system:String>
     <system:String x:Key="Settings_EnsembleMode_Section">アンサンブルモード</system:String>
     <system:String x:Key="Settings_NoModelsLoaded">モデルが読み込まれていません</system:String>
     <system:String x:Key="Settings_ModelLoaded_Single">1つのモデルが読み込まれました（単一モデルモード）</system:String>
@@ -68,6 +76,24 @@
     <system:String x:Key="Settings_DetectionMode">検出モード</system:String>
     <system:String x:Key="Settings_DetectionMode_Voting">投票モード（複数モデルのコンセンサスが必要）</system:String>
     <system:String x:Key="Settings_DetectionMode_Union">統合モード（いずれかのモデルが検出したらマーク）</system:String>
+    <system:String x:Key="Settings_DetectionMode_ClassTransfer">クラス転送（検出モデルが枠を配置し、分類モデルがクラスを投票）</system:String>
+    <system:String x:Key="Settings_ClassTransfer_Help">位置精度の高いモデルに枠の配置を任せ、他のモデルには各枠のクラス判定だけを任せます。最良のモデルに必要なクラスがなく、クラスを知っているモデルの位置精度が低い場合に最適です。</system:String>
+    <system:String x:Key="Settings_ClassTransfer_Roles">モデルの役割</system:String>
+    <system:String x:Key="Settings_ModelRole_Detector">検出（枠を配置）</system:String>
+    <system:String x:Key="Settings_ModelRole_Classifier">分類（クラスを投票）</system:String>
+    <system:String x:Key="Settings_ClassTransfer_NeedDetector">検出モデルを少なくとも1つ選択してください。そうしないと保持する枠がありません。</system:String>
+    <system:String x:Key="Settings_ClassTransfer_VoteIoU">投票の重なりしきい値 (IoU)</system:String>
+    <system:String x:Key="Settings_ClassTransfer_KeepUnvoted">どの分類モデルも認識しなかった枠を残す</system:String>
+    <system:String x:Key="Settings_ClassTransfer_KeepUnvoted_Help">オンの場合、分類の投票がない検出枠を残し、許可リストの最初のクラスを付与します。枠を描き直す代わりにクラスを直すだけで済みます。オフの場合、そのような枠は破棄されます。</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamConsistency">体のチームを内側の頭と一致させる</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamConsistency_Help">頭の枠とそれを囲む体の枠でチームが食い違う場合、信頼度の高い方を優先してもう一方を修正します。下のクラスペアが必要です。</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamPairing">チームのペア設定…</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamPairing_Help">各体クラスを同じチームの頭クラスとペアにします（例：警察の体と警察の頭）。</system:String>
+    <system:String x:Key="TeamPairing_Title">チームのペア</system:String>
+    <system:String x:Key="TeamPairing_Subtitle">体クラスを同じチームの頭クラスとペアにします。体と頭の分類の一貫性を保つために使います。</system:String>
+    <system:String x:Key="TeamPairing_Body">体クラス</system:String>
+    <system:String x:Key="TeamPairing_Head">頭クラス</system:String>
+    <system:String x:Key="TeamPairing_AddPair">ペアを追加</system:String>
     <system:String x:Key="Settings_MinConsensus">必要な最小コンセンサス</system:String>
     <system:String x:Key="Settings_ConsensusIoU">コンセンサス IoU しきい値</system:String>
     <system:String x:Key="Settings_EnsembleIoU">最終アンサンブル IoU しきい値</system:String>
@@ -129,11 +155,18 @@
     <!-- Menu -->
     <system:String x:Key="Menu_Project">プロジェクト</system:String>
     <system:String x:Key="Menu_Settings">設定</system:String>
+    <system:String x:Key="Toolbar_Import">インポート</system:String>
+    <system:String x:Key="Toolbar_AITools">AI ツール</system:String>
+    <system:String x:Key="Toolbar_More">その他</system:String>
+    <system:String x:Key="Toolbar_MoreTooltip">その他のコマンド</system:String>
+    <system:String x:Key="Toolbar_SaveTooltip">プロジェクトを保存 (Ctrl+S)</system:String>
+    <system:String x:Key="Nav_WorkspacesTooltip">ワークスペースを切り替え</system:String>
     <system:String x:Key="Menu_NewProject">新しいプロジェクト...</system:String>
     <system:String x:Key="Menu_OpenProject">プロジェクトを開く...</system:String>
     <system:String x:Key="Menu_SaveProject">プロジェクトを保存</system:String>
     <system:String x:Key="Menu_SaveProjectAs">名前を付けて保存...</system:String>
     <system:String x:Key="Menu_CloseProject">プロジェクトを閉じる</system:String>
+    <system:String x:Key="Menu_BackToStart">スタート画面に戻る</system:String>
     <system:String x:Key="Menu_File">ファイル</system:String>
     <system:String x:Key="Menu_ImportDirectory">ディレクトリをインポート</system:String>
     <system:String x:Key="Menu_ImportLabelsAndImage">ラベルと画像をインポート</system:String>
@@ -143,7 +176,15 @@
     <system:String x:Key="Menu_ExportLabels">ラベルをエクスポート</system:String>
     <system:String x:Key="Menu_ClearAll">すべてクリア</system:String>
     <system:String x:Key="Menu_ClearAllSuggestions">すべての提案をクリア</system:String>
+    <system:String x:Key="Menu_SetManualProgress">現在の画像を手動進捗に設定</system:String>
+    <system:String x:Key="Menu_JumpManualProgress">手動進捗へ移動</system:String>
     <system:String x:Key="Menu_AI">AI</system:String>
+    <system:String x:Key="Msg_ManualProgress_Title">手動ラベル進捗</system:String>
+    <system:String x:Key="Msg_ManualProgress_ProjectRequired">手動進捗を設定する前に、プロジェクトを開くか作成してください。</system:String>
+    <system:String x:Key="Msg_ManualProgress_SelectImage">先に画像を選択してください。</system:String>
+    <system:String x:Key="Msg_ManualProgress_Set">手動進捗を設定しました：{0}</system:String>
+    <system:String x:Key="Msg_ManualProgress_NotSet">手動進捗はまだ設定されていません。</system:String>
+    <system:String x:Key="Msg_ManualProgress_Missing">進捗画像は現在読み込まれていません：{0}</system:String>
     <system:String x:Key="Menu_ManageModels">モデルを管理</system:String>
     <system:String x:Key="Menu_AutoLabelImages">画像に自動ラベル付け</system:String>
     <system:String x:Key="Menu_AutoSuggestLabels">ラベルを自動提案</system:String>
@@ -153,12 +194,22 @@
     <system:String x:Key="Main_Sort">並び替え</system:String>
     <system:String x:Key="Main_SortByName">名前順</system:String>
     <system:String x:Key="Main_SortByStatus">状態順</system:String>
+    <system:String x:Key="Main_SortByDateNewest">日付順（新しい順）</system:String>
+    <system:String x:Key="Main_SortByDateOldest">日付順（古い順）</system:String>
     <system:String x:Key="Main_Filter">フィルター</system:String>
     <system:String x:Key="Main_FilterAll">すべて</system:String>
     <system:String x:Key="Main_FilterReview">レビュー</system:String>
     <system:String x:Key="Main_FilterNone">なし</system:String>
     <system:String x:Key="Main_FilterDone">完了</system:String>
+    <system:String x:Key="Main_FilterAiLabels">AI ラベル</system:String>
     <system:String x:Key="Main_FilterByClass">クラスでフィルター</system:String>
+    <system:String x:Key="Main_FilterModeInclude">含む</system:String>
+    <system:String x:Key="Main_FilterModeAll">すべて</system:String>
+    <system:String x:Key="Main_FilterModeOnly">のみ</system:String>
+    <system:String x:Key="Main_FilterModeExclude">除外</system:String>
+    <system:String x:Key="Main_FilterSelectAll">全選択</system:String>
+    <system:String x:Key="Main_FilterClear">全解除</system:String>
+    <system:String x:Key="Main_FilterInvert">反転</system:String>
     <system:String x:Key="Main_StatusReview">レビュー</system:String>
     <system:String x:Key="Main_StatusNoLabel">ラベルなし</system:String>
     <system:String x:Key="Main_StatusVerified">確認済み</system:String>
@@ -176,6 +227,7 @@
     <system:String x:Key="Main_ImageLabels">画像ラベル</system:String>
     <system:String x:Key="Main_ClearImageClasses">画像クラスをクリア</system:String>
     <system:String x:Key="Main_EditClass">クラスを編集</system:String>
+    <system:String x:Key="Main_ChangeClass">クラスを変更</system:String>
     <system:String x:Key="Main_RemoveSelectedClass">選択したクラスを削除</system:String>
     <system:String x:Key="Main_NoImageSelected">画像が選択されていません</system:String>
     <system:String x:Key="Main_NoLabelsToClear">クリアするラベルがありません</system:String>
@@ -183,6 +235,12 @@
     <system:String x:Key="Main_ConfirmClear">クリアの確認</system:String>
     <system:String x:Key="Main_Error">エラー</system:String>
     <system:String x:Key="Main_Information">情報</system:String>
+    <system:String x:Key="Main_OpenImageLocation">画像ファイルの場所を開く</system:String>
+    <system:String x:Key="Main_OpenLabelLocation">ラベルファイルの場所を開く</system:String>
+    <system:String x:Key="Main_DeleteImage">画像を削除</system:String>
+    <system:String x:Key="Main_ConfirmDeleteImage">「{0}」とそのラベルファイルをごみ箱に移動し、プロジェクトから削除しますか？</system:String>
+    <system:String x:Key="Main_NoLabelFileOnDisk">この画像のラベルファイルはまだディスク上に存在しません。先にプロジェクトを保存またはエクスポートしてください。</system:String>
+    <system:String x:Key="Main_DeleteImageFailed">画像はプロジェクトから削除されましたが、一部のファイルを削除できませんでした：&#x0a;&#x0a;{0}</system:String>
 
     <!-- Propagation Dialog -->
     <system:String x:Key="Propagation_Title">ラベル伝播</system:String>
@@ -331,6 +389,8 @@
     <system:String x:Key="Msg_SingleModel">単一モデル</system:String>
     <system:String x:Key="Msg_EnsembleModels">アンサンブル（{0} モデル）</system:String>
     <system:String x:Key="Msg_ProcessImagesPrompt">{1} 検出を使用して {0} 枚の画像を処理しますか？</system:String>
+    <system:String x:Key="Msg_OnlyUnlabeledSummary">未ラベル画像のみ処理し、ラベル済み画像 {0} 枚をスキップします。</system:String>
+    <system:String x:Key="Msg_NoUnlabeledImages">処理できる未ラベル画像はありません。</system:String>
     <system:String x:Key="Msg_ManyModelsWarning">注意: 多数のモデルでの処理にはかなりの時間がかかる場合があります。</system:String>
     <system:String x:Key="Msg_StartDetection">検出を開始</system:String>
     <system:String x:Key="Msg_UsingModels"> {0} モデルを使用</system:String>
@@ -387,15 +447,19 @@
     <system:String x:Key="Msg_ModelAlreadyLoadedTitle">モデルは既に読み込み済み</system:String>
     <system:String x:Key="Msg_GPUInitFailed">GPU の初期化に失敗しました: {0}&#x0a;CPU にフォールバックします。</system:String>
     <system:String x:Key="Msg_GPUWarning">GPU 警告</system:String>
+    <system:String x:Key="Msg_DirectMLUnsupported">この GPU または現在のドライバーは DirectML をサポートしていません。</system:String>
     <system:String x:Key="Msg_ModelInitFailed">モデルの初期化に失敗しました: {0}</system:String>
     <system:String x:Key="Msg_UnsupportedModel">YOLO モデル形式を検出できないか、サポートされていないモデルタイプです。&#x0a;&#x0a;サポートされている形式:&#x0a;- YOLOv5: [batch, detections, 5+classes]&#x0a;- YOLOv8: [batch, 4+classes, detections]&#x0a;&#x0a;注意: セグメンテーションモデルはサポートされていません。</system:String>
     <system:String x:Key="Msg_UnsupportedModelTitle">サポートされていないモデル</system:String>
     <system:String x:Key="Msg_ModelLoadedSuccess">モデル '{0}' が正常に読み込まれました。&#x0a;形式: {1}&#x0a;クラス: {2}&#x0a;検出: {3}&#x0a;入力サイズ: {4}x{4}&#x0a;合計モデル: {5}</system:String>
     <system:String x:Key="Msg_ModelLoaded">モデルが読み込まれました</system:String>
     <system:String x:Key="Msg_ErrorLoadingModel">モデルの読み込み中にエラーが発生しました: {0}</system:String>
+    <system:String x:Key="Msg_ReloadingModelsForDevice">選択したデバイス用に AI モデルを再読み込みしています...</system:String>
     <system:String x:Key="Msg_YouTube_NoCompatibleStream">{0} の互換性のあるビデオストリームが見つかりません</system:String>
     <system:String x:Key="Msg_YouTube_DownloadError">ダウンロードエラー</system:String>
     <system:String x:Key="Msg_AutoLabelComplete">自動ラベリングが完了しました{0}。&#x0a;検出総数: {1}</system:String>
+    <system:String x:Key="Msg_AutoLabelScopeComplete">処理: {0} 枚、ラベル済みのためスキップ: {1} 枚。</system:String>
+    <system:String x:Key="Msg_AutoLabelFailedImages">失敗または見つからなかった画像: {0} 枚。</system:String>
 
     <!-- Status Bar -->
     <system:String x:Key="Status_NoProject">プロジェクトなし</system:String>
@@ -414,10 +478,10 @@
 
     <!-- Mapping Dialog -->
     <system:String x:Key="Mapping_Title">モデルクラスマッピングの設定</system:String>
-    <system:String x:Key="Mapping_Description">モデルの各クラスに対応するプロジェクトクラスを選択してください</system:String>
+    <system:String x:Key="Mapping_Description">モデルの各クラスが対応できるプロジェクトクラスをすべてチェックしてください</system:String>
     <system:String x:Key="Mapping_LoadClassFile">クラスファイルを読み込む</system:String>
     <system:String x:Key="Mapping_ModelID">モデル ID: {0}</system:String>
-    <system:String x:Key="Mapping_InfoFormat">モデル: {0}&#x0a;クラス数: {1}&#x0a;プロジェクトクラス数: {2}&#x0a;ヒント: 'nan (検出しない)' を選択すると、このクラスの検出をスキップできます</system:String>
+    <system:String x:Key="Mapping_InfoFormat">モデル: {0}&#x0a;クラス数: {1}&#x0a;プロジェクトクラス数: {2}&#x0a;ヒント: 'nan (未検出)' をチェックするとそのクラスをスキップします。複数チェックすると、その検出が分類されうるクラスの集合を宣言します。</system:String>
     <system:String x:Key="Mapping_WarningGeneric">⚠ 警告: クラスファイルが見つかりません。汎用クラス名を表示しています。&#x0a;右上の「クラスファイルを読み込む」ボタンをクリックして、正しいクラス名を手動で読み込んでください。</system:String>
     <system:String x:Key="Mapping_SelectClassFile">クラスファイルを選択</system:String>
     <system:String x:Key="Mapping_ClassFileEmpty">クラスファイルが空であるか、形式が正しくありません。</system:String>
@@ -445,4 +509,147 @@
     <system:String x:Key="ModelManager_NeedProjectClasses">まずプロジェクトでクラスを作成してから、モデルクラスマッピングを設定してください。&#x0a;&#x0a;右側パネルの「Classes」領域でクラスを追加できます。</system:String>
     <system:String x:Key="ModelManager_NeedProjectClassesTitle">プロジェクトクラスが必要</system:String>
 
+    <!-- Duplicate image review -->
+    <system:String x:Key="Main_TabAnnotate">アノテーション</system:String>
+    <system:String x:Key="Main_TabDuplicates">重複画像</system:String>
+    <system:String x:Key="Duplicate_Title">重複画像</system:String>
+    <system:String x:Key="Duplicate_Scan">再スキャン</system:String>
+    <system:String x:Key="Duplicate_NoScan">現在のプロジェクトから重複画像を検索します。</system:String>
+    <system:String x:Key="Duplicate_Scanning">画像をスキャンしています...</system:String>
+    <system:String x:Key="Duplicate_NoImages">スキャンするには画像を2枚以上追加してください。</system:String>
+    <system:String x:Key="Duplicate_NoMatches">重複画像は見つかりませんでした。</system:String>
+    <system:String x:Key="Duplicate_ScanFailed">重複画像をスキャンできませんでした。</system:String>
+    <system:String x:Key="Duplicate_Resolved">すべての重複画像を処理しました。</system:String>
+    <system:String x:Key="Duplicate_Summary">残り {0} グループ、余分な画像 {1} 枚</system:String>
+    <system:String x:Key="Duplicate_GroupProgress">グループ {0} / {1}</system:String>
+    <system:String x:Key="Duplicate_LabelCount">ラベル {0} 件</system:String>
+    <system:String x:Key="Duplicate_KeepLeft">左の画像とラベルを保持</system:String>
+    <system:String x:Key="Duplicate_KeepRight">右の画像とラベルを保持</system:String>
+    <system:String x:Key="Duplicate_RemoveFailed">プロジェクトから重複画像を削除できませんでした。</system:String>
+    <system:String x:Key="Duplicate_AllGroups">すべての重複グループ</system:String>
+    <system:String x:Key="Duplicate_PreviousGroup">前のグループ</system:String>
+    <system:String x:Key="Duplicate_NextGroup">次のグループ</system:String>
+    <system:String x:Key="Duplicate_GroupTitle">グループ {0}</system:String>
+    <system:String x:Key="Duplicate_ExtraCount">余分な画像 {0} 枚</system:String>
+
+    <!-- Center ROI crop -->
+    <system:String x:Key="Main_TabRoiCrop">中央 ROI</system:String>
+    <system:String x:Key="Roi_Title">中央 ROI クロップ</system:String>
+    <system:String x:Key="Roi_OutputSize">出力ピクセルサイズ</system:String>
+    <system:String x:Key="Roi_Width">幅（px）</system:String>
+    <system:String x:Key="Roi_Height">高さ（px）</system:String>
+    <system:String x:Key="Roi_Scope">適用範囲</system:String>
+    <system:String x:Key="Roi_AllImages">プロジェクト内の全画像</system:String>
+    <system:String x:Key="Roi_CurrentImage">現在の画像</system:String>
+    <system:String x:Key="Roi_OutputFolder">出力フォルダー</system:String>
+    <system:String x:Key="Roi_Apply">カスタムサイズのクロップを作成</system:String>
+    <system:String x:Key="Roi_RemoveSmall">ROI より小さい画像を除外</system:String>
+    <system:String x:Key="Roi_RemoveSmallConfirm">{1} x {2} ROI より小さい画像が {0} 枚見つかりました。画像とラベルをこのプロジェクトから除外しますか？元のファイルはディスクに残ります。</system:String>
+    <system:String x:Key="Roi_RemoveSmallComplete">サイズ不足の画像 {0} 枚とそのラベルをプロジェクトから除外しました。</system:String>
+    <system:String x:Key="Roi_NoSmallImages">{0} x {1} ROI より小さい画像はありません。</system:String>
+    <system:String x:Key="Roi_Preview">中央 ROI プレビュー</system:String>
+    <system:String x:Key="Roi_NoPreview">プレビューできる画像がありません</system:String>
+    <system:String x:Key="Roi_InvalidSize">ROI サイズが無効です。</system:String>
+    <system:String x:Key="Roi_Confirm">中央の {0} x {1} ピクセルをクロップしてラベルを更新しますか？</system:String>
+    <system:String x:Key="Roi_Processing">画像をクロップしています...</system:String>
+    <system:String x:Key="Roi_Progress">{0} / {1} - {2}</system:String>
+    <system:String x:Key="Roi_Complete">画像 {0} 枚をクロップ、ラベル {1} 件を削除、{2} 件をクリップ、画像 {3} 枚をスキップしました。</system:String>
+    <system:String x:Key="Roi_Cancelled">ROI クロップをキャンセルしました。</system:String>
+    <system:String x:Key="Roi_ProjectRequired">画像をクロップする前にプロジェクトを開くか作成してください。</system:String>
+    <system:String x:Key="Roi_Failed">ROI クロップに失敗しました。</system:String>
+    <system:String x:Key="Roi_NoImages">クロップできる画像がありません。</system:String>
+
+    <system:String x:Key="Menu_AILabelCurrentImage">現在の画像を AI ラベル付け</system:String>
+    <system:String x:Key="AIClassConfidence_Title">クラス別信頼度</system:String>
+    <system:String x:Key="AIClassConfidence_Subtitle">AI ラベル付けで使用するクラス別の最低信頼度を設定します。</system:String>
+    <system:String x:Key="AIClassConfidence_Class">クラス</system:String>
+    <system:String x:Key="AIClassConfidence_Threshold">最低信頼度</system:String>
+    <system:String x:Key="AIClassConfidence_Reset">グローバル値に戻す</system:String>
+    <system:String x:Key="AIClassConfidence_Running">現在の画像で AI 検出を実行しています...</system:String>
+    <system:String x:Key="AIClassConfidence_Complete">現在の画像のラベル付けが完了しました。{0} 件を検出しました。</system:String>
+    <system:String x:Key="AIClassConfidence_Failed">現在の画像のラベル付けに失敗しました: {0}</system:String>
+    <system:String x:Key="Duplicate_AutoResolvedSummary">自動解決: {0}</system:String>
+    <system:String x:Key="Duplicate_AutoResolvedOnly">画像とラベルが同一の重複画像 {0} 枚をプロジェクトから自動的に削除しました。</system:String>
+    <system:String x:Key="Duplicate_OpenEdit">確認 / 編集</system:String>
+    <system:String x:Key="Duplicate_OpenEditFailed">編集する画像を開けませんでした。</system:String>
+
+
+    <!-- Training Dataset Export -->
+    <system:String x:Key="Menu_ExportTrainingDataset">学習データセットをエクスポート...</system:String>
+    <system:String x:Key="TrainingExport_Title">学習データセットのエクスポート</system:String>
+    <system:String x:Key="TrainingExport_Subtitle">画像とラベルを YOLO の train/val/test フォルダー構成にコピーし、学習に使える data.yaml を生成します。</system:String>
+    <system:String x:Key="TrainingExport_OutputFolder">出力フォルダー</system:String>
+    <system:String x:Key="TrainingExport_Browse">参照...</system:String>
+    <system:String x:Key="TrainingExport_SplitRatios">分割比率 (%)</system:String>
+    <system:String x:Key="TrainingExport_Train">学習</system:String>
+    <system:String x:Key="TrainingExport_Val">検証</system:String>
+    <system:String x:Key="TrainingExport_Test">テスト</system:String>
+    <system:String x:Key="TrainingExport_SumFormat">合計: {0}%(100% にしてください)</system:String>
+    <system:String x:Key="TrainingExport_Seed">乱数シード</system:String>
+    <system:String x:Key="TrainingExport_IncludeBackground">ラベルなし画像を背景サンプルとして含める</system:String>
+    <system:String x:Key="TrainingExport_VerifiedOnly">確認済みの画像のみエクスポート</system:String>
+    <system:String x:Key="Msg_ExportingTrainingDataset">学習データセットをエクスポート中...</system:String>
+    <system:String x:Key="Msg_TrainingDatasetExported">学習データセットをエクスポートしました。&#10;学習: {0}   検証: {1}   テスト: {2}&#10;スキップ: {3}</system:String>
+    <system:String x:Key="Msg_NoImagesToExport">エクスポートする画像がありません。</system:String>
+    <system:String x:Key="Msg_NoClassesToExport">学習データセットをエクスポートする前にクラスを 1 つ以上定義してください。</system:String>
+
+    <!-- Dataset Statistics -->
+    <system:String x:Key="Main_TabStats">データセット統計</system:String>
+    <system:String x:Key="Stats_Title">データセット統計</system:String>
+    <system:String x:Key="Stats_Subtitle">現在のプロジェクトのクラスバランス、ボックスサイズ、確認状況。</system:String>
+    <system:String x:Key="Stats_Refresh">更新</system:String>
+    <system:String x:Key="Stats_Empty">画像が読み込まれていません。</system:String>
+    <system:String x:Key="Stats_TotalImages">総画像数</system:String>
+    <system:String x:Key="Stats_LabeledImages">ラベル付き</system:String>
+    <system:String x:Key="Stats_UnlabeledImages">ラベルなし</system:String>
+    <system:String x:Key="Stats_TotalBoxes">総ボックス数</system:String>
+    <system:String x:Key="Stats_AvgBoxes">画像あたり平均ボックス数</system:String>
+    <system:String x:Key="Stats_ClassBalance">クラスバランス</system:String>
+    <system:String x:Key="Stats_SizeDistribution">ボックスサイズ分布</system:String>
+    <system:String x:Key="Stats_SizeSmall">小 (&lt;1% 面積)</system:String>
+    <system:String x:Key="Stats_SizeMedium">中 (1-5%)</system:String>
+    <system:String x:Key="Stats_SizeLarge">大 (&gt;5%)</system:String>
+    <system:String x:Key="Stats_ReviewStatus">確認状況</system:String>
+    <system:String x:Key="Stats_Verified">確認済み</system:String>
+    <system:String x:Key="Stats_NeedsReview">要確認</system:String>
+    <system:String x:Key="Stats_Suggested">提案</system:String>
+    <system:String x:Key="Stats_NoLabelStatus">ラベルなし</system:String>
+
+    <!-- Data Augmentation -->
+    <system:String x:Key="Menu_DataAugmentation">データ拡張...</system:String>
+    <system:String x:Key="Aug_Title">データ拡張</system:String>
+    <system:String x:Key="Aug_Subtitle">学習用に拡張した画像とラベルのコピーを生成します。反転ではボックス座標を再マッピングし、他の効果はピクセルのみ変更します。</system:String>
+    <system:String x:Key="Aug_OutputFolder">出力フォルダー</system:String>
+    <system:String x:Key="Aug_Browse">参照...</system:String>
+    <system:String x:Key="Aug_Scope">範囲</system:String>
+    <system:String x:Key="Aug_ScopeAll">すべての画像</system:String>
+    <system:String x:Key="Aug_ScopeCurrent">現在の画像</system:String>
+    <system:String x:Key="Aug_Variants">画像あたりのバリエーション数</system:String>
+    <system:String x:Key="Aug_Seed">乱数シード</system:String>
+    <system:String x:Key="Aug_Augmentations">拡張</system:String>
+    <system:String x:Key="Aug_Flip">左右反転</system:String>
+    <system:String x:Key="Aug_Brightness">明るさ / コントラスト</system:String>
+    <system:String x:Key="Aug_Hsv">色相 / 彩度</system:String>
+    <system:String x:Key="Aug_Noise">ガウスノイズ</system:String>
+    <system:String x:Key="Aug_Blur">ぼかし</system:String>
+    <system:String x:Key="Aug_OutputOptions">出力オプション</system:String>
+    <system:String x:Key="Aug_IncludeOriginals">元の画像を含める</system:String>
+    <system:String x:Key="Aug_LabeledOnly">ラベル付き画像のみ拡張</system:String>
+    <system:String x:Key="Aug_NeedAugmentation">少なくとも 1 つの拡張を有効にしてください。</system:String>
+    <system:String x:Key="Msg_Augmenting">画像を拡張中...</system:String>
+    <system:String x:Key="Msg_AugmentationComplete">拡張が完了しました。&#10;元画像: {0}&#10;生成画像: {1}&#10;スキップ: {2}</system:String>
+    <system:String x:Key="Msg_AugmentationFailed">拡張に失敗しました: {0}</system:String>
+
+
+    <!-- Startup Window -->
+    <system:String x:Key="Startup_Title">Yoable - はじめる</system:String>
+    <system:String x:Key="Startup_Subtitle">物体検出ラベリングツール</system:String>
+    <system:String x:Key="Startup_RecentProjects">最近のプロジェクト</system:String>
+    <system:String x:Key="Startup_NoRecent">最近のプロジェクトはありません</system:String>
+    <system:String x:Key="Startup_NoRecentHint">新しいプロジェクトを作成するか、既存のプロジェクトを開いて始めましょう</system:String>
+    <system:String x:Key="Startup_NewProject">新規プロジェクト</system:String>
+    <system:String x:Key="Startup_OpenProject">プロジェクトを開く</system:String>
+    <system:String x:Key="Startup_ContinueWithout">プロジェクトなしで続行</system:String>
+    <system:String x:Key="Startup_OpenFolderTooltip">プロジェクトフォルダーを開く</system:String>
+    <system:String x:Key="Startup_DeleteTooltip">プロジェクトを削除</system:String>
 </ResourceDictionary>
diff --git a/YoableWPF/Resources/Languages/Strings.ru-RU.xaml b/YoableWPF/Resources/Languages/Strings.ru-RU.xaml
index d334b80..15ac381 100644
--- a/YoableWPF/Resources/Languages/Strings.ru-RU.xaml
+++ b/YoableWPF/Resources/Languages/Strings.ru-RU.xaml
@@ -30,6 +30,7 @@
     <system:String x:Key="Settings_CrosshairSettings_Section">Настройки прицельной сетки</system:String>
     <system:String x:Key="Settings_DarkMode">Тёмный режим</system:String>
     <system:String x:Key="Settings_AccentColor">Акцентный цвет (Hex)</system:String>
+    <system:String x:Key="Settings_AccentCustomHex">Свой цвет (Hex)</system:String>
     <system:String x:Key="Settings_AccentColor_Tooltip">Введите шестнадцатеричное значение цвета (например, #FF0000 для красного)</system:String>
     <system:String x:Key="Settings_AccentColor_Help">Изменяет акцентный цвет, используемый во всём приложении.</system:String>
     <system:String x:Key="Settings_General_Section">Общие</system:String>
@@ -58,9 +59,16 @@
     <system:String x:Key="Settings_Detection_Section">Обнаружение</system:String>
     <system:String x:Key="Settings_ProcessingDevice">Устройство обработки</system:String>
     <system:String x:Key="Settings_Device_CPU">CPU</system:String>
-    <system:String x:Key="Settings_Device_GPU">GPU (CUDA)</system:String>
+    <system:String x:Key="Settings_Device_GPU">GPU (DirectML)</system:String>
     <system:String x:Key="Settings_ConfidenceThreshold">Порог уверенности</system:String>
     <system:String x:Key="Settings_ConfidenceThreshold_Help">Минимальная уверенность, необходимая для отображения обнаружений AI.</system:String>
+    <system:String x:Key="Settings_AI_OnlyUnlabeled">Авторазметка только неразмеченных изображений</system:String>
+    <system:String x:Key="Settings_AI_OnlyUnlabeled_Help">Пропускать изображения, у которых уже есть хотя бы одна подтверждённая метка.</system:String>
+    <system:String x:Key="Settings_PerClassConfidence">Пороги по классам...</system:String>
+    <system:String x:Key="Settings_PerClassConfidence_Help">Переопределите порог уверенности для отдельных классов. Неизменённые классы используют глобальное значение выше.</system:String>
+    <system:String x:Key="Settings_PerClassConfidence_NoClasses">Откройте проект с заданными классами, чтобы настроить пороги по классам.</system:String>
+    <system:String x:Key="Settings_AI_ReplaceExisting">Заменять существующие метки ИИ при разметке</system:String>
+    <system:String x:Key="Settings_AI_ReplaceExisting_Help">Если выключено, новые обнаружения добавляются к уже имеющимся на изображении меткам ИИ.</system:String>
     <system:String x:Key="Settings_EnsembleMode_Section">Ансамблевый режим</system:String>
     <system:String x:Key="Settings_NoModelsLoaded">Модели не загружены</system:String>
     <system:String x:Key="Settings_ModelLoaded_Single">Загружена 1 модель (режим одной модели)</system:String>
@@ -68,6 +76,24 @@
     <system:String x:Key="Settings_DetectionMode">Режим обнаружения</system:String>
     <system:String x:Key="Settings_DetectionMode_Voting">Режим голосования (требуется консенсус нескольких моделей)</system:String>
     <system:String x:Key="Settings_DetectionMode_Union">Режим объединения (отмечается любое обнаружение модели)</system:String>
+    <system:String x:Key="Settings_DetectionMode_ClassTransfer">Перенос класса (модели-детекторы ставят рамки, модели-классификаторы голосуют за класс)</system:String>
+    <system:String x:Key="Settings_ClassTransfer_Help">Одна точная модель ставит рамки, а другие только определяют класс каждой рамки. Идеально, когда у лучшей модели нет нужных классов, а модели со знанием классов плохо локализуют.</system:String>
+    <system:String x:Key="Settings_ClassTransfer_Roles">Роли моделей</system:String>
+    <system:String x:Key="Settings_ModelRole_Detector">Детектор (ставит рамки)</system:String>
+    <system:String x:Key="Settings_ModelRole_Classifier">Классификатор (голосует за класс)</system:String>
+    <system:String x:Key="Settings_ClassTransfer_NeedDetector">Выберите хотя бы одну модель-детектор, иначе не будет рамок для сохранения.</system:String>
+    <system:String x:Key="Settings_ClassTransfer_VoteIoU">Порог перекрытия для голосования (IoU)</system:String>
+    <system:String x:Key="Settings_ClassTransfer_KeepUnvoted">Сохранять рамки, не распознанные ни одним классификатором</system:String>
+    <system:String x:Key="Settings_ClassTransfer_KeepUnvoted_Help">Если включено, рамка детектора без голосов классификаторов сохраняется и помечается первым разрешённым классом, чтобы вы лишь исправили класс, а не рисовали рамку заново. Если выключено, такие рамки отбрасываются.</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamConsistency">Согласовывать команду тела с головой внутри него</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamConsistency_Help">Когда рамка головы и охватывающая её рамка тела расходятся по команде, побеждает более уверенная, а другая исправляется. Требуются пары классов ниже.</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamPairing">Пары команд...</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamPairing_Help">Свяжите каждый класс тела с классом головы той же команды (например, тело полиции с головой полиции).</system:String>
+    <system:String x:Key="TeamPairing_Title">Пары команд</system:String>
+    <system:String x:Key="TeamPairing_Subtitle">Свяжите класс тела с классом головы той же команды. Используется для согласования классификации тела и головы.</system:String>
+    <system:String x:Key="TeamPairing_Body">Класс тела</system:String>
+    <system:String x:Key="TeamPairing_Head">Класс головы</system:String>
+    <system:String x:Key="TeamPairing_AddPair">Добавить пару</system:String>
     <system:String x:Key="Settings_MinConsensus">Минимальный консенсус</system:String>
     <system:String x:Key="Settings_ConsensusIoU">Порог консенсуса IoU</system:String>
     <system:String x:Key="Settings_EnsembleIoU">Финальный порог ансамбля IoU</system:String>
@@ -129,11 +155,18 @@
     <!-- Menu -->
     <system:String x:Key="Menu_Project">Проект</system:String>
     <system:String x:Key="Menu_Settings">Настройки</system:String>
+    <system:String x:Key="Toolbar_Import">Импорт</system:String>
+    <system:String x:Key="Toolbar_AITools">ИИ-инструменты</system:String>
+    <system:String x:Key="Toolbar_More">Ещё</system:String>
+    <system:String x:Key="Toolbar_MoreTooltip">Дополнительные команды</system:String>
+    <system:String x:Key="Toolbar_SaveTooltip">Сохранить проект (Ctrl+S)</system:String>
+    <system:String x:Key="Nav_WorkspacesTooltip">Переключить рабочую область</system:String>
     <system:String x:Key="Menu_NewProject">Новый проект...</system:String>
     <system:String x:Key="Menu_OpenProject">Открыть проект...</system:String>
     <system:String x:Key="Menu_SaveProject">Сохранить проект</system:String>
     <system:String x:Key="Menu_SaveProjectAs">Сохранить проект как...</system:String>
     <system:String x:Key="Menu_CloseProject">Закрыть проект</system:String>
+    <system:String x:Key="Menu_BackToStart">Вернуться на стартовый экран</system:String>
     <system:String x:Key="Menu_File">Файл</system:String>
     <system:String x:Key="Menu_ImportDirectory">Импортировать директорию</system:String>
     <system:String x:Key="Menu_ImportLabelsAndImage">Импортировать метки и изображения</system:String>
@@ -143,7 +176,15 @@
     <system:String x:Key="Menu_ExportLabels">Экспортировать метки</system:String>
     <system:String x:Key="Menu_ClearAll">Очистить всё</system:String>
     <system:String x:Key="Menu_ClearAllSuggestions">Очистить все предложения</system:String>
+    <system:String x:Key="Menu_SetManualProgress">Отметить текущий ручной прогресс</system:String>
+    <system:String x:Key="Menu_JumpManualProgress">Перейти к ручному прогрессу</system:String>
     <system:String x:Key="Menu_AI">AI</system:String>
+    <system:String x:Key="Msg_ManualProgress_Title">Прогресс ручной разметки</system:String>
+    <system:String x:Key="Msg_ManualProgress_ProjectRequired">Откройте или создайте проект перед установкой точки прогресса.</system:String>
+    <system:String x:Key="Msg_ManualProgress_SelectImage">Сначала выберите изображение.</system:String>
+    <system:String x:Key="Msg_ManualProgress_Set">Точка ручного прогресса установлена: {0}</system:String>
+    <system:String x:Key="Msg_ManualProgress_NotSet">Точка ручного прогресса ещё не установлена.</system:String>
+    <system:String x:Key="Msg_ManualProgress_Missing">Изображение точки прогресса сейчас не загружено: {0}</system:String>
     <system:String x:Key="Menu_ManageModels">Управление моделями</system:String>
     <system:String x:Key="Menu_AutoLabelImages">Автоматическая разметка изображений</system:String>
     <system:String x:Key="Menu_AutoSuggestLabels">Автоматическое предложение меток</system:String>
@@ -153,12 +194,22 @@
     <system:String x:Key="Main_Sort">Сортировка</system:String>
     <system:String x:Key="Main_SortByName">По имени</system:String>
     <system:String x:Key="Main_SortByStatus">По статусу</system:String>
+    <system:String x:Key="Main_SortByDateNewest">По дате (сначала новые)</system:String>
+    <system:String x:Key="Main_SortByDateOldest">По дате (сначала старые)</system:String>
     <system:String x:Key="Main_Filter">Фильтр</system:String>
     <system:String x:Key="Main_FilterAll">Все</system:String>
     <system:String x:Key="Main_FilterReview">Проверка</system:String>
     <system:String x:Key="Main_FilterNone">Нет</system:String>
     <system:String x:Key="Main_FilterDone">Готово</system:String>
+    <system:String x:Key="Main_FilterAiLabels">Метки AI</system:String>
     <system:String x:Key="Main_FilterByClass">Фильтр по классу</system:String>
+    <system:String x:Key="Main_FilterModeInclude">Содержит</system:String>
+    <system:String x:Key="Main_FilterModeAll">Все</system:String>
+    <system:String x:Key="Main_FilterModeOnly">Только</system:String>
+    <system:String x:Key="Main_FilterModeExclude">Исключить</system:String>
+    <system:String x:Key="Main_FilterSelectAll">Выбрать все</system:String>
+    <system:String x:Key="Main_FilterClear">Очистить</system:String>
+    <system:String x:Key="Main_FilterInvert">Инвертировать</system:String>
     <system:String x:Key="Main_StatusReview">ПРОВЕРКА</system:String>
     <system:String x:Key="Main_StatusNoLabel">БЕЗ МЕТКИ</system:String>
     <system:String x:Key="Main_StatusVerified">ПОДТВЕРЖДЕНО</system:String>
@@ -176,6 +227,7 @@
     <system:String x:Key="Main_ImageLabels">Метки изображений</system:String>
     <system:String x:Key="Main_ClearImageClasses">Очистить классы изображения</system:String>
     <system:String x:Key="Main_EditClass">Редактировать класс</system:String>
+    <system:String x:Key="Main_ChangeClass">Изменить класс</system:String>
     <system:String x:Key="Main_RemoveSelectedClass">Удалить выбранный класс</system:String>
     <system:String x:Key="Main_NoImageSelected">Изображение не выбрано</system:String>
     <system:String x:Key="Main_NoLabelsToClear">Нет меток для очистки</system:String>
@@ -183,6 +235,12 @@
     <system:String x:Key="Main_ConfirmClear">Подтвердить очистку</system:String>
     <system:String x:Key="Main_Error">Ошибка</system:String>
     <system:String x:Key="Main_Information">Информация</system:String>
+    <system:String x:Key="Main_OpenImageLocation">Открыть расположение файла изображения</system:String>
+    <system:String x:Key="Main_OpenLabelLocation">Открыть расположение файла меток</system:String>
+    <system:String x:Key="Main_DeleteImage">Удалить изображение</system:String>
+    <system:String x:Key="Main_ConfirmDeleteImage">Переместить «{0}» и файл его меток в корзину и удалить из проекта?</system:String>
+    <system:String x:Key="Main_NoLabelFileOnDisk">Для этого изображения ещё нет файла меток на диске. Сначала сохраните или экспортируйте проект.</system:String>
+    <system:String x:Key="Main_DeleteImageFailed">Изображение удалено из проекта, но некоторые файлы не удалось удалить:&#x0a;&#x0a;{0}</system:String>
 
     <!-- Propagation Dialog -->
     <system:String x:Key="Propagation_Title">Распространение меток</system:String>
@@ -331,6 +389,8 @@
     <system:String x:Key="Msg_SingleModel">одна модель</system:String>
     <system:String x:Key="Msg_EnsembleModels">ансамбль ({0} моделей)</system:String>
     <system:String x:Key="Msg_ProcessImagesPrompt">Обработать {0} изображений с использованием {1} обнаружения?</system:String>
+    <system:String x:Key="Msg_OnlyUnlabeledSummary">Будут обработаны только неразмеченные изображения; размеченных изображений будет пропущено: {0}.</system:String>
+    <system:String x:Key="Msg_NoUnlabeledImages">Нет неразмеченных изображений для обработки.</system:String>
     <system:String x:Key="Msg_ManyModelsWarning">Примечание: Обработка с большим количеством моделей может занять значительное время.</system:String>
     <system:String x:Key="Msg_StartDetection">Начать обнаружение</system:String>
     <system:String x:Key="Msg_UsingModels"> с использованием {0} моделей</system:String>
@@ -387,15 +447,19 @@
     <system:String x:Key="Msg_ModelAlreadyLoadedTitle">Модель уже загружена</system:String>
     <system:String x:Key="Msg_GPUInitFailed">Ошибка инициализации GPU: {0}&#x0a;Переключение на CPU.</system:String>
     <system:String x:Key="Msg_GPUWarning">Предупреждение GPU</system:String>
+    <system:String x:Key="Msg_DirectMLUnsupported">Этот GPU или текущий драйвер не поддерживает DirectML.</system:String>
     <system:String x:Key="Msg_ModelInitFailed">Не удалось инициализировать модель: {0}</system:String>
     <system:String x:Key="Msg_UnsupportedModel">Не удалось определить формат модели YOLO или неподдерживаемый тип модели.&#x0a;&#x0a;Поддерживаемые форматы:&#x0a;- YOLOv5: [batch, detections, 5+classes]&#x0a;- YOLOv8: [batch, 4+classes, detections]&#x0a;&#x0a;Примечание: Модели сегментации не поддерживаются.</system:String>
     <system:String x:Key="Msg_UnsupportedModelTitle">Неподдерживаемая модель</system:String>
     <system:String x:Key="Msg_ModelLoadedSuccess">Модель '{0}' успешно загружена.&#x0a;Формат: {1}&#x0a;Классы: {2}&#x0a;Обнаружения: {3}&#x0a;Размер входа: {4}x{4}&#x0a;Всего моделей: {5}</system:String>
     <system:String x:Key="Msg_ModelLoaded">Модель загружена</system:String>
     <system:String x:Key="Msg_ErrorLoadingModel">Ошибка загрузки модели: {0}</system:String>
+    <system:String x:Key="Msg_ReloadingModelsForDevice">Повторная загрузка моделей ИИ для выбранного устройства...</system:String>
     <system:String x:Key="Msg_YouTube_NoCompatibleStream">Не найдено совместимых видеопотоков для {0}</system:String>
     <system:String x:Key="Msg_YouTube_DownloadError">Ошибка загрузки</system:String>
     <system:String x:Key="Msg_AutoLabelComplete">Автоматическая разметка завершена{0}.&#x0a;Всего обнаружений: {1}</system:String>
+    <system:String x:Key="Msg_AutoLabelScopeComplete">Обработано: {0}; пропущено размеченных: {1}.</system:String>
+    <system:String x:Key="Msg_AutoLabelFailedImages">Не удалось обработать или найти изображений: {0}.</system:String>
 
     <!-- Status Bar -->
     <system:String x:Key="Status_NoProject">Нет проекта</system:String>
@@ -414,10 +478,10 @@
 
     <!-- Mapping Dialog -->
     <system:String x:Key="Mapping_Title">Настройка сопоставления классов модели</system:String>
-    <system:String x:Key="Mapping_Description">Пожалуйста, выберите соответствующий класс проекта для каждого класса модели</system:String>
+    <system:String x:Key="Mapping_Description">Отметьте все классы проекта, в которые может отображаться каждый класс модели</system:String>
     <system:String x:Key="Mapping_LoadClassFile">Загрузить файл классов</system:String>
     <system:String x:Key="Mapping_ModelID">ID модели: {0}</system:String>
-    <system:String x:Key="Mapping_InfoFormat">Модель: {0}&#x0a;Количество классов: {1}&#x0a;Количество классов проекта: {2}&#x0a;Подсказка: Выберите 'nan (не обнаружено)' чтобы пропустить обнаружение этого класса</system:String>
+    <system:String x:Key="Mapping_InfoFormat">Модель: {0}&#x0a;Количество классов: {1}&#x0a;Количество классов проекта: {2}&#x0a;Подсказка: отметьте 'nan (не обнаружено)', чтобы пропустить класс. Несколько отметок задают набор классов, которым может быть присвоено обнаружение.</system:String>
     <system:String x:Key="Mapping_WarningGeneric">⚠ Предупреждение: Файл классов не найден, отображаются общие имена классов.&#x0a;Пожалуйста, нажмите кнопку 'Загрузить файл классов' в правом верхнем углу, чтобы вручную загрузить правильные имена классов.</system:String>
     <system:String x:Key="Mapping_SelectClassFile">Выбрать файл классов</system:String>
     <system:String x:Key="Mapping_ClassFileEmpty">Файл классов пуст или имеет неправильный формат.</system:String>
@@ -445,4 +509,147 @@
     <system:String x:Key="ModelManager_NeedProjectClasses">Сначала создайте классы в проекте, а затем настройте сопоставление классов модели.&#x0a;&#x0a;Вы можете добавить классы в области «Classes» на правой панели.</system:String>
     <system:String x:Key="ModelManager_NeedProjectClassesTitle">Требуются классы проекта</system:String>
 
+    <!-- Duplicate image review -->
+    <system:String x:Key="Main_TabAnnotate">Разметка</system:String>
+    <system:String x:Key="Main_TabDuplicates">Дубликаты</system:String>
+    <system:String x:Key="Duplicate_Title">Дубликаты изображений</system:String>
+    <system:String x:Key="Duplicate_Scan">Сканировать снова</system:String>
+    <system:String x:Key="Duplicate_NoScan">Найти дубликаты изображений в текущем проекте.</system:String>
+    <system:String x:Key="Duplicate_Scanning">Сканирование изображений...</system:String>
+    <system:String x:Key="Duplicate_NoImages">Для сканирования добавьте не менее двух изображений.</system:String>
+    <system:String x:Key="Duplicate_NoMatches">Дубликаты изображений не найдены.</system:String>
+    <system:String x:Key="Duplicate_ScanFailed">Не удалось найти дубликаты изображений.</system:String>
+    <system:String x:Key="Duplicate_Resolved">Все дубликаты обработаны.</system:String>
+    <system:String x:Key="Duplicate_Summary">Осталось групп: {0}, лишних изображений: {1}</system:String>
+    <system:String x:Key="Duplicate_GroupProgress">Группа {0} из {1}</system:String>
+    <system:String x:Key="Duplicate_LabelCount">Меток: {0}</system:String>
+    <system:String x:Key="Duplicate_KeepLeft">Оставить левое изображение и метки</system:String>
+    <system:String x:Key="Duplicate_KeepRight">Оставить правое изображение и метки</system:String>
+    <system:String x:Key="Duplicate_RemoveFailed">Не удалось удалить дубликат из проекта.</system:String>
+    <system:String x:Key="Duplicate_AllGroups">Все группы дубликатов</system:String>
+    <system:String x:Key="Duplicate_PreviousGroup">Предыдущая группа</system:String>
+    <system:String x:Key="Duplicate_NextGroup">Следующая группа</system:String>
+    <system:String x:Key="Duplicate_GroupTitle">Группа {0}</system:String>
+    <system:String x:Key="Duplicate_ExtraCount">Лишних изображений: {0}</system:String>
+
+    <!-- Center ROI crop -->
+    <system:String x:Key="Main_TabRoiCrop">Центральная ROI</system:String>
+    <system:String x:Key="Roi_Title">Обрезка центральной ROI</system:String>
+    <system:String x:Key="Roi_OutputSize">Размер в пикселях</system:String>
+    <system:String x:Key="Roi_Width">Ширина (пкс)</system:String>
+    <system:String x:Key="Roi_Height">Высота (пкс)</system:String>
+    <system:String x:Key="Roi_Scope">Применить к</system:String>
+    <system:String x:Key="Roi_AllImages">Всем изображениям проекта</system:String>
+    <system:String x:Key="Roi_CurrentImage">Текущему изображению</system:String>
+    <system:String x:Key="Roi_OutputFolder">Папка вывода</system:String>
+    <system:String x:Key="Roi_Apply">Создать обрезки заданного размера</system:String>
+    <system:String x:Key="Roi_RemoveSmall">Удалить изображения меньше ROI</system:String>
+    <system:String x:Key="Roi_RemoveSmallConfirm">Найдено изображений меньше ROI {1} x {2}: {0}. Удалить их и их метки из проекта? Исходные файлы останутся на диске.</system:String>
+    <system:String x:Key="Roi_RemoveSmallComplete">Из проекта удалено изображений недостаточного размера и их меток: {0}.</system:String>
+    <system:String x:Key="Roi_NoSmallImages">В проекте нет изображений меньше ROI {0} x {1}.</system:String>
+    <system:String x:Key="Roi_Preview">Предпросмотр центральной ROI</system:String>
+    <system:String x:Key="Roi_NoPreview">Нет изображения для предпросмотра</system:String>
+    <system:String x:Key="Roi_InvalidSize">Недопустимый размер ROI.</system:String>
+    <system:String x:Key="Roi_Confirm">Обрезать центральную область {0} x {1} пикселей и обновить метки?</system:String>
+    <system:String x:Key="Roi_Processing">Обрезка изображений...</system:String>
+    <system:String x:Key="Roi_Progress">{0} / {1} - {2}</system:String>
+    <system:String x:Key="Roi_Complete">Обрезано изображений: {0}, удалено меток: {1}, обрезано меток: {2}, пропущено изображений: {3}.</system:String>
+    <system:String x:Key="Roi_Cancelled">Обрезка ROI отменена.</system:String>
+    <system:String x:Key="Roi_ProjectRequired">Перед обрезкой откройте или создайте проект.</system:String>
+    <system:String x:Key="Roi_Failed">Не удалось обрезать ROI.</system:String>
+    <system:String x:Key="Roi_NoImages">Нет изображений для обрезки.</system:String>
+
+    <system:String x:Key="Menu_AILabelCurrentImage">AI-разметка текущего изображения</system:String>
+    <system:String x:Key="AIClassConfidence_Title">Порог для каждого класса</system:String>
+    <system:String x:Key="AIClassConfidence_Subtitle">Задайте минимальную уверенность для каждого класса, используемую при разметке ИИ.</system:String>
+    <system:String x:Key="AIClassConfidence_Class">Класс</system:String>
+    <system:String x:Key="AIClassConfidence_Threshold">Минимальная уверенность</system:String>
+    <system:String x:Key="AIClassConfidence_Reset">Сбросить к общему значению</system:String>
+    <system:String x:Key="AIClassConfidence_Running">Выполняется AI-распознавание текущего изображения...</system:String>
+    <system:String x:Key="AIClassConfidence_Complete">Разметка текущего изображения завершена. Обнаружено объектов: {0}.</system:String>
+    <system:String x:Key="AIClassConfidence_Failed">Не удалось разметить текущее изображение: {0}</system:String>
+    <system:String x:Key="Duplicate_AutoResolvedSummary">Устранено автоматически: {0}</system:String>
+    <system:String x:Key="Duplicate_AutoResolvedOnly">Из проекта автоматически удалено дубликатов с одинаковыми изображениями и метками: {0}.</system:String>
+    <system:String x:Key="Duplicate_OpenEdit">Проверить</system:String>
+    <system:String x:Key="Duplicate_OpenEditFailed">Не удалось открыть изображение для редактирования.</system:String>
+
+
+    <!-- Training Dataset Export -->
+    <system:String x:Key="Menu_ExportTrainingDataset">Экспорт обучающего набора...</system:String>
+    <system:String x:Key="TrainingExport_Title">Экспорт обучающего набора</system:String>
+    <system:String x:Key="TrainingExport_Subtitle">Скопировать изображения и метки в структуру папок YOLO train/val/test с файлом data.yaml, готовым для обучения.</system:String>
+    <system:String x:Key="TrainingExport_OutputFolder">Папка вывода</system:String>
+    <system:String x:Key="TrainingExport_Browse">Обзор...</system:String>
+    <system:String x:Key="TrainingExport_SplitRatios">Доли разбиения (%)</system:String>
+    <system:String x:Key="TrainingExport_Train">Обучение</system:String>
+    <system:String x:Key="TrainingExport_Val">Валидация</system:String>
+    <system:String x:Key="TrainingExport_Test">Тест</system:String>
+    <system:String x:Key="TrainingExport_SumFormat">Итого: {0}% (должно быть 100%)</system:String>
+    <system:String x:Key="TrainingExport_Seed">Случайное зерно</system:String>
+    <system:String x:Key="TrainingExport_IncludeBackground">Включить изображения без меток как фоновые образцы</system:String>
+    <system:String x:Key="TrainingExport_VerifiedOnly">Экспортировать только проверенные изображения</system:String>
+    <system:String x:Key="Msg_ExportingTrainingDataset">Экспорт обучающего набора...</system:String>
+    <system:String x:Key="Msg_TrainingDatasetExported">Обучающий набор экспортирован.&#10;Обучение: {0}   Валидация: {1}   Тест: {2}&#10;Пропущено: {3}</system:String>
+    <system:String x:Key="Msg_NoImagesToExport">Нет изображений для экспорта.</system:String>
+    <system:String x:Key="Msg_NoClassesToExport">Определите хотя бы один класс перед экспортом обучающего набора.</system:String>
+
+    <!-- Dataset Statistics -->
+    <system:String x:Key="Main_TabStats">Статистика</system:String>
+    <system:String x:Key="Stats_Title">Статистика набора данных</system:String>
+    <system:String x:Key="Stats_Subtitle">Баланс классов, размеры рамок и статус проверки текущего проекта.</system:String>
+    <system:String x:Key="Stats_Refresh">Обновить</system:String>
+    <system:String x:Key="Stats_Empty">Изображения не загружены.</system:String>
+    <system:String x:Key="Stats_TotalImages">Всего изображений</system:String>
+    <system:String x:Key="Stats_LabeledImages">С разметкой</system:String>
+    <system:String x:Key="Stats_UnlabeledImages">Без разметки</system:String>
+    <system:String x:Key="Stats_TotalBoxes">Всего рамок</system:String>
+    <system:String x:Key="Stats_AvgBoxes">Рамок на изображение</system:String>
+    <system:String x:Key="Stats_ClassBalance">Баланс классов</system:String>
+    <system:String x:Key="Stats_SizeDistribution">Распределение размеров рамок</system:String>
+    <system:String x:Key="Stats_SizeSmall">Малые (&lt;1% площади)</system:String>
+    <system:String x:Key="Stats_SizeMedium">Средние (1-5%)</system:String>
+    <system:String x:Key="Stats_SizeLarge">Большие (&gt;5%)</system:String>
+    <system:String x:Key="Stats_ReviewStatus">Статус проверки</system:String>
+    <system:String x:Key="Stats_Verified">Проверено</system:String>
+    <system:String x:Key="Stats_NeedsReview">Требует проверки</system:String>
+    <system:String x:Key="Stats_Suggested">Предложено</system:String>
+    <system:String x:Key="Stats_NoLabelStatus">Без метки</system:String>
+
+    <!-- Data Augmentation -->
+    <system:String x:Key="Menu_DataAugmentation">Аугментация данных...</system:String>
+    <system:String x:Key="Aug_Title">Аугментация данных</system:String>
+    <system:String x:Key="Aug_Subtitle">Создание аугментированных копий изображений и меток для обучения. При отражении координаты рамок пересчитываются, другие эффекты меняют только пиксели.</system:String>
+    <system:String x:Key="Aug_OutputFolder">Папка вывода</system:String>
+    <system:String x:Key="Aug_Browse">Обзор...</system:String>
+    <system:String x:Key="Aug_Scope">Область</system:String>
+    <system:String x:Key="Aug_ScopeAll">Все изображения</system:String>
+    <system:String x:Key="Aug_ScopeCurrent">Текущее изображение</system:String>
+    <system:String x:Key="Aug_Variants">Вариантов на изображение</system:String>
+    <system:String x:Key="Aug_Seed">Случайное зерно</system:String>
+    <system:String x:Key="Aug_Augmentations">Аугментации</system:String>
+    <system:String x:Key="Aug_Flip">Горизонтальное отражение</system:String>
+    <system:String x:Key="Aug_Brightness">Яркость / контраст</system:String>
+    <system:String x:Key="Aug_Hsv">Оттенок / насыщенность</system:String>
+    <system:String x:Key="Aug_Noise">Гауссов шум</system:String>
+    <system:String x:Key="Aug_Blur">Размытие</system:String>
+    <system:String x:Key="Aug_OutputOptions">Параметры вывода</system:String>
+    <system:String x:Key="Aug_IncludeOriginals">Включить оригинальные изображения</system:String>
+    <system:String x:Key="Aug_LabeledOnly">Аугментировать только размеченные изображения</system:String>
+    <system:String x:Key="Aug_NeedAugmentation">Включите хотя бы одну аугментацию.</system:String>
+    <system:String x:Key="Msg_Augmenting">Аугментация изображений...</system:String>
+    <system:String x:Key="Msg_AugmentationComplete">Аугментация завершена.&#10;Исходных изображений: {0}&#10;Создано изображений: {1}&#10;Пропущено: {2}</system:String>
+    <system:String x:Key="Msg_AugmentationFailed">Ошибка аугментации: {0}</system:String>
+
+
+    <!-- Startup Window -->
+    <system:String x:Key="Startup_Title">Yoable - Начало работы</system:String>
+    <system:String x:Key="Startup_Subtitle">Инструмент разметки для обнаружения объектов</system:String>
+    <system:String x:Key="Startup_RecentProjects">Недавние проекты</system:String>
+    <system:String x:Key="Startup_NoRecent">Нет недавних проектов</system:String>
+    <system:String x:Key="Startup_NoRecentHint">Создайте новый проект или откройте существующий, чтобы начать</system:String>
+    <system:String x:Key="Startup_NewProject">Новый проект</system:String>
+    <system:String x:Key="Startup_OpenProject">Открыть проект</system:String>
+    <system:String x:Key="Startup_ContinueWithout">Продолжить без проекта</system:String>
+    <system:String x:Key="Startup_OpenFolderTooltip">Открыть папку проекта</system:String>
+    <system:String x:Key="Startup_DeleteTooltip">Удалить проект</system:String>
 </ResourceDictionary>
diff --git a/YoableWPF/Resources/Languages/Strings.zh-CN.xaml b/YoableWPF/Resources/Languages/Strings.zh-CN.xaml
index 4e5574a..128210c 100644
--- a/YoableWPF/Resources/Languages/Strings.zh-CN.xaml
+++ b/YoableWPF/Resources/Languages/Strings.zh-CN.xaml
@@ -30,6 +30,7 @@
     <system:String x:Key="Settings_CrosshairSettings_Section">十字准线设置</system:String>
     <system:String x:Key="Settings_DarkMode">深色模式</system:String>
     <system:String x:Key="Settings_AccentColor">强调色（十六进制）</system:String>
+    <system:String x:Key="Settings_AccentCustomHex">自定义颜色（十六进制）</system:String>
     <system:String x:Key="Settings_AccentColor_Tooltip">输入十六进制颜色值（例如：#FF0000 表示红色）</system:String>
     <system:String x:Key="Settings_AccentColor_Help">更改应用程序中使用的强调色。</system:String>
     <system:String x:Key="Settings_General_Section">常规</system:String>
@@ -58,9 +59,16 @@
     <system:String x:Key="Settings_Detection_Section">检测</system:String>
     <system:String x:Key="Settings_ProcessingDevice">处理设备</system:String>
     <system:String x:Key="Settings_Device_CPU">CPU</system:String>
-    <system:String x:Key="Settings_Device_GPU">GPU (CUDA)</system:String>
+    <system:String x:Key="Settings_Device_GPU">GPU (DirectML)</system:String>
     <system:String x:Key="Settings_ConfidenceThreshold">置信度阈值</system:String>
     <system:String x:Key="Settings_ConfidenceThreshold_Help">显示 AI 检测所需的最低置信度。</system:String>
+    <system:String x:Key="Settings_AI_OnlyUnlabeled">只自动标注无标注图片</system:String>
+    <system:String x:Key="Settings_AI_OnlyUnlabeled_Help">跳过已有一个或多个确认标注的图片。</system:String>
+    <system:String x:Key="Settings_PerClassConfidence">各类别阈值设置…</system:String>
+    <system:String x:Key="Settings_PerClassConfidence_Help">为个别类别覆盖置信度阈值。未调整的类别会沿用上方的全局滑块数值。</system:String>
+    <system:String x:Key="Settings_PerClassConfidence_NoClasses">请先打开已定义类别的项目，才能设置各类别阈值。</system:String>
+    <system:String x:Key="Settings_AI_ReplaceExisting">标注时替换已有的 AI 标注</system:String>
+    <system:String x:Key="Settings_AI_ReplaceExisting_Help">关闭时，新的检测结果会与图片上已有的 AI 标注并存。</system:String>
     <system:String x:Key="Settings_EnsembleMode_Section">集成模式</system:String>
     <system:String x:Key="Settings_NoModelsLoaded">未加载模型</system:String>
     <system:String x:Key="Settings_ModelLoaded_Single">已加载 1 个模型（单一模型模式）</system:String>
@@ -68,6 +76,24 @@
     <system:String x:Key="Settings_DetectionMode">检测模式</system:String>
     <system:String x:Key="Settings_DetectionMode_Voting">投票模式（需要多个模型共识）</system:String>
     <system:String x:Key="Settings_DetectionMode_Union">联合模式（任何模型检测到即标记）</system:String>
+    <system:String x:Key="Settings_DetectionMode_ClassTransfer">分类转移（定位模型出框，分类模型投票决定类别）</system:String>
+    <system:String x:Key="Settings_ClassTransfer_Help">用一个定位准的模型负责画框，其他模型只负责判断每个框的类别。适合你最好的模型缺少所需类别、而懂类别的模型定位又不准的情况。</system:String>
+    <system:String x:Key="Settings_ClassTransfer_Roles">模型角色</system:String>
+    <system:String x:Key="Settings_ModelRole_Detector">定位者（负责画框）</system:String>
+    <system:String x:Key="Settings_ModelRole_Classifier">分类者（投票决定类别）</system:String>
+    <system:String x:Key="Settings_ClassTransfer_NeedDetector">请至少选一个定位者模型，否则没有框可以保留。</system:String>
+    <system:String x:Key="Settings_ClassTransfer_VoteIoU">投票重叠阈值 (IoU)</system:String>
+    <system:String x:Key="Settings_ClassTransfer_KeepUnvoted">保留没有任何分类者识别到的框</system:String>
+    <system:String x:Key="Settings_ClassTransfer_KeepUnvoted_Help">开启时，没有分类者投票的定位框会保留，并标成它允许列表中的第一个类别，你只需修改类别而不用重画框。关闭时则直接舍弃这类框。</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamConsistency">让身体的阵营与其头部一致</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamConsistency_Help">当头框与包住它的身体框阵营不一致时，以置信度较高的一方为准修正另一方。需要下方的类别配对。</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamPairing">阵营配对设置…</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamPairing_Help">把每个身体类别与同一队的头类别配对（例如：警身体 配 警头）。</system:String>
+    <system:String x:Key="TeamPairing_Title">阵营配对</system:String>
+    <system:String x:Key="TeamPairing_Subtitle">把身体类别与同一队的头类别配对，用来维持身体与头部分类的一致性。</system:String>
+    <system:String x:Key="TeamPairing_Body">身体类别</system:String>
+    <system:String x:Key="TeamPairing_Head">头类别</system:String>
+    <system:String x:Key="TeamPairing_AddPair">新增配对</system:String>
     <system:String x:Key="Settings_MinConsensus">所需最低共识</system:String>
     <system:String x:Key="Settings_ConsensusIoU">共识 IoU 阈值</system:String>
     <system:String x:Key="Settings_EnsembleIoU">最终集成 IoU 阈值</system:String>
@@ -129,11 +155,18 @@
     <!-- Menu -->
     <system:String x:Key="Menu_Project">项目</system:String>
     <system:String x:Key="Menu_Settings">设置</system:String>
+    <system:String x:Key="Toolbar_Import">导入</system:String>
+    <system:String x:Key="Toolbar_AITools">AI 工具</system:String>
+    <system:String x:Key="Toolbar_More">更多</system:String>
+    <system:String x:Key="Toolbar_MoreTooltip">更多命令</system:String>
+    <system:String x:Key="Toolbar_SaveTooltip">保存项目 (Ctrl+S)</system:String>
+    <system:String x:Key="Nav_WorkspacesTooltip">切换工作区</system:String>
     <system:String x:Key="Menu_NewProject">新建项目...</system:String>
     <system:String x:Key="Menu_OpenProject">打开项目...</system:String>
     <system:String x:Key="Menu_SaveProject">保存项目</system:String>
     <system:String x:Key="Menu_SaveProjectAs">另存项目为...</system:String>
     <system:String x:Key="Menu_CloseProject">关闭项目</system:String>
+    <system:String x:Key="Menu_BackToStart">回到启动页</system:String>
     <system:String x:Key="Menu_File">文件</system:String>
     <system:String x:Key="Menu_ImportDirectory">导入目录</system:String>
     <system:String x:Key="Menu_ImportLabelsAndImage">导入标签与图片</system:String>
@@ -143,7 +176,15 @@
     <system:String x:Key="Menu_ExportLabels">导出标签</system:String>
     <system:String x:Key="Menu_ClearAll">清除全部</system:String>
     <system:String x:Key="Menu_ClearAllSuggestions">清除所有建议</system:String>
+    <system:String x:Key="Menu_SetManualProgress">将当前图片设为手动进度点</system:String>
+    <system:String x:Key="Menu_JumpManualProgress">跳转到手动进度点</system:String>
     <system:String x:Key="Menu_AI">AI</system:String>
+    <system:String x:Key="Msg_ManualProgress_Title">手动标注进度</system:String>
+    <system:String x:Key="Msg_ManualProgress_ProjectRequired">请先打开或创建项目，再设置手动进度点。</system:String>
+    <system:String x:Key="Msg_ManualProgress_SelectImage">请先选择一张图片。</system:String>
+    <system:String x:Key="Msg_ManualProgress_Set">手动进度点已设置为：{0}</system:String>
+    <system:String x:Key="Msg_ManualProgress_NotSet">尚未设置手动进度点。</system:String>
+    <system:String x:Key="Msg_ManualProgress_Missing">当前未加载进度点图片：{0}</system:String>
     <system:String x:Key="Menu_ManageModels">管理模型</system:String>
     <system:String x:Key="Menu_AutoLabelImages">自动标签图片</system:String>
     <system:String x:Key="Menu_AutoSuggestLabels">自动建议标签</system:String>
@@ -153,12 +194,22 @@
     <system:String x:Key="Main_Sort">排序</system:String>
     <system:String x:Key="Main_SortByName">按名称</system:String>
     <system:String x:Key="Main_SortByStatus">按状态</system:String>
+    <system:String x:Key="Main_SortByDateNewest">按日期（最新）</system:String>
+    <system:String x:Key="Main_SortByDateOldest">按日期（最旧）</system:String>
     <system:String x:Key="Main_Filter">筛选</system:String>
     <system:String x:Key="Main_FilterAll">全部</system:String>
     <system:String x:Key="Main_FilterReview">审查</system:String>
     <system:String x:Key="Main_FilterNone">无</system:String>
     <system:String x:Key="Main_FilterDone">已完成</system:String>
+    <system:String x:Key="Main_FilterAiLabels">AI 标注</system:String>
     <system:String x:Key="Main_FilterByClass">依类别筛选</system:String>
+    <system:String x:Key="Main_FilterModeInclude">包含</system:String>
+    <system:String x:Key="Main_FilterModeAll">同时</system:String>
+    <system:String x:Key="Main_FilterModeOnly">只有</system:String>
+    <system:String x:Key="Main_FilterModeExclude">排除</system:String>
+    <system:String x:Key="Main_FilterSelectAll">全选</system:String>
+    <system:String x:Key="Main_FilterClear">全不选</system:String>
+    <system:String x:Key="Main_FilterInvert">反选</system:String>
     <system:String x:Key="Main_StatusReview">审查</system:String>
     <system:String x:Key="Main_StatusNoLabel">无标签</system:String>
     <system:String x:Key="Main_StatusVerified">已验证</system:String>
@@ -176,6 +227,7 @@
     <system:String x:Key="Main_ImageLabels">图片标签</system:String>
     <system:String x:Key="Main_ClearImageClasses">清除图片类别</system:String>
     <system:String x:Key="Main_EditClass">编辑类别</system:String>
+    <system:String x:Key="Main_ChangeClass">更改类别</system:String>
     <system:String x:Key="Main_RemoveSelectedClass">移除选中的类别</system:String>
     <system:String x:Key="Main_NoImageSelected">未选择图片</system:String>
     <system:String x:Key="Main_NoLabelsToClear">没有可清除的标签</system:String>
@@ -183,6 +235,12 @@
     <system:String x:Key="Main_ConfirmClear">确认清除</system:String>
     <system:String x:Key="Main_Error">错误</system:String>
     <system:String x:Key="Main_Information">信息</system:String>
+    <system:String x:Key="Main_OpenImageLocation">打开图片文件位置</system:String>
+    <system:String x:Key="Main_OpenLabelLocation">打开标签文件位置</system:String>
+    <system:String x:Key="Main_DeleteImage">删除图片</system:String>
+    <system:String x:Key="Main_ConfirmDeleteImage">确定要将“{0}”及其标签文件移到回收站，并从项目中移除吗？</system:String>
+    <system:String x:Key="Main_NoLabelFileOnDisk">此图片在磁盘上尚无标签文件。请先保存或导出项目。</system:String>
+    <system:String x:Key="Main_DeleteImageFailed">图片已从项目移除，但以下文件无法删除：&#x0a;&#x0a;{0}</system:String>
 
     <!-- Propagation Dialog -->
     <system:String x:Key="Propagation_Title">标签传播</system:String>
@@ -331,6 +389,8 @@
     <system:String x:Key="Msg_SingleModel">单一模型</system:String>
     <system:String x:Key="Msg_EnsembleModels">集成（{0} 个模型）</system:String>
     <system:String x:Key="Msg_ProcessImagesPrompt">使用 {1} 检测处理 {0} 张图片？</system:String>
+    <system:String x:Key="Msg_OnlyUnlabeledSummary">只处理无标注图片；将跳过 {0} 张已有标注的图片。</system:String>
+    <system:String x:Key="Msg_NoUnlabeledImages">没有可处理的无标注图片。</system:String>
     <system:String x:Key="Msg_ManyModelsWarning">注意：使用多个模型进行处理可能需要较长时间。</system:String>
     <system:String x:Key="Msg_StartDetection">开始检测</system:String>
     <system:String x:Key="Msg_UsingModels"> 使用 {0} 个模型</system:String>
@@ -387,15 +447,19 @@
     <system:String x:Key="Msg_ModelAlreadyLoadedTitle">模型已加载</system:String>
     <system:String x:Key="Msg_GPUInitFailed">GPU 初始化失败：{0}&#x0a;回退到 CPU。</system:String>
     <system:String x:Key="Msg_GPUWarning">GPU 警告</system:String>
+    <system:String x:Key="Msg_DirectMLUnsupported">此 GPU 或当前驱动程序不支持 DirectML。</system:String>
     <system:String x:Key="Msg_ModelInitFailed">模型初始化失败：{0}</system:String>
     <system:String x:Key="Msg_UnsupportedModel">无法检测 YOLO 模型格式或不支持的模型类型。&#x0a;&#x0a;支持的格式：&#x0a;- YOLOv5: [batch, detections, 5+classes]&#x0a;- YOLOv8: [batch, 4+classes, detections]&#x0a;&#x0a;注意：不支持分割模型。</system:String>
     <system:String x:Key="Msg_UnsupportedModelTitle">不支持的模型</system:String>
     <system:String x:Key="Msg_ModelLoadedSuccess">模型 '{0}' 加载成功。&#x0a;格式：{1}&#x0a;类别：{2}&#x0a;检测：{3}&#x0a;输入尺寸：{4}x{4}&#x0a;模型总数：{5}</system:String>
     <system:String x:Key="Msg_ModelLoaded">模型已加载</system:String>
     <system:String x:Key="Msg_ErrorLoadingModel">加载模型时出错：{0}</system:String>
+    <system:String x:Key="Msg_ReloadingModelsForDevice">正在为所选设备重新加载 AI 模型...</system:String>
     <system:String x:Key="Msg_YouTube_NoCompatibleStream">未找到 {0} 的兼容视频流</system:String>
     <system:String x:Key="Msg_YouTube_DownloadError">下载错误</system:String>
     <system:String x:Key="Msg_AutoLabelComplete">自动标注完成{0}。&#x0a;总检测数：{1}</system:String>
+    <system:String x:Key="Msg_AutoLabelScopeComplete">已处理：{0}；已跳过有标注图片：{1}。</system:String>
+    <system:String x:Key="Msg_AutoLabelFailedImages">有 {0} 张图片处理失败或文件不存在。</system:String>
 
     <!-- Status Bar -->
     <system:String x:Key="Status_NoProject">无项目</system:String>
@@ -414,10 +478,10 @@
 
     <!-- Mapping Dialog -->
     <system:String x:Key="Mapping_Title">配置模型类别映射</system:String>
-    <system:String x:Key="Mapping_Description">请为模型的每个类别选择对应的项目类别</system:String>
+    <system:String x:Key="Mapping_Description">请勾选模型每个类别允许对应到的项目类别</system:String>
     <system:String x:Key="Mapping_LoadClassFile">加载类别文件</system:String>
     <system:String x:Key="Mapping_ModelID">模型 ID: {0}</system:String>
-    <system:String x:Key="Mapping_InfoFormat">模型: {0}&#x0a;类别数量: {1}&#x0a;项目类别数量: {2}&#x0a;提示: 选择 'nan (不检测)' 可跳过该类别的检测</system:String>
+    <system:String x:Key="Mapping_InfoFormat">模型: {0}&#x0a;类别数量: {1}&#x0a;项目类别数量: {2}&#x0a;提示: 勾选 'nan (不检测)' 可跳过该类别。勾选多个类别代表声明该检测允许被分类成哪几类。</system:String>
     <system:String x:Key="Mapping_WarningGeneric">⚠ 警告: 未找到类别文件，显示通用类别名称。&#x0a;请点击右上角「加载类别文件」按钮手动加载正确的类别名称。</system:String>
     <system:String x:Key="Mapping_SelectClassFile">选择类别文件</system:String>
     <system:String x:Key="Mapping_ClassFileEmpty">类别文件为空或格式不正确。</system:String>
@@ -445,4 +509,147 @@
     <system:String x:Key="ModelManager_NeedProjectClasses">请先在项目中创建类别，然后再配置模型类别映射。&#x0a;&#x0a;您可以在右侧面板的「Classes」区域添加类别。</system:String>
     <system:String x:Key="ModelManager_NeedProjectClassesTitle">需要项目类别</system:String>
 
+    <!-- Duplicate image review -->
+    <system:String x:Key="Main_TabAnnotate">图片标注</system:String>
+    <system:String x:Key="Main_TabDuplicates">重复图片</system:String>
+    <system:String x:Key="Duplicate_Title">重复图片</system:String>
+    <system:String x:Key="Duplicate_Scan">重新扫描</system:String>
+    <system:String x:Key="Duplicate_NoScan">扫描当前项目中的重复图片。</system:String>
+    <system:String x:Key="Duplicate_Scanning">正在扫描图片...</system:String>
+    <system:String x:Key="Duplicate_NoImages">至少添加两张图片后才能扫描。</system:String>
+    <system:String x:Key="Duplicate_NoMatches">没有找到重复图片。</system:String>
+    <system:String x:Key="Duplicate_ScanFailed">无法扫描重复图片。</system:String>
+    <system:String x:Key="Duplicate_Resolved">所有重复图片均已处理完成。</system:String>
+    <system:String x:Key="Duplicate_Summary">剩余 {0} 组重复图片，共 {1} 张多余图片</system:String>
+    <system:String x:Key="Duplicate_GroupProgress">第 {0} 组，共 {1} 组</system:String>
+    <system:String x:Key="Duplicate_LabelCount">{0} 个标注</system:String>
+    <system:String x:Key="Duplicate_KeepLeft">保留左侧图片与标注</system:String>
+    <system:String x:Key="Duplicate_KeepRight">保留右侧图片与标注</system:String>
+    <system:String x:Key="Duplicate_RemoveFailed">无法从项目中移除重复图片。</system:String>
+    <system:String x:Key="Duplicate_AllGroups">全部重复分组</system:String>
+    <system:String x:Key="Duplicate_PreviousGroup">上一组</system:String>
+    <system:String x:Key="Duplicate_NextGroup">下一组</system:String>
+    <system:String x:Key="Duplicate_GroupTitle">第 {0} 组</system:String>
+    <system:String x:Key="Duplicate_ExtraCount">{0} 张多余图片</system:String>
+
+    <!-- Center ROI crop -->
+    <system:String x:Key="Main_TabRoiCrop">中心 ROI</system:String>
+    <system:String x:Key="Roi_Title">中心 ROI 裁切</system:String>
+    <system:String x:Key="Roi_OutputSize">输出像素尺寸</system:String>
+    <system:String x:Key="Roi_Width">宽度（px）</system:String>
+    <system:String x:Key="Roi_Height">高度（px）</system:String>
+    <system:String x:Key="Roi_Scope">应用范围</system:String>
+    <system:String x:Key="Roi_AllImages">项目内全部图片</system:String>
+    <system:String x:Key="Roi_CurrentImage">当前图片</system:String>
+    <system:String x:Key="Roi_OutputFolder">输出文件夹</system:String>
+    <system:String x:Key="Roi_Apply">创建自定义尺寸裁切图片</system:String>
+    <system:String x:Key="Roi_RemoveSmall">移除小于 ROI 的图片</system:String>
+    <system:String x:Key="Roi_RemoveSmallConfirm">找到 {0} 张小于 {1} x {2} ROI 的图片。要从项目中移除这些图片及其标注吗？硬盘上的原始文件会保留。</system:String>
+    <system:String x:Key="Roi_RemoveSmallComplete">已从项目中移除 {0} 张尺寸不足的图片及其标注。</system:String>
+    <system:String x:Key="Roi_NoSmallImages">项目中没有小于 {0} x {1} ROI 的图片。</system:String>
+    <system:String x:Key="Roi_Preview">中心 ROI 预览</system:String>
+    <system:String x:Key="Roi_NoPreview">没有可预览的图片</system:String>
+    <system:String x:Key="Roi_InvalidSize">ROI 尺寸无效。</system:String>
+    <system:String x:Key="Roi_Confirm">要创建正中央 {0} x {1} 像素裁切图片并更新标注吗？</system:String>
+    <system:String x:Key="Roi_Processing">正在裁切图片...</system:String>
+    <system:String x:Key="Roi_Progress">{0} / {1} - {2}</system:String>
+    <system:String x:Key="Roi_Complete">已裁切 {0} 张图片、移除 {1} 个标注、裁短 {2} 个标注、跳过 {3} 张图片。</system:String>
+    <system:String x:Key="Roi_Cancelled">已取消 ROI 裁切。</system:String>
+    <system:String x:Key="Roi_ProjectRequired">请先打开或创建项目再裁切图片。</system:String>
+    <system:String x:Key="Roi_Failed">ROI 裁切失败。</system:String>
+    <system:String x:Key="Roi_NoImages">没有可裁切的图片。</system:String>
+
+    <system:String x:Key="Menu_AILabelCurrentImage">AI 标记当前图片</system:String>
+    <system:String x:Key="AIClassConfidence_Title">各类别置信度</system:String>
+    <system:String x:Key="AIClassConfidence_Subtitle">设置 AI 标记时，每个类别需要达到的最低置信度。</system:String>
+    <system:String x:Key="AIClassConfidence_Class">类别</system:String>
+    <system:String x:Key="AIClassConfidence_Threshold">最低置信度</system:String>
+    <system:String x:Key="AIClassConfidence_Reset">重置为全局值</system:String>
+    <system:String x:Key="AIClassConfidence_Running">正在对当前图片执行 AI 检测...</system:String>
+    <system:String x:Key="AIClassConfidence_Complete">当前图片标记完成，共检测到 {0} 个对象。</system:String>
+    <system:String x:Key="AIClassConfidence_Failed">当前图片标记失败：{0}</system:String>
+    <system:String x:Key="Duplicate_AutoResolvedSummary">已自动处理：{0}</system:String>
+    <system:String x:Key="Duplicate_AutoResolvedOnly">已从项目自动移除 {0} 张图片与标记均相同的重复图片。</system:String>
+    <system:String x:Key="Duplicate_OpenEdit">检查 / 修改</system:String>
+    <system:String x:Key="Duplicate_OpenEditFailed">无法打开图片进行修改。</system:String>
+
+
+    <!-- Training Dataset Export -->
+    <system:String x:Key="Menu_ExportTrainingDataset">导出训练数据集...</system:String>
+    <system:String x:Key="TrainingExport_Title">导出训练数据集</system:String>
+    <system:String x:Key="TrainingExport_Subtitle">将图片和标签复制为 YOLO 的 train/val/test 文件夹结构,并生成可直接用于训练的 data.yaml。</system:String>
+    <system:String x:Key="TrainingExport_OutputFolder">输出文件夹</system:String>
+    <system:String x:Key="TrainingExport_Browse">浏览...</system:String>
+    <system:String x:Key="TrainingExport_SplitRatios">切分比例 (%)</system:String>
+    <system:String x:Key="TrainingExport_Train">训练</system:String>
+    <system:String x:Key="TrainingExport_Val">验证</system:String>
+    <system:String x:Key="TrainingExport_Test">测试</system:String>
+    <system:String x:Key="TrainingExport_SumFormat">合计:{0}%(必须等于 100%)</system:String>
+    <system:String x:Key="TrainingExport_Seed">随机种子</system:String>
+    <system:String x:Key="TrainingExport_IncludeBackground">将无标签图片作为背景样本纳入</system:String>
+    <system:String x:Key="TrainingExport_VerifiedOnly">仅导出已验证的图片</system:String>
+    <system:String x:Key="Msg_ExportingTrainingDataset">正在导出训练数据集...</system:String>
+    <system:String x:Key="Msg_TrainingDatasetExported">训练数据集已导出。&#10;训练:{0}   验证:{1}   测试:{2}&#10;已跳过:{3}</system:String>
+    <system:String x:Key="Msg_NoImagesToExport">没有可导出的图片。</system:String>
+    <system:String x:Key="Msg_NoClassesToExport">导出训练数据集前请至少定义一个类别。</system:String>
+
+    <!-- Dataset Statistics -->
+    <system:String x:Key="Main_TabStats">数据集统计</system:String>
+    <system:String x:Key="Stats_Title">数据集统计</system:String>
+    <system:String x:Key="Stats_Subtitle">当前项目的类别平衡、框大小分布与审查状态。</system:String>
+    <system:String x:Key="Stats_Refresh">刷新</system:String>
+    <system:String x:Key="Stats_Empty">尚未加载图片。</system:String>
+    <system:String x:Key="Stats_TotalImages">图片总数</system:String>
+    <system:String x:Key="Stats_LabeledImages">已标注</system:String>
+    <system:String x:Key="Stats_UnlabeledImages">未标注</system:String>
+    <system:String x:Key="Stats_TotalBoxes">框总数</system:String>
+    <system:String x:Key="Stats_AvgBoxes">平均每图框数</system:String>
+    <system:String x:Key="Stats_ClassBalance">类别平衡</system:String>
+    <system:String x:Key="Stats_SizeDistribution">框大小分布</system:String>
+    <system:String x:Key="Stats_SizeSmall">小 (&lt;1% 面积)</system:String>
+    <system:String x:Key="Stats_SizeMedium">中 (1-5%)</system:String>
+    <system:String x:Key="Stats_SizeLarge">大 (&gt;5%)</system:String>
+    <system:String x:Key="Stats_ReviewStatus">审查状态</system:String>
+    <system:String x:Key="Stats_Verified">已验证</system:String>
+    <system:String x:Key="Stats_NeedsReview">待审查</system:String>
+    <system:String x:Key="Stats_Suggested">建议</system:String>
+    <system:String x:Key="Stats_NoLabelStatus">无标签</system:String>
+
+    <!-- Data Augmentation -->
+    <system:String x:Key="Menu_DataAugmentation">数据增强...</system:String>
+    <system:String x:Key="Aug_Title">数据增强</system:String>
+    <system:String x:Key="Aug_Subtitle">为训练生成增强后的图片与标签副本。翻转会重映框坐标,其他效果只改变像素。</system:String>
+    <system:String x:Key="Aug_OutputFolder">输出文件夹</system:String>
+    <system:String x:Key="Aug_Browse">浏览...</system:String>
+    <system:String x:Key="Aug_Scope">范围</system:String>
+    <system:String x:Key="Aug_ScopeAll">所有图片</system:String>
+    <system:String x:Key="Aug_ScopeCurrent">当前图片</system:String>
+    <system:String x:Key="Aug_Variants">每张图变体数</system:String>
+    <system:String x:Key="Aug_Seed">随机种子</system:String>
+    <system:String x:Key="Aug_Augmentations">增强项目</system:String>
+    <system:String x:Key="Aug_Flip">水平翻转</system:String>
+    <system:String x:Key="Aug_Brightness">亮度 / 对比度</system:String>
+    <system:String x:Key="Aug_Hsv">色相 / 饱和度</system:String>
+    <system:String x:Key="Aug_Noise">高斯噪声</system:String>
+    <system:String x:Key="Aug_Blur">模糊</system:String>
+    <system:String x:Key="Aug_OutputOptions">输出选项</system:String>
+    <system:String x:Key="Aug_IncludeOriginals">包含原始图片</system:String>
+    <system:String x:Key="Aug_LabeledOnly">只增强已标注的图片</system:String>
+    <system:String x:Key="Aug_NeedAugmentation">请至少启用一项增强。</system:String>
+    <system:String x:Key="Msg_Augmenting">正在增强图片...</system:String>
+    <system:String x:Key="Msg_AugmentationComplete">增强完成。&#10;来源图片:{0}&#10;生成图片:{1}&#10;已跳过:{2}</system:String>
+    <system:String x:Key="Msg_AugmentationFailed">增强失败:{0}</system:String>
+
+
+    <!-- Startup Window -->
+    <system:String x:Key="Startup_Title">Yoable - 开始使用</system:String>
+    <system:String x:Key="Startup_Subtitle">目标检测标注工具</system:String>
+    <system:String x:Key="Startup_RecentProjects">最近的项目</system:String>
+    <system:String x:Key="Startup_NoRecent">没有最近的项目</system:String>
+    <system:String x:Key="Startup_NoRecentHint">创建新项目或打开现有项目以开始使用</system:String>
+    <system:String x:Key="Startup_NewProject">新建项目</system:String>
+    <system:String x:Key="Startup_OpenProject">打开项目</system:String>
+    <system:String x:Key="Startup_ContinueWithout">不打开项目继续</system:String>
+    <system:String x:Key="Startup_OpenFolderTooltip">打开项目文件夹</system:String>
+    <system:String x:Key="Startup_DeleteTooltip">删除项目</system:String>
 </ResourceDictionary>
diff --git a/YoableWPF/Resources/Languages/Strings.zh-TW.xaml b/YoableWPF/Resources/Languages/Strings.zh-TW.xaml
index 59191ac..d086e5a 100644
--- a/YoableWPF/Resources/Languages/Strings.zh-TW.xaml
+++ b/YoableWPF/Resources/Languages/Strings.zh-TW.xaml
@@ -30,6 +30,7 @@
     <system:String x:Key="Settings_CrosshairSettings_Section">十字準線設定</system:String>
     <system:String x:Key="Settings_DarkMode">深色模式</system:String>
     <system:String x:Key="Settings_AccentColor">強調色（十六進制）</system:String>
+    <system:String x:Key="Settings_AccentCustomHex">自訂顏色（十六進位）</system:String>
     <system:String x:Key="Settings_AccentColor_Tooltip">輸入十六進制顏色值（例如：#FF0000 代表紅色）</system:String>
     <system:String x:Key="Settings_AccentColor_Help">更改應用程序中使用的強調色</system:String>
     <system:String x:Key="Settings_General_Section">常規</system:String>
@@ -58,9 +59,16 @@
     <system:String x:Key="Settings_Detection_Section">檢測</system:String>
     <system:String x:Key="Settings_ProcessingDevice">處理裝置</system:String>
     <system:String x:Key="Settings_Device_CPU">CPU</system:String>
-    <system:String x:Key="Settings_Device_GPU">GPU (CUDA)</system:String>
+    <system:String x:Key="Settings_Device_GPU">GPU (DirectML)</system:String>
     <system:String x:Key="Settings_ConfidenceThreshold">信心閾值</system:String>
     <system:String x:Key="Settings_ConfidenceThreshold_Help">顯示 AI 檢測所需的最低信心值</system:String>
+    <system:String x:Key="Settings_AI_OnlyUnlabeled">只自動標註無標籤圖片</system:String>
+    <system:String x:Key="Settings_AI_OnlyUnlabeled_Help">略過已有一個或多個確認標籤的圖片。</system:String>
+    <system:String x:Key="Settings_PerClassConfidence">各類別門檻設定…</system:String>
+    <system:String x:Key="Settings_PerClassConfidence_Help">為個別類別覆寫置信度門檻。未調整的類別會沿用上方的全域滑桿數值。</system:String>
+    <system:String x:Key="Settings_PerClassConfidence_NoClasses">請先開啟已定義類別的專案，才能設定各類別門檻。</system:String>
+    <system:String x:Key="Settings_AI_ReplaceExisting">標註時取代既有的 AI 標籤</system:String>
+    <system:String x:Key="Settings_AI_ReplaceExisting_Help">關閉時，新的偵測結果會與圖片上既有的 AI 標籤並存。</system:String>
     <system:String x:Key="Settings_EnsembleMode_Section">集成模式</system:String>
     <system:String x:Key="Settings_NoModelsLoaded">未載入模型</system:String>
     <system:String x:Key="Settings_ModelLoaded_Single">已載入 1 個模型（單一模型模式）</system:String>
@@ -68,6 +76,24 @@
     <system:String x:Key="Settings_DetectionMode">檢測模式</system:String>
     <system:String x:Key="Settings_DetectionMode_Voting">投票模式（需要多個模型共識）</system:String>
     <system:String x:Key="Settings_DetectionMode_Union">聯合模式（任何模型檢測到即標記）</system:String>
+    <system:String x:Key="Settings_DetectionMode_ClassTransfer">分類轉移（定位模型出框，分類模型投票決定類別）</system:String>
+    <system:String x:Key="Settings_ClassTransfer_Help">用一個定位準的模型負責畫框，其他模型只負責判斷每個框的類別。適合你最好的模型缺少所需類別、而懂類別的模型定位又不準的情況。</system:String>
+    <system:String x:Key="Settings_ClassTransfer_Roles">模型角色</system:String>
+    <system:String x:Key="Settings_ModelRole_Detector">定位者（負責畫框）</system:String>
+    <system:String x:Key="Settings_ModelRole_Classifier">分類者（投票決定類別）</system:String>
+    <system:String x:Key="Settings_ClassTransfer_NeedDetector">請至少選一個定位者模型，否則沒有框可以保留。</system:String>
+    <system:String x:Key="Settings_ClassTransfer_VoteIoU">投票重疊門檻 (IoU)</system:String>
+    <system:String x:Key="Settings_ClassTransfer_KeepUnvoted">保留沒有任何分類者辨識到的框</system:String>
+    <system:String x:Key="Settings_ClassTransfer_KeepUnvoted_Help">開啟時，沒有分類者投票的定位框會保留，並標成它允許清單中的第一個類別，你只需修改類別而不用重畫框。關閉時則直接捨棄這類框。</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamConsistency">讓身體的陣營與其頭部一致</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamConsistency_Help">當頭框與包住它的身體框陣營不一致時，以置信度較高的一方為準修正另一方。需要下方的類別配對。</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamPairing">陣營配對設定…</system:String>
+    <system:String x:Key="Settings_ClassTransfer_TeamPairing_Help">把每個身體類別與同一隊的頭類別配對（例如：警身體 配 警頭）。</system:String>
+    <system:String x:Key="TeamPairing_Title">陣營配對</system:String>
+    <system:String x:Key="TeamPairing_Subtitle">把身體類別與同一隊的頭類別配對，用來維持身體與頭部分類的一致性。</system:String>
+    <system:String x:Key="TeamPairing_Body">身體類別</system:String>
+    <system:String x:Key="TeamPairing_Head">頭類別</system:String>
+    <system:String x:Key="TeamPairing_AddPair">新增配對</system:String>
     <system:String x:Key="Settings_MinConsensus">所需最低共識</system:String>
     <system:String x:Key="Settings_ConsensusIoU">共識 IoU 閾值</system:String>
     <system:String x:Key="Settings_EnsembleIoU">最終集成 IoU 閾值</system:String>
@@ -129,11 +155,18 @@
     <!-- Menu -->
     <system:String x:Key="Menu_Project">專案</system:String>
     <system:String x:Key="Menu_Settings">設置</system:String>
+    <system:String x:Key="Toolbar_Import">匯入</system:String>
+    <system:String x:Key="Toolbar_AITools">AI 工具</system:String>
+    <system:String x:Key="Toolbar_More">更多</system:String>
+    <system:String x:Key="Toolbar_MoreTooltip">更多指令</system:String>
+    <system:String x:Key="Toolbar_SaveTooltip">儲存專案 (Ctrl+S)</system:String>
+    <system:String x:Key="Nav_WorkspacesTooltip">切換工作區</system:String>
     <system:String x:Key="Menu_NewProject">新增專案...</system:String>
     <system:String x:Key="Menu_OpenProject">開啟專案...</system:String>
     <system:String x:Key="Menu_SaveProject">儲存專案</system:String>
     <system:String x:Key="Menu_SaveProjectAs">另存專案為...</system:String>
     <system:String x:Key="Menu_CloseProject">關閉專案</system:String>
+    <system:String x:Key="Menu_BackToStart">回到啟動頁</system:String>
     <system:String x:Key="Menu_File">檔案</system:String>
     <system:String x:Key="Menu_ImportDirectory">匯入目錄</system:String>
     <system:String x:Key="Menu_ImportLabelsAndImage">匯入標籤與圖片</system:String>
@@ -143,7 +176,15 @@
     <system:String x:Key="Menu_ExportLabels">匯出標籤</system:String>
     <system:String x:Key="Menu_ClearAll">清除全部</system:String>
     <system:String x:Key="Menu_ClearAllSuggestions">清除所有建議</system:String>
+    <system:String x:Key="Menu_SetManualProgress">設定目前圖片為手動進度點</system:String>
+    <system:String x:Key="Menu_JumpManualProgress">跳至手動進度點</system:String>
     <system:String x:Key="Menu_AI">AI</system:String>
+    <system:String x:Key="Msg_ManualProgress_Title">手動標註進度</system:String>
+    <system:String x:Key="Msg_ManualProgress_ProjectRequired">請先開啟或建立專案，再設定手動進度點。</system:String>
+    <system:String x:Key="Msg_ManualProgress_SelectImage">請先選擇一張圖片。</system:String>
+    <system:String x:Key="Msg_ManualProgress_Set">手動進度點已設定為：{0}</system:String>
+    <system:String x:Key="Msg_ManualProgress_NotSet">尚未設定手動進度點。</system:String>
+    <system:String x:Key="Msg_ManualProgress_Missing">目前未載入進度點圖片：{0}</system:String>
     <system:String x:Key="Menu_ManageModels">管理模型</system:String>
     <system:String x:Key="Menu_AutoLabelImages">自動標籤圖片</system:String>
     <system:String x:Key="Menu_AutoSuggestLabels">自動建議標籤</system:String>
@@ -153,12 +194,22 @@
     <system:String x:Key="Main_Sort">排序</system:String>
     <system:String x:Key="Main_SortByName">依名稱</system:String>
     <system:String x:Key="Main_SortByStatus">依狀態</system:String>
+    <system:String x:Key="Main_SortByDateNewest">依日期（最新）</system:String>
+    <system:String x:Key="Main_SortByDateOldest">依日期（最舊）</system:String>
     <system:String x:Key="Main_Filter">篩選</system:String>
     <system:String x:Key="Main_FilterAll">全部</system:String>
     <system:String x:Key="Main_FilterReview">審查</system:String>
     <system:String x:Key="Main_FilterNone">無</system:String>
     <system:String x:Key="Main_FilterDone">已完成</system:String>
+    <system:String x:Key="Main_FilterAiLabels">AI 標籤</system:String>
     <system:String x:Key="Main_FilterByClass">依類別篩選</system:String>
+    <system:String x:Key="Main_FilterModeInclude">包含</system:String>
+    <system:String x:Key="Main_FilterModeAll">同時</system:String>
+    <system:String x:Key="Main_FilterModeOnly">只有</system:String>
+    <system:String x:Key="Main_FilterModeExclude">排除</system:String>
+    <system:String x:Key="Main_FilterSelectAll">全選</system:String>
+    <system:String x:Key="Main_FilterClear">全不選</system:String>
+    <system:String x:Key="Main_FilterInvert">反選</system:String>
     <system:String x:Key="Main_StatusReview">審查</system:String>
     <system:String x:Key="Main_StatusNoLabel">無標籤</system:String>
     <system:String x:Key="Main_StatusVerified">已驗證</system:String>
@@ -176,6 +227,7 @@
     <system:String x:Key="Main_ImageLabels">圖片標籤</system:String>
     <system:String x:Key="Main_ClearImageClasses">清除圖片類別</system:String>
     <system:String x:Key="Main_EditClass">編輯類別</system:String>
+    <system:String x:Key="Main_ChangeClass">變更類別</system:String>
     <system:String x:Key="Main_RemoveSelectedClass">移除選取的類別</system:String>
     <system:String x:Key="Main_NoImageSelected">未選擇圖片</system:String>
     <system:String x:Key="Main_NoLabelsToClear">沒有可清除的標籤</system:String>
@@ -183,6 +235,12 @@
     <system:String x:Key="Main_ConfirmClear">確認清除</system:String>
     <system:String x:Key="Main_Error">錯誤</system:String>
     <system:String x:Key="Main_Information">資訊</system:String>
+    <system:String x:Key="Main_OpenImageLocation">開啟圖片檔案位置</system:String>
+    <system:String x:Key="Main_OpenLabelLocation">開啟標籤檔案位置</system:String>
+    <system:String x:Key="Main_DeleteImage">刪除圖片</system:String>
+    <system:String x:Key="Main_ConfirmDeleteImage">確定要將「{0}」及其標籤檔移到資源回收筒，並從專案中移除嗎？</system:String>
+    <system:String x:Key="Main_NoLabelFileOnDisk">此圖片在磁碟上尚無標籤檔。請先儲存或匯出專案。</system:String>
+    <system:String x:Key="Main_DeleteImageFailed">圖片已從專案移除，但下列檔案無法刪除：&#x0a;&#x0a;{0}</system:String>
 
     <!-- Propagation Dialog -->
     <system:String x:Key="Propagation_Title">標籤傳播</system:String>
@@ -331,6 +389,8 @@
     <system:String x:Key="Msg_SingleModel">單一模型</system:String>
     <system:String x:Key="Msg_EnsembleModels">集成（{0} 個模型）</system:String>
     <system:String x:Key="Msg_ProcessImagesPrompt">使用 {1} 偵測處理 {0} 張圖片？</system:String>
+    <system:String x:Key="Msg_OnlyUnlabeledSummary">只處理無標籤圖片；將略過 {0} 張已有標籤的圖片。</system:String>
+    <system:String x:Key="Msg_NoUnlabeledImages">沒有可處理的無標籤圖片。</system:String>
     <system:String x:Key="Msg_ManyModelsWarning">注意：使用多個模型進行處理可能需要較長時間。</system:String>
     <system:String x:Key="Msg_StartDetection">開始偵測</system:String>
     <system:String x:Key="Msg_UsingModels"> 使用 {0} 個模型</system:String>
@@ -387,15 +447,19 @@
     <system:String x:Key="Msg_ModelAlreadyLoadedTitle">模型已載入</system:String>
     <system:String x:Key="Msg_GPUInitFailed">GPU 初始化失敗：{0}&#x0a;回退到 CPU。</system:String>
     <system:String x:Key="Msg_GPUWarning">GPU 警告</system:String>
+    <system:String x:Key="Msg_DirectMLUnsupported">此 GPU 或目前的驅動程式不支援 DirectML。</system:String>
     <system:String x:Key="Msg_ModelInitFailed">模型初始化失敗：{0}</system:String>
     <system:String x:Key="Msg_UnsupportedModel">無法偵測 YOLO 模型格式或不支援的模型類型。&#x0a;&#x0a;支援的格式：&#x0a;- YOLOv5: [batch, detections, 5+classes]&#x0a;- YOLOv8: [batch, 4+classes, detections]&#x0a;&#x0a;注意：不支援分割模型。</system:String>
     <system:String x:Key="Msg_UnsupportedModelTitle">不支援的模型</system:String>
     <system:String x:Key="Msg_ModelLoadedSuccess">模型 '{0}' 載入成功。&#x0a;格式：{1}&#x0a;類別：{2}&#x0a;偵測：{3}&#x0a;輸入尺寸：{4}x{4}&#x0a;模型總數：{5}</system:String>
     <system:String x:Key="Msg_ModelLoaded">模型已載入</system:String>
     <system:String x:Key="Msg_ErrorLoadingModel">載入模型時出錯：{0}</system:String>
+    <system:String x:Key="Msg_ReloadingModelsForDevice">正在為選取的裝置重新載入 AI 模型...</system:String>
     <system:String x:Key="Msg_YouTube_NoCompatibleStream">未找到 {0} 的相容視訊串流</system:String>
     <system:String x:Key="Msg_YouTube_DownloadError">下載錯誤</system:String>
     <system:String x:Key="Msg_AutoLabelComplete">自動標註完成{0}。&#x0a;總偵測數：{1}</system:String>
+    <system:String x:Key="Msg_AutoLabelScopeComplete">已處理：{0}；已略過有標籤圖片：{1}。</system:String>
+    <system:String x:Key="Msg_AutoLabelFailedImages">有 {0} 張圖片處理失敗或檔案不存在。</system:String>
 
     <!-- Status Bar -->
     <system:String x:Key="Status_NoProject">無專案</system:String>
@@ -414,10 +478,10 @@
 
     <!-- Mapping Dialog -->
     <system:String x:Key="Mapping_Title">配置模型類別映射</system:String>
-    <system:String x:Key="Mapping_Description">請為模型的每個類別選擇對應的項目類別</system:String>
+    <system:String x:Key="Mapping_Description">請勾選模型每個類別允許對應到的專案類別</system:String>
     <system:String x:Key="Mapping_LoadClassFile">載入類別文件</system:String>
     <system:String x:Key="Mapping_ModelID">模型 ID: {0}</system:String>
-    <system:String x:Key="Mapping_InfoFormat">模型: {0}&#x0a;類別數量: {1}&#x0a;項目類別數量: {2}&#x0a;提示: 選擇 'nan (不檢測)' 可跳過該類別的檢測</system:String>
+    <system:String x:Key="Mapping_InfoFormat">模型: {0}&#x0a;類別數量: {1}&#x0a;專案類別數量: {2}&#x0a;提示: 勾選 'nan (不檢測)' 可跳過該類別。勾選多個類別代表宣告該偵測允許被分類成哪幾類。</system:String>
     <system:String x:Key="Mapping_WarningGeneric">⚠ 警告: 未找到類別文件，顯示通用類別名稱。&#x0a;請點擊右上角「載入類別文件」按鈕手動載入正確的類別名稱。</system:String>
     <system:String x:Key="Mapping_SelectClassFile">選擇類別文件</system:String>
     <system:String x:Key="Mapping_ClassFileEmpty">類別文件為空或格式不正確。</system:String>
@@ -445,4 +509,147 @@
     <system:String x:Key="ModelManager_NeedProjectClasses">請先在專案中創建類別，然後再配置模型類別映射。&#x0a;&#x0a;您可以在右側面板的「Classes」區域添加類別。</system:String>
     <system:String x:Key="ModelManager_NeedProjectClassesTitle">需要專案類別</system:String>
 
+    <!-- Duplicate image review -->
+    <system:String x:Key="Main_TabAnnotate">圖片標註</system:String>
+    <system:String x:Key="Main_TabDuplicates">重複圖片</system:String>
+    <system:String x:Key="Duplicate_Title">重複圖片</system:String>
+    <system:String x:Key="Duplicate_Scan">重新掃描</system:String>
+    <system:String x:Key="Duplicate_NoScan">掃描目前專案中的重複圖片。</system:String>
+    <system:String x:Key="Duplicate_Scanning">正在掃描圖片...</system:String>
+    <system:String x:Key="Duplicate_NoImages">至少加入兩張圖片後才能掃描。</system:String>
+    <system:String x:Key="Duplicate_NoMatches">沒有找到重複圖片。</system:String>
+    <system:String x:Key="Duplicate_ScanFailed">無法掃描重複圖片。</system:String>
+    <system:String x:Key="Duplicate_Resolved">所有重複圖片都已處理完成。</system:String>
+    <system:String x:Key="Duplicate_Summary">剩餘 {0} 組重複圖片，共 {1} 張多餘圖片</system:String>
+    <system:String x:Key="Duplicate_GroupProgress">第 {0} 組，共 {1} 組</system:String>
+    <system:String x:Key="Duplicate_LabelCount">{0} 個標註</system:String>
+    <system:String x:Key="Duplicate_KeepLeft">保留左側圖片與標註</system:String>
+    <system:String x:Key="Duplicate_KeepRight">保留右側圖片與標註</system:String>
+    <system:String x:Key="Duplicate_RemoveFailed">無法從專案移除重複圖片。</system:String>
+    <system:String x:Key="Duplicate_AllGroups">全部重複群組</system:String>
+    <system:String x:Key="Duplicate_PreviousGroup">上一組</system:String>
+    <system:String x:Key="Duplicate_NextGroup">下一組</system:String>
+    <system:String x:Key="Duplicate_GroupTitle">第 {0} 組</system:String>
+    <system:String x:Key="Duplicate_ExtraCount">{0} 張多餘圖片</system:String>
+
+    <!-- Center ROI crop -->
+    <system:String x:Key="Main_TabRoiCrop">中心 ROI</system:String>
+    <system:String x:Key="Roi_Title">中心 ROI 裁切</system:String>
+    <system:String x:Key="Roi_OutputSize">輸出像素尺寸</system:String>
+    <system:String x:Key="Roi_Width">寬度（px）</system:String>
+    <system:String x:Key="Roi_Height">高度（px）</system:String>
+    <system:String x:Key="Roi_Scope">套用範圍</system:String>
+    <system:String x:Key="Roi_AllImages">專案內全部圖片</system:String>
+    <system:String x:Key="Roi_CurrentImage">目前圖片</system:String>
+    <system:String x:Key="Roi_OutputFolder">輸出資料夾</system:String>
+    <system:String x:Key="Roi_Apply">建立自訂尺寸裁切圖片</system:String>
+    <system:String x:Key="Roi_RemoveSmall">移除小於 ROI 的圖片</system:String>
+    <system:String x:Key="Roi_RemoveSmallConfirm">找到 {0} 張小於 {1} x {2} ROI 的圖片。要從專案中移除這些圖片及其標註嗎？硬碟上的原始檔會保留。</system:String>
+    <system:String x:Key="Roi_RemoveSmallComplete">已從專案中移除 {0} 張尺寸不足的圖片及其標註。</system:String>
+    <system:String x:Key="Roi_NoSmallImages">專案中沒有小於 {0} x {1} ROI 的圖片。</system:String>
+    <system:String x:Key="Roi_Preview">中心 ROI 預覽</system:String>
+    <system:String x:Key="Roi_NoPreview">沒有可預覽的圖片</system:String>
+    <system:String x:Key="Roi_InvalidSize">ROI 尺寸無效。</system:String>
+    <system:String x:Key="Roi_Confirm">要建立正中央 {0} x {1} 像素裁切圖片並更新標註嗎？</system:String>
+    <system:String x:Key="Roi_Processing">正在裁切圖片...</system:String>
+    <system:String x:Key="Roi_Progress">{0} / {1} - {2}</system:String>
+    <system:String x:Key="Roi_Complete">已裁切 {0} 張圖片、移除 {1} 個標註、裁短 {2} 個標註、跳過 {3} 張圖片。</system:String>
+    <system:String x:Key="Roi_Cancelled">已取消 ROI 裁切。</system:String>
+    <system:String x:Key="Roi_ProjectRequired">請先開啟或建立專案再裁切圖片。</system:String>
+    <system:String x:Key="Roi_Failed">ROI 裁切失敗。</system:String>
+    <system:String x:Key="Roi_NoImages">沒有可裁切的圖片。</system:String>
+
+    <system:String x:Key="Menu_AILabelCurrentImage">AI 標記目前圖片</system:String>
+    <system:String x:Key="AIClassConfidence_Title">各類別置信度</system:String>
+    <system:String x:Key="AIClassConfidence_Subtitle">設定 AI 標記時，每個類別需要達到的最低置信度。</system:String>
+    <system:String x:Key="AIClassConfidence_Class">類別</system:String>
+    <system:String x:Key="AIClassConfidence_Threshold">最低置信度</system:String>
+    <system:String x:Key="AIClassConfidence_Reset">重設為全域值</system:String>
+    <system:String x:Key="AIClassConfidence_Running">正在對目前圖片執行 AI 偵測...</system:String>
+    <system:String x:Key="AIClassConfidence_Complete">目前圖片標記完成，共偵測到 {0} 個物件。</system:String>
+    <system:String x:Key="AIClassConfidence_Failed">目前圖片標記失敗：{0}</system:String>
+    <system:String x:Key="Duplicate_AutoResolvedSummary">已自動處理：{0}</system:String>
+    <system:String x:Key="Duplicate_AutoResolvedOnly">已從專案自動移除 {0} 張圖片與標籤皆相同的重複圖片。</system:String>
+    <system:String x:Key="Duplicate_OpenEdit">檢查 / 修改</system:String>
+    <system:String x:Key="Duplicate_OpenEditFailed">無法開啟圖片進行修改。</system:String>
+
+
+    <!-- Training Dataset Export -->
+    <system:String x:Key="Menu_ExportTrainingDataset">匯出訓練資料集...</system:String>
+    <system:String x:Key="TrainingExport_Title">匯出訓練資料集</system:String>
+    <system:String x:Key="TrainingExport_Subtitle">將圖片與標籤複製為 YOLO 的 train/val/test 資料夾結構,並產生可直接用於訓練的 data.yaml。</system:String>
+    <system:String x:Key="TrainingExport_OutputFolder">輸出資料夾</system:String>
+    <system:String x:Key="TrainingExport_Browse">瀏覽...</system:String>
+    <system:String x:Key="TrainingExport_SplitRatios">切分比例 (%)</system:String>
+    <system:String x:Key="TrainingExport_Train">訓練</system:String>
+    <system:String x:Key="TrainingExport_Val">驗證</system:String>
+    <system:String x:Key="TrainingExport_Test">測試</system:String>
+    <system:String x:Key="TrainingExport_SumFormat">合計:{0}%(必須等於 100%)</system:String>
+    <system:String x:Key="TrainingExport_Seed">隨機種子</system:String>
+    <system:String x:Key="TrainingExport_IncludeBackground">將無標籤圖片作為背景樣本納入</system:String>
+    <system:String x:Key="TrainingExport_VerifiedOnly">僅匯出已驗證的圖片</system:String>
+    <system:String x:Key="Msg_ExportingTrainingDataset">正在匯出訓練資料集...</system:String>
+    <system:String x:Key="Msg_TrainingDatasetExported">訓練資料集已匯出。&#10;訓練:{0}   驗證:{1}   測試:{2}&#10;已跳過:{3}</system:String>
+    <system:String x:Key="Msg_NoImagesToExport">沒有可匯出的圖片。</system:String>
+    <system:String x:Key="Msg_NoClassesToExport">匯出訓練資料集前請至少定義一個類別。</system:String>
+
+    <!-- Dataset Statistics -->
+    <system:String x:Key="Main_TabStats">資料集統計</system:String>
+    <system:String x:Key="Stats_Title">資料集統計</system:String>
+    <system:String x:Key="Stats_Subtitle">目前專案的類別平衡、框大小分布與審查狀態。</system:String>
+    <system:String x:Key="Stats_Refresh">重新整理</system:String>
+    <system:String x:Key="Stats_Empty">尚未載入圖片。</system:String>
+    <system:String x:Key="Stats_TotalImages">圖片總數</system:String>
+    <system:String x:Key="Stats_LabeledImages">已標註</system:String>
+    <system:String x:Key="Stats_UnlabeledImages">未標註</system:String>
+    <system:String x:Key="Stats_TotalBoxes">框總數</system:String>
+    <system:String x:Key="Stats_AvgBoxes">平均每圖框數</system:String>
+    <system:String x:Key="Stats_ClassBalance">類別平衡</system:String>
+    <system:String x:Key="Stats_SizeDistribution">框大小分布</system:String>
+    <system:String x:Key="Stats_SizeSmall">小 (&lt;1% 面積)</system:String>
+    <system:String x:Key="Stats_SizeMedium">中 (1-5%)</system:String>
+    <system:String x:Key="Stats_SizeLarge">大 (&gt;5%)</system:String>
+    <system:String x:Key="Stats_ReviewStatus">審查狀態</system:String>
+    <system:String x:Key="Stats_Verified">已驗證</system:String>
+    <system:String x:Key="Stats_NeedsReview">待審查</system:String>
+    <system:String x:Key="Stats_Suggested">建議</system:String>
+    <system:String x:Key="Stats_NoLabelStatus">無標籤</system:String>
+
+    <!-- Data Augmentation -->
+    <system:String x:Key="Menu_DataAugmentation">資料增強...</system:String>
+    <system:String x:Key="Aug_Title">資料增強</system:String>
+    <system:String x:Key="Aug_Subtitle">為訓練產生增強後的圖片與標籤副本。翻轉會重映框座標,其他效果只改變像素。</system:String>
+    <system:String x:Key="Aug_OutputFolder">輸出資料夾</system:String>
+    <system:String x:Key="Aug_Browse">瀏覽...</system:String>
+    <system:String x:Key="Aug_Scope">範圍</system:String>
+    <system:String x:Key="Aug_ScopeAll">所有圖片</system:String>
+    <system:String x:Key="Aug_ScopeCurrent">目前圖片</system:String>
+    <system:String x:Key="Aug_Variants">每張圖變體數</system:String>
+    <system:String x:Key="Aug_Seed">隨機種子</system:String>
+    <system:String x:Key="Aug_Augmentations">增強項目</system:String>
+    <system:String x:Key="Aug_Flip">水平翻轉</system:String>
+    <system:String x:Key="Aug_Brightness">亮度 / 對比</system:String>
+    <system:String x:Key="Aug_Hsv">色相 / 飽和度</system:String>
+    <system:String x:Key="Aug_Noise">高斯雜訊</system:String>
+    <system:String x:Key="Aug_Blur">模糊</system:String>
+    <system:String x:Key="Aug_OutputOptions">輸出選項</system:String>
+    <system:String x:Key="Aug_IncludeOriginals">包含原始圖片</system:String>
+    <system:String x:Key="Aug_LabeledOnly">只增強已標註的圖片</system:String>
+    <system:String x:Key="Aug_NeedAugmentation">請至少啟用一項增強。</system:String>
+    <system:String x:Key="Msg_Augmenting">正在增強圖片...</system:String>
+    <system:String x:Key="Msg_AugmentationComplete">增強完成。&#10;來源圖片:{0}&#10;產生圖片:{1}&#10;已跳過:{2}</system:String>
+    <system:String x:Key="Msg_AugmentationFailed">增強失敗:{0}</system:String>
+
+
+    <!-- Startup Window -->
+    <system:String x:Key="Startup_Title">Yoable - 開始使用</system:String>
+    <system:String x:Key="Startup_Subtitle">物件偵測標註工具</system:String>
+    <system:String x:Key="Startup_RecentProjects">最近的專案</system:String>
+    <system:String x:Key="Startup_NoRecent">沒有最近的專案</system:String>
+    <system:String x:Key="Startup_NoRecentHint">建立新專案或開啟現有專案以開始使用</system:String>
+    <system:String x:Key="Startup_NewProject">新建專案</system:String>
+    <system:String x:Key="Startup_OpenProject">開啟專案</system:String>
+    <system:String x:Key="Startup_ContinueWithout">不開啟專案繼續</system:String>
+    <system:String x:Key="Startup_OpenFolderTooltip">開啟專案資料夾</system:String>
+    <system:String x:Key="Startup_DeleteTooltip">刪除專案</system:String>
 </ResourceDictionary>
diff --git a/YoableWPF/RoiCropControl.xaml b/YoableWPF/RoiCropControl.xaml
new file mode 100644
index 0000000..acc0e14
--- /dev/null
+++ b/YoableWPF/RoiCropControl.xaml
@@ -0,0 +1,202 @@
+<UserControl x:Class="YoableWPF.RoiCropControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             MinWidth="720"
+             MinHeight="460">
+    <Grid Background="{DynamicResource SystemControlPageBackgroundChromeLowBrush}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="300"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+
+        <Border Grid.Column="0"
+                Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
+                BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                BorderThickness="0,0,1,0"
+                Padding="18">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <TextBlock Text="{DynamicResource Roi_Title}"
+                           FontSize="18"
+                           FontWeight="SemiBold"/>
+
+                <Border Grid.Row="1"
+                        Margin="0,20,0,0"
+                        Padding="12,10"
+                        Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
+                        CornerRadius="4">
+                    <StackPanel>
+                        <TextBlock Text="{DynamicResource Roi_OutputSize}"
+                                   FontSize="11"
+                                   Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+                        <Grid Margin="0,7,0,0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <StackPanel>
+                                <TextBlock Text="{DynamicResource Roi_Width}"
+                                           Margin="0,0,0,3"
+                                           FontSize="10"
+                                           Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+                                <TextBox x:Name="CropWidthTextBox"
+                                         Text="640"
+                                         MaxLength="6"
+                                         Padding="6,4"
+                                         TextChanged="CropSizeTextBox_TextChanged"/>
+                            </StackPanel>
+                            <TextBlock Grid.Column="1"
+                                       Text="×"
+                                       Margin="8,18,8,0"
+                                       VerticalAlignment="Center"
+                                       FontSize="16"/>
+                            <StackPanel Grid.Column="2">
+                                <TextBlock Text="{DynamicResource Roi_Height}"
+                                           Margin="0,0,0,3"
+                                           FontSize="10"
+                                           Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+                                <TextBox x:Name="CropHeightTextBox"
+                                         Text="640"
+                                         MaxLength="6"
+                                         Padding="6,4"
+                                         TextChanged="CropSizeTextBox_TextChanged"/>
+                            </StackPanel>
+                        </Grid>
+                    </StackPanel>
+                </Border>
+
+                <StackPanel Grid.Row="2" Margin="0,16,0,0">
+                    <TextBlock Text="{DynamicResource Roi_Scope}"
+                               Margin="0,0,0,6"
+                               FontSize="12"/>
+                    <ComboBox x:Name="ScopeComboBox" SelectedIndex="0" Padding="6,4">
+                        <ComboBoxItem Content="{DynamicResource Roi_AllImages}"/>
+                        <ComboBoxItem Content="{DynamicResource Roi_CurrentImage}"/>
+                    </ComboBox>
+                </StackPanel>
+
+                <Border Grid.Row="3"
+                        Margin="0,16,0,0"
+                        Padding="10"
+                        Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
+                        CornerRadius="4">
+                    <StackPanel>
+                        <TextBlock Text="{DynamicResource Roi_OutputFolder}"
+                                   FontSize="11"
+                                   Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+                        <TextBlock Text="roi_images"
+                                   Margin="0,3,0,0"
+                                   FontSize="12"
+                                   FontWeight="SemiBold"/>
+                    </StackPanel>
+                </Border>
+
+                <StackPanel Grid.Row="4" Margin="0,18,0,0" VerticalAlignment="Top">
+                    <Separator Margin="0,0,0,12"/>
+                    <Button x:Name="RemoveSmallImagesButton"
+                            Click="RemoveSmallImagesButton_Click"
+                            Padding="12,8"
+                            HorizontalAlignment="Stretch">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                            <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE74D;" Margin="0,0,7,0"/>
+                            <TextBlock Text="{DynamicResource Roi_RemoveSmall}"/>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+
+                <StackPanel Grid.Row="5">
+                    <TextBlock x:Name="StatusText"
+                               Margin="0,0,0,8"
+                               TextWrapping="Wrap"
+                               FontSize="11"
+                               Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+                    <ProgressBar x:Name="CropProgressBar"
+                                 Height="5"
+                                 Margin="0,0,0,10"
+                                 Visibility="Collapsed"/>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="8"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <Button x:Name="ApplyCropButton"
+                                Click="ApplyCropButton_Click"
+                                Padding="12,8"
+                                HorizontalAlignment="Stretch">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE7A8;" Margin="0,0,7,0"/>
+                                <TextBlock Text="{DynamicResource Roi_Apply}"/>
+                            </StackPanel>
+                        </Button>
+                        <Button x:Name="CancelCropButton"
+                                Grid.Column="2"
+                                Width="36"
+                                Height="34"
+                                Padding="0"
+                                Click="CancelCropButton_Click"
+                                ToolTip="{DynamicResource Common_Cancel}"
+                                Visibility="Collapsed">
+                            <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE711;"/>
+                        </Button>
+                    </Grid>
+                </StackPanel>
+            </Grid>
+        </Border>
+
+        <Grid Grid.Column="1" Margin="18">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="{DynamicResource Roi_Preview}"
+                           FontSize="14"
+                           FontWeight="SemiBold"/>
+                <TextBlock x:Name="PreviewFileNameText"
+                           Grid.Column="1"
+                           MaxWidth="420"
+                           FontSize="11"
+                           TextTrimming="CharacterEllipsis"
+                           Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+            </Grid>
+
+            <Border Grid.Row="1"
+                    Margin="0,10,0,0"
+                    Background="{StaticResource CanvasBackgroundBrush}"
+                    BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                    BorderThickness="1"
+                    CornerRadius="6"
+                    ClipToBounds="True">
+                <Grid x:Name="PreviewHost" SizeChanged="PreviewHost_SizeChanged">
+                    <Image x:Name="PreviewImage" Stretch="Uniform"/>
+                    <Canvas x:Name="PreviewOverlay" IsHitTestVisible="False">
+                        <Border x:Name="RoiPreviewBorder"
+                                BorderBrush="{StaticResource WarningBrush}"
+                                BorderThickness="2"
+                                Background="{StaticResource InfoFaintBrush}"/>
+                    </Canvas>
+                    <TextBlock x:Name="NoPreviewText"
+                               Text="{DynamicResource Roi_NoPreview}"
+                               HorizontalAlignment="Center"
+                               VerticalAlignment="Center"
+                               Foreground="White"
+                               Visibility="Collapsed"/>
+                </Grid>
+            </Border>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/YoableWPF/RoiCropControl.xaml.cs b/YoableWPF/RoiCropControl.xaml.cs
new file mode 100644
index 0000000..3d2eda8
--- /dev/null
+++ b/YoableWPF/RoiCropControl.xaml.cs
@@ -0,0 +1,287 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using YoableWPF.Managers;
+
+namespace YoableWPF
+{
+    public sealed record RoiCropPreviewData(
+        ImageSource Image,
+        Size ImageSize,
+        string FileName);
+
+    public partial class RoiCropControl : UserControl
+    {
+        private const int DefaultOutputSize = 640;
+        private Func<Task<RoiCropPreviewData?>>? loadPreview;
+        private Func<int, int, RoiCropScope, IProgress<(int current, int total, string fileName)>, CancellationToken, Task<RoiCropBatchResult>>? applyCrop;
+        private Func<int, int, IReadOnlyList<string>>? findSmallImages;
+        private Func<IReadOnlyCollection<string>, int>? removeImages;
+        private CancellationTokenSource? cropCancellation;
+        private Size previewImageSize;
+
+        public RoiCropControl()
+        {
+            InitializeComponent();
+        }
+
+        public void Initialize(
+            Func<Task<RoiCropPreviewData?>> previewCallback,
+            Func<int, int, RoiCropScope, IProgress<(int current, int total, string fileName)>, CancellationToken, Task<RoiCropBatchResult>> applyCallback,
+            Func<int, int, IReadOnlyList<string>> findSmallImagesCallback,
+            Func<IReadOnlyCollection<string>, int> removeImagesCallback)
+        {
+            loadPreview = previewCallback;
+            applyCrop = applyCallback;
+            findSmallImages = findSmallImagesCallback;
+            removeImages = removeImagesCallback;
+        }
+
+        public async Task RefreshPreviewAsync()
+        {
+            if (loadPreview == null)
+                return;
+
+            var preview = await loadPreview();
+            if (preview == null)
+            {
+                PreviewImage.Source = null;
+                PreviewFileNameText.Text = "";
+                NoPreviewText.Visibility = Visibility.Visible;
+                RoiPreviewBorder.Visibility = Visibility.Collapsed;
+                return;
+            }
+
+            PreviewImage.Source = preview.Image;
+            previewImageSize = preview.ImageSize;
+            PreviewFileNameText.Text = preview.FileName;
+            NoPreviewText.Visibility = Visibility.Collapsed;
+            RoiPreviewBorder.Visibility = Visibility.Visible;
+            UpdateRoiPreview();
+        }
+
+        private void PreviewHost_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            UpdateRoiPreview();
+        }
+
+        private void CropSizeTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            UpdateRoiPreview();
+        }
+
+        private void UpdateRoiPreview()
+        {
+            if (PreviewHost == null ||
+                RoiPreviewBorder == null ||
+                previewImageSize.Width <= 0 ||
+                previewImageSize.Height <= 0 ||
+                !TryGetCropSize(out int cropWidth, out int cropHeight))
+            {
+                if (RoiPreviewBorder != null)
+                    RoiPreviewBorder.Visibility = Visibility.Collapsed;
+                return;
+            }
+
+            RoiPreviewBorder.Visibility = Visibility.Visible;
+
+            double hostWidth = PreviewHost.ActualWidth;
+            double hostHeight = PreviewHost.ActualHeight;
+            if (hostWidth <= 0 || hostHeight <= 0)
+                return;
+
+            double scale = Math.Min(
+                hostWidth / previewImageSize.Width,
+                hostHeight / previewImageSize.Height);
+            double displayedWidth = previewImageSize.Width * scale;
+            double displayedHeight = previewImageSize.Height * scale;
+            double offsetX = (hostWidth - displayedWidth) / 2;
+            double offsetY = (hostHeight - displayedHeight) / 2;
+            double visibleCropWidth = Math.Min(cropWidth, previewImageSize.Width);
+            double visibleCropHeight = Math.Min(cropHeight, previewImageSize.Height);
+
+            RoiPreviewBorder.Width = visibleCropWidth * scale;
+            RoiPreviewBorder.Height = visibleCropHeight * scale;
+            Canvas.SetLeft(
+                RoiPreviewBorder,
+                offsetX + ((previewImageSize.Width - visibleCropWidth) / 2) * scale);
+            Canvas.SetTop(
+                RoiPreviewBorder,
+                offsetY + ((previewImageSize.Height - visibleCropHeight) / 2) * scale);
+        }
+
+        private async void ApplyCropButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (applyCrop == null || !TryGetCropSize(out int cropWidth, out int cropHeight))
+            {
+                ShowMessage("Roi_InvalidSize", "Enter a valid ROI width and height.", MessageBoxImage.Warning);
+                return;
+            }
+
+            var confirmation = CustomMessageBox.Show(
+                string.Format(
+                    GetString("Roi_Confirm", "Create a centered {0} x {1} ROI crop and update labels?"),
+                    cropWidth,
+                    cropHeight),
+                GetString("Roi_Title", "Center ROI Crop"),
+                MessageBoxButton.YesNo,
+                MessageBoxImage.Question);
+            if (confirmation != MessageBoxResult.Yes)
+                return;
+
+            cropCancellation?.Dispose();
+            cropCancellation = new CancellationTokenSource();
+            ApplyCropButton.IsEnabled = false;
+            RemoveSmallImagesButton.IsEnabled = false;
+            CancelCropButton.Visibility = Visibility.Visible;
+            CropProgressBar.Visibility = Visibility.Visible;
+            CropProgressBar.Value = 0;
+            StatusText.Text = GetString("Roi_Processing", "Cropping images...");
+
+            var progress = new Progress<(int current, int total, string fileName)>(value =>
+            {
+                CropProgressBar.Maximum = Math.Max(1, value.total);
+                CropProgressBar.Value = value.current;
+                StatusText.Text = string.Format(
+                    GetString("Roi_Progress", "{0} / {1} - {2}"),
+                    value.current,
+                    value.total,
+                    value.fileName);
+            });
+
+            try
+            {
+                var scope = ScopeComboBox.SelectedIndex == 1
+                    ? RoiCropScope.CurrentImage
+                    : RoiCropScope.AllImages;
+                var result = await applyCrop(
+                    cropWidth,
+                    cropHeight,
+                    scope,
+                    progress,
+                    cropCancellation.Token);
+
+                StatusText.Text = string.Format(
+                    GetString("Roi_Complete", "Cropped {0} image(s), removed {1} label(s), clipped {2} label(s), skipped {3} image(s)."),
+                    result.ProcessedItems.Count,
+                    result.RemovedLabelCount,
+                    result.ClippedLabelCount,
+                    result.SkippedImageCount);
+                await RefreshPreviewAsync();
+            }
+            catch (OperationCanceledException)
+            {
+                StatusText.Text = GetString("Roi_Cancelled", "ROI crop cancelled.");
+            }
+            catch (InvalidOperationException ex)
+            {
+                CustomMessageBox.Show(
+                    ex.Message,
+                    GetString("Roi_Title", "Center ROI Crop"),
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Information);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"ROI crop failed: {ex.Message}");
+                ShowMessage("Roi_Failed", "ROI crop failed.", MessageBoxImage.Error);
+            }
+            finally
+            {
+                ApplyCropButton.IsEnabled = true;
+                RemoveSmallImagesButton.IsEnabled = true;
+                CancelCropButton.Visibility = Visibility.Collapsed;
+                CropProgressBar.Visibility = Visibility.Collapsed;
+            }
+        }
+
+        private void CancelCropButton_Click(object sender, RoutedEventArgs e)
+        {
+            cropCancellation?.Cancel();
+        }
+
+        private async void RemoveSmallImagesButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (findSmallImages == null ||
+                removeImages == null ||
+                !TryGetCropSize(out int cropWidth, out int cropHeight))
+            {
+                ShowMessage("Roi_InvalidSize", "Enter a valid ROI width and height.", MessageBoxImage.Warning);
+                return;
+            }
+
+            var candidates = findSmallImages(cropWidth, cropHeight);
+            if (candidates.Count == 0)
+            {
+                CustomMessageBox.Show(
+                    string.Format(
+                        GetString("Roi_NoSmallImages", "No project images are smaller than the {0} x {1} ROI."),
+                        cropWidth,
+                        cropHeight),
+                    GetString("Roi_Title", "Center ROI Crop"),
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Information);
+                return;
+            }
+
+            var confirmation = CustomMessageBox.Show(
+                string.Format(
+                    GetString(
+                        "Roi_RemoveSmallConfirm",
+                        "Found {0} image(s) smaller than the {1} x {2} ROI. Remove them and their labels from this project? Original files will remain on disk."),
+                    candidates.Count,
+                    cropWidth,
+                    cropHeight),
+                GetString("Roi_Title", "Center ROI Crop"),
+                MessageBoxButton.YesNo,
+                MessageBoxImage.Warning);
+            if (confirmation != MessageBoxResult.Yes)
+                return;
+
+            RemoveSmallImagesButton.IsEnabled = false;
+            ApplyCropButton.IsEnabled = false;
+            try
+            {
+                int removedCount = removeImages(candidates);
+                StatusText.Text = string.Format(
+                    GetString(
+                        "Roi_RemoveSmallComplete",
+                        "Removed {0} undersized image(s) and their labels from the project."),
+                    removedCount);
+                await RefreshPreviewAsync();
+            }
+            finally
+            {
+                RemoveSmallImagesButton.IsEnabled = true;
+                ApplyCropButton.IsEnabled = true;
+            }
+        }
+
+        private bool TryGetCropSize(out int width, out int height)
+        {
+            width = DefaultOutputSize;
+            height = DefaultOutputSize;
+
+            return CropWidthTextBox != null &&
+                   CropHeightTextBox != null &&
+                   int.TryParse(CropWidthTextBox.Text, out width) &&
+                   int.TryParse(CropHeightTextBox.Text, out height) &&
+                   width > 0 &&
+                   height > 0;
+        }
+
+        private void ShowMessage(string key, string fallback, MessageBoxImage image)
+        {
+            CustomMessageBox.Show(
+                GetString(key, fallback),
+                GetString("Roi_Title", "Center ROI Crop"),
+                MessageBoxButton.OK,
+                image);
+        }
+
+        private static string GetString(string key, string fallback)
+        {
+            return LanguageManager.Instance.GetString(key) ?? fallback;
+        }
+    }
+}
diff --git a/YoableWPF/SettingsWindow.xaml b/YoableWPF/SettingsWindow.xaml
index 6d36c1b..d60a1ba 100644
--- a/YoableWPF/SettingsWindow.xaml
+++ b/YoableWPF/SettingsWindow.xaml
@@ -14,69 +14,33 @@
     MinWidth="650">
 
     <Window.Resources>
-        <!-- Accent color for buttons (uses system accent) -->
-        <SolidColorBrush x:Key="AccentButtonBrush" Color="{DynamicResource SystemAccentColor}"/>
-
-        <!-- Modern Button Style -->
-        <Style x:Key="ModernButton" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource AccentButtonBrush}"/>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="16,8"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.9"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.5"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
+        <!-- Shared styles come from Themes/*.xaml (app-level) -->
 
-        <!-- Secondary Button Style -->
-        <Style x:Key="SecondaryButton" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"/>
-            <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="16,8"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
+        <!-- Accent preset swatch -->
+        <Style x:Key="AccentSwatch" TargetType="RadioButton">
+            <Setter Property="Margin" Value="0,0,8,8"/>
             <Setter Property="Cursor" Value="Hand"/>
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
+                    <ControlTemplate TargetType="RadioButton">
+                        <Grid>
+                            <Border x:Name="Ring" Width="32" Height="32" CornerRadius="16"
+                                    BorderThickness="2" BorderBrush="Transparent"/>
+                            <Border Width="24" Height="24" CornerRadius="12"
+                                    Background="{TemplateBinding Background}"/>
+                            <TextBlock x:Name="Check" FontFamily="Segoe MDL2 Assets" Text="&#xE73E;"
+                                       FontSize="12" Foreground="White" Visibility="Collapsed"
+                                       HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
+                                <Setter TargetName="Ring" Property="BorderBrush"
+                                        Value="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
                             </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="Ring" Property="BorderBrush"
+                                        Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+                                <Setter TargetName="Check" Property="Visibility" Value="Visible"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -84,37 +48,6 @@
             </Setter>
         </Style>
 
-        <!-- Setting Card Style -->
-        <Style x:Key="SettingCard" TargetType="Border">
-            <Setter Property="Background" Value="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"/>
-            <Setter Property="CornerRadius" Value="6"/>
-            <Setter Property="Padding" Value="16"/>
-            <Setter Property="Margin" Value="0,0,0,16"/>
-        </Style>
-
-        <!-- Section Header Style -->
-        <Style x:Key="SectionHeader" TargetType="TextBlock">
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Margin" Value="0,0,0,12"/>
-            <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-        </Style>
-
-        <!-- Setting Label Style -->
-        <Style x:Key="SettingLabel" TargetType="TextBlock">
-            <Setter Property="FontSize" Value="13"/>
-            <Setter Property="FontWeight" Value="Medium"/>
-            <Setter Property="Margin" Value="0,0,0,8"/>
-        </Style>
-
-        <!-- Help Text Style -->
-        <Style x:Key="HelpText" TargetType="TextBlock">
-            <Setter Property="Foreground" Value="Gray"/>
-            <Setter Property="FontSize" Value="11"/>
-            <Setter Property="TextWrapping" Value="Wrap"/>
-            <Setter Property="Margin" Value="0,6,0,0"/>
-        </Style>
-
         <!-- Horizontal Tab Style -->
         <Style x:Key="HorizontalTab" TargetType="RadioButton">
             <Setter Property="Background" Value="Transparent"/>
@@ -296,6 +229,28 @@
                             </Grid>
                             <TextBlock Text="{DynamicResource Settings_ConfidenceThreshold_Help}"
                                        Style="{StaticResource HelpText}"/>
+
+                            <Button x:Name="PerClassConfidenceButton"
+                                    Content="{DynamicResource Settings_PerClassConfidence}"
+                                    HorizontalAlignment="Left"
+                                    Padding="14,6"
+                                    Margin="0,12,0,0"
+                                    Click="PerClassConfidence_Click"/>
+                            <TextBlock x:Name="PerClassConfidenceHelpText"
+                                       Text="{DynamicResource Settings_PerClassConfidence_Help}"
+                                       Style="{StaticResource HelpText}"/>
+
+                            <CheckBox x:Name="AutoLabelOnlyUnlabeledCheckBox"
+                                      Content="{DynamicResource Settings_AI_OnlyUnlabeled}"
+                                      Margin="0,12,0,0"/>
+                            <TextBlock Text="{DynamicResource Settings_AI_OnlyUnlabeled_Help}"
+                                       Style="{StaticResource HelpText}"/>
+
+                            <CheckBox x:Name="ReplaceExistingLabelsCheckBox"
+                                      Content="{DynamicResource Settings_AI_ReplaceExisting}"
+                                      Margin="0,12,0,0"/>
+                            <TextBlock Text="{DynamicResource Settings_AI_ReplaceExisting_Help}"
+                                       Style="{StaticResource HelpText}"/>
                         </StackPanel>
                     </Border>
 
@@ -317,8 +272,86 @@
                                       SelectionChanged="DetectionModeComboBox_SelectionChanged">
                                 <ComboBoxItem Content="{DynamicResource Settings_DetectionMode_Voting}" Tag="0"/>
                                 <ComboBoxItem Content="{DynamicResource Settings_DetectionMode_Union}" Tag="1"/>
+                                <ComboBoxItem Content="{DynamicResource Settings_DetectionMode_ClassTransfer}" Tag="2"/>
                             </ComboBox>
 
+                            <!-- Class transfer: per-model roles and voting options -->
+                            <StackPanel x:Name="ClassTransferPanel" Visibility="Collapsed" Margin="0,0,0,12">
+                                <TextBlock Text="{DynamicResource Settings_ClassTransfer_Help}"
+                                           Style="{StaticResource HelpText}"
+                                           Margin="0,0,0,8"/>
+
+                                <TextBlock Text="{DynamicResource Settings_ClassTransfer_Roles}" Style="{StaticResource SettingLabel}"/>
+                                <ItemsControl x:Name="ModelRoleList" Margin="0,4,0,8">
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid Margin="0,3">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*"/>
+                                                    <ColumnDefinition Width="160"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock Text="{Binding ModelName}"
+                                                           VerticalAlignment="Center"
+                                                           TextTrimming="CharacterEllipsis"
+                                                           ToolTip="{Binding ModelName}"/>
+                                                <ComboBox Grid.Column="1"
+                                                          SelectedIndex="{Binding RoleIndex, Mode=TwoWay}">
+                                                    <ComboBoxItem Content="{DynamicResource Settings_ModelRole_Detector}"/>
+                                                    <ComboBoxItem Content="{DynamicResource Settings_ModelRole_Classifier}"/>
+                                                </ComboBox>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                </ItemsControl>
+                                <TextBlock x:Name="ModelRoleWarningText"
+                                           Text="{DynamicResource Settings_ClassTransfer_NeedDetector}"
+                                           Foreground="{StaticResource StatusNoLabelBrush}"
+                                           FontSize="11"
+                                           TextWrapping="Wrap"
+                                           Visibility="Collapsed"
+                                           Margin="0,0,0,8"/>
+
+                                <TextBlock Text="{DynamicResource Settings_ClassTransfer_VoteIoU}" Style="{StaticResource SettingLabel}"/>
+                                <Grid Margin="0,0,0,8">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="40"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Slider x:Name="ClassTransferIoUSlider"
+                                            Minimum="0.1"
+                                            Maximum="0.9"
+                                            Value="0.5"
+                                            TickFrequency="0.05"
+                                            TickPlacement="BottomRight"/>
+                                    <TextBlock Grid.Column="1"
+                                               Text="{Binding Value, ElementName=ClassTransferIoUSlider, StringFormat={}{0:F2}}"
+                                               VerticalAlignment="Center"
+                                               HorizontalAlignment="Right"
+                                               FontSize="12"
+                                               FontWeight="SemiBold"/>
+                                </Grid>
+
+                                <CheckBox x:Name="ClassTransferKeepUnvotedCheckBox"
+                                          Content="{DynamicResource Settings_ClassTransfer_KeepUnvoted}"/>
+                                <TextBlock Text="{DynamicResource Settings_ClassTransfer_KeepUnvoted_Help}"
+                                           Style="{StaticResource HelpText}"/>
+
+                                <CheckBox x:Name="ClassTransferTeamConsistencyCheckBox"
+                                          Content="{DynamicResource Settings_ClassTransfer_TeamConsistency}"
+                                          Margin="0,12,0,0"/>
+                                <TextBlock Text="{DynamicResource Settings_ClassTransfer_TeamConsistency_Help}"
+                                           Style="{StaticResource HelpText}"/>
+                                <Button x:Name="TeamPairingButton"
+                                        Content="{DynamicResource Settings_ClassTransfer_TeamPairing}"
+                                        HorizontalAlignment="Left"
+                                        Padding="14,6"
+                                        Margin="0,8,0,0"
+                                        Click="TeamPairing_Click"/>
+                                <TextBlock x:Name="TeamPairingHelpText"
+                                           Text="{DynamicResource Settings_ClassTransfer_TeamPairing_Help}"
+                                           Style="{StaticResource HelpText}"/>
+                            </StackPanel>
+
                             <TextBlock Text="{DynamicResource Settings_MinConsensus}" Style="{StaticResource SettingLabel}"/>
                             <Grid Margin="0,0,0,12">
                                 <Grid.ColumnDefinitions>
@@ -599,7 +632,7 @@
                     </Expander>
 
                     <!-- Info Card -->
-                    <Border Background="#4400BCD4"
+                    <Border Background="{StaticResource InfoSubtleBrush}"
                             CornerRadius="6"
                             Padding="16">
                         <Grid>
@@ -611,12 +644,12 @@
                                        FontFamily="Segoe MDL2 Assets"
                                        Text="&#xE946;"
                                        FontSize="16"
-                                       Foreground="#00BCD4"
+                                       Foreground="{StaticResource InfoBrush}"
                                        VerticalAlignment="Top"
                                        Margin="0,0,10,0"/>
                             <TextBlock Grid.Column="1"
                                        Text="{DynamicResource Settings_EnsembleInfo}"
-                                       Foreground="#00BCD4"
+                                       Foreground="{StaticResource InfoBrush}"
                                        FontSize="12"
                                        TextWrapping="Wrap"
                                        VerticalAlignment="Top"/>
@@ -639,12 +672,10 @@
                                       SelectionChanged="LanguageComboBox_SelectionChanged">
                                 <ComboBox.ItemTemplate>
                                     <DataTemplate>
-                                        <TextBlock>
-                                            <Run Text="{Binding NativeName}"/>
-                                            <Run Text=" (" Foreground="Gray"/>
-                                            <Run Text="{Binding Name}" Foreground="Gray"/>
-                                            <Run Text=")" Foreground="Gray"/>
-                                        </TextBlock>
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock Text="{Binding NativeName}"/>
+                                            <TextBlock Text="{Binding Name, StringFormat=' ({0})'}" Foreground="Gray"/>
+                                        </StackPanel>
                                     </DataTemplate>
                                 </ComboBox.ItemTemplate>
                             </ComboBox>
@@ -664,6 +695,14 @@
                                       Margin="0,0,0,16"/>
 
                             <TextBlock Text="{DynamicResource Settings_AccentColor}" Style="{StaticResource SettingLabel}"/>
+                            <ItemsControl x:Name="AccentPresetPanel" Margin="0,0,0,10">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <WrapPanel/>
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                            </ItemsControl>
+                            <TextBlock Text="{DynamicResource Settings_AccentCustomHex}" Style="{StaticResource SettingLabel}"/>
                             <TextBox x:Name="FormHexAccent"
                                      ui:ControlHelper.PlaceholderText="#RRGGBB"
                                      MaxLength="7"
@@ -862,8 +901,8 @@
                     </Border>
 
                     <!-- Help Text -->
-                    <Border Background="#2200BCD4"
-                            BorderBrush="#4400BCD4"
+                    <Border Background="{StaticResource InfoFaintBrush}"
+                            BorderBrush="{StaticResource InfoSubtleBrush}"
                             BorderThickness="1"
                             CornerRadius="6"
                             Padding="16">
@@ -871,7 +910,7 @@
                             <TextBlock FontFamily="Segoe MDL2 Assets" 
                                        Text="&#xE946;" 
                                        FontSize="16" 
-                                       Foreground="#00BCD4"
+                                       Foreground="{StaticResource InfoBrush}"
                                        Margin="0,0,12,0"
                                        VerticalAlignment="Center"/>
                             <TextBlock Text="{DynamicResource Settings_Hotkey_Description}"
@@ -968,7 +1007,7 @@
                     </Border>
 
                     <!-- Performance Tips Card -->
-                    <Border Background="#44FFB74D"
+                    <Border Background="{StaticResource StatusReviewSubtleBrush}"
                             CornerRadius="6"
                             Padding="16">
                         <Grid>
@@ -980,12 +1019,12 @@
                                        FontFamily="Segoe MDL2 Assets"
                                        Text="&#xE7BA;"
                                        FontSize="16"
-                                       Foreground="#FFB74D"
+                                       Foreground="{StaticResource StatusReviewBrush}"
                                        VerticalAlignment="Top"
                                        Margin="0,0,10,0"/>
                             <TextBlock Grid.Column="1"
                                        Text="{DynamicResource Settings_PerformanceTip}"
-                                       Foreground="#CC7A00"
+                                       Foreground="{StaticResource StatusReviewDeepBrush}"
                                        FontSize="12"
                                        TextWrapping="Wrap"
                                        VerticalAlignment="Top"/>
diff --git a/YoableWPF/SettingsWindow.xaml.cs b/YoableWPF/SettingsWindow.xaml.cs
index a49c7b3..5c6f4ee 100644
--- a/YoableWPF/SettingsWindow.xaml.cs
+++ b/YoableWPF/SettingsWindow.xaml.cs
@@ -5,22 +5,129 @@
 using System.Windows.Controls;
 using System.Windows.Media;
 using YoableWPF.Managers;
+using YoableWPF.Models;
 using System.Collections.Generic;
 
 namespace YoableWPF
 {
+    /// <summary>
+    /// Binds a loaded model's ClassTransfer role to a combo box. Writes straight through to the
+    /// model so the choice survives without extra plumbing; the project saves it from there.
+    /// </summary>
+    public class ModelRoleItem
+    {
+        private readonly YoloModel model;
+
+        public ModelRoleItem(YoloModel model)
+        {
+            this.model = model;
+        }
+
+        public string ModelName => model.Name;
+
+        public ModelRole Role => model.Role;
+
+        public int RoleIndex
+        {
+            get => (int)model.Role;
+            set => model.Role = value == (int)ModelRole.Classifier
+                ? ModelRole.Classifier
+                : ModelRole.Detector;
+        }
+    }
+
     public partial class SettingsWindow : Window
     {
         private YoloAI yoloAI;
+        private List<ModelRoleItem> modelRoleItems = new List<ModelRoleItem>();
 
         public SettingsWindow()
         {
             InitializeComponent();
             InitializeLanguageComboBox();
+            BuildAccentSwatches();
             LoadSettings();
-            
+
             // Subscribe to language changes to update UI immediately
             LanguageManager.Instance.LanguageChanged += LanguageManager_LanguageChanged;
+
+            // Revert live theme/accent preview when the dialog is dismissed without saving
+            Closing += (s, e) =>
+            {
+                if (DialogResult != true)
+                {
+                    ThemeManager.Current.ApplicationTheme = Properties.Settings.Default.DarkTheme
+                        ? ApplicationTheme.Dark
+                        : ApplicationTheme.Light;
+                    try
+                    {
+                        ThemeManager.Current.AccentColor =
+                            (Color)ColorConverter.ConvertFromString(Properties.Settings.Default.FormAccent);
+                    }
+                    catch { /* invalid stored hex — leave current accent */ }
+                }
+            };
+        }
+
+        // Preset accent colors shown as swatches in the UI tab
+        private static readonly string[] AccentPresets =
+        {
+            "#ba0012", // Yoable default crimson
+            "#0078D4", // Windows blue
+            "#E81123", // red
+            "#F7630C", // orange
+            "#FFB900", // gold
+            "#107C10", // green
+            "#00B294", // teal
+            "#0099BC", // cyan
+            "#6B69D6", // purple
+            "#C239B3", // magenta
+        };
+
+        private bool suppressSwatchEvents;
+
+        private void BuildAccentSwatches()
+        {
+            foreach (string hex in AccentPresets)
+            {
+                var swatch = new RadioButton
+                {
+                    Style = (Style)FindResource("AccentSwatch"),
+                    GroupName = "AccentPreset",
+                    Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString(hex)),
+                    Tag = hex,
+                    ToolTip = hex
+                };
+                swatch.Checked += AccentSwatch_Checked;
+                AccentPresetPanel.Items.Add(swatch);
+            }
+        }
+
+        private void AccentSwatch_Checked(object sender, RoutedEventArgs e)
+        {
+            if (suppressSwatchEvents) return;
+            if (sender is RadioButton rb && rb.Tag is string hex &&
+                !string.Equals(FormHexAccent.Text, hex, StringComparison.OrdinalIgnoreCase))
+            {
+                FormHexAccent.Text = hex;
+            }
+        }
+
+        private void UpdateAccentSwatchSelection(string hex)
+        {
+            suppressSwatchEvents = true;
+            try
+            {
+                foreach (var item in AccentPresetPanel.Items)
+                {
+                    if (item is RadioButton rb)
+                        rb.IsChecked = string.Equals((string)rb.Tag, hex, StringComparison.OrdinalIgnoreCase);
+                }
+            }
+            finally
+            {
+                suppressSwatchEvents = false;
+            }
         }
 
         private void LanguageManager_LanguageChanged(object sender, EventArgs e)
@@ -115,7 +222,144 @@ private void UpdateTextControlsRecursive(DependencyObject obj)
         public SettingsWindow(YoloAI ai) : this()
         {
             yoloAI = ai;
+            LoadModelRoles();
             UpdateEnsembleControls();
+            UpdateModeDependentSettings();
+        }
+
+        private void LoadModelRoles()
+        {
+            modelRoleItems = (yoloAI?.GetLoadedModels() ?? new List<YoloModel>())
+                .Select(model => new ModelRoleItem(model))
+                .ToList();
+
+            if (ModelRoleList != null)
+                ModelRoleList.ItemsSource = modelRoleItems;
+        }
+
+        /// <summary>
+        /// Per-class thresholds are project-scoped (they key off project class IDs), so the
+        /// caller supplies the current project's classes and saved thresholds. When no project
+        /// with classes is open the editor is unavailable.
+        /// </summary>
+        public SettingsWindow(
+            YoloAI ai,
+            IEnumerable<LabelClass> classes,
+            IReadOnlyDictionary<int, float> savedThresholds,
+            IEnumerable<ClassTeamPair> savedTeamPairs = null) : this(ai)
+        {
+            projectClasses = classes?.ToList() ?? new List<LabelClass>();
+            ClassConfidenceThresholds = savedThresholds == null
+                ? new Dictionary<int, float>()
+                : new Dictionary<int, float>(savedThresholds);
+            ClassTeamPairs = savedTeamPairs == null
+                ? new List<ClassTeamPair>()
+                : savedTeamPairs
+                    .Select(pair => new ClassTeamPair
+                    {
+                        BodyClassId = pair.BodyClassId,
+                        HeadClassId = pair.HeadClassId
+                    })
+                    .ToList();
+
+            UpdatePerClassConfidenceControls();
+            UpdateTeamPairingControls();
+        }
+
+        /// <summary>
+        /// Team pairings as edited in this window. Only meaningful once the dialog returns true.
+        /// </summary>
+        public List<ClassTeamPair> ClassTeamPairs { get; private set; } = new List<ClassTeamPair>();
+
+        /// <summary>
+        /// True once the user opened the pairing editor and confirmed a change, so the caller
+        /// can avoid marking the project dirty on an untouched settings visit.
+        /// </summary>
+        public bool ClassTeamPairsChanged { get; private set; }
+
+        private void UpdateTeamPairingControls()
+        {
+            if (TeamPairingButton == null)
+                return;
+
+            bool hasClasses = projectClasses.Count > 0;
+            TeamPairingButton.IsEnabled = hasClasses;
+
+            if (!hasClasses && TeamPairingHelpText != null)
+            {
+                TeamPairingHelpText.Text =
+                    LanguageManager.Instance.GetString("Settings_PerClassConfidence_NoClasses") ??
+                    "Open a project with defined classes to configure this.";
+            }
+        }
+
+        private void TeamPairing_Click(object sender, RoutedEventArgs e)
+        {
+            if (projectClasses.Count == 0)
+                return;
+
+            var dialog = new TeamPairingDialog(projectClasses, ClassTeamPairs)
+            {
+                Owner = this
+            };
+
+            if (dialog.ShowDialog() != true)
+                return;
+
+            ClassTeamPairs = dialog.Pairs;
+            ClassTeamPairsChanged = true;
+        }
+
+        private List<LabelClass> projectClasses = new List<LabelClass>();
+
+        /// <summary>
+        /// Thresholds as edited in this window. Only meaningful once the dialog returns true.
+        /// </summary>
+        public Dictionary<int, float> ClassConfidenceThresholds { get; private set; } =
+            new Dictionary<int, float>();
+
+        /// <summary>
+        /// True when the user actually opened the editor and confirmed a change, so the caller
+        /// can avoid marking the project dirty on an untouched settings visit.
+        /// </summary>
+        public bool ClassConfidenceThresholdsChanged { get; private set; }
+
+        private void UpdatePerClassConfidenceControls()
+        {
+            if (PerClassConfidenceButton == null)
+                return;
+
+            bool hasClasses = projectClasses.Count > 0;
+            PerClassConfidenceButton.IsEnabled = hasClasses;
+
+            if (!hasClasses && PerClassConfidenceHelpText != null)
+            {
+                PerClassConfidenceHelpText.Text =
+                    LanguageManager.Instance.GetString("Settings_PerClassConfidence_NoClasses") ??
+                    "Open a project with defined classes to set per-class thresholds.";
+            }
+        }
+
+        private void PerClassConfidence_Click(object sender, RoutedEventArgs e)
+        {
+            if (projectClasses.Count == 0)
+                return;
+
+            // Use the slider's live value so the "reset to global" action reflects an
+            // unsaved change to the global threshold made in this same visit.
+            var dialog = new ClassConfidenceDialog(
+                projectClasses,
+                ClassConfidenceThresholds,
+                (float)(ConfidenceSlider.Value / 100))
+            {
+                Owner = this
+            };
+
+            if (dialog.ShowDialog() != true)
+                return;
+
+            ClassConfidenceThresholds = dialog.ConfidenceThresholds;
+            ClassConfidenceThresholdsChanged = true;
         }
 
         private void Tab_Changed(object sender, RoutedEventArgs e)
@@ -199,6 +443,8 @@ private void LoadSettings()
             // Load AI Settings
             ProcessingDeviceComboBox.SelectedIndex = Properties.Settings.Default.UseGPU ? 1 : 0;
             ConfidenceSlider.Value = Properties.Settings.Default.AIConfidence * 100;
+            AutoLabelOnlyUnlabeledCheckBox.IsChecked = Properties.Settings.Default.AIAutoLabelOnlyUnlabeled;
+            ReplaceExistingLabelsCheckBox.IsChecked = Properties.Settings.Default.AIReplaceExistingLabels;
             FormHexAccent.Text = Properties.Settings.Default.FormAccent;
 
             // Load Ensemble Settings
@@ -207,6 +453,9 @@ private void LoadSettings()
             ConsensusIoUSlider.Value = Properties.Settings.Default.ConsensusIoUThreshold;
             EnsembleIoUSlider.Value = Properties.Settings.Default.EnsembleIoUThreshold;
             UseWeightedAverageCheckBox.IsChecked = Properties.Settings.Default.UseWeightedAverage;
+            ClassTransferIoUSlider.Value = Properties.Settings.Default.ClassTransferIoUThreshold;
+            ClassTransferKeepUnvotedCheckBox.IsChecked = Properties.Settings.Default.ClassTransferKeepUnvoted;
+            ClassTransferTeamConsistencyCheckBox.IsChecked = Properties.Settings.Default.ClassTransferTeamConsistency;
 
             // Load Propagation Settings
             EnablePropagationCheckBox.IsChecked = Properties.Settings.Default.EnablePropagation;
@@ -337,6 +586,10 @@ private void FormHexInput_TextChanged(object sender, TextChangedEventArgs e)
                 {
                     FormHexAccent.ClearValue(TextBox.BackgroundProperty);
                     SaveButton.IsEnabled = true;
+
+                    // Live preview + sync preset swatch selection (reverted on cancel/close)
+                    ThemeManager.Current.AccentColor = (Color)ColorConverter.ConvertFromString("#" + hex);
+                    UpdateAccentSwatchSelection("#" + hex);
                 }
                 else
                 {
@@ -356,6 +609,10 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
             // Save AI Settings
             Properties.Settings.Default.UseGPU = ProcessingDeviceComboBox.SelectedIndex == 1;
             Properties.Settings.Default.AIConfidence = (float)(ConfidenceSlider.Value / 100);
+            Properties.Settings.Default.AIAutoLabelOnlyUnlabeled =
+                AutoLabelOnlyUnlabeledCheckBox.IsChecked ?? false;
+            Properties.Settings.Default.AIReplaceExistingLabels =
+                ReplaceExistingLabelsCheckBox.IsChecked ?? true;
 
             // Save Ensemble Settings
             Properties.Settings.Default.EnsembleDetectionMode = DetectionModeComboBox.SelectedIndex;
@@ -363,6 +620,11 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
             Properties.Settings.Default.ConsensusIoUThreshold = (float)ConsensusIoUSlider.Value;
             Properties.Settings.Default.EnsembleIoUThreshold = (float)EnsembleIoUSlider.Value;
             Properties.Settings.Default.UseWeightedAverage = UseWeightedAverageCheckBox.IsChecked ?? true;
+            Properties.Settings.Default.ClassTransferIoUThreshold = (float)ClassTransferIoUSlider.Value;
+            Properties.Settings.Default.ClassTransferKeepUnvoted =
+                ClassTransferKeepUnvotedCheckBox.IsChecked ?? true;
+            Properties.Settings.Default.ClassTransferTeamConsistency =
+                ClassTransferTeamConsistencyCheckBox.IsChecked ?? true;
 
             // Save Propagation Settings
             Properties.Settings.Default.EnablePropagation = EnablePropagationCheckBox.IsChecked ?? true;
@@ -460,8 +722,33 @@ private void UpdateModeDependentSettings()
         {
             // Show/hide relevant settings based on mode
             bool isVotingMode = DetectionModeComboBox.SelectedIndex == 0;
+            bool isClassTransferMode =
+                DetectionModeComboBox.SelectedIndex == (int)EnsembleDetectionMode.ClassTransfer;
+
             MinConsensusSlider.IsEnabled = isVotingMode;
             ConsensusIoUSlider.IsEnabled = isVotingMode;
+
+            if (ClassTransferPanel == null)
+                return;
+
+            ClassTransferPanel.Visibility = isClassTransferMode
+                ? Visibility.Visible
+                : Visibility.Collapsed;
+
+            if (isClassTransferMode)
+                UpdateModelRoleWarning();
+        }
+
+        private void UpdateModelRoleWarning()
+        {
+            if (ModelRoleWarningText == null)
+                return;
+
+            // Without a detector there is nothing to take boxes from, so the mode cannot work.
+            bool hasDetector = modelRoleItems.Any(item => item.Role == ModelRole.Detector);
+            ModelRoleWarningText.Visibility = modelRoleItems.Count > 0 && !hasDetector
+                ? Visibility.Visible
+                : Visibility.Collapsed;
         }
 
         protected override void OnClosed(EventArgs e)
diff --git a/YoableWPF/StartupWindow.xaml b/YoableWPF/StartupWindow.xaml
index acd4482..b653809 100644
--- a/YoableWPF/StartupWindow.xaml
+++ b/YoableWPF/StartupWindow.xaml
@@ -1,110 +1,41 @@
-<Window x:Class="YoableWPF.StartupWindow"
+<Window x:Class="YoableWPF.StartupWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:ui="http://schemas.modernwpf.com/2019"
         ui:WindowHelper.UseModernWindowStyle="True"
-        Title="Yoable - Get Started"
-        Width="900" 
-        Height="450"
+        Title="{DynamicResource Startup_Title}"
+        Width="900"
+        Height="660"
         WindowStartupLocation="CenterScreen"
         ResizeMode="CanResize"
         MinWidth="800"
         MinHeight="650">
 
     <Window.Resources>
-        <!-- Hero Section Style -->
-        <Style x:Key="HeroText" TargetType="TextBlock">
-            <Setter Property="FontSize" Value="32"/>
-            <Setter Property="FontWeight" Value="Bold"/>
-        </Style>
-
-        <!-- Subtitle Style -->
-        <Style x:Key="SubtitleText" TargetType="TextBlock">
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Foreground" Value="Gray"/>
-        </Style>
-
-        <!-- Project Card Style -->
-        <Style x:Key="ProjectCard" TargetType="Border">
-            <Setter Property="Background">
-                <Setter.Value>
-                    <SolidColorBrush Color="#19FFFFFF"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="CornerRadius" Value="8"/>
-            <Setter Property="Padding" Value="20,16"/>
-            <Setter Property="Margin" Value="0,0,0,12"/>
+        <!-- Recent project card: theme-aware hover -->
+        <Style x:Key="ProjectCard" TargetType="Border" BasedOn="{StaticResource ModernCard}">
+            <Setter Property="Padding" Value="20,14"/>
             <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Effect">
-                <Setter.Value>
-                    <DropShadowEffect BlurRadius="10" ShadowDepth="2" Opacity="0.15" Direction="270"/>
-                </Setter.Value>
-            </Setter>
+            <Style.Triggers>
+                <Trigger Property="IsMouseOver" Value="True">
+                    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
+                </Trigger>
+            </Style.Triggers>
         </Style>
 
-        <!-- Large Action Button -->
-        <Style x:Key="LargeActionButton" TargetType="Button">
-            <Setter Property="Background" Value="#FF0078D4"/>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="32,16"/>
-            <Setter Property="FontSize" Value="16"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="MinWidth" Value="180"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                CornerRadius="6"
-                                Padding="{TemplateBinding Padding}">
-                            <StackPanel Orientation="Horizontal" 
-                                      HorizontalAlignment="Center">
-                                <TextBlock x:Name="Icon"
-                                         FontFamily="Segoe MDL2 Assets"
-                                         FontSize="20"
-                                         VerticalAlignment="Center"
-                                         Margin="0,0,12,0"/>
-                                <ContentPresenter VerticalAlignment="Center"/>
-                            </StackPanel>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.9"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <!-- Secondary Action Button -->
-        <Style x:Key="SecondaryActionButton" TargetType="Button" BasedOn="{StaticResource LargeActionButton}">
-            <Setter Property="Background">
-                <Setter.Value>
-                    <SolidColorBrush Color="#33FFFFFF"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Foreground" Value="White"/>
-        </Style>
-
-        <!-- Text Link Style -->
+        <!-- Text link -->
         <Style x:Key="TextLink" TargetType="Button">
             <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Foreground" Value="#FF0078D4"/>
+            <Setter Property="Foreground" Value="{DynamicResource AccentBrush}"/>
             <Setter Property="BorderThickness" Value="0"/>
             <Setter Property="Cursor" Value="Hand"/>
             <Setter Property="FontSize" Value="13"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
-                        <TextBlock x:Name="Text" 
-                                 Text="{TemplateBinding Content}"
-                                 Foreground="{TemplateBinding Foreground}"/>
+                        <TextBlock x:Name="Text"
+                                   Text="{TemplateBinding Content}"
+                                   Foreground="{TemplateBinding Foreground}"/>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
                                 <Setter TargetName="Text" Property="TextDecorations" Value="Underline"/>
@@ -124,57 +55,49 @@
         </Grid.RowDefinitions>
 
         <!-- Header Section -->
-        <Border Grid.Row="0" 
-                Padding="40,32">
-            <Border.Background>
-                <SolidColorBrush Color="#19FFFFFF"/>
-            </Border.Background>
+        <Border Grid.Row="0" Style="{StaticResource DialogHeader}" Padding="40,28">
             <StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,8">
-                    <!-- App Icon using Segoe MDL2 Assets -->
-                    <TextBlock FontFamily="Segoe MDL2 Assets" 
-                             Text="&#xE8B7;" 
-                             FontSize="48"
-                             Foreground="#FF9C27B0"
-                             VerticalAlignment="Center"
-                             Margin="0,0,16,0"/>
+                    <TextBlock FontFamily="Segoe MDL2 Assets"
+                               Text="&#xE8B7;"
+                               FontSize="44"
+                               Foreground="{DynamicResource AccentBrush}"
+                               VerticalAlignment="Center"
+                               Margin="0,0,16,0"/>
                     <StackPanel VerticalAlignment="Center">
-                        <TextBlock Text="Yoable" 
-                                 Style="{StaticResource HeroText}"/>
-                        <TextBlock Text="Object Detection Labeling Tool" 
-                                 Style="{StaticResource SubtitleText}"/>
+                        <TextBlock Text="Yoable"
+                                   FontSize="30"
+                                   FontWeight="Bold"/>
+                        <TextBlock Text="{DynamicResource Startup_Subtitle}"
+                                   FontSize="14"
+                                   Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
                     </StackPanel>
                 </StackPanel>
                 <TextBlock x:Name="VersionText"
-                         Text="Version"
-                         FontSize="11"
-                         Foreground="Gray"
-                         Margin="0,4,0,0"/>
+                           Text="Version"
+                           FontSize="11"
+                           Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"
+                           Margin="0,4,0,0"/>
             </StackPanel>
         </Border>
 
         <!-- Main Content Area -->
-        <ScrollViewer Grid.Row="1" 
+        <ScrollViewer Grid.Row="1"
                       VerticalScrollBarVisibility="Auto"
                       Padding="40,20">
             <StackPanel>
                 <!-- Recent Projects Section -->
                 <StackPanel x:Name="RecentProjectsPanel">
-                    <Grid Margin="0,0,0,16">
-                        <TextBlock Text="RECENT PROJECTS" 
-                                 FontSize="13" 
-                                 FontWeight="SemiBold"
-                                 Foreground="Gray"
-                                 VerticalAlignment="Center"/>
-                    </Grid>
+                    <TextBlock Text="{DynamicResource Startup_RecentProjects}"
+                               Style="{StaticResource SectionHeader}"/>
 
                     <!-- Recent Projects List -->
                     <ItemsControl x:Name="RecentProjectsList">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
                                 <Border Style="{StaticResource ProjectCard}"
-                                      MouseLeftButtonDown="ProjectCard_Click"
-                                      Tag="{Binding ProjectPath}">
+                                        MouseLeftButtonDown="ProjectCard_Click"
+                                        Tag="{Binding ProjectPath}">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="Auto"/>
@@ -184,104 +107,59 @@
 
                                         <!-- Project Icon -->
                                         <Border Grid.Column="0"
-                                              Background="#4400BCD4"
-                                              CornerRadius="6"
-                                              Width="48"
-                                              Height="48"
-                                              Margin="0,0,16,0">
+                                                Background="{StaticResource InfoSubtleBrush}"
+                                                CornerRadius="8"
+                                                Width="48"
+                                                Height="48"
+                                                Margin="0,0,16,0">
                                             <TextBlock FontFamily="Segoe MDL2 Assets"
-                                                     Text="&#xE8B7;"
-                                                     FontSize="24"
-                                                     Foreground="#00BCD4"
-                                                     HorizontalAlignment="Center"
-                                                     VerticalAlignment="Center"/>
+                                                       Text="&#xE8B7;"
+                                                       FontSize="24"
+                                                       Foreground="{StaticResource InfoBrush}"
+                                                       HorizontalAlignment="Center"
+                                                       VerticalAlignment="Center"/>
                                         </Border>
 
                                         <!-- Project Info -->
                                         <StackPanel Grid.Column="1" VerticalAlignment="Center">
                                             <TextBlock Text="{Binding ProjectName}"
-                                                     FontSize="16"
-                                                     FontWeight="SemiBold"
-                                                     Margin="0,0,0,4"/>
+                                                       FontSize="16"
+                                                       FontWeight="SemiBold"
+                                                       Margin="0,0,0,4"/>
                                             <TextBlock Text="{Binding ProjectPath}"
-                                                     FontSize="11"
-                                                     Foreground="Gray"
-                                                     TextTrimming="CharacterEllipsis"
-                                                     Margin="0,0,0,4"/>
+                                                       FontSize="11"
+                                                       Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"
+                                                       TextTrimming="CharacterEllipsis"
+                                                       Margin="0,0,0,4"/>
                                             <TextBlock Text="{Binding LastOpenedText}"
-                                                     FontSize="11"
-                                                     Foreground="#00BCD4"/>
+                                                       FontSize="11"
+                                                       Foreground="{DynamicResource AccentBrush}"/>
                                         </StackPanel>
 
                                         <!-- Action Buttons -->
-                                        <StackPanel Grid.Column="2" 
-                                                  Orientation="Horizontal"
-                                                  VerticalAlignment="Center">
-                                            <!-- Folder Icon Button -->
-                                            <Button Background="Transparent"
-                                                  BorderThickness="0"
-                                                  Padding="8"
-                                                  Cursor="Hand"
-                                                  ToolTip="Open project folder"
-                                                  Tag="{Binding ProjectPath}"
-                                                  Click="OpenProjectFolder_Click">
+                                        <StackPanel Grid.Column="2"
+                                                    Orientation="Horizontal"
+                                                    VerticalAlignment="Center">
+                                            <Button Style="{StaticResource IconButton}"
+                                                    Width="32" Height="32"
+                                                    ToolTip="{DynamicResource Startup_OpenFolderTooltip}"
+                                                    Tag="{Binding ProjectPath}"
+                                                    Click="OpenProjectFolder_Click">
                                                 <TextBlock FontFamily="Segoe MDL2 Assets"
-                                                         Text="&#xE838;"
-                                                         FontSize="16"
-                                                         Foreground="#00BCD4"/>
-                                                <Button.Template>
-                                                    <ControlTemplate TargetType="Button">
-                                                        <Border x:Name="Border"
-                                                              Background="{TemplateBinding Background}"
-                                                              Padding="{TemplateBinding Padding}"
-                                                              CornerRadius="4">
-                                                            <ContentPresenter/>
-                                                        </Border>
-                                                        <ControlTemplate.Triggers>
-                                                            <Trigger Property="IsMouseOver" Value="True">
-                                                                <Setter TargetName="Border" Property="Background">
-                                                                    <Setter.Value>
-                                                                        <SolidColorBrush Color="#1A00BCD4"/>
-                                                                    </Setter.Value>
-                                                                </Setter>
-                                                            </Trigger>
-                                                        </ControlTemplate.Triggers>
-                                                    </ControlTemplate>
-                                                </Button.Template>
+                                                           Text="&#xE838;"
+                                                           FontSize="15"
+                                                           Foreground="{StaticResource InfoBrush}"/>
                                             </Button>
-
-                                            <!-- Delete Icon Button -->
-                                            <Button Background="Transparent"
-                                                  BorderThickness="0"
-                                                  Padding="8"
-                                                  Cursor="Hand"
-                                                  ToolTip="Delete project"
-                                                  Tag="{Binding ProjectPath}"
-                                                  Click="DeleteProject_Click"
-                                                  Margin="4,0,0,0">
+                                            <Button Style="{StaticResource IconButton}"
+                                                    Width="32" Height="32"
+                                                    Margin="4,0,0,0"
+                                                    ToolTip="{DynamicResource Startup_DeleteTooltip}"
+                                                    Tag="{Binding ProjectPath}"
+                                                    Click="DeleteProject_Click">
                                                 <TextBlock FontFamily="Segoe MDL2 Assets"
-                                                         Text="&#xE74D;"
-                                                         FontSize="16"
-                                                         Foreground="#F44336"/>
-                                                <Button.Template>
-                                                    <ControlTemplate TargetType="Button">
-                                                        <Border x:Name="Border"
-                                                              Background="{TemplateBinding Background}"
-                                                              Padding="{TemplateBinding Padding}"
-                                                              CornerRadius="4">
-                                                            <ContentPresenter/>
-                                                        </Border>
-                                                        <ControlTemplate.Triggers>
-                                                            <Trigger Property="IsMouseOver" Value="True">
-                                                                <Setter TargetName="Border" Property="Background">
-                                                                    <Setter.Value>
-                                                                        <SolidColorBrush Color="#1AF44336"/>
-                                                                    </Setter.Value>
-                                                                </Setter>
-                                                            </Trigger>
-                                                        </ControlTemplate.Triggers>
-                                                    </ControlTemplate>
-                                                </Button.Template>
+                                                           Text="&#xE74D;"
+                                                           FontSize="15"
+                                                           Foreground="{StaticResource DangerBrush}"/>
                                             </Button>
                                         </StackPanel>
                                     </Grid>
@@ -292,35 +170,33 @@
 
                     <!-- Empty State -->
                     <Border x:Name="EmptyStatePanel"
-                          Style="{StaticResource ProjectCard}"
-                          Background="Transparent"
-                          BorderThickness="2"
-                          Visibility="Collapsed">
-                        <Border.BorderBrush>
-                            <SolidColorBrush Color="#33FFFFFF"/>
-                        </Border.BorderBrush>
-                        <StackPanel HorizontalAlignment="Center" 
-                                  VerticalAlignment="Center"
-                                  Margin="32">
+                            Background="Transparent"
+                            BorderThickness="2"
+                            BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                            CornerRadius="8"
+                            Visibility="Collapsed">
+                        <StackPanel HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Margin="32">
                             <TextBlock FontFamily="Segoe MDL2 Assets"
-                                     Text="&#xE8B7;"
-                                     FontSize="48"
-                                     Foreground="Gray"
-                                     HorizontalAlignment="Center"
-                                     Opacity="0.5"
-                                     Margin="0,0,0,16"/>
-                            <TextBlock Text="No recent projects"
-                                     FontSize="16"
-                                     Foreground="Gray"
-                                     HorizontalAlignment="Center"
-                                     Margin="0,0,0,8"/>
-                            <TextBlock Text="Create a new project or open an existing one to get started"
-                                     FontSize="13"
-                                     Foreground="Gray"
-                                     HorizontalAlignment="Center"
-                                     TextWrapping="Wrap"
-                                     TextAlignment="Center"
-                                     Opacity="0.7"/>
+                                       Text="&#xE8B7;"
+                                       FontSize="48"
+                                       Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"
+                                       HorizontalAlignment="Center"
+                                       Opacity="0.5"
+                                       Margin="0,0,0,16"/>
+                            <TextBlock Text="{DynamicResource Startup_NoRecent}"
+                                       FontSize="16"
+                                       Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"
+                                       HorizontalAlignment="Center"
+                                       Margin="0,0,0,8"/>
+                            <TextBlock Text="{DynamicResource Startup_NoRecentHint}"
+                                       FontSize="13"
+                                       Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"
+                                       HorizontalAlignment="Center"
+                                       TextWrapping="Wrap"
+                                       TextAlignment="Center"
+                                       Opacity="0.7"/>
                         </StackPanel>
                     </Border>
                 </StackPanel>
@@ -334,96 +210,51 @@
                     </Grid.ColumnDefinitions>
 
                     <Button Grid.Column="0"
-                          x:Name="NewProjectButton"
-                          Content="New Project"
-                          Click="NewProject_Click"
-                          Style="{StaticResource LargeActionButton}"
-                          HorizontalAlignment="Stretch">
-                        <Button.Template>
-                            <ControlTemplate TargetType="Button">
-                                <Border x:Name="Border"
-                                      Background="{TemplateBinding Background}"
-                                      CornerRadius="6"
-                                      Padding="{TemplateBinding Padding}">
-                                    <StackPanel Orientation="Horizontal" 
-                                              HorizontalAlignment="Center">
-                                        <TextBlock FontFamily="Segoe MDL2 Assets"
-                                                 Text="&#xE710;"
-                                                 FontSize="20"
-                                                 VerticalAlignment="Center"
-                                                 Margin="0,0,12,0"/>
-                                        <ContentPresenter VerticalAlignment="Center"/>
-                                    </StackPanel>
-                                </Border>
-                                <ControlTemplate.Triggers>
-                                    <Trigger Property="IsMouseOver" Value="True">
-                                        <Setter TargetName="Border" Property="Opacity" Value="0.9"/>
-                                    </Trigger>
-                                    <Trigger Property="IsPressed" Value="True">
-                                        <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                                    </Trigger>
-                                </ControlTemplate.Triggers>
-                            </ControlTemplate>
-                        </Button.Template>
+                            x:Name="NewProjectButton"
+                            Style="{StaticResource ModernButton}"
+                            Click="NewProject_Click"
+                            Padding="24,14"
+                            FontSize="15"
+                            HorizontalAlignment="Stretch">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock FontFamily="Segoe MDL2 Assets"
+                                       Text="&#xE710;"
+                                       FontSize="18"
+                                       VerticalAlignment="Center"
+                                       Margin="0,0,12,0"/>
+                            <TextBlock Text="{DynamicResource Startup_NewProject}" VerticalAlignment="Center"/>
+                        </StackPanel>
                     </Button>
 
                     <Button Grid.Column="2"
-                          x:Name="OpenProjectButton"
-                          Content="Open Project"
-                          Click="OpenProject_Click"
-                          Style="{StaticResource SecondaryActionButton}"
-                          HorizontalAlignment="Stretch">
-                        <Button.Template>
-                            <ControlTemplate TargetType="Button">
-                                <Border x:Name="Border"
-                                      Background="{TemplateBinding Background}"
-                                      CornerRadius="6"
-                                      Padding="{TemplateBinding Padding}">
-                                    <StackPanel Orientation="Horizontal" 
-                                              HorizontalAlignment="Center">
-                                        <TextBlock FontFamily="Segoe MDL2 Assets"
-                                                 Text="&#xE8E5;"
-                                                 FontSize="20"
-                                                 VerticalAlignment="Center"
-                                                 Margin="0,0,12,0"/>
-                                        <ContentPresenter VerticalAlignment="Center"/>
-                                    </StackPanel>
-                                </Border>
-                                <ControlTemplate.Triggers>
-                                    <Trigger Property="IsMouseOver" Value="True">
-                                        <Setter TargetName="Border" Property="Background">
-                                            <Setter.Value>
-                                                <SolidColorBrush Color="#44FFFFFF"/>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </Trigger>
-                                    <Trigger Property="IsPressed" Value="True">
-                                        <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                                    </Trigger>
-                                </ControlTemplate.Triggers>
-                            </ControlTemplate>
-                        </Button.Template>
+                            x:Name="OpenProjectButton"
+                            Style="{StaticResource SecondaryButton}"
+                            Click="OpenProject_Click"
+                            Padding="24,14"
+                            FontSize="15"
+                            HorizontalAlignment="Stretch">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock FontFamily="Segoe MDL2 Assets"
+                                       Text="&#xE8E5;"
+                                       FontSize="18"
+                                       VerticalAlignment="Center"
+                                       Foreground="{StaticResource SuccessBrush}"
+                                       Margin="0,0,12,0"/>
+                            <TextBlock Text="{DynamicResource Startup_OpenProject}" VerticalAlignment="Center"/>
+                        </StackPanel>
                     </Button>
                 </Grid>
             </StackPanel>
         </ScrollViewer>
 
         <!-- Footer -->
-        <Border Grid.Row="2"
-                Padding="40,16">
-            <Border.Background>
-                <SolidColorBrush Color="#19FFFFFF"/>
-            </Border.Background>
-            <Border.BorderBrush>
-                <SolidColorBrush Color="#0FFFFFFF"/>
-            </Border.BorderBrush>
-            <Border.BorderThickness>0,1,0,0</Border.BorderThickness>
+        <Border Grid.Row="2" Style="{StaticResource DialogFooter}" Padding="40,14">
             <Grid>
                 <Button x:Name="ContinueWithoutProjectButton"
-                      Content="Continue Without Project"
-                      Click="ContinueWithoutProject_Click"
-                      Style="{StaticResource TextLink}"
-                      HorizontalAlignment="Left"/>
+                        Content="{DynamicResource Startup_ContinueWithout}"
+                        Click="ContinueWithoutProject_Click"
+                        Style="{StaticResource TextLink}"
+                        HorizontalAlignment="Left"/>
             </Grid>
         </Border>
     </Grid>
diff --git a/YoableWPF/TeamPairingDialog.xaml b/YoableWPF/TeamPairingDialog.xaml
new file mode 100644
index 0000000..f6b0568
--- /dev/null
+++ b/YoableWPF/TeamPairingDialog.xaml
@@ -0,0 +1,115 @@
+<Window x:Class="YoableWPF.TeamPairingDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:ui="http://schemas.modernwpf.com/2019"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        Title="{DynamicResource TeamPairing_Title}"
+        Width="560"
+        Height="480"
+        MinWidth="460"
+        MinHeight="360"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="CanResize">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <Border Grid.Row="0"
+                Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
+                BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                BorderThickness="0,0,0,1"
+                Padding="20,16">
+            <StackPanel>
+                <TextBlock Text="{DynamicResource TeamPairing_Title}"
+                           FontSize="18"
+                           FontWeight="SemiBold"/>
+                <TextBlock Text="{DynamicResource TeamPairing_Subtitle}"
+                           Margin="0,6,0,0"
+                           FontSize="12"
+                           Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"
+                           TextWrapping="Wrap"/>
+            </StackPanel>
+        </Border>
+
+        <Grid Grid.Row="1" Margin="20,14,20,6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="28"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="40"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Grid.Column="0"
+                       Text="{DynamicResource TeamPairing_Body}"
+                       FontSize="11"
+                       FontWeight="SemiBold"/>
+            <TextBlock Grid.Column="2"
+                       Text="{DynamicResource TeamPairing_Head}"
+                       FontSize="11"
+                       FontWeight="SemiBold"/>
+        </Grid>
+
+        <ScrollViewer Grid.Row="2" Margin="20,0" VerticalScrollBarVisibility="Auto">
+            <ItemsControl x:Name="PairList">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Grid Margin="0,4">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="28"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="40"/>
+                            </Grid.ColumnDefinitions>
+                            <ComboBox Grid.Column="0"
+                                      ItemsSource="{Binding Classes}"
+                                      SelectedItem="{Binding SelectedBody, Mode=TwoWay}"
+                                      DisplayMemberPath="Name"/>
+                            <TextBlock Grid.Column="1"
+                                       Text="↔"
+                                       FontSize="16"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"/>
+                            <ComboBox Grid.Column="2"
+                                      ItemsSource="{Binding Classes}"
+                                      SelectedItem="{Binding SelectedHead, Mode=TwoWay}"
+                                      DisplayMemberPath="Name"/>
+                            <Button Grid.Column="3"
+                                    Content="✕"
+                                    Width="28"
+                                    Height="28"
+                                    Margin="8,0,0,0"
+                                    Click="RemovePair_Click"
+                                    Tag="{Binding}"/>
+                        </Grid>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </ScrollViewer>
+
+        <Grid Grid.Row="3" Margin="20,14,20,18">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <Button Grid.Column="0"
+                    Content="{DynamicResource TeamPairing_AddPair}"
+                    HorizontalAlignment="Left"
+                    Padding="14,6"
+                    Click="AddPair_Click"/>
+            <StackPanel Grid.Column="1" Orientation="Horizontal">
+                <Button Content="{DynamicResource Common_Cancel}"
+                        Width="96"
+                        Margin="0,0,8,0"
+                        IsCancel="True"
+                        Click="Cancel_Click"/>
+                <Button Content="{DynamicResource Common_OK}"
+                        Width="96"
+                        IsDefault="True"
+                        Click="Confirm_Click"/>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Window>
diff --git a/YoableWPF/TeamPairingDialog.xaml.cs b/YoableWPF/TeamPairingDialog.xaml.cs
new file mode 100644
index 0000000..e0f0d39
--- /dev/null
+++ b/YoableWPF/TeamPairingDialog.xaml.cs
@@ -0,0 +1,91 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using YoableWPF.Models;
+
+namespace YoableWPF
+{
+    /// <summary>
+    /// One body-class/head-class pairing row backed by combo box selections.
+    /// </summary>
+    public class TeamPairRow
+    {
+        public List<LabelClass> Classes { get; set; }
+        public LabelClass SelectedBody { get; set; }
+        public LabelClass SelectedHead { get; set; }
+    }
+
+    /// <summary>
+    /// Edits the body/head class pairings a project uses for ClassTransfer team consistency.
+    /// </summary>
+    public partial class TeamPairingDialog : Window
+    {
+        private readonly List<LabelClass> projectClasses;
+        public ObservableCollection<TeamPairRow> Rows { get; }
+
+        /// <summary>
+        /// Fully specified, de-duplicated pairings; only meaningful once the dialog returns true.
+        /// </summary>
+        public List<ClassTeamPair> Pairs => Rows
+            .Where(row => row.SelectedBody != null && row.SelectedHead != null &&
+                          row.SelectedBody.ClassId != row.SelectedHead.ClassId)
+            .Select(row => new ClassTeamPair
+            {
+                BodyClassId = row.SelectedBody.ClassId,
+                HeadClassId = row.SelectedHead.ClassId
+            })
+            .GroupBy(pair => (pair.BodyClassId, pair.HeadClassId))
+            .Select(group => group.First())
+            .ToList();
+
+        public TeamPairingDialog(
+            IEnumerable<LabelClass> classes,
+            IEnumerable<ClassTeamPair> savedPairs)
+        {
+            projectClasses = classes?.ToList() ?? new List<LabelClass>();
+            Rows = new ObservableCollection<TeamPairRow>();
+
+            InitializeComponent();
+
+            if (savedPairs != null)
+            {
+                foreach (ClassTeamPair pair in savedPairs)
+                {
+                    Rows.Add(new TeamPairRow
+                    {
+                        Classes = projectClasses,
+                        SelectedBody = projectClasses.FirstOrDefault(c => c.ClassId == pair.BodyClassId),
+                        SelectedHead = projectClasses.FirstOrDefault(c => c.ClassId == pair.HeadClassId)
+                    });
+                }
+            }
+
+            PairList.ItemsSource = Rows;
+        }
+
+        private void AddPair_Click(object sender, RoutedEventArgs e)
+        {
+            Rows.Add(new TeamPairRow { Classes = projectClasses });
+        }
+
+        private void RemovePair_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is Button button && button.Tag is TeamPairRow row)
+                Rows.Remove(row);
+        }
+
+        private void Confirm_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = true;
+            Close();
+        }
+
+        private void Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+    }
+}
diff --git a/YoableWPF/Themes/Cards.xaml b/YoableWPF/Themes/Cards.xaml
new file mode 100644
index 0000000..37538bd
--- /dev/null
+++ b/YoableWPF/Themes/Cards.xaml
@@ -0,0 +1,87 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Palette.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- Modern Card: elevated surface for panels -->
+    <Style x:Key="ModernCard" TargetType="Border">
+        <Setter Property="Background" Value="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"/>
+        <Setter Property="CornerRadius" Value="8"/>
+        <Setter Property="Padding" Value="16"/>
+        <Setter Property="Margin" Value="0,0,0,12"/>
+        <Setter Property="Effect">
+            <Setter.Value>
+                <DropShadowEffect BlurRadius="10" ShadowDepth="2" Opacity="0.15" Direction="270"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Status Card: small colored summary tiles -->
+    <Style x:Key="StatusCard" TargetType="Border">
+        <Setter Property="CornerRadius" Value="6"/>
+        <Setter Property="Padding" Value="12,10"/>
+        <Setter Property="Effect">
+            <Setter.Value>
+                <DropShadowEffect BlurRadius="8" ShadowDepth="1" Opacity="0.2" Direction="270"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Setting Card: flat grouping card used in dialogs -->
+    <Style x:Key="SettingCard" TargetType="Border">
+        <Setter Property="Background" Value="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"/>
+        <Setter Property="CornerRadius" Value="6"/>
+        <Setter Property="Padding" Value="16"/>
+        <Setter Property="Margin" Value="0,0,0,16"/>
+    </Style>
+
+    <!-- Section Header -->
+    <Style x:Key="SectionHeader" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Margin" Value="0,0,0,12"/>
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+    </Style>
+
+    <!-- Setting Label -->
+    <Style x:Key="SettingLabel" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="13"/>
+        <Setter Property="FontWeight" Value="Medium"/>
+        <Setter Property="Margin" Value="0,0,0,8"/>
+    </Style>
+
+    <!-- Help / hint text -->
+    <Style x:Key="HelpText" TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+        <Setter Property="FontSize" Value="11"/>
+        <Setter Property="TextWrapping" Value="Wrap"/>
+        <Setter Property="Margin" Value="0,6,0,0"/>
+    </Style>
+
+    <!-- Badge Pill: rounded status pill (status bar, list badges) -->
+    <Style x:Key="BadgePill" TargetType="Border">
+        <Setter Property="CornerRadius" Value="10"/>
+        <Setter Property="Padding" Value="8,3"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+
+    <!-- Dialog Footer: bottom button bar of every dialog -->
+    <Style x:Key="DialogFooter" TargetType="Border">
+        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseLowBrush}"/>
+        <Setter Property="BorderThickness" Value="0,1,0,0"/>
+        <Setter Property="Padding" Value="16,12"/>
+    </Style>
+
+    <!-- Dialog Header: top banner of every dialog -->
+    <Style x:Key="DialogHeader" TargetType="Border">
+        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseLowBrush}"/>
+        <Setter Property="BorderThickness" Value="0,0,0,1"/>
+        <Setter Property="Padding" Value="24,20"/>
+    </Style>
+
+</ResourceDictionary>
diff --git a/YoableWPF/Themes/Controls.xaml b/YoableWPF/Themes/Controls.xaml
new file mode 100644
index 0000000..bf18599
--- /dev/null
+++ b/YoableWPF/Themes/Controls.xaml
@@ -0,0 +1,276 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Palette.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- Primary accent button -->
+    <Style x:Key="ModernButton" TargetType="Button">
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBrush}"/>
+        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="16,8"/>
+        <Setter Property="MinWidth" Value="90"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="Border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="4"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.9"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Secondary neutral button -->
+    <Style x:Key="SecondaryButton" TargetType="Button">
+        <Setter Property="Background" Value="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="16,8"/>
+        <Setter Property="MinWidth" Value="90"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="Border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="4"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Destructive action button -->
+    <Style x:Key="DangerButton" TargetType="Button">
+        <Setter Property="Background" Value="{StaticResource StatusNoLabelSubtleBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource StatusNoLabelBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="16,8"/>
+        <Setter Property="MinWidth" Value="90"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="Border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="4"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource StatusNoLabelBrush}"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource DangerDeepBrush}"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Small square icon button (list row actions) -->
+    <Style x:Key="IconButton" TargetType="Button">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="4"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Width" Value="24"/>
+        <Setter Property="Height" Value="24"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}"
+                            CornerRadius="4"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Collapse / expand panel button -->
+    <Style x:Key="CollapsePanelButton" TargetType="Button">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="8"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}"
+                            CornerRadius="4"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Top toolbar button: transparent, 36px tall, icon + optional label -->
+    <Style x:Key="ToolbarButton" TargetType="Button">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Height" Value="36"/>
+        <Setter Property="Padding" Value="10,0"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="Border"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="4"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SystemControlHighlightListMediumBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Left navigation rail item: vertical icon + label RadioButton -->
+    <Style x:Key="NavRailButton" TargetType="RadioButton">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+        <Setter Property="Width" Value="68"/>
+        <Setter Property="Height" Value="60"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RadioButton">
+                    <Grid>
+                        <Border x:Name="Border"
+                                Background="{TemplateBinding Background}"
+                                CornerRadius="6"
+                                Margin="6,2">
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Border>
+                        <Rectangle x:Name="Pill"
+                                   Width="3" Height="24"
+                                   RadiusX="1.5" RadiusY="1.5"
+                                   HorizontalAlignment="Left"
+                                   VerticalAlignment="Center"
+                                   Fill="{DynamicResource SystemControlHighlightAccentBrush}"
+                                   Visibility="Collapsed"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
+                            <Setter TargetName="Pill" Property="Visibility" Value="Visible"/>
+                            <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Status filter chip (image list filters) -->
+    <Style x:Key="FilterChip" TargetType="Button">
+        <Setter Property="FontSize" Value="10"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Padding" Value="6,6"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="Border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="4"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.85"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.7"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/YoableWPF/Themes/Lists.xaml b/YoableWPF/Themes/Lists.xaml
new file mode 100644
index 0000000..034b19f
--- /dev/null
+++ b/YoableWPF/Themes/Lists.xaml
@@ -0,0 +1,44 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Palette.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- Borderless transparent ListBox -->
+    <Style x:Key="ModernListBox" TargetType="ListBox" BasedOn="{StaticResource {x:Type ListBox}}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="4"/>
+    </Style>
+
+    <!-- Image list rounded row -->
+    <Style x:Key="ImageListItemStyle" TargetType="ListBoxItem">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="0,2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <Border x:Name="Border"
+                            Background="Transparent"
+                            CornerRadius="6"
+                            Padding="10,8"
+                            Margin="0,1">
+                        <ContentPresenter/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SystemControlHighlightAccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/YoableWPF/Themes/Palette.xaml b/YoableWPF/Themes/Palette.xaml
new file mode 100644
index 0000000..7cbe6bf
--- /dev/null
+++ b/YoableWPF/Themes/Palette.xaml
@@ -0,0 +1,71 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+    mc:Ignorable="po">
+
+    <!-- ============================================================
+         Yoable shared palette — theme-invariant semantic colors.
+         Single source of truth for every status / semantic color
+         previously hard-coded across windows and UIStateManager.
+         ============================================================ -->
+
+    <!-- Accent (follows ModernWpf system accent; NOT frozen on purpose) -->
+    <SolidColorBrush x:Key="AccentBrush" Color="{DynamicResource SystemAccentColor}"/>
+    <SolidColorBrush x:Key="AccentButtonBrush" Color="{DynamicResource SystemAccentColor}"/>
+
+    <!-- Status: Needs review / verification (orange) -->
+    <Color x:Key="StatusReviewColor">#FFFFB74D</Color>
+    <SolidColorBrush x:Key="StatusReviewBrush" Color="#FFFFB74D" po:Freeze="True"/>
+    <SolidColorBrush x:Key="StatusReviewSubtleBrush" Color="#44FFB74D" po:Freeze="True"/>
+    <SolidColorBrush x:Key="StatusReviewDeepBrush" Color="#FFCC7A00" po:Freeze="True"/>
+
+    <!-- Status: AI suggested (blue) -->
+    <Color x:Key="StatusSuggestedColor">#FF64B5F6</Color>
+    <SolidColorBrush x:Key="StatusSuggestedBrush" Color="#FF64B5F6" po:Freeze="True"/>
+    <SolidColorBrush x:Key="StatusSuggestedSubtleBrush" Color="#4464B5F6" po:Freeze="True"/>
+    <SolidColorBrush x:Key="StatusSuggestedDeepBrush" Color="#FF1565C0" po:Freeze="True"/>
+
+    <!-- Status: No label / unverified (red) -->
+    <Color x:Key="StatusNoLabelColor">#FFE57373</Color>
+    <SolidColorBrush x:Key="StatusNoLabelBrush" Color="#FFE57373" po:Freeze="True"/>
+    <SolidColorBrush x:Key="StatusNoLabelSubtleBrush" Color="#44E57373" po:Freeze="True"/>
+    <SolidColorBrush x:Key="StatusNoLabelDeepBrush" Color="#FFCC3300" po:Freeze="True"/>
+
+    <!-- Status: Verified (green) -->
+    <Color x:Key="StatusVerifiedColor">#FF81C784</Color>
+    <SolidColorBrush x:Key="StatusVerifiedBrush" Color="#FF81C784" po:Freeze="True"/>
+    <SolidColorBrush x:Key="StatusVerifiedSubtleBrush" Color="#4481C784" po:Freeze="True"/>
+    <SolidColorBrush x:Key="StatusVerifiedDeepBrush" Color="#FF2E7D32" po:Freeze="True"/>
+
+    <!-- Status: AI labeled (purple) -->
+    <Color x:Key="StatusAiColor">#FFBA68C8</Color>
+    <SolidColorBrush x:Key="StatusAiBrush" Color="#FFBA68C8" po:Freeze="True"/>
+    <SolidColorBrush x:Key="StatusAiSubtleBrush" Color="#44BA68C8" po:Freeze="True"/>
+
+    <!-- Semantic -->
+    <SolidColorBrush x:Key="InfoBrush" Color="#FF00BCD4" po:Freeze="True"/>
+    <SolidColorBrush x:Key="InfoSubtleBrush" Color="#4400BCD4" po:Freeze="True"/>
+    <SolidColorBrush x:Key="InfoDeepBrush" Color="#FF007B8A" po:Freeze="True"/>
+    <SolidColorBrush x:Key="SuccessBrush" Color="#FF4CAF50" po:Freeze="True"/>
+    <SolidColorBrush x:Key="WarningBrush" Color="#FFFF9800" po:Freeze="True"/>
+    <SolidColorBrush x:Key="DangerBrush" Color="#FFF44336" po:Freeze="True"/>
+    <SolidColorBrush x:Key="DangerDeepBrush" Color="#FFD32F2F" po:Freeze="True"/>
+    <SolidColorBrush x:Key="DangerFaintBrush" Color="#22F44336" po:Freeze="True"/>
+    <SolidColorBrush x:Key="DangerSubtleBrush" Color="#44F44336" po:Freeze="True"/>
+    <SolidColorBrush x:Key="InfoFaintBrush" Color="#2200BCD4" po:Freeze="True"/>
+
+    <!-- Image viewer / thumbnail letterbox background -->
+    <SolidColorBrush x:Key="CanvasBackgroundBrush" Color="#FF202020" po:Freeze="True"/>
+
+    <!-- Glyph icon colors (menu / toolbar icons) -->
+    <SolidColorBrush x:Key="GlyphPurpleBrush" Color="#FF9C27B0" po:Freeze="True"/>
+    <SolidColorBrush x:Key="GlyphBlueBrush" Color="#FF2196F3" po:Freeze="True"/>
+    <SolidColorBrush x:Key="GlyphTealBrush" Color="#FF26A69A" po:Freeze="True"/>
+    <SolidColorBrush x:Key="GlyphIndigoBrush" Color="#FF3F51B5" po:Freeze="True"/>
+    <SolidColorBrush x:Key="GlyphGreyBrush" Color="#FF607D8B" po:Freeze="True"/>
+    <SolidColorBrush x:Key="GlyphLimeBrush" Color="#FF8BC34A" po:Freeze="True"/>
+    <SolidColorBrush x:Key="GlyphRedLightBrush" Color="#FFE57373" po:Freeze="True"/>
+
+</ResourceDictionary>
diff --git a/YoableWPF/Themes/Shell.xaml b/YoableWPF/Themes/Shell.xaml
new file mode 100644
index 0000000..fa2a2fb
--- /dev/null
+++ b/YoableWPF/Themes/Shell.xaml
@@ -0,0 +1,55 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Palette.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- MainWindow shell chrome -->
+
+    <!-- Top toolbar strip -->
+    <Style x:Key="TopToolbar" TargetType="Border">
+        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseLowBrush}"/>
+        <Setter Property="BorderThickness" Value="0,0,0,1"/>
+        <Setter Property="Padding" Value="8,6"/>
+    </Style>
+
+    <!-- Left navigation rail strip -->
+    <Style x:Key="NavRail" TargetType="Border">
+        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseLowBrush}"/>
+        <Setter Property="BorderThickness" Value="0,0,1,0"/>
+        <Setter Property="Padding" Value="0,8"/>
+    </Style>
+
+    <!-- Bottom status bar strip -->
+    <Style x:Key="AppStatusBar" TargetType="Border">
+        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseLowBrush}"/>
+        <Setter Property="BorderThickness" Value="0,1,0,0"/>
+        <Setter Property="Padding" Value="16,6"/>
+    </Style>
+
+    <!-- Workspace TabControl with hidden tab strip -->
+    <Style x:Key="WorkspaceTabControl" TargetType="TabControl">
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Background" Value="Transparent"/>
+    </Style>
+
+    <Style x:Key="HiddenTabItemStyle" TargetType="TabItem">
+        <Setter Property="Visibility" Value="Collapsed"/>
+    </Style>
+
+    <!-- Toolbar separator -->
+    <Style x:Key="ToolbarSeparator" TargetType="Rectangle">
+        <Setter Property="Width" Value="1"/>
+        <Setter Property="Height" Value="22"/>
+        <Setter Property="Margin" Value="6,0"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Fill" Value="{DynamicResource SystemControlForegroundBaseLowBrush}"/>
+    </Style>
+
+</ResourceDictionary>
diff --git a/YoableWPF/TrainingExportDialog.xaml b/YoableWPF/TrainingExportDialog.xaml
new file mode 100644
index 0000000..cac6eeb
--- /dev/null
+++ b/YoableWPF/TrainingExportDialog.xaml
@@ -0,0 +1,153 @@
+<Window x:Class="YoableWPF.TrainingExportDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:ui="http://schemas.modernwpf.com/2019"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        Title="{DynamicResource TrainingExport_Title}"
+        Width="560"
+        Height="500"
+        MinWidth="480"
+        MinHeight="440"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="CanResize">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <Border Grid.Row="0"
+                Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
+                BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                BorderThickness="0,0,0,1"
+                Padding="20,16">
+            <StackPanel>
+                <TextBlock Text="{DynamicResource TrainingExport_Title}"
+                           FontSize="18"
+                           FontWeight="SemiBold"/>
+                <TextBlock Text="{DynamicResource TrainingExport_Subtitle}"
+                           Margin="0,6,0,0"
+                           FontSize="12"
+                           Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"
+                           TextWrapping="Wrap"/>
+            </StackPanel>
+        </Border>
+
+        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" Padding="20,16">
+            <StackPanel>
+                <!-- Output folder -->
+                <TextBlock Text="{DynamicResource TrainingExport_OutputFolder}"
+                           FontWeight="SemiBold"
+                           Margin="0,0,0,6"/>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBox x:Name="OutputPathBox"
+                             Grid.Column="0"
+                             Height="30"
+                             IsReadOnly="True"
+                             VerticalContentAlignment="Center"
+                             TextChanged="OutputPath_TextChanged"/>
+                    <Button Grid.Column="1"
+                            Content="{DynamicResource TrainingExport_Browse}"
+                            Width="100"
+                            Height="30"
+                            Margin="8,0,0,0"
+                            Click="Browse_Click"/>
+                </Grid>
+
+                <!-- Split ratios -->
+                <TextBlock Text="{DynamicResource TrainingExport_SplitRatios}"
+                           FontWeight="SemiBold"
+                           Margin="0,20,0,6"/>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <StackPanel Grid.Column="0" Margin="0,0,6,0">
+                        <TextBlock Text="{DynamicResource TrainingExport_Train}" FontSize="11"/>
+                        <xctk:IntegerUpDown x:Name="TrainInput"
+                                            Height="30"
+                                            Margin="0,4,0,0"
+                                            Minimum="0"
+                                            Maximum="100"
+                                            Increment="5"
+                                            Value="80"
+                                            ValueChanged="Ratio_ValueChanged"/>
+                    </StackPanel>
+                    <StackPanel Grid.Column="1" Margin="3,0">
+                        <TextBlock Text="{DynamicResource TrainingExport_Val}" FontSize="11"/>
+                        <xctk:IntegerUpDown x:Name="ValInput"
+                                            Height="30"
+                                            Margin="0,4,0,0"
+                                            Minimum="0"
+                                            Maximum="100"
+                                            Increment="5"
+                                            Value="20"
+                                            ValueChanged="Ratio_ValueChanged"/>
+                    </StackPanel>
+                    <StackPanel Grid.Column="2" Margin="6,0,0,0">
+                        <TextBlock Text="{DynamicResource TrainingExport_Test}" FontSize="11"/>
+                        <xctk:IntegerUpDown x:Name="TestInput"
+                                            Height="30"
+                                            Margin="0,4,0,0"
+                                            Minimum="0"
+                                            Maximum="100"
+                                            Increment="5"
+                                            Value="0"
+                                            ValueChanged="Ratio_ValueChanged"/>
+                    </StackPanel>
+                </Grid>
+                <TextBlock x:Name="SumText"
+                           Margin="0,8,0,0"
+                           FontSize="11"
+                           Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"/>
+
+                <!-- Seed -->
+                <TextBlock Text="{DynamicResource TrainingExport_Seed}"
+                           FontWeight="SemiBold"
+                           Margin="0,20,0,6"/>
+                <xctk:IntegerUpDown x:Name="SeedInput"
+                                    Height="30"
+                                    Width="140"
+                                    HorizontalAlignment="Left"
+                                    Minimum="0"
+                                    Maximum="2147483647"
+                                    Increment="1"
+                                    Value="0"/>
+
+                <!-- Options -->
+                <CheckBox x:Name="BackgroundCheck"
+                          Content="{DynamicResource TrainingExport_IncludeBackground}"
+                          Margin="0,20,0,0"/>
+                <CheckBox x:Name="VerifiedCheck"
+                          Content="{DynamicResource TrainingExport_VerifiedOnly}"
+                          Margin="0,10,0,0"/>
+            </StackPanel>
+        </ScrollViewer>
+
+        <Border Grid.Row="2"
+                BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                BorderThickness="0,1,0,0"
+                Padding="20,14">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button Content="{DynamicResource Common_Cancel}"
+                        Width="96"
+                        Margin="0,0,8,0"
+                        IsCancel="True"
+                        Click="Cancel_Click"/>
+                <Button x:Name="OkButton"
+                        Content="{DynamicResource Common_OK}"
+                        Width="96"
+                        IsDefault="True"
+                        Click="Confirm_Click"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>
diff --git a/YoableWPF/TrainingExportDialog.xaml.cs b/YoableWPF/TrainingExportDialog.xaml.cs
new file mode 100644
index 0000000..6c3b6df
--- /dev/null
+++ b/YoableWPF/TrainingExportDialog.xaml.cs
@@ -0,0 +1,103 @@
+using System;
+using System.IO;
+using System.Windows;
+using System.Windows.Media;
+using Microsoft.Win32;
+using YoableWPF.Managers;
+
+namespace YoableWPF
+{
+    public partial class TrainingExportDialog : Window
+    {
+        public TrainingExportOptions Options { get; private set; }
+
+        public TrainingExportDialog(string defaultOutputDir, int trainPercent, int valPercent, int testPercent, int seed)
+        {
+            InitializeComponent();
+
+            OutputPathBox.Text = defaultOutputDir ?? string.Empty;
+            TrainInput.Value = Math.Clamp(trainPercent, 0, 100);
+            ValInput.Value = Math.Clamp(valPercent, 0, 100);
+            TestInput.Value = Math.Clamp(testPercent, 0, 100);
+            SeedInput.Value = Math.Max(0, seed);
+
+            UpdateValidationState();
+        }
+
+        private void Browse_Click(object sender, RoutedEventArgs e)
+        {
+            // Folder picker using the OpenFileDialog "Select Folder" trick already used elsewhere.
+            var dialog = new OpenFileDialog
+            {
+                ValidateNames = false,
+                CheckFileExists = false,
+                CheckPathExists = true,
+                FileName = "Select Folder"
+            };
+
+            if (!string.IsNullOrEmpty(OutputPathBox.Text) && Directory.Exists(OutputPathBox.Text))
+                dialog.InitialDirectory = OutputPathBox.Text;
+
+            if (dialog.ShowDialog() == true)
+            {
+                string folderPath = Path.GetDirectoryName(dialog.FileName);
+                if (!string.IsNullOrEmpty(folderPath))
+                    OutputPathBox.Text = folderPath;
+            }
+        }
+
+        private void Ratio_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            UpdateValidationState();
+        }
+
+        private void OutputPath_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+        {
+            UpdateValidationState();
+        }
+
+        private void UpdateValidationState()
+        {
+            // Controls may still be null during InitializeComponent when a ValueChanged fires early.
+            if (SumText == null || OkButton == null) return;
+
+            int train = TrainInput?.Value ?? 0;
+            int val = ValInput?.Value ?? 0;
+            int test = TestInput?.Value ?? 0;
+            int sum = train + val + test;
+
+            string format = LanguageManager.Instance.GetString("TrainingExport_SumFormat") ?? "Total: {0}% (must equal 100%)";
+            SumText.Text = string.Format(format, sum);
+
+            bool valid = sum == 100 && train > 0 && !string.IsNullOrWhiteSpace(OutputPathBox?.Text);
+
+            SumText.Foreground = sum == 100
+                ? (TryFindResource("SystemControlForegroundBaseMediumBrush") as Brush) ?? Brushes.Gray
+                : Brushes.IndianRed;
+            OkButton.IsEnabled = valid;
+        }
+
+        private void Confirm_Click(object sender, RoutedEventArgs e)
+        {
+            Options = new TrainingExportOptions
+            {
+                OutputDirectory = OutputPathBox.Text.Trim(),
+                TrainRatio = (TrainInput.Value ?? 0) / 100.0,
+                ValRatio = (ValInput.Value ?? 0) / 100.0,
+                TestRatio = (TestInput.Value ?? 0) / 100.0,
+                Seed = SeedInput.Value ?? 0,
+                IncludeUnlabeledAsBackground = BackgroundCheck.IsChecked == true,
+                VerifiedOnly = VerifiedCheck.IsChecked == true
+            };
+
+            DialogResult = true;
+            Close();
+        }
+
+        private void Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+    }
+}
diff --git a/YoableWPF/UI/DrawingCanvas.cs b/YoableWPF/UI/DrawingCanvas.cs
index 2988c74..4a85b48 100644
--- a/YoableWPF/UI/DrawingCanvas.cs
+++ b/YoableWPF/UI/DrawingCanvas.cs
@@ -322,7 +322,14 @@ public void LoadImage(string imagePath, Size originalDimensions)
             bitmap.CacheOption = BitmapCacheOption.OnLoad;
             bitmap.EndInit();
 
-            Image = bitmap;
+            LoadImage(bitmap, originalDimensions);
+        }
+
+        public void LoadImage(ImageSource image, Size originalDimensions)
+        {
+            if (image == null) return;
+
+            Image = image;
             originalImageDimensions = originalDimensions;
 
             Labels.Clear();
diff --git a/YoableWPF/YoableWPF.csproj b/YoableWPF/YoableWPF.csproj
index 5fc8241..610aa20 100644
--- a/YoableWPF/YoableWPF.csproj
+++ b/YoableWPF/YoableWPF.csproj
@@ -8,6 +8,7 @@
     <UseWPF>true</UseWPF>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Platforms>AnyCPU;x64</Platforms>
+    <PlatformTarget>x64</PlatformTarget>
     <StartupObject></StartupObject>
     <Version>3.2.0</Version>
     <AssemblyVersion>$(Version).0</AssemblyVersion>
@@ -27,12 +28,11 @@
     </PackageReference>
     <PackageReference Include="Microsoft.AI.DirectML" Version="1.15.4" />
     <PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.23.0" />
-    <PackageReference Include="Microsoft.ML.OnnxRuntime.Managed" Version="1.23.2" />
     <PackageReference Include="ModernWpfUI" Version="0.9.7-preview.2" />
     <PackageReference Include="OpenCvSharp4" Version="4.11.0.20250507" />
     <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.11.0.20250507" />
     <PackageReference Include="System.Drawing.Common" Version="10.0.0-rc.2.25502.107" />
-    <PackageReference Include="YoutubeExplode" Version="6.5.6" />
+    <PackageReference Include="YoutubeExplode" Version="6.6.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/YoableWPF/YoutubeDownloadWindow.xaml b/YoableWPF/YoutubeDownloadWindow.xaml
index 763cbe0..6652853 100644
--- a/YoableWPF/YoutubeDownloadWindow.xaml
+++ b/YoableWPF/YoutubeDownloadWindow.xaml
@@ -12,94 +12,16 @@
 
     <Window.Resources>
         <!-- Accent color for buttons (uses system accent) -->
-        <SolidColorBrush x:Key="AccentButtonBrush" Color="{DynamicResource SystemAccentColor}"/>
 
         <!-- Modern Button Style -->
-        <Style x:Key="ModernButton" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource AccentButtonBrush}"/>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="16,8"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.9"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
 
         <!-- Secondary Button Style -->
-        <Style x:Key="SecondaryButton" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"/>
-            <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="16,8"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="0"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" 
-                                            VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.8"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
 
         <!-- Setting Card Style -->
-        <Style x:Key="SettingCard" TargetType="Border">
-            <Setter Property="Background" Value="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"/>
-            <Setter Property="CornerRadius" Value="6"/>
-            <Setter Property="Padding" Value="16"/>
-            <Setter Property="Margin" Value="0,0,0,16"/>
-        </Style>
 
         <!-- Label Style -->
-        <Style x:Key="SettingLabel" TargetType="TextBlock">
-            <Setter Property="FontSize" Value="13"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Margin" Value="0,0,0,8"/>
-        </Style>
 
         <!-- Help Text Style -->
-        <Style x:Key="HelpText" TargetType="TextBlock">
-            <Setter Property="Foreground" Value="Gray"/>
-            <Setter Property="FontSize" Value="11"/>
-            <Setter Property="TextWrapping" Value="Wrap"/>
-            <Setter Property="Margin" Value="0,6,0,0"/>
-        </Style>
     </Window.Resources>
 
     <Grid>
@@ -120,7 +42,7 @@
                     <TextBlock FontFamily="Segoe MDL2 Assets" 
                                Text="&#xE714;" 
                                FontSize="24"
-                               Foreground="#FFF44336"
+                               Foreground="{StaticResource DangerBrush}"
                                VerticalAlignment="Center"
                                Margin="0,0,12,0"/>
                     <TextBlock Text="YouTube Video Download" 
@@ -199,18 +121,18 @@
                 </Border>
 
                 <!-- Info Card -->
-                <Border Background="#4400BCD4"
+                <Border Background="{StaticResource InfoSubtleBrush}"
                         CornerRadius="6"
                         Padding="16">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock FontFamily="Segoe MDL2 Assets"
                                    Text="&#xE946;"
                                    FontSize="16"
-                                   Foreground="#00BCD4"
+                                   Foreground="{StaticResource InfoBrush}"
                                    VerticalAlignment="Center"
                                    Margin="0,0,10,0"/>
                         <TextBlock Text="Frames will be extracted, resized, and imported automatically into the image list."
-                                   Foreground="#007B8A"
+                                   Foreground="{StaticResource InfoDeepBrush}"
                                    FontSize="12"
                                    TextWrapping="Wrap"
                                    VerticalAlignment="Center"/>
diff --git a/agent.md b/agent.md
new file mode 100644
index 0000000..e9a86ae
--- /dev/null
+++ b/agent.md
@@ -0,0 +1,143 @@
+# Agent Notes — Yoable
+
+給 AI coding agent 的專案指南。Yoable 是一個 WPF 桌面應用程式，用於 YOLO 資料集的影像標註，支援 ONNX 模型自動標註。
+
+---
+
+## 1. 硬性規則（優先於其他所有指引）
+
+- **絕對不要 push 到 `Babyhamsta/Yoable`**（也就是 `origin`）。那是上游倉庫，不是我們的。
+  - `origin` → `https://github.com/Babyhamsta/Yoable`（上游，**唯讀**，只能 fetch/pull）
+  - `myfork` → `https://github.com/asenyeroao-ct/Yoable`（我們的 fork，push 目標）
+  - 要 push 時明確指定 remote：`git push myfork <branch>`。**不要**用裸的 `git push`。
+- 未經使用者要求，不要自行 commit 或 push。
+- 不要提交 `dist/`、`Releases/`、`bin/`、`obj/`、`.vs/`，以及任何 `.zip`/`.rar`/`.7z` 發布壓縮檔（`.gitignore` 已涵蓋，別用 `-f` 繞過）。
+
+---
+
+## 2. 專案概觀
+
+| 項目 | 內容 |
+|---|---|
+| 框架 | .NET 9 WPF（`net9.0-windows7.0`），C# with `Nullable` + `ImplicitUsings` enable |
+| 方案檔 | `YoableWPF.sln` → 單一專案 `YoableWPF/YoableWPF.csproj` |
+| 版本號 | 定義在 `YoableWPF.csproj` 的 `<Version>`（目前 3.2.0），由 `VersionInfo.cs` 於執行期讀取 |
+| 平台 | 僅 Windows x64（DirectML / OpenCvSharp 有原生相依） |
+| 打包 | Costura.Fody 把相依 DLL 併入單一 exe |
+
+主要相依套件：ModernWpfUI（主題）、Microsoft.ML.OnnxRuntime.DirectML（推論）、OpenCvSharp4（影像處理／樣板比對）、YoutubeExplode（影片下載）、Extended.Wpf.Toolkit。
+
+### 建置與執行
+
+```bash
+dotnet build YoableWPF.sln -c Debug                 # 建置
+dotnet run --project YoableWPF/YoableWPF.csproj     # 執行
+dotnet build YoableWPF.sln -c Release               # 發布用建置
+```
+
+沒有測試專案。**驗證方式是實際跑起來操作 UI**，不是跑測試。改動涉及大型資料集效能時，用數千張圖的專案實測切圖流暢度。
+
+---
+
+## 3. 程式碼結構
+
+```
+YoableWPF/
+├── App.xaml.cs              進入點：升級 settings → 初始化 LanguageManager → 開 StartupWindow
+├── StartupWindow.xaml       啟動畫面 + 專案選擇器（不是 MainWindow 先開）
+├── MainWindow.xaml(.cs)     主視窗，3374 行，所有 manager 的組裝點與事件中樞
+├── VersionInfo.cs           從 assembly attribute 讀版本
+├── Managers/                商業邏輯（見下表）
+├── Models/                  共用資料模型
+├── UI/DrawingCanvas.cs      標註畫布：繪製／拖曳／縮放 bounding box
+├── Resources/Languages/     5 個語系的 ResourceDictionary
+└── Properties/Settings.*    使用者設定（Settings.Designer.cs 是自動產生，別手改）
+```
+
+### Managers（`YoableWPF/Managers/`）
+
+| 檔案 | 職責 |
+|---|---|
+| `YoloAi.cs` (1917行) | ONNX 模型載入、YOLO v5/v8/v11 推論、NMS、model→project 類別對應 |
+| `ProjectManager.cs` (1433行) | `.yoable` 專案檔的存讀、另存新檔、最近專案 |
+| `PropagationManager.cs` (1191行) | Auto Suggest：影像相似度 / 物件相似度 / 追蹤三種標籤傳播模式 |
+| `LabelManager.cs` (1008行) | 標籤的記憶體儲存、YOLO txt 匯入匯出、suggestion 的 accept/reject |
+| `ImageManager.cs` | 影像清單、尺寸登記、狀態（NoLabel/VerificationNeeded/Verified/Suggested） |
+| `ImageCacheManager.cs` | 已解碼 bitmap 的 LRU 快取（預設 512MB / 512 張）+ 背景預載 |
+| `UIStateManager.cs` | UI 狀態同步 |
+| `LanguageManager.cs` | 多語系單例，含系統語系自動偵測 |
+| `OverlayManager.cs` | 載入中／進度覆蓋層 |
+| `HotkeyManager.cs` | 可自訂快捷鍵 |
+| `UpdateManager.cs` | GitHub 自動更新檢查 |
+| `YoutubeDownloader.cs` | YouTube 影片下載並抽格 |
+
+### Models（`YoableWPF/Models/`）
+
+- `Models.cs` — `ImageStatus` enum、`ImageListItem`、`LabelClass`（含凍結的 `SolidColorBrush`）
+- `ProjectData.cs` — `.yoable` 專案檔的序列化結構、`ImageReference`
+- `SuggestedLabel.cs`、`LabelListItemView.cs`、`RecentProjectInfo.cs`
+
+---
+
+## 4. 關鍵慣例與陷阱
+
+### 4.1 多語系（改 UI 文字必看）
+
+- **每個使用者可見字串都必須進 5 個語系檔**：`en-US`、`ja-JP`、`ru-RU`、`zh-CN`、`zh-TW`。
+- **不變條件：5 個檔案的 `x:Key` 數量必須完全相同（目前各 426 個）。** 加字串時 5 個都要加，漏一個就是 bug。
+
+  驗證：
+  ```bash
+  for f in YoableWPF/Resources/Languages/*.xaml; do echo -n "$f: "; grep -c "x:Key=" "$f"; done
+  ```
+  五行數字必須一致。
+
+- key 命名採 `區塊_用途`：`Common_OK`、`Main_ChangeClass`、`Settings_Theme`。
+- XAML 中用 `{DynamicResource Key}`（**不是** `StaticResource`，否則切換語言不會即時更新）；C# 中用 `LanguageManager.Instance.GetString("Key")`。
+- 找不到 key 時會 fallback 到英文，再找不到就直接顯示 key 本身 — 所以漏翻譯不會 crash，只會默默顯示英文或 key，要主動檢查。
+
+### 4.2 執行緒與效能（大型資料集是本專案的核心痛點）
+
+專案要處理 8000~10000 張影像，效能問題都出在這裡：
+
+- **絕不在 UI 執行緒同步解碼影像。** 走 `imageManager.Cache`：快取命中就直接顯示，未命中在背景執行緒解碼。
+- 快取的 `BitmapImage` 一律 `Freeze()` — 這是能跨執行緒使用的前提。任何新建的 `Brush`/`Bitmap` 若會跨執行緒或大量重複使用，也應 `Freeze()`（見 `LabelClass.CreateFrozenBrush`）。
+- **切圖有 generation 計數器**（`MainWindow.ImageListBox_SelectionChanged`）：快速連續切圖時，過時的背景解碼結果必須被捨棄，否則**標籤會存到錯的檔案**。動這段程式碼時務必保留這個機制。
+- 切圖後 `PrefetchNeighboringImages()` 會背景預載後 12 張、前 4 張。
+- 專案檔的 `ImageReference` 已存 `Width`/`Height`，開專案時走 `AddImageWithKnownSize()` 完全跳過解碼；只有舊版專案檔（尺寸 0x0）才 fallback 到解碼路徑。**新增專案檔欄位時記得同時處理舊檔相容。**
+- 檔案 I/O 與資料夾建立放背景執行緒（參考 `SaveProjectAsAsync`）。
+- `LabelManager.LabelStorage` / `ImageManager.ImagePathMap` 是 `ConcurrentDictionary`，本來就預期多執行緒存取。
+
+### 4.3 架構現況
+
+- `MainWindow` 的 manager 欄位刻意是 `public`，因為 `ProjectManager` 要回頭存取它們。這是既有設計，不要順手「修正」成 private。
+- `MainWindow.xaml.cs` 有 3374 行，是事實上的 God object。**不要為了整潔而大規模重構它** — 除非使用者明確要求。改動請局部化。
+- 沒有 MVVM framework，也沒有 DI container，就是 code-behind + 手動 new manager。照著現有風格寫，不要引入新架構。
+
+### 4.4 標籤與類別
+
+- 標籤以 YOLO 格式存 txt：`classId cx cy w h`（正規化座標）。
+- 專案內部區分 **app 建立的標籤**（存在專案資料夾）與 **匯入的外部標籤**（指向原始路徑）— 見 `ProjectData.AppCreatedLabels` vs `ImportedLabelPaths`。
+- 專案類別 ID 可以和模型的類別 ID 不同，透過 `ModelClassMappings` 對應；設成 `"nan"` 表示過濾掉該類別。
+- 刪除類別後可能出現孤兒標籤，`LabelManager.FixAllOrphanedLabels()` 負責處理。
+
+---
+
+## 5. 程式風格
+
+- 跟著周圍的程式碼寫：4 空白縮排、大括號自成一行（Allman）、public 成員 PascalCase、私有欄位 camelCase（manager 類別多半**不加** `_` 前綴，但 `Models.cs` 的 backing field 有用 `_` — 依所在檔案的既有風格為準）。
+- public API 加 `///` XML doc comment，其他地方註解從簡。
+- 程式碼註解用英文（現有程式碼皆為英文）；`CHANGES.md` 用繁體中文。
+- 例外處理傾向 catch + `System.Diagnostics.Debug.WriteLine` + 優雅降級，而不是讓 UI crash。
+
+---
+
+## 6. Git 工作流程
+
+- 主分支：`master`。
+- 本機領先上游數個 commit，`CHANGES.md`（未提交，本機專用）記錄相對 `origin/master` 的所有差異 — **改動有意義時請同步更新它**。
+- commit message 用英文祈使句：`Improve image performance and labeling workflows`、`Fix label exports and YouTube downloads`。
+- 從上游同步：`git fetch origin && git rebase origin/master`。
+- 推自己的變更：`git push myfork master`。
+
+`.github/workflows/claude-code-review.yml` 會在 PR 上跑 Claude Code Review。