From 98bfdc690d353df54d33782c766cad9a74c4eda3 Mon Sep 17 00:00:00 2001
From: Masusder <59669685+Masusder@users.noreply.github.com>
Date: Sun, 13 Sep 2026 21:03:01 +0200
Subject: [PATCH] Arc Raiders/PUBG Mobile 4.6/Splitgate 2/InZOI updates, Delta
 Force VT fix, Fixed PSK exports, Added support for new Roco Kingdom: World
 encryption, Criware fixes, Option to clear empty game directories, APKs can
 now be loaded directly, Fixed laggy game version filtering, Added update
 notification, Audio middleware assets are now grouped

Co-Authored-By: LongerWarrior <37636768+LongerWarrior@users.noreply.github.com>
Co-Authored-By: Luke <17146677+lukefz@users.noreply.github.com>
Co-Authored-By: Abishek <73873078+abishek82828@users.noreply.github.com>
---
 CUE4Parse                                     |   2 +-
 FModel/Enums.cs                               |   8 +
 FModel/MainWindow.xaml                        |  27 +++
 .../ApiEndpoints/FModelApiEndpoint.cs         |   1 +
 FModel/ViewModels/ApplicationViewModel.cs     |   9 +-
 FModel/ViewModels/AudioPlayerViewModel.cs     |   6 +-
 FModel/ViewModels/CUE4ParseViewModel.cs       |   8 +-
 FModel/ViewModels/Commands/LoadCommand.cs     |   2 +-
 FModel/ViewModels/GameFileViewModel.cs        |  58 ++++++-
 FModel/ViewModels/GameSelectorViewModel.cs    |  35 +++-
 FModel/Views/DirectorySelector.xaml           |   8 +-
 FModel/Views/DirectorySelector.xaml.cs        |  38 +++++
 FModel/Views/Resources/Colors.xaml            |   5 +
 .../Explorer/ListExplorer/FileRow.xaml        |   2 +
 .../Explorer/TiledExplorer/FileButton.xaml    |   2 +
 .../Resources/Controls/FilterableComboBox.cs  | 157 +++++++++++++-----
 .../Converters/FileToGeometryConverter.cs     |  16 +-
 FModel/Views/Resources/Icons.xaml             |   6 +
 FModel/Views/Resources/Resources.xaml         |  10 ++
 19 files changed, 339 insertions(+), 61 deletions(-)

diff --git a/CUE4Parse b/CUE4Parse
index 89ef88f6..33529e8f 160000
--- a/CUE4Parse
+++ b/CUE4Parse
@@ -1 +1 @@
-Subproject commit 89ef88f6a3cf9437e599838e68b990e341a329d3
+Subproject commit 33529e8f7e9d764aa05877db1b6c3e9b0b7f7122
diff --git a/FModel/Enums.cs b/FModel/Enums.cs
index c172cdd3..6d599d95 100644
--- a/FModel/Enums.cs
+++ b/FModel/Enums.cs
@@ -171,6 +171,14 @@ public enum EAssetCategory : uint
         GothamKnights = GameSpecific + 7,
 }
 
+public enum EAssetFamily
+{
+    None,
+    Criware,
+    Wwise,
+    FMod,
+}
+
 public enum EUnluacMode
 {
     Decompile,
diff --git a/FModel/MainWindow.xaml b/FModel/MainWindow.xaml
index 6c63f0d7..53048aa6 100644
--- a/FModel/MainWindow.xaml
+++ b/FModel/MainWindow.xaml
@@ -807,6 +807,33 @@
                            HorizontalAlignment="Right" VerticalAlignment="Stretch"
                            HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
                 <StackPanel Orientation="Horizontal">
+                    <StatusBarItem Margin="0 0 10 0"
+                                   Padding="0"
+                                   HorizontalContentAlignment="Stretch"
+                                   VerticalContentAlignment="Stretch"
+                                   Visibility="{Binding IsUpdateAvailable, Converter={StaticResource BoolToVisibilityConverter}}">
+                        <Button HorizontalContentAlignment="Stretch"
+                                VerticalContentAlignment="Center"
+                                Style="{StaticResource StatusBarButton}"
+                                Background="{DynamicResource {x:Static adonisUi:Brushes.AlertBrush}}"
+                                ToolTip="A new version of FModel is available. Click to view it."
+                                Command="{Binding MenuCommand}"
+                                CommandParameter="Help_Releases">
+                            <StackPanel Orientation="Horizontal"
+                                        VerticalAlignment="Center">
+                                <Viewbox Width="16"
+                                         Height="16">
+                                    <Canvas Width="24"
+                                            Height="24">
+                                        <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.AccentForegroundBrush}}"
+                                              Data="{StaticResource UpdateIcon}" />
+                                    </Canvas>
+                                </Viewbox>
+                                <TextBlock Margin="10 0 0 0"
+                                           Text="Update Available" />
+                            </StackPanel>
+                        </Button>
+                    </StatusBarItem>
                     <StatusBarItem Margin="0 0 10 0" Padding="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
                         <Button x:Name="ExportSessionButton"
                                 HorizontalContentAlignment="Stretch"
diff --git a/FModel/ViewModels/ApiEndpoints/FModelApiEndpoint.cs b/FModel/ViewModels/ApiEndpoints/FModelApiEndpoint.cs
index db2882ed..b5eb94d4 100644
--- a/FModel/ViewModels/ApiEndpoints/FModelApiEndpoint.cs
+++ b/FModel/ViewModels/ApiEndpoints/FModelApiEndpoint.cs
@@ -131,6 +131,7 @@ public class FModelApiEndpoint : AbstractApiProvider
             UserSettings.Default.LastUpdateCheck = DateTime.Now;
 
             var targetHash = ((CustomMandatory) args.Mandatory).CommitHash;
+            _applicationView.IsUpdateAvailable = targetHash != Constants.APP_COMMIT_ID;
             if (targetHash == Constants.APP_COMMIT_ID)
             {
                 if (UserSettings.Default.ShowChangelog)
diff --git a/FModel/ViewModels/ApplicationViewModel.cs b/FModel/ViewModels/ApplicationViewModel.cs
index 242379f9..40c0cfce 100644
--- a/FModel/ViewModels/ApplicationViewModel.cs
+++ b/FModel/ViewModels/ApplicationViewModel.cs
@@ -61,6 +61,13 @@ public class ApplicationViewModel : ViewModel
         }
     }
 
+    private bool _isUpdateAvailable;
+    public bool IsUpdateAvailable
+    {
+        get => _isUpdateAvailable;
+        internal set => SetProperty(ref _isUpdateAvailable, value);
+    }
+
     private int _selectedLeftTabIndex;
     public int SelectedLeftTabIndex
     {
@@ -139,7 +146,7 @@ public class ApplicationViewModel : ViewModel
     public DirectorySettings AvoidEmptyGameDirectory(bool bAlreadyLaunched)
     {
         var gameDirectory = UserSettings.Default.GameDirectory;
-        if (!bAlreadyLaunched && UserSettings.Default.PerDirectory.TryGetValue(gameDirectory, out var currentDir))
+        if (!bAlreadyLaunched && GameSelectorViewModel.IsGameDirectoryAvailable(gameDirectory) && UserSettings.Default.PerDirectory.TryGetValue(gameDirectory, out var currentDir))
             return currentDir;
 
         Status.SetStatus(EStatusKind.Configuring);
diff --git a/FModel/ViewModels/AudioPlayerViewModel.cs b/FModel/ViewModels/AudioPlayerViewModel.cs
index ee9f2af9..43757288 100644
--- a/FModel/ViewModels/AudioPlayerViewModel.cs
+++ b/FModel/ViewModels/AudioPlayerViewModel.cs
@@ -14,9 +14,9 @@ using CSCore.CoreAudioAPI;
 using CSCore.DSP;
 using CSCore.SoundOut;
 using CSCore.Streams;
-using CUE4Parse.UE4.CriWare.Decoders;
-using CUE4Parse.UE4.CriWare.Decoders.ADX;
-using CUE4Parse.UE4.CriWare.Decoders.HCA;
+using CUE4Parse.UE4.Criware.Decoders;
+using CUE4Parse.UE4.Criware.Decoders.ADX;
+using CUE4Parse.UE4.Criware.Decoders.HCA;
 using CUE4Parse.Utils;
 using FModel.Extensions;
 using FModel.Framework;
diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs
index 08f2bb17..d9374782 100644
--- a/FModel/ViewModels/CUE4ParseViewModel.cs
+++ b/FModel/ViewModels/CUE4ParseViewModel.cs
@@ -31,7 +31,7 @@ using CUE4Parse.GameTypes.HonorOfKings.FileProvider;
 using CUE4Parse.GameTypes.KRD.Assets.Exports;
 using CUE4Parse.GameTypes.LegoBatman.Assets;
 using CUE4Parse.GameTypes.LordOfMysteries.FileProvider;
-using CUE4Parse.GameTypes.RocoKingdomWorld.Assets.Objects;
+using CUE4Parse.GameTypes.Tencent.RocoKingdomWorld.Assets.Objects;
 using CUE4Parse.GameTypes.SMG.UE4.Assets.Exports.Wwise;
 using CUE4Parse.GameTypes.SquareEnix.UE4.Assets.Exports;
 using CUE4Parse.GameTypes.Theia.FileProvider;
@@ -43,7 +43,7 @@ using CUE4Parse.UE4.AssetRegistry;
 using CUE4Parse.UE4.Assets;
 using CUE4Parse.UE4.Assets.Exports;
 using CUE4Parse.UE4.Assets.Exports.Animation;
-using CUE4Parse.UE4.Assets.Exports.CriWare;
+using CUE4Parse.UE4.Assets.Exports.Criware;
 using CUE4Parse.UE4.Assets.Exports.Engine;
 using CUE4Parse.UE4.Assets.Exports.Fmod;
 using CUE4Parse.UE4.Assets.Exports.GeometryCollection;
@@ -55,8 +55,8 @@ using CUE4Parse.UE4.Assets.Exports.Verse;
 using CUE4Parse.UE4.Assets.Exports.Wwise;
 using CUE4Parse.UE4.Assets.Objects;
 using CUE4Parse.UE4.BinaryConfig;
-using CUE4Parse.UE4.CriWare;
-using CUE4Parse.UE4.CriWare.Readers;
+using CUE4Parse.UE4.Criware;
+using CUE4Parse.UE4.Criware.Readers;
 using CUE4Parse.UE4.FMod;
 using CUE4Parse.UE4.GameFeatures;
 using CUE4Parse.UE4.IO;
diff --git a/FModel/ViewModels/Commands/LoadCommand.cs b/FModel/ViewModels/Commands/LoadCommand.cs
index c29a695e..20a1bc12 100644
--- a/FModel/ViewModels/Commands/LoadCommand.cs
+++ b/FModel/ViewModels/Commands/LoadCommand.cs
@@ -148,7 +148,7 @@ public class LoadCommand : ViewModelCommand<LoadingModesViewModel>
                 {
                     entries.Add(asset);
                 }
-                else if (includeLooseFiles && asset is OsGameFile)
+                else if (includeLooseFiles && asset is not VfsEntry)
                 {
                     entries.Add(asset);
                 }
diff --git a/FModel/ViewModels/GameFileViewModel.cs b/FModel/ViewModels/GameFileViewModel.cs
index c0fdda06..dffb8191 100644
--- a/FModel/ViewModels/GameFileViewModel.cs
+++ b/FModel/ViewModels/GameFileViewModel.cs
@@ -22,7 +22,8 @@ using CUE4Parse.UE4.Assets.Exports.Animation;
 using CUE4Parse.UE4.Assets.Exports.BuildData;
 using CUE4Parse.UE4.Assets.Exports.ChaosClothAsset;
 using CUE4Parse.UE4.Assets.Exports.Component;
-using CUE4Parse.UE4.Assets.Exports.CriWare;
+using CUE4Parse.UE4.Assets.Exports.Criware;
+using CUE4Parse.UE4.Assets.Exports.Criware.Media;
 using CUE4Parse.UE4.Assets.Exports.CustomizableObject;
 using CUE4Parse.UE4.Assets.Exports.Engine;
 using CUE4Parse.UE4.Assets.Exports.Engine.Font;
@@ -97,6 +98,13 @@ public class GameFileViewModel(GameFile asset) : ViewModel
         }
     }
 
+    private EAssetFamily _assetFamily = EAssetFamily.None;
+    public EAssetFamily AssetFamily
+    {
+        get => _assetFamily;
+        private set => SetProperty(ref _assetFamily, value);
+    }
+
     private EBulkType _assetActions = EBulkType.None;
     public EBulkType AssetActions
     {
@@ -200,6 +208,20 @@ public class GameFileViewModel(GameFile asset) : ViewModel
             var dummy = ((AbstractUePackage) pkg).ConstructObject(pointer.Class, pkg);
             ResolvedAssetType = dummy.ExportType;
 
+            AssetFamily = dummy switch
+            {
+                UAtomSoundBase or UAtomSoundBank or USoundAtomCue or USoundAtomCueSheet
+                    or USoundAtomConfig or UAtomDspBusSetting or UAtomRackBase => EAssetFamily.Criware,
+
+                UAkAudioType or UAkAssetData or UAkAssetPlatformData or UAkMediaAssetData
+                    or UAkMediaAsset or UWwiseAssetLibrary or UExternalSource or UExternalSourceBank => EAssetFamily.Wwise,
+
+                UFMODEvent or UFMODBank or UFMODBankLookup or UFMODBus
+                    or UFMODSnapshot or UFMODSnapshotReverb or UFMODVCA => EAssetFamily.FMod,
+
+                _ => EAssetFamily.None,
+            };
+
             (AssetCategory, AssetActions) = dummy switch
             {
                 URigVMBlueprintGeneratedClass => (EAssetCategory.RigVMBlueprintGeneratedClass, EBulkType.Code),
@@ -242,18 +264,23 @@ public class GameFileViewModel(GameFile asset) : ViewModel
                 UObjectRedirector => (EAssetCategory.ObjectRedirector, EBulkType.None),
                 UPhysicalMaterial => (EAssetCategory.PhysicalMaterial, EBulkType.None),
 
-                USoundAtomCue or UAkAudioEvent or USoundCue or UFMODEvent
+                USoundAtomCue or UAtomSoundCue or UAkAudioEvent or USoundCue or UFMODEvent
                     or UAkAssetData or UAkAssetPlatformData => (EAssetCategory.AudioEvent, EBulkType.Audio),
 
-                UFMODBankLookup => (EAssetCategory.Data, EBulkType.None),
+                UFileManaMovie => (EAssetCategory.Video, EBulkType.None),
 
-                UFMODBus or UFMODSnapshot or UFMODSnapshotReverb or UFMODVCA or USQEXSEADSoundAttenuation => (EAssetCategory.Audio, EBulkType.None),
+                UFMODBankLookup or USoundAtomConfig or UFMODSnapshotReverb or UFMODBus or UFMODSnapshot
+                    or UFMODVCA or UAtomDspBusSetting => (EAssetCategory.Data, EBulkType.None),
 
-                UFMODBank or UAkAudioBank or UAtomWaveBank or UAkInitBank or USQEXSEADSoundBank => (EAssetCategory.SoundBank, EBulkType.Audio),
+                USQEXSEADSoundAttenuation => (EAssetCategory.Audio, EBulkType.None),
 
-                UWwiseAssetLibrary or USoundBase or UAkMediaAssetData or UAtomCueSheet
-                    or USoundAtomCueSheet or UAkAudioType or UExternalSource or UExternalSourceBank
-                    or UAkMediaAsset => (EAssetCategory.Audio, EBulkType.Audio),
+                UFMODBank or UAkAudioBank or UAtomSoundBank or USoundAtomCueSheet
+                    or UAkInitBank or USQEXSEADSoundBank => (EAssetCategory.SoundBank, EBulkType.Audio),
+
+                UWwiseAssetLibrary or UAtomSoundBase or USoundBase or UAkMediaAssetData
+                    or UExternalSource or UExternalSourceBank or UAkMediaAsset => (EAssetCategory.Audio, EBulkType.Audio),
+
+                UAkAudioType => (EAssetCategory.Data, EBulkType.None),
 
                 UFileMediaSource => (EAssetCategory.Video, EBulkType.None),
                 UFont or UFontFace or USMGLocaleFontUMG => (EAssetCategory.Font, EBulkType.None),
@@ -334,6 +361,15 @@ public class GameFileViewModel(GameFile asset) : ViewModel
     {
         Resolved |= EResolveCompute.Preview;
         var lowercaseExtension = Asset.Extension.ToLowerInvariant();
+
+        AssetFamily = lowercaseExtension switch
+        {
+            "acb" or "acf" or "adx" or "awb" or "hca" or "usm" => EAssetFamily.Criware,
+            "bnk" or "pck" or "wem" => EAssetFamily.Wwise,
+            "bank" or "fsb" => EAssetFamily.FMod,
+            _ => EAssetFamily.None,
+        };
+
         switch (lowercaseExtension)
         {
             case "uproject":
@@ -363,6 +399,7 @@ public class GameFileViewModel(GameFile asset) : ViewModel
             case "sql":
             case "py":
             case "cs":
+            case "acf":
                 AssetCategory = EAssetCategory.Data;
                 break;
             case "stinfo":
@@ -373,6 +410,8 @@ public class GameFileViewModel(GameFile asset) : ViewModel
                 break;
             case "wav":
             case "awb": // This is technically soundbank and should be below but I want it to be distinguishable from "acb"
+            case "adx":
+            case "hca":
             case "xvag":
             case "flac":
             case "at9":
@@ -383,6 +422,7 @@ public class GameFileViewModel(GameFile asset) : ViewModel
                 break;
             case "acb":
             case "bank":
+            case "fsb":
             case "bnk":
             case "pck":
                 AssetCategory = EAssetCategory.SoundBank;
@@ -393,7 +433,9 @@ public class GameFileViewModel(GameFile asset) : ViewModel
             case "ttf":
                 AssetCategory = EAssetCategory.Font;
                 break;
+            case "webm":
             case "mp4":
+            case "usm":
                 AssetCategory = EAssetCategory.Video;
                 break;
             case "jpg":
diff --git a/FModel/ViewModels/GameSelectorViewModel.cs b/FModel/ViewModels/GameSelectorViewModel.cs
index d49d77f4..bc666d97 100644
--- a/FModel/ViewModels/GameSelectorViewModel.cs
+++ b/FModel/ViewModels/GameSelectorViewModel.cs
@@ -58,7 +58,7 @@ public class GameSelectorViewModel : ViewModel
 
         if (DetectedDirectories.FirstOrDefault(x => x.GameDirectory == gameDirectory) is { } detectedGame)
             SelectedDirectory = detectedGame;
-        else if (!string.IsNullOrEmpty(gameDirectory))
+        else if (IsGameDirectoryAvailable(gameDirectory))
             AddUndetectedDir(gameDirectory);
         else
             SelectedDirectory = DetectedDirectories.FirstOrDefault();
@@ -189,6 +189,39 @@ public class GameSelectorViewModel : ViewModel
         SelectedDirectory = DetectedDirectories.Last();
     }
 
+    public int ClearMissingDirectories()
+    {
+        var removedDirectories = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        var missingDirectories = UserSettings.Default.PerDirectory
+            .Where(x => !IsGameDirectoryAvailable(x.Value.GameDirectory))
+            .Select(x => new KeyValuePair<string, string>(x.Key, x.Value.GameDirectory))
+            .ToArray();
+
+        foreach (var (key, gameDirectory) in missingDirectories)
+        {
+            UserSettings.Default.PerDirectory.Remove(key);
+            removedDirectories.Add(gameDirectory);
+        }
+
+        var missingDetectedDirectories = _detectedDirectories
+            .Where(x => !IsGameDirectoryAvailable(x.GameDirectory))
+            .ToArray();
+
+        foreach (var directory in missingDetectedDirectories)
+        {
+            _detectedDirectories.Remove(directory);
+            removedDirectories.Add(directory.GameDirectory);
+        }
+
+        if (SelectedDirectory is null || !_detectedDirectories.Contains(SelectedDirectory))
+            SelectedDirectory = DetectedDirectories.FirstOrDefault();
+
+        return removedDirectories.Count;
+    }
+
+    public static bool IsGameDirectoryAvailable(string gameDirectory)
+        => gameDirectory is Constants._FN_LIVE_TRIGGER or Constants._VAL_LIVE_TRIGGER || Directory.Exists(gameDirectory);
+
     private IEnumerable<EGame> EnumerateUeGames()
         => Enum.GetValues<EGame>()
             .GroupBy(value => (int)value)
diff --git a/FModel/Views/DirectorySelector.xaml b/FModel/Views/DirectorySelector.xaml
index 3bc8b1de..f0a44c6f 100644
--- a/FModel/Views/DirectorySelector.xaml
+++ b/FModel/Views/DirectorySelector.xaml
@@ -130,14 +130,18 @@
                 adonisExtensions:LayerExtension.IncreaseLayer="True">
             <Grid Margin="30, 12, 6, 12">
                 <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
 
-                <Button Grid.Column="1" MinWidth="78" Margin="0 0 12 0" IsDefault="True" IsCancel="False"
+                <Button Grid.Column="0" MinWidth="78" Margin="0 0 12 0"
+                        HorizontalAlignment="Left" VerticalAlignment="Bottom" Content="Clear"
+                        ToolTip="Remove game directories that no longer exist" Click="OnClearDirectories" />
+                <Button Grid.Column="2" MinWidth="78" Margin="0 0 12 0" IsDefault="True" IsCancel="False"
                         HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="OK" Click="OnClick" />
-                <Button Grid.Column="2" MinWidth="78" Margin="0 0 12 0" IsDefault="False"  IsCancel="True"
+                <Button Grid.Column="3" MinWidth="78" Margin="0 0 12 0" IsDefault="False"  IsCancel="True"
                         HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="Cancel" />
             </Grid>
         </Border>
diff --git a/FModel/Views/DirectorySelector.xaml.cs b/FModel/Views/DirectorySelector.xaml.cs
index 8b0be143..4bd59e2c 100644
--- a/FModel/Views/DirectorySelector.xaml.cs
+++ b/FModel/Views/DirectorySelector.xaml.cs
@@ -1,6 +1,13 @@
 using FModel.ViewModels;
+using FModel.Views.Resources.Controls;
 using Ookii.Dialogs.Wpf;
+using Serilog;
 using System.Windows;
+using MessageBox = AdonisUI.Controls.MessageBox;
+using MessageBoxButtons = AdonisUI.Controls.MessageBoxButtons;
+using MessageBoxImage = AdonisUI.Controls.MessageBoxImage;
+using MessageBoxModel = AdonisUI.Controls.MessageBoxModel;
+using MessageBoxResult = AdonisUI.Controls.MessageBoxResult;
 
 namespace FModel.Views;
 
@@ -63,6 +70,37 @@ public partial class DirectorySelector
         gameLauncherViewModel.DeleteSelectedGame();
     }
 
+    private void OnClearDirectories(object sender, RoutedEventArgs e)
+    {
+        if (DataContext is not GameSelectorViewModel gameSelectorViewModel)
+            return;
+
+        var messageBox = new MessageBoxModel
+        {
+            Text = "Remove all saved game directories that no longer exist?",
+            Caption = "Clear Empty Directories",
+            Icon = MessageBoxImage.Question,
+            Buttons = MessageBoxButtons.YesNo(),
+            IsSoundEnabled = false
+        };
+
+        MessageBox.Show(messageBox);
+        if (messageBox.Result != MessageBoxResult.Yes)
+            return;
+
+        var removedCount = gameSelectorViewModel.ClearMissingDirectories();
+        var message = removedCount switch
+        {
+            0 => "No empty directories were found",
+            1 => "Removed 1 empty game directory",
+            _ => $"Removed {removedCount} empty game directories"
+        };
+
+        Log.Information("{Message}", message);
+        if (FLogger.Logger is not null) // When only directory selector is open, FLogger.Logger is null
+            FLogger.Append(ELog.Information, () => FLogger.Text(message, Constants.WHITE, true));
+    }
+
     public void AddManualGame(string directory)
     {
         ManualGameExpander.IsExpanded = true;
diff --git a/FModel/Views/Resources/Colors.xaml b/FModel/Views/Resources/Colors.xaml
index 61d7cbaa..990915bb 100644
--- a/FModel/Views/Resources/Colors.xaml
+++ b/FModel/Views/Resources/Colors.xaml
@@ -54,6 +54,11 @@
     <SolidColorBrush x:Key="PythonBrush" Color="#3d77a8" />
     <SolidColorBrush x:Key="CSharpBrush" Color="#9e559a" />
 
+    <!-- Asset family brushes -->
+    <SolidColorBrush x:Key="CriwareBrush" Color="#005bab" />
+    <SolidColorBrush x:Key="WwiseBrush" Color="#0152a1" />
+    <SolidColorBrush x:Key="FModBrush" Color="#00758f" />
+
     <!-- For specific games -->
     <SolidColorBrush x:Key="BorderlandsBrush" Color="Yellow"></SolidColorBrush>
     <SolidColorBrush x:Key="AionBrush" Color="DeepSkyBlue"></SolidColorBrush>
diff --git a/FModel/Views/Resources/Controls/Explorer/ListExplorer/FileRow.xaml b/FModel/Views/Resources/Controls/Explorer/ListExplorer/FileRow.xaml
index f92cb39f..c3d3d40b 100644
--- a/FModel/Views/Resources/Controls/Explorer/ListExplorer/FileRow.xaml
+++ b/FModel/Views/Resources/Controls/Explorer/ListExplorer/FileRow.xaml
@@ -44,12 +44,14 @@
                         <MultiBinding Converter="{x:Static converters:FileToGeometryConverter.Instance}">
                             <Binding Path="AssetCategory" />
                             <Binding Path="ResolvedAssetType" />
+                            <Binding Path="AssetFamily" />
                         </MultiBinding>
                     </Path.Data>
                     <Path.Fill>
                         <MultiBinding Converter="{x:Static converters:FileToGeometryConverter.Instance}">
                             <Binding Path="AssetCategory" />
                             <Binding Path="ResolvedAssetType" />
+                            <Binding Path="AssetFamily" />
                         </MultiBinding>
                     </Path.Fill>
                 </Path>
diff --git a/FModel/Views/Resources/Controls/Explorer/TiledExplorer/FileButton.xaml b/FModel/Views/Resources/Controls/Explorer/TiledExplorer/FileButton.xaml
index ab58b3a0..ec1d1d94 100644
--- a/FModel/Views/Resources/Controls/Explorer/TiledExplorer/FileButton.xaml
+++ b/FModel/Views/Resources/Controls/Explorer/TiledExplorer/FileButton.xaml
@@ -35,12 +35,14 @@
                     <MultiBinding Converter="{x:Static converters:FileToGeometryConverter.Instance}">
                         <Binding Path="AssetCategory" />
                         <Binding Path="ResolvedAssetType" />
+                        <Binding Path="AssetFamily" />
                     </MultiBinding>
                 </Path.Data>
                 <Path.Fill>
                     <MultiBinding Converter="{x:Static converters:FileToGeometryConverter.Instance}">
                         <Binding Path="AssetCategory" />
                         <Binding Path="ResolvedAssetType" />
+                        <Binding Path="AssetFamily" />
                     </MultiBinding>
                 </Path.Fill>
             </Path>
diff --git a/FModel/Views/Resources/Controls/FilterableComboBox.cs b/FModel/Views/Resources/Controls/FilterableComboBox.cs
index 35bb3d64..6d5ad065 100644
--- a/FModel/Views/Resources/Controls/FilterableComboBox.cs
+++ b/FModel/Views/Resources/Controls/FilterableComboBox.cs
@@ -5,6 +5,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;
+using System.Windows.Threading;
 
 namespace FModel.Views.Resources.Controls;
 
@@ -17,8 +18,9 @@ public class FilterableComboBox : ComboBox
     /// If true, on lost focus or enter key pressed, checks the text in the combobox. If the text is not present
     /// in the list, it leaves it blank.
     /// </summary>
-    public bool OnlyValuesInList {
-        get => (bool)GetValue(OnlyValuesInListProperty);
+    public bool OnlyValuesInList
+    {
+        get => (bool) GetValue(OnlyValuesInListProperty);
         set => SetValue(OnlyValuesInListProperty, value);
     }
     public static readonly DependencyProperty OnlyValuesInListProperty =
@@ -27,8 +29,9 @@ public class FilterableComboBox : ComboBox
     /// <summary>
     /// Selected item, changes only on lost focus or enter key pressed
     /// </summary>
-    public object EffectivelySelectedItem {
-        get => (bool)GetValue(EffectivelySelectedItemProperty);
+    public object EffectivelySelectedItem
+    {
+        get => (bool) GetValue(EffectivelySelectedItemProperty);
         set => SetValue(EffectivelySelectedItemProperty, value);
     }
     public static readonly DependencyProperty EffectivelySelectedItemProperty =
@@ -38,6 +41,7 @@ public class FilterableComboBox : ComboBox
     private bool TextBoxFreezed;
     protected TextBox EditableTextBox => GetTemplateChild("PART_EditableTextBox") as TextBox;
     private UserChange<bool> IsDropDownOpenUC;
+    private readonly DispatcherTimer FilterTimer;
 
     /// <summary>
     /// Triggers on lost focus or enter key pressed, if the selected item changed since the last time focus was lost or enter was pressed.
@@ -47,6 +51,15 @@ public class FilterableComboBox : ComboBox
     public FilterableComboBox()
     {
         IsDropDownOpenUC = new UserChange<bool>(v => IsDropDownOpen = v);
+        FilterTimer = new DispatcherTimer(DispatcherPriority.Background, Dispatcher)
+        {
+            Interval = TimeSpan.FromMilliseconds(125)
+        };
+        FilterTimer.Tick += (_, _) =>
+        {
+            FilterTimer.Stop();
+            RefreshFilter();
+        };
         DropDownOpened += FilteredComboBox_DropDownOpened;
 
         Focusable = true;
@@ -55,7 +68,8 @@ public class FilterableComboBox : ComboBox
         StaysOpenOnEdit = true;
         IsReadOnly = false;
 
-        Loaded += (s, e) => {
+        Loaded += (s, e) =>
+        {
             if (EditableTextBox != null)
                 new TextBoxBaseUserChangeTracker(EditableTextBox).UserTextChanged += FilteredComboBox_UserTextChange;
         };
@@ -67,25 +81,53 @@ public class FilterableComboBox : ComboBox
 
     protected override void OnPreviewKeyDown(KeyEventArgs e)
     {
+        if (IsDropDownOpen && Keyboard.Modifiers == ModifierKeys.None && e.Key is Key.Up or Key.Down)
+        {
+            MoveSelection(e.Key);
+            e.Handled = true;
+            return;
+        }
+
         base.OnPreviewKeyDown(e);
-        if (e.Key == Key.Down && !IsDropDownOpen) {
+        if (e.Key == Key.Down && !IsDropDownOpen)
+        {
+            ApplyPendingFilter();
             IsDropDownOpen = true;
             e.Handled = true;
         }
-        else if (e.Key == Key.Escape) {
+        else if (e.Key == Key.Escape)
+        {
             ClearFilter();
             Text = "";
             IsDropDownOpen = true;
         }
-        else if (e.Key == Key.Enter || e.Key == Key.Tab) {
+        else if (e.Key == Key.Enter || e.Key == Key.Tab)
+        {
+            ApplyPendingFilter();
             CheckSelectedItem();
             TriggerSelectedItemChanged();
         }
     }
 
+    private void MoveSelection(Key key)
+    {
+        ApplyPendingFilter();
+        if (Items.Count == 0)
+            return;
+
+        var index = SelectedItem == null ? -1 : Items.IndexOf(SelectedItem);
+        index = index < 0
+            ? key == Key.Up ? Items.Count - 1 : 0
+            : Math.Clamp(index + (key == Key.Up ? -1 : 1), 0, Items.Count - 1);
+
+        SelectedItem = Items[index];
+        (ItemContainerGenerator.ContainerFromIndex(index) as ComboBoxItem)?.BringIntoView();
+    }
+
     protected override void OnPreviewLostKeyboardFocus(KeyboardFocusChangedEventArgs e)
     {
         base.OnPreviewLostKeyboardFocus(e);
+        ApplyPendingFilter();
         CheckSelectedItem();
         if ((e.OldFocus == this || e.OldFocus == EditableTextBox) && e.NewFocus != this && e.NewFocus != EditableTextBox)
             TriggerSelectedItemChanged();
@@ -100,7 +142,8 @@ public class FilterableComboBox : ComboBox
     private bool shouldTriggerSelectedItemChanged = false;
     private void TriggerSelectedItemChanged()
     {
-        if (shouldTriggerSelectedItemChanged) {
+        if (shouldTriggerSelectedItemChanged)
+        {
             SelectionEffectivelyChanged?.Invoke(this, SelectedItem);
             shouldTriggerSelectedItemChanged = false;
         }
@@ -108,9 +151,12 @@ public class FilterableComboBox : ComboBox
 
     public void ClearFilter()
     {
-        if (string.IsNullOrEmpty(CurrentFilter)) return;
+        FilterTimer.Stop();
+        if (string.IsNullOrEmpty(CurrentFilter))
+            return;
         CurrentFilter = "";
-        CollectionViewSource.GetDefaultView(ItemsSource).Refresh();
+        if (ItemsSource != null)
+            CollectionViewSource.GetDefaultView(ItemsSource).Refresh();
     }
 
     private void FilteredComboBox_DropDownOpened(object sender, EventArgs e)
@@ -121,47 +167,64 @@ public class FilterableComboBox : ComboBox
 
     private void FilteredComboBox_UserTextChange(object sender, EventArgs e)
     {
-        if (TextBoxFreezed) return;
+        if (TextBoxFreezed)
+            return;
         var tb = EditableTextBox;
         if (tb.SelectionStart + tb.SelectionLength == tb.Text.Length)
-            CurrentFilter = tb.Text.Substring(0, tb.SelectionStart).ToLower();
+            CurrentFilter = tb.Text.Substring(0, tb.SelectionStart);
         else
-            CurrentFilter = tb.Text.ToLower();
-        RefreshFilter();
+            CurrentFilter = tb.Text;
+
+        FilterTimer.Stop();
+        FilterTimer.Start();
     }
 
     protected override void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
     {
-        if (newValue != null) {
+        FilterTimer.Stop();
+
+        if (newValue != null)
+        {
             var view = CollectionViewSource.GetDefaultView(newValue);
             view.Filter += FilterItem;
         }
 
-        if (oldValue != null) {
+        if (oldValue != null)
+        {
             var view = CollectionViewSource.GetDefaultView(oldValue);
-            if (view != null) view.Filter -= FilterItem;
+            if (view != null)
+                view.Filter -= FilterItem;
         }
 
         base.OnItemsSourceChanged(oldValue, newValue);
     }
 
+    private void ApplyPendingFilter()
+    {
+        if (!FilterTimer.IsEnabled)
+            return;
+        FilterTimer.Stop();
+        RefreshFilter();
+    }
+
     private void RefreshFilter()
     {
-        if (ItemsSource == null) return;
+        if (ItemsSource == null)
+            return;
 
         var view = CollectionViewSource.GetDefaultView(ItemsSource);
-        FreezTextBoxState(() => {
-            var isDropDownOpen = IsDropDownOpen;
-            //always hide because showing it enables the user to pick with up and down keys, otherwise it's not working because of the glitch in view.Refresh()
-            IsDropDownOpenUC.Set(false);
+        FreezTextBoxState(() =>
+        {
             view.Refresh();
 
-            if (!string.IsNullOrEmpty(CurrentFilter) || isDropDownOpen)
+            if (!IsDropDownOpen && !string.IsNullOrEmpty(CurrentFilter))
                 IsDropDownOpenUC.Set(true);
 
-            if (SelectedItem == null) {
+            if (SelectedItem == null)
+            {
                 foreach (var itm in ItemsSource)
-                    if (itm.ToString() == Text) {
+                    if (itm.ToString() == Text)
+                    {
                         SelectedItem = itm;
                         break;
                     }
@@ -185,10 +248,16 @@ public class FilterableComboBox : ComboBox
 
     private bool FilterItem(object value)
     {
-        if (value == null) return false;
-        if (CurrentFilter.Length == 0) return true;
+        if (value == null)
+            return false;
+        if (CurrentFilter.Length == 0)
+            return true;
 
-        return value.ToString().ToLower().Contains(CurrentFilter);
+        var text = value.ToString();
+        if (text?.StartsWith("GAME_", StringComparison.OrdinalIgnoreCase) == true)
+            text = text[5..];
+
+        return text?.Contains(CurrentFilter, StringComparison.OrdinalIgnoreCase) == true;
     }
 
     private class TextBoxBaseUserChangeTracker
@@ -205,11 +274,13 @@ public class FilterableComboBox : ComboBox
             TextBoxBase = textBoxBase;
             LastText = TextBoxBase.ToString();
 
-            textBoxBase.PreviewTextInput += (s, e) => {
+            textBoxBase.PreviewTextInput += (s, e) =>
+            {
                 IsTextInput = true;
             };
 
-            textBoxBase.TextChanged += (s, e) => {
+            textBoxBase.TextChanged += (s, e) =>
+            {
                 var isUserChange = PressedKeys.Count > 0 || IsTextInput || LastText == TextBoxBase.ToString();
                 IsTextInput = false;
                 LastText = TextBoxBase.ToString();
@@ -217,17 +288,21 @@ public class FilterableComboBox : ComboBox
                     UserTextChanged?.Invoke(this, e);
             };
 
-            textBoxBase.PreviewKeyDown += (s, e) => {
-                switch (e.Key) {
+            textBoxBase.PreviewKeyDown += (s, e) =>
+            {
+                switch (e.Key)
+                {
                     case Key.Back:
                     case Key.Space:
                         if (!PressedKeys.Contains(e.Key))
                             PressedKeys.Add(e.Key);
                         break;
                 }
-                if (e.Key == Key.Back) {
+                if (e.Key == Key.Back)
+                {
                     var textBox = textBoxBase as TextBox;
-                    if (textBox.SelectionStart > 0 && textBox.SelectionLength > 0 && (textBox.SelectionStart + textBox.SelectionLength) == textBox.Text.Length) {
+                    if (textBox.SelectionStart > 0 && textBox.SelectionLength > 0 && (textBox.SelectionStart + textBox.SelectionLength) == textBox.Text.Length)
+                    {
                         textBox.SelectionStart--;
                         textBox.SelectionLength++;
                         e.Handled = true;
@@ -236,12 +311,14 @@ public class FilterableComboBox : ComboBox
                 }
             };
 
-            textBoxBase.PreviewKeyUp += (s, e) => {
+            textBoxBase.PreviewKeyUp += (s, e) =>
+            {
                 if (PressedKeys.Contains(e.Key))
                     PressedKeys.Remove(e.Key);
             };
 
-            textBoxBase.LostFocus += (s, e) => {
+            textBoxBase.LostFocus += (s, e) =>
+            {
                 PressedKeys.Clear();
                 IsTextInput = false;
             };
@@ -261,11 +338,13 @@ public class FilterableComboBox : ComboBox
 
         public void Set(T val)
         {
-            try {
+            try
+            {
                 IsUserChange = false;
                 action(val);
             }
-            finally {
+            finally
+            {
                 IsUserChange = true;
             }
         }
diff --git a/FModel/Views/Resources/Converters/FileToGeometryConverter.cs b/FModel/Views/Resources/Converters/FileToGeometryConverter.cs
index 04e408c8..790c3091 100644
--- a/FModel/Views/Resources/Converters/FileToGeometryConverter.cs
+++ b/FModel/Views/Resources/Converters/FileToGeometryConverter.cs
@@ -12,7 +12,7 @@ public class FileToGeometryConverter : IMultiValueConverter
 
     public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
     {
-        if (values.Length < 2 || values[0] is not EAssetCategory category || values[1] is not string resolvedAssetType)
+        if (values.Length < 3 || values[0] is not EAssetCategory category || values[1] is not string resolvedAssetType || values[2] is not EAssetFamily family)
             return null;
 
         resolvedAssetType = resolvedAssetType.ToLowerInvariant();
@@ -106,6 +106,20 @@ public class FileToGeometryConverter : IMultiValueConverter
             _ => ("AssetIcon", "NeutralBrush")
         };
 
+        (geometry, brush) = (family, category) switch
+        {
+            (EAssetFamily.Criware, EAssetCategory.Data) => ("CriwareIcon", "CriwareBrush"),
+            (EAssetFamily.Criware, _) => ("CriwareIcon", brush),
+
+            (EAssetFamily.Wwise, EAssetCategory.Data) => ("WwiseIcon", "WwiseBrush"),
+            (EAssetFamily.Wwise, _) => ("WwiseIcon", brush),
+
+            (EAssetFamily.FMod, EAssetCategory.Data) => ("FModIcon", "FModBrush"),
+            (EAssetFamily.FMod, _) => ("FModIcon", brush),
+
+            _ => (geometry, brush),
+        };
+
         if (targetType == typeof(Geometry))
             return Application.Current.FindResource(geometry) as Geometry;
         if (targetType == typeof(Brush))
diff --git a/FModel/Views/Resources/Icons.xaml b/FModel/Views/Resources/Icons.xaml
index d5ee8748..42d63ec6 100644
--- a/FModel/Views/Resources/Icons.xaml
+++ b/FModel/Views/Resources/Icons.xaml
@@ -116,6 +116,12 @@
     <Geometry x:Key="GeometryCollectionIcon">M748.57 80.43c28.56-1.38 65.8-2.6 92.37 9.11 12.37 5.45 24.48 13.05 30 25.99 5.31 12.45 3.33 25.88 3.03 38.97-.53 22.7-.75 45.29.04 68 .93 26.86 4.13 54.15 2.11 81-1.16 15.42-7.32 31.34-22.58 37.62-32 13.17-52.25-1.78-77.57-18.6-10.79-7.18-21.42-14.59-32.13-21.88-14.17-9.64-29.51-19.34-36.01-36.04-4.74-12.16-4.33-25.26-4.49-38.1-.23-17.66-.11-35.34-.41-53-.32-18.99-.65-38.02-1.31-57-.29-8.4-1.75-19.16 4.41-25.96 8.13-8.96 31.23-9.56 42.54-10.11Zm-249.82 7.03c39.11-1.88 78.62-.49 117.75.17 15.32.26 35.8-3.07 48.34 8.01 10.52 9.3 10.71 22.85 10.09 35.86-.88 18.67-2.02 37.33-2.88 56-.97 21.31-.53 58.34-10.25 76.8-9.73 18.49-33.19 32.82-49.7 45.29-18.07 13.64-36.27 27.26-54.99 40-8.65 5.89-16.78 12.29-26.35 16.7-18.43 8.51-39.37 11.67-59.26 14.85-12.69 2.03-29.25 5.91-41.87 3.59-19.34-3.55-23.72-22.14-29.99-37.93-6.58-16.57-20.78-48.26-20.15-65.22.53-14.27 6.67-27.25 9.34-41.11 2.53-13.14 2-26.66 2.46-39.97.56-16.66 1.16-33.34 1.54-50 .32-14.15-1.48-30.3 8.18-42 8.25-10.01 22.17-13.85 34.44-15.76 21.06-3.28 42.06-4.26 63.3-5.28Zm-177.11 15.95c4.49-.49 8.81-.65 13.28.12 3.47.6 7 1.38 10.21 2.88 17.42 8.12 16.56 27.82 16.34 44.15-.2 15.32-.49 30.62-.13 45.94.42 18.1 1.21 37.2-7.78 53.56-9.17 16.67-26.61 23.5-43.04 30.98-20.86 9.48-41.61 19.15-62.56 28.43-16.15 7.16-32.99 15.16-50.36 18.83-8.67 1.83-18.3 1.61-25.87-3.53-8.1-5.49-11.83-15.08-13.95-24.22-3.87-16.68-3.51-35.01-3.51-52.05 0-16.26.58-32.78 4.11-48.71 2.59-11.71 6.25-23.37 11.96-33.98a106 106 0 0 1 15.67-22.3c36.95-39.58 86.3-34.81 135.63-40.1Zm569.05 37.09c12.83-1.97 23.54 16.54 29.48 25.82 19.4 30.32 38.29 63.13 44.02 99.18 1.9 11.94 6.07 39.03-8.87 44.26-10.91 3.83-31.7-2.78-40.34-10.24-2.89-2.5-4.96-6-6.54-9.43-4.32-9.34-3.53-21.36-4.81-31.45-2.91-23.03-5.62-46.14-8.84-69.13-1.49-10.61-2.81-21.25-4.16-31.88-.72-5.69-2.33-11.71.06-17.13ZM332.64 305.41c11.84-.61 19.71 8.73 23.63 18.86a514 514 0 0 1 13.14 38.91c3.87 12.93 7.81 25.65 4.31 39.17-5.46 21.11-25.7 32.55-41.6 45.23-35.14 28.03-71.7 54.22-106.96 82.05-14.58 11.51-37.72 33.56-57.04 20.77-12.47-8.25-14.94-21.94-16.51-35.75-1.98-17.5-2.33-35.54-2.44-53.15-.13-20.68-.1-41.39 1.45-62.02.81-10.7 1.33-23.38 7.96-32.37 10.69-14.5 36.32-9.26 52.39-11.62 18.53-2.73 35.07-11.21 51.75-19.27 11.02-5.33 22.15-10.47 33.16-15.81 10.68-5.19 24.88-14.38 36.76-15Zm353.14.05c10.21-.77 17.67 5.18 25.37 10.91 12.22 9.1 24.37 18.3 36.53 27.48 17.58 13.27 35.19 25.27 55.01 34.94 13.07 6.38 28.46 9.11 38.06 20.95 6.41 7.9 8.39 17.99 10.5 27.68 2.24 10.33 4.83 20.59 7.05 30.93a856 856 0 0 1 7.84 40.13c2.39 14.5 4.29 28.13-9.31 37.86-9.18 6.56-21.49 6.96-32.33 7.79-18.32 1.4-36.62 2.63-55 2.98-20.35.39-40.7 1.65-61 3.12-24.71 1.79-40.91 5.62-60.96-12.25-14.48-12.92-24.16-30.22-32.61-47.41-9.66-19.67-18.47-39.79-27.1-59.93-5.64-13.15-15.96-28.34-10.87-43.13 3.34-9.67 11.23-15.93 18.85-22.17 13.07-10.68 26.91-20.5 40.56-30.43 7.93-5.77 16-11.32 23.99-17 7.89-5.61 15.38-11.69 25.42-12.45Zm233.95 28.02c11.01-.55 33.13 5.03 39.1 15.2 5.34 9.08 2.29 31.09 1.87 41.82-1.1 28.35-2.15 56.72-3.26 85.06-.51 13.12 1.84 28.57-3.31 40.98-4.65 11.2-17.83 13.14-28.63 13.4-28.81.69-28.55-26.85-32.85-48.24-4.34-21.62-7.93-43.37-11.99-65.04-2.54-13.58-6.37-28.38-3.76-42.16 3.71-19.56 22.29-40 42.83-41.02Zm-397.99 71.01c20.02-.18 27.59 20.61 34.57 35.74 5.89 12.77 11.95 25.46 17.57 38.37 5.71 13.11 11.01 26.54 17.93 39.09 6.57 11.91 13.8 23.46 21.07 34.96 4.74 7.5 10.19 15.45 13.12 23.87 4.78 13.75-3.05 26.63-15.61 32.37-10.88 4.97-24.16 5.19-35.87 6.41a8360 8360 0 0 1-59.01 6.01c-14.68 1.42-28.96 2.63-41.4-6.89-10.14-7.75-16.36-20.45-22.9-31.13q-15.39-25.13-30.69-50.32c-14.16-23.33-43.61-58.38-29.72-86.65 7.27-14.81 22.65-19.43 37.6-22.6 20.62-4.37 41.22-8.96 61.88-13.1 10.19-2.05 21.02-6.03 31.46-6.13Zm-184.95 90.87c8.21-1.58 16.57 2.24 22.09 8.28 5.88 6.42 10.49 14.45 15.22 21.74 5.23 8.06 10.76 15.94 15.95 24.03 13.73 21.44 27.2 42.77 38.41 65.67 5.3 10.84 10.91 23.11 8.5 35.42-3.4 17.36-22.16 37.02-32.68 51.26-8.33 11.27-23.27 35.37-37.78 37.18-12.96 1.62-27.5-5.95-39.25-10.64-15.33-6.13-35.61-12.95-47.78-24.27-8.25-7.66-12.4-16.86-17.11-26.86-6.93-14.68-13.09-29.66-19.49-44.57-4.96-11.56-9.33-23.37-13.94-35.07-2.9-7.38-6.11-14.38-4.43-22.54 2.59-12.56 14.25-18.44 24.05-24.97 19.61-13.09 39.43-25.89 59.19-38.76 8.94-5.81 18.35-13.83 29.05-15.9Zm565.92 62.09c4.59-.3 9.33.55 13.82 1.36 13 2.34 34.19 7.59 41.19 19.97 5.3 9.37 3.66 25.11 4 35.72.83 26.01 1.31 52.08 2.85 78.06.49 8.27.49 16.55.88 24.83.39 8.56 1.33 17.54.32 26.08-.9 7.6-4.25 15.35-12.38 17.27-19.79 4.7-44.59-10.93-52.97-28.63-6.59-13.93-6.85-31.49-8.76-46.56-3.41-27.04-6.58-54.17-10.34-81.16-2.65-18.99-4.86-45.25 21.39-46.94ZM769.8 574.47c13.57-.81 27.14-.04 40.7.42 8.99.3 17.77.14 25.34 5.75 12.21 9.04 13.09 25.06 15.27 38.86 4.19 26.62 9.19 53.2 12.13 80 1.33 12.08 5.27 25.85-.97 37.24-6.14 11.24-18.58 15-29.71 19.38-20 7.88-40.1 15.65-59.85 24.12-14.27 6.13-28.64 12.05-42.98 18.03-8.64 3.6-17.51 7.52-26.97 4.39-17.49-5.8-19.5-29.8-23.17-44.85-8.35-34.17-16.86-68.27-21.99-103.09-2.42-16.41-5.61-35.47 4.53-50.06 9.07-13.06 23.89-17.93 38.77-21.2 22.84-5.01 45.59-7.6 68.9-8.99Zm-595.23 14.8c11.22-1.38 19.16 7.81 23.83 16.85 11.39 22.09 22.01 44.66 33.07 66.92 3.59 7.23 15.38 25.81 4.46 31.38-7.4 3.78-22.05 1.46-30.34 1.13-9.55-.37-19.58.14-28.97-1.83-17.51-3.69-21.24-16.37-22.91-32.2a452 452 0 0 1-1.93-27.02c-.82-17.67-1.5-52.24 22.79-55.23Zm422.07 56.11c11.63-1.13 22.82 3.55 27.88 14.58 4.81 10.47 6.11 22.36 8.73 33.48 4.9 20.83 8.94 41.85 13.13 62.82 2.83 14.17 8.99 30.87 4.48 45.18-4.26 13.53-19.8 20.9-30.93 28.01-12.31 7.88-24.54 17.4-39.45 19.32-16.51 2.13-32.18-4.76-47.27-10.42a4593 4593 0 0 1-69.39-26.73c-17.18-6.76-47.4-14.42-58.51-29.39-8.92-12.03-2.86-20.63 4.38-31 6.71-9.62 13.63-19.09 20.33-28.71 8.62-12.39 17.1-24.88 25.75-37.24 5.42-7.73 10-16.59 17.93-22.08 12.42-8.6 29.35-8.06 43.8-9.45 26.4-2.55 52.74-5.8 79.14-8.37Zm-433.95 81.88c5.84-1.64 12.86 0 18.81.51a701 701 0 0 1 38 4.06c13.13 1.82 26.08 4.51 39.11 6.86 29.86 5.39 74 14.01 96.64 35.56 8.43 8.03 14.33 19.24 17.79 30.25 4.18 13.31.16 25.41-3.77 38.15-5.58 18.03-11.05 36.11-17.02 54.02-5.11 15.32-9.73 30.81-14.9 46.11-3.33 9.83-8 20.21-16.94 26.18-15.09 10.08-41.83 1.64-58.91-.83-14.66-2.12-29.68-4.47-43.66-9.52-32.71-11.82-61.35-38.63-69.51-73.32-5.21-22.17-3.08-46.17-3.37-68.79-.27-20.23-2.68-49.58 2.48-68.6 2.1-7.75 6.7-18.24 15.25-20.64Zm717.03 46.16c12.34-1.49 22.24 2.98 32.84 8.53 15.62 8.18 32.14 18.79 39.42 35.57 6.65 15.31 5.9 34.67 4.8 50.98-3.45 51.08-31.88 96.67-82.39 112.32-14.92 4.62-30.31 6.49-45.89 6.52-14.2.02-29.7 1.62-42.99-4.35-16.8-7.55-21.43-24.75-24.94-41.18-1.98-9.31-4.15-18.57-6.04-27.9-3.15-15.47-6.69-30.86-9.77-46.34-2.02-10.13-5.54-20.88-1.78-31.06 5.4-14.58 20.2-19.09 33.12-24.94a843 843 0 0 1 64.3-25.7c12.66-4.51 25.91-10.81 39.32-12.45Zm-458.05 58.9c7.79-1.49 14.5 1.43 21.71 3.88 12.25 4.16 24.31 8.87 36.42 13.43 17.22 6.46 34.37 13.21 51.66 19.48 13.71 4.98 28.92 9.91 36.38 23.55 6.66 12.17 5.38 28.39 5.94 41.84.59 14.03 5.4 38.32-5.77 49.01-9.85 9.43-33.8 5.87-46.51 5.44-20.36-.68-40.67-2.41-61-3.63-16.37-.98-32.81-1.61-49.03-4.09-14.33-2.18-32.4-6.5-39.45-20.76-5.3-10.71-.69-21.64 2.76-32.09a2123 2123 0 0 1 24.93-71.13c4.02-10.87 9.28-22.51 21.96-24.93Zm255.08 5.06c31.26-5.59 36.57 32.33 41.92 54.34 1.26 5.19 2.39 10.4 3.63 15.59a962 962 0 0 1 8.98 41.11c1.55 8.06 3.37 16.59.18 24.54-4.27 10.67-15.66 13.62-25.92 15.29a315 315 0 0 1-52.04 3.91c-8.88-.04-18.07.25-26.6-2.61-23.54-7.9-23.6-34.42-23.72-55.05-.1-16.68-.46-34.78 6.5-50.29 8.11-18.07 27.23-27.27 43.7-36.33 7.34-4.04 15.01-9 23.37-10.5Z</Geometry>
     <Geometry x:Key="ChaosClothIcon">M511.92 134.63C511.92 134.97 511.92 135.3 511.92 135.63C493.79 163.46 475.66 191.3 457.53 219.13C439.31 210.85 421.1 202.56 402.88 194.28C402.7 293.72 402.51 393.16 402.33 492.6C304.78 492.6 207.22 492.6 109.67 492.6C109.51 393.19 109.34 293.78 109.18 194.37C90.94 202.62 72.71 210.87 54.47 219.13C36.34 191.29 18.21 163.46 0.08 135.63C0.08 135.3 0.08 134.96 0.08 134.63C2.79 132.96 5.03 130.4 7.38 128.27C14.02 122.27 20.69 116.3 27.37 110.36C47.41 92.52 67.09 74.31 87.32 56.7C93.68 51.17 102.54 41.18 109.3 37.05C113.64 34.4 125.62 33.12 131.1 31.69C142.25 28.77 153.58 26.56 164.74 23.71C171.22 22.05 177.84 20 184.46 18.98C187.1 21.48 188.93 24.95 191.38 27.69C197.34 34.39 204.7 40.54 212.62 44.78C241.44 60.24 276.6 59.07 304.32 41.78C310.75 37.76 316.9 32.29 321.71 26.42C323.68 24.01 325.3 21.11 327.54 18.98C332.88 19.59 338.33 21.44 343.54 22.75C354.69 25.56 365.94 28.15 377.13 30.78C382.83 32.12 398.45 34.46 402.7 37.05C409.55 41.23 417.12 50.17 423.46 55.59C444.24 73.37 464.27 92.09 484.64 110.34C491.31 116.31 498.01 122.24 504.63 128.25C506.98 130.38 509.22 132.95 511.92 134.63Z</Geometry>
     <Geometry x:Key="GroomAssetIcon">M 286.07 75.06 C 285.63 76.88 279.9 78.9 278.2 80.2 C 271.19 85.58 264.42 90.89 257.86 96.91 C 243.82 109.8 234.91 128.03 229.1 145.84 C 227.53 150.63 227.26 155.76 226.41 160.49 C 223.8 174.94 223.69 190.82 226.43 205.27 C 226.94 207.97 226.65 211.37 227.14 214.29 C 229.43 227.82 234.03 242.91 232.16 256.84 C 230.38 270.16 227.98 284.63 224.25 297.48 C 220.37 310.84 212.53 322.94 206.62 335.28 C 205.18 333.13 207.43 322.53 207.66 319.86 C 208.22 313.29 207.68 307.32 206.71 301.14 C 206 297 206 285.84 205.47 284.26 C 204.42 281.15 204.91 277.06 203.61 273.76 C 200.58 266.06 200.14 256.77 197.95 248.37 C 191.58 223.99 184.08 193.15 190 168 C 191 165 191.12 162.37 191.84 160.02 C 196.1 146.13 202.35 132.57 210.59 120.42 C 222.02 103.58 241.64 83.23 261.61 77.8 C 265 77 268 76 268.28 75.9 C 273.63 75.55 281.04 72.19 286.07 75.06 Z M 291.1 81.7 C 296.32 83.57 307.77 90.44 312.63 93.5 C 314.92 94.94 318.78 95.37 319.86 98.08 C 317.12 98.32 314.04 101.37 311.69 102.86 C 303.98 107.73 296.82 113.89 291.02 120.86 C 286.57 126.21 281.78 131.25 277.77 136.89 C 267.16 151.83 259.63 169 252.17 185.69 C 247.54 196.06 244.61 207.67 241.27 218.61 C 240.35 221.63 239.94 224.71 238.58 227.86 C 237.17 224.75 237.73 221.28 236.85 218.06 C 234.46 209.31 234.22 199.93 233.87 190.64 C 233.41 178.49 233.93 166.29 236.87 154.87 C 237.42 152.72 237.27 150.21 237.96 148.18 C 247.04 121.33 264.34 93.92 291.1 81.7 Z M 358.23 112.56 C 356.61 114.86 342.72 121.71 338.83 124.9 C 324.09 137.01 311.26 152.57 303.97 170.44 C 300.16 179.8 297.16 189.61 294.62 199.4 C 293.85 202.37 293.96 206.24 293.24 208.89 C 288.97 224.46 286.18 241.38 281.9 257.17 C 272.8 290.72 254.35 322.85 231.16 348.28 C 219.09 361.52 204 373.47 187.1 380.05 C 182.31 381.92 176.92 385.15 171.65 384.7 C 174.12 380.79 184.09 374.94 187.94 370.81 C 195.79 362.37 203.49 354.13 210.47 344.92 C 218.95 333.73 224 320.26 229.91 307.82 C 232.74 301.86 233.23 294.98 235.61 289.26 C 236.14 287.98 235.83 286.36 236.24 285.08 C 237.88 280.02 238.69 274.54 239.65 269.17 C 239.9 267.77 239.62 265.99 239.97 264.7 C 242.48 255.55 243.61 245.93 245.74 236.77 C 247.06 231.12 249 224 249.72 220.32 C 250 219 254 206 254.73 204.34 C 256 202 257.83 197.37 258.96 194.38 C 261.72 187.11 264.63 179.48 268.27 172.58 C 279.44 151.43 291.56 128.99 310.96 114.4 C 314.52 111.72 325.57 101.85 329.45 101.71 C 332.11 101.61 334.81 103.52 337.3 104.47 C 343.34 106.77 353.05 109.28 358.23 112.56 Z M 413.13 124.43 C 412.53 131.96 399.82 138.75 394.63 143.21 C 390.07 147.13 383.88 149.51 378.78 152.98 C 366.37 161.41 354.44 172.48 346.05 184.61 C 333.93 202.13 326.01 221.45 321.62 241.9 C 320 248 319 253 318 257 C 318 257 317 263 316.55 266.06 C 315.74 269.66 315.87 273.9 313.47 276.81 C 311.67 272.33 311.1 262.82 309.87 257.4 C 307.04 244.84 302.49 232.99 302.83 219.86 C 303.66 187.52 318.24 154.92 343.02 134.11 C 350.63 127.72 359.16 120.9 368.94 118.03 C 373.75 116.62 380.98 120.57 385.62 121.93 C 394.89 124.64 403.67 123.87 413.13 124.43 Z M 296.58 239.28 C 326.37 306.53 285.88 380.19 224 410.08 C 210.57 416.56 195.53 420.81 180.59 421.47 C 176 422 172 422 167 422 C 163 422 150.19 420.7 143.58 418.02 C 127.51 411.51 112.03 402.52 102.62 387.11 C 99.3 381.67 96.36 376.19 95.14 369.96 C 94.7 367.72 92.86 365.29 94.75 363.4 C 100.82 370.14 108.35 375.28 115.77 380.18 C 122.26 384.47 129.24 388.17 136.64 390.13 C 146.05 392.62 154.77 394.27 164.61 394.02 C 197.51 393.19 230.49 367.89 249.72 341.71 C 253.04 337.19 255.91 332.54 259.06 328.14 C 264.49 320.57 270.35 311.81 274.11 303.1 C 280.16 289.05 286.47 274.94 290.64 260.27 C 291.7 256.51 294.28 241.48 296.58 239.28 Z</Geometry>
+    <Geometry x:Key="UpdateIcon">M21,10.12H14.22L16.96,7.3C14.23,4.6 9.81,4.5 7.08,7.2C4.35,9.91 4.35,14.28 7.08,17C9.81,19.7 14.23,19.7 16.96,17C18.32,15.65 19,14.08 19,12.1H21C21,14.08 20.12,16.65 18.36,18.39C14.85,21.87 9.15,21.87 5.64,18.39C2.14,14.92 2.11,9.28 5.62,5.81C9.13,2.34 14.76,2.34 18.27,5.81L21,3V10.12M12.5,8V12.25L16,14.33L15.28,15.54L11,13V8H12.5Z</Geometry>
+    
+    <!-- Asset family icons -->
+    <Geometry x:Key="CriwareIcon">M477.02.94h10.15l.46.74 5.58-.09 2.47-.07.53 1.16 5.57-.17 19.81 4.28c1.84 1.44 3.52 1.76 5.93 1.7 9.78 1.22 24.46 8.28 34.04 11.94 19.48 7.42 38.87 14.88 58.33 22.3 1.58.6 3.22.72 4.82 1.18 3.04.87 5.94 2.83 8.9 3.96 6.68 2.55 13.43 5.22 20.26 7.19 1.62.46 3.04 1.65 4.61 2.25 6.6 2.51 13.13 5.2 19.73 7.72 3.81 1.45 7.94 2.32 11.69 3.75 1.35.52 2.28 1.83 3.75 2.25 8.61 2.49 16.82 6.42 25.41 8.9 3.04.88 5.94 2.84 8.9 3.97 6.66 2.54 13.47 5.22 20.27 7.18 1.61.47 3.03 1.65 4.61 2.25 10.43 3.98 20.82 8.42 31.41 11.48 6.86 1.97 13.2 6.27 20.05 8.25 15.33 4.43 29.84 12.21 45.14 16.62 1.62.47 3.04 1.65 4.61 2.25 5.8 2.21 11.78 4.62 17.69 6.33 6.94 2 15.36 5.93 22.3 8.58 1.58.6 3 1.78 4.62 2.25 4.74 1.37 9.08 3.38 13.72 5.14 11.9 4.54 24.64 8.33 33.99 17.48 10.92 10.69 16.78 28.66 16.9 43.59l-.18 335.38c-4.12-.37-8.15-4.7-12.03-6.49l-.24-1.11-3.96-.97-13.72-4.79-.34-1.37-3.82.11-.46-1.08-4.24.32-9.49-1.78-.49-301.07c.26-2 .34-2.71-.97-4.18.02-2.94-1.45-4.82-2.24-7.56-3-10.4-12.87-16.47-23.05-18.98-2.86-.7-5.68-1.29-8.19-2.73l-.23-.67-4.18-.1-95.69-29.05-.48-.98-5.58-.83-114.13-34.27c-1.98-1.68-3.68-1.82-6.33-1.76-6.08-2.42-12.73-3.11-18.76-5.41a145 145 0 0 0-17.16-5.15c-21.86-5.39-52.7-24.27-67.06 4.45a33 33 0 0 0-3.02 11.17l-.78.41.02 5.58v585.84c-.31 2.35-.61 4.1.83 5.95 2.87 13.51 8.23 22.93 22.65 25.81 2.82.57 5.58 1.28 8.58.81 4.46-.7 8.98-2.18 13.32-3.5l4.12-.33.31-1.28 13.58-3.55 4.72-.69.46-1.13c9.67-3.28 19.63-5.71 29.4-8.53 12.37-3.57 24.35-8.05 36.88-11.15 1.92-.47 3.6-1.71 5.47-2.25 6.7-1.93 13.5-4.06 20.27-5.47 4.86-1.01 9.14-3.93 14.23-3.98l-.03 3.72 1.34.32c2.73 8.42 4.79 18.06 9.98 25.54.04 2.17.69 3.08 1.67 5.01l1.21.29c2.56 2.97 4.65 6.4 6.95 9.55 3.1 4.25 7.83 7.89 11.55 11.61-2.23 4.26-11.31 5.26-15.73 7.42-3.86 1.89-7.92 3.15-11.98 4.32-3.87 1.12-7.69 3.38-11.48 4.82-8.76 3.34-17.53 6.43-26.26 9.76l-72.05 27.45c-7.45 2.84-14.87 5.74-22.31 8.58-1.57.6-2.99 1.78-4.61 2.25-7.63 2.2-15.36 5.19-22.83 8.04-2.16.82-4.11 2.47-6.33 3.11-5.63 1.62-10.8 3.91-16.3 6-16.17 6.17-37.14 11.35-54.3 12.29h-14.59c-4.08-.22-8.8-.1-12.43-1.83l-1.36.23-.36-.89-3.86-.02c-6.15-.6-11.77-3.07-17.74-4.31a139 139 0 0 1-21.13-6.33c-1.57-.59-2.99-1.78-4.61-2.25-8.26-2.38-16.47-5.81-24.55-8.9-3.85-1.46-7.53-3.68-11.47-4.82-8.22-2.37-16.51-5.83-24.55-8.9-1.58-.6-3-1.79-4.61-2.25-5.98-1.73-11.85-4.1-17.7-6.33-3.78-1.44-7.6-3.7-11.47-4.82-10.56-3.05-21.09-7.54-31.41-11.47-1.58-.6-3-1.79-4.61-2.26-14.6-4.21-28.66-10.87-42.89-16.29a147 147 0 0 0-11.69-3.76c-1.47-.42-2.4-1.73-3.75-2.25-3.72-1.42-8.05-1.97-11.69-3.75a87 87 0 0 0-11.09-4.62l-.22-1.03-3.42-.19-91.37-34.99-.42-1.01-4.22-.74c-8.55-3.66-17.63-7.18-26.5-9.74-1.61-.47-3.04-1.66-4.61-2.25-7.47-2.85-14.81-5.73-22.3-8.58-12.42-4.74-26.67-9.38-34.98-20.78-7.65-10.47-11.81-23.1-12.6-35.99L1 652.66l-.24-6.77-.07-422.02.35-6.86.55-4.29.98-6.43-.2-1.24 1.21-.48-.2-3.86c.71-6.61 3.74-13.32 7.32-18.89 10.39-16.22 22.1-20.16 39.32-26.73 28.11-10.72 55.95-22.03 84.37-32.53 2.17.04 3.14.16 4.44-1.68l25.86-9.49c1.85-.08 2.32-.14 3.45-1.58l185.25-70.45 4.17-1.75c14.37-5.52 28.86-10.83 43.28-16.33 10.32-3.93 20.16-8.5 30.88-11.15 1.91-.47 3.59-1.71 5.47-2.25 6.08-1.75 12.37-2.52 18.54-3.75 2.34-.47 4.11-1.52 6.6-1.61l6.43.15.46-1.16 1.69.08 5.57.3zM876.86 808.1l-16.91-.03c-4.78-1.78-9.73.02-14.61-.95-1.22-.25-1.67-1.12-2.76-1.53-3.39-1.3-7.33-1.17-10.83-2.04a90 90 0 0 1-16.3-6c-8.23-4.02-17.01-8.61-24.58-14.02-3.44-2.46-6.07-6.03-9.49-8.52-3.44-2.52-12.9-11.58-14.95-15.07-.34-.57-.28-1.42-.65-1.93-.69-.97-2.02-1.34-2.78-2.36-3.3-4.42-6.94-9.69-9.44-14.58-.88-1.73-1.24-3.71-2.3-5.41-3.73-5.95-7.42-13.91-9.14-20.89-.89-3.58-1.16-7.26-2.04-10.82-.67-2.71-1.98-5.18-2.23-8.02-.19-2.32.1-4.34-.26-6.78l-.02-22.09c2.43-37.54 23.68-75.53 55.02-97.92 4.5-3.21 9.77-6.06 14.31-8.84 6.95-4.26 23.72-10.44 31.71-12.04 2.68-.53 5.66-.31 8.26-1.18.82-.27 1.21-1.12 2.04-1.39 4.15-1.35 9.23-.37 13.53-1.04 6.3-.99 14.11-1.82 20.59-.81 3.63.57 11.49.89 14.45 1.85.82.27 1.21 1.12 2.03 1.39 5.87 1.96 12.84 1.82 18.55 4.61 4.38 2.14 8.75 4.38 13.19 6.55 12.69 6.19 28.16 16.71 37.15 28.03 5.62 7.08 11.31 14.52 16.16 22.44 3.48 5.66 6.41 13.6 9.41 19.75 2.25 4.6 2.36 10.28 3.76 15.12.29 1.02 1.14 1.87 1.39 2.9.88 3.55 1.29 7.42 1.85 11.01.48 3.07-.43 6.32.05 9.38 1.33 8.46.6 23.1-1.04 31.61-.64 3.32-2.43 6.45-3.11 9.75-5.96 28.72-26.66 58.06-50.8 75.3a137 137 0 0 1-30.26 16.06c-2.45.93-4.62 2.47-7.18 3.1-4.45 1.1-8.98 1.81-13.41 2.9-1.02.25-1.87 1.15-2.89 1.39-5.11 1.22-10.42-.68-15.47 1.12Zm-3.24-203.39c-1.46 2.14-3.46 1.54-5.55 3.03-2.48 1.77-4.46 4.17-6.91 5.95-1.13.82-2.68 1.36-3.68 2.34-2.66 2.6-5.95 4.83-9.14 7.15-3.4 2.48-6.6 5.51-9.89 8.12-1.37 1.1-2.37 2.95-3.88 3.84-.58.34-1.42.28-1.93.64-2.93 2.09-8 8.25-11.5 9.09-10.77 2.57-29.34-4.97-36.7 5.33-3.06 4.28-2.17 10.88-2.17 15.84v29.17c0 7.15.8 14.56 8.31 17.42 6.91 2.64 16.49 1.02 23.85 1.02 3.72 0 7.87-.61 10.99 1.88 1.44 1.14 2.41 2.78 3.76 3.96 2.03 1.79 4.88 3.29 7.1 4.91 4.55 3.32 8.8 7.46 12.92 11.09 2.35 2.08 5.62 3.62 8.12 5.61 4.19 3.32 10.81 11.09 16.3 11.09 5.03 0 7.42-3.64 8.12-8.12.74-4.74-.28-9.91-.51-14.55-.18-3.77.19-7.31.54-11.15 1.07-11.75-1.16-23.28-.67-34.18.49-11.01.42-22.35 0-33.72-.04-1.07.57-2.18.67-3.3.4-4.39-.31-8.78-.67-13-.48-5.59 1.67-20.62-.65-25.14-1.19-2.33-4.73-3.26-6.83-4.32Zm92.26 88.31.68-.39.02-5.57-.01-18.01.21-4.72-.84-.52c-1.68-5.04-1.32-10.73-3.7-15.62-5.71-11.68-8.76-18.09-17-28.46-4.62-5.83-9.56-13.85-17.98-7.7-3.08 2.25-4.78 7.12-3.01 10.67.52 1.03 1.85 1.69 2.52 2.63 3.67 5.13 7.45 10.26 11.15 15.44 6.86 9.6 10.75 26.57 10.75 38.14 0 11.74-3.13 24.38-9.3 34.44-1.55 2.54-2.24 5.5-4.02 7.99-2.69 3.77-6.7 6.59-9.38 10.35-2.92 4.09-3.17 10.85 1.29 14.1 1.72 1.25 3.5 1.31 5.54 1.31 6.2 0 7.78-4.26 11.58-8.15 7.99-8.15 15.98-22.53 18.71-33.61.96-3.87 1.03-8.82 2.79-12.32Zm-58.81 24.06c3.16-1.58 6.28-3.12 8.85-5.74 1.57-1.6 2.13-3.54 3.19-5.38.49-.86 1.44-1.45 1.98-2.31 1.54-2.45 2.09-5.59 2.87-8.28 3.59-12.45 4.66-21.55 0-33.78-2.64-6.91-6.86-20.31-16.03-20.85-6.41-.38-10.1 6.81-8.98 12.41.55 2.73 3.42 4.91 4.66 7.35 1.56 3.04 3.33 7.33 3.86 10.72 1.09 6.92.05 14.7-1.85 21.25-1.9 6.6-6.95 7.87-6.7 15.6.08 2.51.84 4.89 3.01 6.44 1.52 1.09 3.5 1.54 5.14 2.57Z</Geometry>
+    <Geometry x:Key="WwiseIcon">M284.07 238.36v6.85a37 37 0 0 1-4.43 13.2c-3.29 5.74-9.1 9.16-13.49 13.91-6.58 7.12-11.45 17.08-11.04 27 .58 14.19 9.93 16.64 18.41 25.12 5.54 5.54 7.78 12.02 9.58 19.4v8.21c-3.76 15.74-11.94 25.32-28.31 28.79l-9.58.02c-16.44-3.74-24.7-13.19-28.3-29.26l.01-7.31c1.65-7.51 4.01-14.2 9.57-19.83 8.33-8.45 19.25-12.01 18.36-26.51-.54-8.96-3.85-16.34-9.11-23.42-3.18-4.29-7.89-7.02-11.42-10.95a33.1 33.1 0 0 1-7.99-28.19c2.17-11.22 10.36-17.07 17.73-24.84 6.46-6.81 10.35-16.51 10.82-25.85.74-14.84-9.71-18.67-18.29-27.5-8.47-8.74-12.75-22.81-7.69-34.42 1.64-3.78 3.35-7.18 6.11-10.32 3.37-3.83 7.59-7.2 12.38-9.05 25.96-10.04 54.22 14.15 44.18 41.43-6.02 16.36-28.45 21-26.41 40.78.8 7.67 3.24 15.17 7.89 21.39 9.15 12.2 18.37 14.18 21.02 31.35Zm-118.94-93c15.72-3.34 30.52 9.92 29.83 25.64a24.3 24.3 0 0 1-7.69 16.49c-5.4 5.15-11.98 7.17-11.5 15.93.75 13.57 18.79 18.28 21.91 32.89 1.86 8.75-1.16 17.83-7.38 24.08-5.47 5.49-12.6 9.37-14.28 17.62-2.3 11.26 10.85 14.24 15.63 22.34 9.62 16.26-2.76 36.37-21.1 36.75-19.73.41-31.99-21.67-21.11-38.12 4.43-6.7 17.17-9.97 15.41-19.75-1.67-9.27-9.06-12.71-15.02-18.79-5.83-5.95-9.02-14.92-7.3-23.21 3.37-16.15 20.83-19.44 22.39-33.81 1.13-10.36-10.79-12.59-15.54-19.72-9.76-14.63-1.36-34.7 15.75-38.34Zm159.42.03c17.03-4.59 31.41 11.6 30.23 27.44-.5 6.72-5.01 12.76-10.17 16.75-5.21 4.03-10.12 6.27-9.75 13.84.62 12.67 19.31 17.86 22.65 33.35 1.81 8.39-1.27 16.99-6.98 23.13-5.83 6.27-13.45 9.67-15.36 18.88-2.11 10.11 10.82 13.37 15.37 20.21 10.74 16.16-.87 37.78-20.17 38.13-18.8.34-31.66-20.18-22.02-36.77 4.81-8.28 17.78-10.95 15.64-22.37-1.53-8.2-8.97-12.13-14.37-17.52a27 27 0 0 1-7.35-23.7c2.62-14.97 20.79-19.09 21.91-32.88.87-10.7-9.51-12.89-14.86-20.26-10.48-14.43-.76-33.92 15.23-38.23Zm55.8 99.82v-6.85c3.13-7.28 5.3-14.33 13.3-17.99 15.61-7.15 35.19 3.41 35.16 21.41-.03 16.74-18.25 27.76-33.4 21.91-8.87-3.41-11.62-10.61-15.06-18.48ZM90.87 218.17l9.59-.02c7.33 1.82 13.88 6.86 17.09 13.81.9 1.94 1.16 4.04 2.06 5.94l-.01 7.75c-3.65 6.86-3.34 10.88-10.83 15.87-24.2 16.1-51.95-18.88-29-37.7a29 29 0 0 1 11.1-5.65Zm301.5 110.66 6.72-.01c2.79.94 6.03.58 8.88 1.34 7.47 1.99 14.66 6.46 20.65 11.3 5.57 4.5 9.87 11.6 12.49 18.09 2.58 6.41 2.79 10.22 3.84 16.85.24 1.48.95 2.57.75 4.19-.82 6.78-2.02 14.58-5.2 20.88-11.55 22.87-37.17 35.57-61.96 27.54a52 52 0 0 1-19.92-11.59c-6.7-6.31-11.57-15.03-14.19-23.68-.85-2.8-.61-6.14-1.48-8.81l-.01-7.76c.39-1.19-.08-2.44.22-3.68.93-3.84 1.87-7.71 3.16-11.47 4-11.69 14.41-22.11 25.24-27.65a60 60 0 0 1 11.34-4.22c2.98-.78 6.56-.3 9.47-1.32Zm2.9 23.8c-3.17.33-15.64 11.68-18.93 14.31-3.54 2.84-9.31-.63-13.14.99-5.59 2.38-3.38 12.93-3.38 17.69 0 1.82-.43 4.36.35 6.05 3.18 6.91 12.45.83 17.16 4.72 4.1 3.38 8.44 6.44 12.49 9.91 1.51 1.28 3.75 3.8 5.84 3.83 5.37.08 3.4-8.91 3.46-12.18.22-11.7.19-23.46 0-35.16-.06-3.47 1.6-10.72-3.85-10.16Zm23.32 1.46a4.05 4.05 0 0 0-3.47 5.01c.59 2.12 3.21 4.23 4.45 6.06 3.05 4.51 5.26 10.39 5.22 15.89-.04 5.67-2.14 11.7-5.21 16.36-1.31 1.99-3.89 3.65-4.52 6.04-.66 2.48 1.49 4.78 3.89 4.75 3.79-.05 6.82-5.94 8.46-8.83 6.1-10.77 6.86-23.78.99-34.85-1.61-3.04-5.63-10.89-9.81-10.43Zm-9.93 23.54c1.34 2.37 1.34 4.37 0 6.84-1.17 1.75-3.67 5.81-3.5 7.97.27 3.43 3.98 4.67 6.43 2.5 5.96-5.28 6.18-14.61 3.76-21.48-.91-2.59-2.83-6.89-6.01-7.27-7.2-.86-2.6 9.01-.68 11.44Z</Geometry>
+    <Geometry x:Key="FModIcon">M694.06 421.19c-3.16 1.58-6.35 1.31-9.72 1.96-3.9.75-7.81 1.97-11.69 2.92-9.67 2.39-27.83 13.73-33.72 21.81-5.37 7.35-11.53 14.38-14.87 23.12-1.75 4.6-4.72 19.06-7.07 21.42-6.98-8.6-12.45-27.43-15.12-38.22-1.91-7.75-5.84-15.12-7.76-22.92-3.89-15.78-9.99-31-13.88-46.76-2.25-9.12-5.79-17.92-8.04-27.03-1.35-5.47-3.18-12.02-8.67-14.7-7.03-3.44-15.74 1.53-18.36 8.4a1549 1549 0 0 0-21.92 61.37c-14.67 44.02-31 92.62-72.21 118.47-12.07 7.57-25.66 10.79-39.2 13.4a105 105 0 0 1-34.46.57c-9.75-1.53-19.11-4.62-28.37-8.15-8.02-3.06-14.94-8.41-21.72-13.36-35.56-25.95-45.21-72.71-58.28-111.94-5.78-17.33-9.57-35.26-15.35-52.6-2.72-8.17-4.96-18.02-15.84-17.03-13.97 1.27-17.79 27.44-21.92 37.99-15.5 39.62-27.98 81.36-53.36 116.14a81 81 0 0 1-15.66 15.75c-5.58 4.08-10.47 9.08-16.12 13.11-15.24 10.89-34.21 16.46-52.19 19.41-7.49 1.22-28.01 2.76-33.97-2.61-2.08-1.87-3.24-5.38-3.65-8.03-.56-3.56.51-7.36-.05-10.92-.87-5.53-.48-10.58.02-16.09.87-9.56 0-19.62 0-29.23 0-7.53-1.97-17.32 2.31-23.99 4.67-7.29 14.46-3.8 21.41-4.89 10.61-1.66 18.64-5.7 24.39-15.07 2.58-4.21 4.34-9.74 6.09-14.36 3.47-9.09 7.5-17.95 10.96-27.03 6.19-16.23 14.73-31.54 20.92-47.76 15.63-41 32.57-84.86 74.43-105.3 8.91-4.35 18.74-5.96 28.33-7.46 9.95-1.56 19.69-.6 29.38 1.34 12 2.4 23.5 7.06 33.82 13.68 22.91 14.69 36.65 42.36 43.99 67.78 1.72 5.98 4.33 11.89 6.3 17.81 6.68 20.02 13.79 39.91 20.46 59.91 4.92 14.76 9.46 29.62 15.11 44.06 2.15 5.49 5.9 12.06 12.45 13.13 8 1.31 14.97-4.19 17.74-11.44 5.28-13.85 11.06-27.52 16.34-41.37 2.53-6.62 5.8-13 8.04-19.72 4.66-14 11.27-27.4 16.53-41.19 13.23-34.71 22.87-63.98 54.18-86.83 4.65-3.39 9.96-7.3 15.36-9.47a133 133 0 0 1 23.61-7.08 81 81 0 0 1 27.92-.61c11.72 1.91 23.71 4.74 33.97 11.32 11.59 7.43 21.43 15.38 29.94 26.32 15.33 19.72 21.4 44.29 30.09 67.08 6.81 17.87 12.17 36.18 18.99 54.07 3.47 9.08 9.99 21.16 10.09 30.82Zm.51 12.92c6.74-1.3 14.02.63 20.45 1.92 24.25 4.85 45.26 24.64 51.24 48.86.95 3.88 1 7.61 1.62 11.53.61 3.9 1.32 8.36.68 12.42-1.31 8.34-2.9 15.98-5.96 23.99-9.01 23.64-33.53 37.68-57.23 41.39-6.03.95-12.51-.26-18.27-1.41-24.9-4.98-47.76-23.66-55-48.75-1.25-4.33-1.66-8.58-2.35-12.99-.61-3.91-1.32-8.36-.69-12.42 3.56-22.7 15.28-45.89 37.01-56.5 9.3-4.54 18.59-6.13 28.5-8.04Zm33.6 29.22c-3.59.55-5.44 5.21-4.01 8.13 1.6 3.28 4.82 5.51 6.78 8.56a45 45 0 0 1 6.96 23.72c0 7.78-1.95 15.59-6.23 22.26-1.96 3.06-6.37 5.87-7.51 9.3-1.39 4.15.66 8.54 5.34 8.26 5.99-.35 10.58-9.49 12.9-14.13 8.18-16.36 9.39-33.33.98-50.16-2.34-4.67-8.91-16.89-15.21-15.94Zm-35.06 3.66c-7.46 2.41-14.55 12.41-20.99 17.01-5.85 4.18-11.44.48-17.74 1.98-7.93 1.9-5.81 18.57-4.91 24.36.36 2.24-.76 5.23.9 7.15 4.85 5.61 14.79-.43 21.75 4.54 5.32 3.8 9.89 8.7 15 12.76 2.36 1.87 4.55 5.35 8.02 5.1 6.63-.49 4.77-11.43 4.77-15.69v-45.3c0-4.12.31-14.22-6.8-11.91Zm20.45 15.34c-3.57.54-4.62 4.55-4.13 7.51.68 4.14 4.4 7.5 5.07 11.74.99 6.32-4.17 10.29-5.07 16.07-.65 4.15 1.99 6.85 6.16 6.16 3.62-.59 5.62-4.6 7.08-7.53 3.83-7.65 4.11-17.61.25-25.32-1.71-3.42-4.6-9.35-9.36-8.63Z</Geometry>
 
     <!-- For specific games-->
     <Geometry x:Key="BorderlandsIcon">M13,9V3.5L18.5,9M6,2C4.89,2 4,2.89 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2H6 ZM12,11A3,3 0 1,0 12,17A3,3 0 0,0 12,11 ZM12,12.5L14,16H13L12,14.5L11,16H10L12,12.5Z</Geometry>
diff --git a/FModel/Views/Resources/Resources.xaml b/FModel/Views/Resources/Resources.xaml
index 53cefe2b..4089d215 100644
--- a/FModel/Views/Resources/Resources.xaml
+++ b/FModel/Views/Resources/Resources.xaml
@@ -1682,6 +1682,16 @@
 
     <Style x:Key="UComboBox" TargetType="ComboBox" BasedOn="{StaticResource {x:Type ComboBox}}">
         <Setter Property="adonisExtensions:WatermarkExtension.Watermark" Value="UE5 / UE4 / GameName..." />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
+        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Recycling" />
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <VirtualizingStackPanel />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ComboBox">