fix access violation

animated emotes and fix clipper in chat window
just misc
2026-01-06 00:42:44 +09:00 · 2026-01-05 22:43:50 +09:00 · 2026-01-05 07:48:14 +09:00 · 2026-01-03 13:53:55 +09:00 · 2026-01-03 10:20:07 +09:00 · 2026-01-03 03:19:10 +09:00
172 changed files with 12379 additions and 28641 deletions
--- a/.gitea/workflows/lightless-tag-and-release.yml
+++ b/.gitea/workflows/lightless-tag-and-release.yml
@@ -9,8 +9,7 @@ env:
  DOTNET_VERSION: |
      10.x.x
      9.x.x
-  DOTNET_CLI_TELEMETRY_OPTOUT: true
-  
+
 jobs:
  tag-and-release:
    runs-on: ubuntu-22.04
@@ -33,14 +32,16 @@ jobs:

    - name: Download Dalamud
      run: |
-        mkdir -p ~/.xlcore/dalamud/Hooks/dev
+        cd /
+        mkdir -p root/.xlcore/dalamud/Hooks/dev
        curl -O https://goatcorp.github.io/dalamud-distrib/stg/latest.zip
-        unzip latest.zip -d ~/.xlcore/dalamud/Hooks/dev
+        unzip latest.zip -d /root/.xlcore/dalamud/Hooks/dev

    - name: Lets Build Lightless!
      run: | 
-        dotnet publish --configuration Release
-        mv LightlessSync/bin/x64/Release/LightlessSync/latest.zip LightlessClient.zip
+          dotnet restore
+          dotnet build --configuration Release --no-restore
+          dotnet publish --configuration Release --no-build

    - name: Get version
      id: package_version
@@ -52,6 +53,19 @@ jobs:
      run: | 
          echo "Version: ${{ steps.package_version.outputs.version }}"

+    - name: Prepare Lightless Client
+      run: |
+        PUBLISH_PATH="/workspace/Lightless-Sync/LightlessClient/LightlessSync/bin/x64/Release/publish/"
+        if [ -d "$PUBLISH_PATH" ]; then
+          rm -rf "$PUBLISH_PATH"
+          echo "Removed $PUBLISH_PATH"
+        else
+          echo "$PUBLISH_PATH does not exist, nothing to remove."
+        fi
+
+        mkdir -p output
+        (cd /workspace/Lightless-Sync/LightlessClient/LightlessSync/bin/x64/Release/ && zip -r $OLDPWD/output/LightlessClient.zip *)
+
    - name: Create Git tag if not exists (master)
      if: github.ref == 'refs/heads/master'
      run: |
@@ -148,7 +162,14 @@ jobs:
        echo "release_id=$release_id"
        echo "release_id=$release_id" >> $GITHUB_OUTPUT || echo "::set-output name=release_id::$release_id"
        echo "RELEASE_ID=$release_id" >> $GITHUB_ENV
-
+        
+    - name: Check asset exists
+      run: |
+        if [ ! -f output/LightlessClient.zip ]; then
+          echo "output/LightlessClient.zip does not exist!"
+          exit 1
+        fi
+        
    - name: Upload Assets to release
      env:
         RELEASE_ID: ${{ env.RELEASE_ID }}
@@ -156,7 +177,7 @@ jobs:
          echo "Uploading to release ID: $RELEASE_ID"
          curl --fail-with-body -s -X POST \
            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
-            -F "attachment=@LightlessClient.zip" \
+            -F "attachment=@output/LightlessClient.zip" \
           "https://git.lightless-sync.org/api/v1/repos/${GITHUB_REPOSITORY}/releases/$RELEASE_ID/assets"

    - name: Clone plugin hosting repo
@@ -165,7 +186,7 @@ jobs:
          cd LightlessSyncRepo
          git clone https://git.lightless-sync.org/${{ gitea.repository_owner }}/LightlessSync.git
      env:
-          GIT_TERMINAL_PROMPT: 0
+        GIT_TERMINAL_PROMPT: 0

    - name: Update plogonmaster.json with version (master)
      if: github.ref == 'refs/heads/master'
@@ -261,8 +282,8 @@ jobs:
    - name: Commit and push to LightlessSync
      run: |
          cd LightlessSyncRepo/LightlessSync
-          git config user.name "Gitea-Automation"
-          git config user.email "aaa@aaaaaaa.aaa"
+          git config user.name "github-actions"
+          git config user.email "github-actions@github.com"
          git add .
          git diff-index --quiet HEAD || git commit -m "Update ${{ env.PLUGIN_NAME }} to ${{ steps.package_version.outputs.version }}"
          git push https://x-access-token:${{ secrets.AUTOMATION_TOKEN }}@git.lightless-sync.org/${{ gitea.repository_owner }}/LightlessSync.git HEAD:main
--- a/LightlessCompactor/FileCache/CompactorInterfaces.cs
+++ b/LightlessCompactor/FileCache/CompactorInterfaces.cs
@@ -1,18 +0,0 @@
-namespace LightlessSync.FileCache;
-
-public interface ICompactorContext
-{
-    bool UseCompactor { get; }
-    string CacheFolder { get; }
-    bool IsWine { get; }
-}
-
-public interface ICompactionExecutor
-{
-    bool TryCompact(string filePath);
-}
-
-public sealed class NoopCompactionExecutor : ICompactionExecutor
-{
-    public bool TryCompact(string filePath) => false;
-}
--- a/LightlessCompactor/LightlessCompactor.csproj
+++ b/LightlessCompactor/LightlessCompactor.csproj
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <LangVersion>latest</LangVersion>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
-  </ItemGroup>
-
-</Project>
--- a/LightlessCompactorWorker/LightlessCompactorWorker.csproj
+++ b/LightlessCompactorWorker/LightlessCompactorWorker.csproj
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
-    <LangVersion>latest</LangVersion>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LightlessCompactor\LightlessCompactor.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.1" />
-  </ItemGroup>
-
-</Project>
--- a/LightlessCompactorWorker/Program.cs
+++ b/LightlessCompactorWorker/Program.cs
@@ -1,270 +0,0 @@
-using LightlessSync.FileCache;
-using Microsoft.Extensions.Logging;
-using System.Diagnostics;
-using System.IO.Pipes;
-using System.Text.Json;
-
-internal sealed class WorkerCompactorContext : ICompactorContext
-{
-    public WorkerCompactorContext(string cacheFolder, bool isWine)
-    {
-        CacheFolder = cacheFolder;
-        IsWine = isWine;
-    }
-
-    public bool UseCompactor => true;
-    public string CacheFolder { get; }
-    public bool IsWine { get; }
-}
-
-internal sealed class WorkerOptions
-{
-    public string? FilePath { get; init; }
-    public bool IsWine { get; init; }
-    public string CacheFolder { get; init; } = string.Empty;
-    public LogLevel LogLevel { get; init; } = LogLevel.Information;
-    public string PipeName { get; init; } = "LightlessCompactor";
-    public int? ParentProcessId { get; init; }
-}
-
-internal static class Program
-{
-    public static async Task<int> Main(string[] args)
-    {
-        var options = ParseOptions(args, out var error);
-        if (options is null)
-        {
-            Console.Error.WriteLine(error ?? "Invalid arguments.");
-            Console.Error.WriteLine("Usage: LightlessCompactorWorker --file <path> [--wine] [--cache-folder <path>] [--verbose]");
-            Console.Error.WriteLine("   or: LightlessCompactorWorker --pipe <name> [--wine] [--parent <pid>] [--verbose]");
-            return 2;
-        }
-
-        TrySetLowPriority();
-
-        using var loggerFactory = LoggerFactory.Create(builder =>
-        {
-            builder.SetMinimumLevel(options.LogLevel);
-            builder.AddSimpleConsole(o =>
-            {
-                o.SingleLine = true;
-                o.TimestampFormat = "HH:mm:ss.fff ";
-            });
-        });
-
-        var logger = loggerFactory.CreateLogger<FileCompactor>();
-        var context = new WorkerCompactorContext(options.CacheFolder, options.IsWine);
-
-        using var compactor = new FileCompactor(logger, context, new NoopCompactionExecutor());
-
-        if (!string.IsNullOrWhiteSpace(options.FilePath))
-        {
-            var success = compactor.TryCompactFile(options.FilePath!);
-            return success ? 0 : 1;
-        }
-
-        var serverLogger = loggerFactory.CreateLogger("CompactorWorker");
-        return await RunServerAsync(compactor, options, serverLogger).ConfigureAwait(false);
-    }
-
-    private static async Task<int> RunServerAsync(FileCompactor compactor, WorkerOptions options, ILogger serverLogger)
-    {
-        using var cts = new CancellationTokenSource();
-        var token = cts.Token;
-
-        if (options.ParentProcessId.HasValue)
-        {
-            _ = Task.Run(() => MonitorParent(options.ParentProcessId.Value, cts));
-        }
-
-        serverLogger.LogInformation("Compactor worker listening on pipe {pipe}", options.PipeName);
-
-        try
-        {
-            while (!token.IsCancellationRequested)
-            {
-                var server = new NamedPipeServerStream(
-                    options.PipeName,
-                    PipeDirection.InOut,
-                    NamedPipeServerStream.MaxAllowedServerInstances,
-                    PipeTransmissionMode.Byte,
-                    PipeOptions.Asynchronous);
-
-                try
-                {
-                    await server.WaitForConnectionAsync(token).ConfigureAwait(false);
-                }
-                catch
-                {
-                    server.Dispose();
-                    throw;
-                }
-
-                _ = Task.Run(() => HandleClientAsync(server, compactor, cts));
-            }
-        }
-        catch (OperationCanceledException)
-        {
-            // shutdown requested
-        }
-        catch (Exception ex)
-        {
-            serverLogger.LogWarning(ex, "Compactor worker terminated unexpectedly.");
-            return 1;
-        }
-
-        return 0;
-    }
-
-    private static async Task HandleClientAsync(NamedPipeServerStream pipe, FileCompactor compactor, CancellationTokenSource shutdownCts)
-    {
-        await using var _ = pipe;
-        using var reader = new StreamReader(pipe);
-        using var writer = new StreamWriter(pipe) { AutoFlush = true };
-
-        var line = await reader.ReadLineAsync().ConfigureAwait(false);
-        if (string.IsNullOrWhiteSpace(line))
-            return;
-
-        CompactorRequest? request = null;
-        try
-        {
-            request = JsonSerializer.Deserialize<CompactorRequest>(line);
-        }
-        catch
-        {
-            // ignore
-        }
-
-        CompactorResponse response;
-        if (request is null)
-        {
-            response = new CompactorResponse { Success = false, Error = "Invalid request." };
-        }
-        else if (string.Equals(request.Type, "shutdown", StringComparison.OrdinalIgnoreCase))
-        {
-            shutdownCts.Cancel();
-            response = new CompactorResponse { Success = true };
-        }
-        else if (string.Equals(request.Type, "compact", StringComparison.OrdinalIgnoreCase))
-        {
-            var success = compactor.TryCompactFile(request.Path ?? string.Empty);
-            response = new CompactorResponse { Success = success };
-        }
-        else
-        {
-            response = new CompactorResponse { Success = false, Error = "Unknown request type." };
-        }
-
-        await writer.WriteLineAsync(JsonSerializer.Serialize(response)).ConfigureAwait(false);
-    }
-
-    private static void MonitorParent(int parentPid, CancellationTokenSource shutdownCts)
-    {
-        try
-        {
-            var parent = Process.GetProcessById(parentPid);
-            parent.WaitForExit();
-        }
-        catch
-        {
-            // parent missing
-        }
-        finally
-        {
-            shutdownCts.Cancel();
-        }
-    }
-
-    private static WorkerOptions? ParseOptions(string[] args, out string? error)
-    {
-        string? filePath = null;
-        bool isWine = false;
-        string cacheFolder = string.Empty;
-        var logLevel = LogLevel.Information;
-        string pipeName = "LightlessCompactor";
-        int? parentPid = null;
-
-        for (int i = 0; i < args.Length; i++)
-        {
-            var arg = args[i];
-            switch (arg)
-            {
-                case "--file":
-                    if (i + 1 >= args.Length)
-                    {
-                        error = "Missing value for --file.";
-                        return null;
-                    }
-                    filePath = args[++i];
-                    break;
-                case "--cache-folder":
-                    if (i + 1 >= args.Length)
-                    {
-                        error = "Missing value for --cache-folder.";
-                        return null;
-                    }
-                    cacheFolder = args[++i];
-                    break;
-                case "--pipe":
-                    if (i + 1 >= args.Length)
-                    {
-                        error = "Missing value for --pipe.";
-                        return null;
-                    }
-                    pipeName = args[++i];
-                    break;
-                case "--parent":
-                    if (i + 1 >= args.Length || !int.TryParse(args[++i], out var pid))
-                    {
-                        error = "Invalid value for --parent.";
-                        return null;
-                    }
-                    parentPid = pid;
-                    break;
-                case "--wine":
-                    isWine = true;
-                    break;
-                case "--verbose":
-                    logLevel = LogLevel.Trace;
-                    break;
-            }
-        }
-
-        error = null;
-        return new WorkerOptions
-        {
-            FilePath = filePath,
-            IsWine = isWine,
-            CacheFolder = cacheFolder,
-            LogLevel = logLevel,
-            PipeName = pipeName,
-            ParentProcessId = parentPid
-        };
-    }
-
-    private static void TrySetLowPriority()
-    {
-        try
-        {
-            if (OperatingSystem.IsWindows())
-                Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.BelowNormal;
-        }
-        catch
-        {
-            // ignore
-        }
-    }
-
-    private sealed class CompactorRequest
-    {
-        public string Type { get; init; } = "compact";
-        public string? Path { get; init; }
-    }
-
-    private sealed class CompactorResponse
-    {
-        public bool Success { get; init; }
-        public string? Error { get; init; }
-    }
-}
--- a/LightlessSync.sln
+++ b/LightlessSync.sln
@@ -22,10 +22,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OtterGui", "OtterGui\OtterG
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pictomancy", "ffxiv_pictomancy\Pictomancy\Pictomancy.csproj", "{825F17D8-2704-24F6-DF8B-2542AC92C765}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightlessCompactor", "LightlessCompactor\LightlessCompactor.csproj", "{01F31917-9F1E-426D-BDAE-17268CBF9523}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightlessCompactorWorker", "LightlessCompactorWorker\LightlessCompactorWorker.csproj", "{72BE3664-CD0E-4DA4-B040-91338A2798E0}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -120,30 +116,6 @@ Global
 		{825F17D8-2704-24F6-DF8B-2542AC92C765}.Release|x64.Build.0 = Release|x64
 		{825F17D8-2704-24F6-DF8B-2542AC92C765}.Release|x86.ActiveCfg = Release|x64
 		{825F17D8-2704-24F6-DF8B-2542AC92C765}.Release|x86.Build.0 = Release|x64
-		{01F31917-9F1E-426D-BDAE-17268CBF9523}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01F31917-9F1E-426D-BDAE-17268CBF9523}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01F31917-9F1E-426D-BDAE-17268CBF9523}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{01F31917-9F1E-426D-BDAE-17268CBF9523}.Debug|x64.Build.0 = Debug|Any CPU
-		{01F31917-9F1E-426D-BDAE-17268CBF9523}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{01F31917-9F1E-426D-BDAE-17268CBF9523}.Debug|x86.Build.0 = Debug|Any CPU
-		{01F31917-9F1E-426D-BDAE-17268CBF9523}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01F31917-9F1E-426D-BDAE-17268CBF9523}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01F31917-9F1E-426D-BDAE-17268CBF9523}.Release|x64.ActiveCfg = Release|Any CPU
-		{01F31917-9F1E-426D-BDAE-17268CBF9523}.Release|x64.Build.0 = Release|Any CPU
-		{01F31917-9F1E-426D-BDAE-17268CBF9523}.Release|x86.ActiveCfg = Release|Any CPU
-		{01F31917-9F1E-426D-BDAE-17268CBF9523}.Release|x86.Build.0 = Release|Any CPU
-		{72BE3664-CD0E-4DA4-B040-91338A2798E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72BE3664-CD0E-4DA4-B040-91338A2798E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72BE3664-CD0E-4DA4-B040-91338A2798E0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{72BE3664-CD0E-4DA4-B040-91338A2798E0}.Debug|x64.Build.0 = Debug|Any CPU
-		{72BE3664-CD0E-4DA4-B040-91338A2798E0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{72BE3664-CD0E-4DA4-B040-91338A2798E0}.Debug|x86.Build.0 = Debug|Any CPU
-		{72BE3664-CD0E-4DA4-B040-91338A2798E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{72BE3664-CD0E-4DA4-B040-91338A2798E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{72BE3664-CD0E-4DA4-B040-91338A2798E0}.Release|x64.ActiveCfg = Release|Any CPU
-		{72BE3664-CD0E-4DA4-B040-91338A2798E0}.Release|x64.Build.0 = Release|Any CPU
-		{72BE3664-CD0E-4DA4-B040-91338A2798E0}.Release|x86.ActiveCfg = Release|Any CPU
-		{72BE3664-CD0E-4DA4-B040-91338A2798E0}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/LightlessSync/FileCache/ExternalCompactionExecutor.cs
+++ b/LightlessSync/FileCache/ExternalCompactionExecutor.cs
@@ -1,241 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System.Diagnostics;
-using System.IO.Pipes;
-using System.Text.Json;
-
-namespace LightlessSync.FileCache;
-
-internal sealed class ExternalCompactionExecutor : ICompactionExecutor, IDisposable
-{
-    private readonly ILogger<ExternalCompactionExecutor> _logger;
-    private readonly ICompactorContext _context;
-    private readonly TimeSpan _timeout = TimeSpan.FromMinutes(5);
-    private readonly string _pipeName;
-    private Process? _workerProcess;
-    private bool _disposed;
-    private readonly object _sync = new();
-
-    public ExternalCompactionExecutor(ILogger<ExternalCompactionExecutor> logger, ICompactorContext context)
-    {
-        _logger = logger;
-        _context = context;
-        _pipeName = $"LightlessCompactor-{Environment.ProcessId}";
-    }
-
-    public bool TryCompact(string filePath)
-    {
-        if (string.IsNullOrWhiteSpace(filePath) || !File.Exists(filePath))
-            return false;
-
-        if (!EnsureWorkerRunning())
-            return false;
-
-        try
-        {
-            var request = new CompactorRequest
-            {
-                Type = "compact",
-                Path = filePath
-            };
-
-            return SendRequest(request, out var response) && response?.Success == true;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "External compactor failed for {file}", filePath);
-            return false;
-        }
-    }
-
-    public void Dispose()
-    {
-        if (_disposed)
-            return;
-
-        _disposed = true;
-
-        try
-        {
-            SendRequest(new CompactorRequest { Type = "shutdown" }, out _);
-        }
-        catch
-        {
-            // ignore
-        }
-
-        lock (_sync)
-        {
-            if (_workerProcess is null)
-                return;
-
-            TryKill(_workerProcess);
-            _workerProcess.Dispose();
-            _workerProcess = null;
-        }
-    }
-
-    private bool EnsureWorkerRunning()
-    {
-        lock (_sync)
-        {
-            if (_workerProcess is { HasExited: false })
-                return true;
-
-            _workerProcess?.Dispose();
-            _workerProcess = null;
-
-            var workerPath = ResolveWorkerPath();
-            if (string.IsNullOrEmpty(workerPath))
-                return false;
-
-            var args = BuildArguments();
-            var startInfo = new ProcessStartInfo
-            {
-                FileName = workerPath,
-                Arguments = args,
-                CreateNoWindow = true,
-                UseShellExecute = false,
-                RedirectStandardOutput = true,
-                RedirectStandardError = true
-            };
-
-            var process = new Process { StartInfo = startInfo };
-            if (!process.Start())
-                return false;
-
-            TrySetLowPriority(process);
-            _ = DrainAsync(process.StandardOutput, "stdout");
-            _ = DrainAsync(process.StandardError, "stderr");
-
-            _workerProcess = process;
-            return true;
-        }
-    }
-
-    private bool SendRequest(CompactorRequest request, out CompactorResponse? response)
-    {
-        response = null;
-        using var pipe = new NamedPipeClientStream(".", _pipeName, PipeDirection.InOut, PipeOptions.Asynchronous);
-
-        try
-        {
-            pipe.Connect((int)_timeout.TotalMilliseconds);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogDebug(ex, "Compactor pipe connection failed.");
-            return false;
-        }
-
-        using var writer = new StreamWriter(pipe) { AutoFlush = true };
-        using var reader = new StreamReader(pipe);
-
-        var payload = JsonSerializer.Serialize(request);
-        writer.WriteLine(payload);
-
-        var readTask = reader.ReadLineAsync();
-        if (!readTask.Wait(_timeout))
-        {
-            _logger.LogWarning("Compactor pipe timed out waiting for response.");
-            return false;
-        }
-
-        var line = readTask.Result;
-        if (string.IsNullOrWhiteSpace(line))
-            return false;
-
-        try
-        {
-            response = JsonSerializer.Deserialize<CompactorResponse>(line);
-            return response is not null;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogDebug(ex, "Failed to parse compactor response.");
-            return false;
-        }
-    }
-
-    private string? ResolveWorkerPath()
-    {
-        var baseDir = AppContext.BaseDirectory;
-        var exeName = OperatingSystem.IsWindows() || _context.IsWine
-            ? "LightlessCompactorWorker.exe"
-            : "LightlessCompactorWorker";
-        var path = Path.Combine(baseDir, exeName);
-        return File.Exists(path) ? path : null;
-    }
-
-    private string BuildArguments()
-    {
-        var args = new List<string> { "--pipe", Quote(_pipeName), "--parent", Environment.ProcessId.ToString() };
-        if (_context.IsWine)
-            args.Add("--wine");
-        return string.Join(' ', args);
-    }
-
-    private static string Quote(string value)
-    {
-        if (string.IsNullOrEmpty(value))
-            return "\"\"";
-
-        if (!value.Contains('"', StringComparison.Ordinal))
-            return "\"" + value + "\"";
-
-        return "\"" + value.Replace("\"", "\\\"", StringComparison.Ordinal) + "\"";
-    }
-
-    private static void TrySetLowPriority(Process process)
-    {
-        try
-        {
-            if (OperatingSystem.IsWindows())
-                process.PriorityClass = ProcessPriorityClass.BelowNormal;
-        }
-        catch
-        {
-            // ignore
-        }
-    }
-
-    private async Task DrainAsync(StreamReader reader, string label)
-    {
-        try
-        {
-            string? line;
-            while ((line = await reader.ReadLineAsync().ConfigureAwait(false)) != null)
-            {
-                if (_logger.IsEnabled(LogLevel.Trace))
-                    _logger.LogTrace("Compactor {label}: {line}", label, line);
-            }
-        }
-        catch
-        {
-            // ignore
-        }
-    }
-
-    private static void TryKill(Process process)
-    {
-        try
-        {
-            process.Kill(entireProcessTree: true);
-        }
-        catch
-        {
-            // ignore
-        }
-    }
-
-    private sealed class CompactorRequest
-    {
-        public string Type { get; init; } = "compact";
-        public string? Path { get; init; }
-    }
-
-    private sealed class CompactorResponse
-    {
-        public bool Success { get; init; }
-        public string? Error { get; init; }
-    }
-}
--- a/LightlessSync/FileCache/FileCacheManager.cs
+++ b/LightlessSync/FileCache/FileCacheManager.cs
@@ -27,7 +27,6 @@ public sealed class FileCacheManager : IHostedService
    private readonly ConcurrentDictionary<string, ConcurrentDictionary<string, FileCacheEntity>> _fileCaches = new(StringComparer.Ordinal);
    private readonly ConcurrentDictionary<string, FileCacheEntity> _fileCachesByPrefixedPath = new(StringComparer.OrdinalIgnoreCase);
    private readonly SemaphoreSlim _getCachesByPathsSemaphore = new(1, 1);
-    private readonly SemaphoreSlim _evictSemaphore = new(1, 1);
    private readonly Lock _fileWriteLock = new();
    private readonly IpcManager _ipcManager;
    private readonly ILogger<FileCacheManager> _logger;
@@ -115,35 +114,6 @@ public sealed class FileCacheManager : IHostedService
        return true;
    }

-    private static bool TryGetHashFromFileName(FileInfo fileInfo, out string hash)
-    {
-        hash = Path.GetFileNameWithoutExtension(fileInfo.Name);
-        if (string.IsNullOrWhiteSpace(hash))
-        {
-            return false;
-        }
-
-        if (hash.Length is not (40 or 64))
-        {
-            return false;
-        }
-
-        for (var i = 0; i < hash.Length; i++)
-        {
-            var c = hash[i];
-            var isHex = (c >= '0' && c <= '9')
-                || (c >= 'a' && c <= 'f')
-                || (c >= 'A' && c <= 'F');
-            if (!isHex)
-            {
-                return false;
-            }
-        }
-
-        hash = hash.ToUpperInvariant();
-        return true;
-    }
-
    private static string BuildVersionHeader() => $"{FileCacheVersionHeaderPrefix}{FileCacheVersion}";

    private static bool TryParseVersionHeader(string? line, out int version)
@@ -256,23 +226,13 @@ public sealed class FileCacheManager : IHostedService
            var compressed = LZ4Wrapper.WrapHC(raw, 0, raw.Length);

            var tmpPath = compressedPath + ".tmp";
-            try
-            {
-                await File.WriteAllBytesAsync(tmpPath, compressed, token).ConfigureAwait(false);
-                File.Move(tmpPath, compressedPath, overwrite: true);
-            }
-            finally
-            {
-                try { if (File.Exists(tmpPath)) File.Delete(tmpPath); } catch { /* ignore */ }
-            }
+            await File.WriteAllBytesAsync(tmpPath, compressed, token).ConfigureAwait(false);
+            File.Move(tmpPath, compressedPath, overwrite: true);

-            var compressedSize = new FileInfo(compressedPath).Length;
+            var compressedSize = compressed.LongLength;
            SetSizeInfo(hash, originalSize, compressedSize);
            UpdateEntitiesSizes(hash, originalSize, compressedSize);

-            var maxBytes = GiBToBytes(_configService.Current.MaxLocalCacheInGiB);
-            await EnforceCacheLimitAsync(maxBytes, token).ConfigureAwait(false);
-
            return compressed;
        }
        finally
@@ -317,11 +277,6 @@ public sealed class FileCacheManager : IHostedService
        _logger.LogTrace("Creating cache entry for {path}", path);
        var cacheFolder = _configService.Current.CacheFolder;
        if (string.IsNullOrEmpty(cacheFolder)) return null;
-        if (TryGetHashFromFileName(fi, out var hash))
-        {
-            return CreateCacheEntryWithKnownHash(fi.FullName, hash);
-        }
-
        return CreateFileEntity(cacheFolder, CachePrefix, fi);
    }

@@ -976,83 +931,6 @@ public sealed class FileCacheManager : IHostedService
        }, token).ConfigureAwait(false);
    }

-    private async Task EnforceCacheLimitAsync(long maxBytes, CancellationToken token)
-    {
-        if (string.IsNullOrWhiteSpace(CacheFolder) || maxBytes <= 0) return;
-
-        await _evictSemaphore.WaitAsync(token).ConfigureAwait(false);
-        try
-        {
-            Directory.CreateDirectory(CacheFolder);
-
-            foreach (var tmp in Directory.EnumerateFiles(CacheFolder, "*" + _compressedCacheExtension + ".tmp"))
-            {
-                try { File.Delete(tmp); } catch { /* ignore */ }
-            }
-
-            var files = Directory.EnumerateFiles(CacheFolder, "*" + _compressedCacheExtension, SearchOption.TopDirectoryOnly)
-                .Select(p => new FileInfo(p))
-                .Where(fi => fi.Exists)
-                .OrderBy(fi => fi.LastWriteTimeUtc)
-                .ToList();
-
-            long total = files.Sum(f => f.Length);
-            if (total <= maxBytes) return;
-
-            foreach (var fi in files)
-            {
-                token.ThrowIfCancellationRequested();
-                if (total <= maxBytes) break;
-
-                var hash = Path.GetFileNameWithoutExtension(fi.Name);
-
-                try
-                {
-                    var len = fi.Length;
-                    fi.Delete();
-                    total -= len;
-                    _sizeCache.TryRemove(hash, out _);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogWarning(ex, "Failed to evict cache file {file}", fi.FullName);
-                }
-            }
-        }
-        finally
-        {
-            _evictSemaphore.Release();
-        }
-    }
-
-    private static long GiBToBytes(double gib)
-    {
-        if (double.IsNaN(gib) || double.IsInfinity(gib) || gib <= 0)
-            return 0;
-
-        var bytes = gib * 1024d * 1024d * 1024d;
-
-        if (bytes >= long.MaxValue) return long.MaxValue;
-
-        return (long)Math.Round(bytes, MidpointRounding.AwayFromZero);
-    }
-
-    private void CleanupOrphanCompressedCache()
-    {
-        if (string.IsNullOrWhiteSpace(CacheFolder) || !Directory.Exists(CacheFolder))
-            return;
-
-        foreach (var path in Directory.EnumerateFiles(CacheFolder, "*" + _compressedCacheExtension))
-        {
-            var hash = Path.GetFileNameWithoutExtension(path);
-            if (!_fileCaches.ContainsKey(hash))
-            {
-                try { File.Delete(path); }
-                catch (Exception ex) { _logger.LogWarning(ex, "Failed deleting orphan {file}", path); }
-            }
-        }
-    }
-
    public async Task StartAsync(CancellationToken cancellationToken)
    {
        _logger.LogInformation("Starting FileCacheManager");
@@ -1236,8 +1114,6 @@ public sealed class FileCacheManager : IHostedService
            {
                await WriteOutFullCsvAsync(cancellationToken).ConfigureAwait(false);
            }
-
-            CleanupOrphanCompressedCache();
        }

        _logger.LogInformation("Started FileCacheManager");
--- a/LightlessCompactor/FileCache/FileCompactor.cs
+++ b/LightlessCompactor/FileCache/FileCompactor.cs
@@ -1,4 +1,6 @@
-using LightlessSync.Services.Compactor;
+using LightlessSync.LightlessConfiguration;
+using LightlessSync.Services;
+using LightlessSync.Services.Compactor;
 using Microsoft.Extensions.Logging;
 using Microsoft.Win32.SafeHandles;
 using System.Collections.Concurrent;
@@ -18,8 +20,8 @@ public sealed partial class FileCompactor : IDisposable

    private readonly ConcurrentDictionary<string, byte> _pendingCompactions;
    private readonly ILogger<FileCompactor> _logger;
-    private readonly ICompactorContext _context;
-    private readonly ICompactionExecutor _compactionExecutor;
+    private readonly LightlessConfigService _lightlessConfigService;
+    private readonly DalamudUtilService _dalamudUtilService;

    private readonly Channel<string> _compactionQueue;
    private readonly CancellationTokenSource _compactionCts = new();
@@ -57,12 +59,12 @@ public sealed partial class FileCompactor : IDisposable
        XPRESS16K = 3
    }

-    public FileCompactor(ILogger<FileCompactor> logger, ICompactorContext context, ICompactionExecutor compactionExecutor)
+    public FileCompactor(ILogger<FileCompactor> logger, LightlessConfigService lightlessConfigService, DalamudUtilService dalamudUtilService)
    {
        _pendingCompactions = new(StringComparer.OrdinalIgnoreCase);
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        _context = context ?? throw new ArgumentNullException(nameof(context));
-        _compactionExecutor = compactionExecutor ?? throw new ArgumentNullException(nameof(compactionExecutor));
+        _logger = logger;
+        _lightlessConfigService = lightlessConfigService;
+        _dalamudUtilService = dalamudUtilService;
        _isWindows = OperatingSystem.IsWindows();

        _compactionQueue = Channel.CreateUnbounded<string>(new UnboundedChannelOptions
@@ -92,7 +94,7 @@ public sealed partial class FileCompactor : IDisposable

        //Uses an batching service for the filefrag command on Linux
        _fragBatch = new BatchFilefragService(
-            useShell: _context.IsWine,
+            useShell: _dalamudUtilService.IsWine,
            log: _logger,
            batchSize: 64,
            flushMs: 25,
@@ -116,7 +118,7 @@ public sealed partial class FileCompactor : IDisposable

        try
        {
-            var folder = _context.CacheFolder;
+            var folder = _lightlessConfigService.Current.CacheFolder;
            if (string.IsNullOrWhiteSpace(folder) || !Directory.Exists(folder))
            {
                if (_logger.IsEnabled(LogLevel.Warning))
@@ -125,7 +127,7 @@ public sealed partial class FileCompactor : IDisposable
                return;
            }

-            var files = Directory.EnumerateFiles(folder, "*", SearchOption.AllDirectories).ToArray();
+            var files = Directory.EnumerateFiles(folder).ToArray();
            var total = files.Length;
            Progress = $"0/{total}";
            if (total == 0) return;
@@ -153,7 +155,7 @@ public sealed partial class FileCompactor : IDisposable
                    {
                        if (compress)
                        {
-                            if (_context.UseCompactor)
+                            if (_lightlessConfigService.Current.UseCompactor)
                                CompactFile(file, workerId);
                        }
                        else
@@ -219,52 +221,19 @@ public sealed partial class FileCompactor : IDisposable

        await File.WriteAllBytesAsync(filePath, bytes, token).ConfigureAwait(false);

-        if (_context.UseCompactor)
+        if (_lightlessConfigService.Current.UseCompactor)
            EnqueueCompaction(filePath);
    }

-    /// <summary>
-    /// Notify the compactor that a file was written directly (streamed) so it can enqueue compaction.
-    /// </summary>
-    public void NotifyFileWritten(string filePath)
-    {
-        EnqueueCompaction(filePath);
-    }
-
-    public bool TryCompactFile(string filePath)
-    {
-        if (string.IsNullOrWhiteSpace(filePath))
-            return false;
-
-        if (!_context.UseCompactor || !File.Exists(filePath))
-            return false;
-
-        try
-        {
-            CompactFile(filePath, workerId: -1);
-            return true;
-        }
-        catch (IOException ioEx)
-        {
-            _logger.LogDebug(ioEx, "File being read/written, skipping file: {file}", filePath);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Error compacting file: {file}", filePath);
-        }
-
-        return false;
-    }
-
    /// <summary>
    /// Gets the File size for an BTRFS or NTFS file system for the given FileInfo
    /// </summary>
    /// <param name="path">Amount of blocks used in the disk</param>
    public long GetFileSizeOnDisk(FileInfo fileInfo)
    {
-        var fsType = GetFilesystemType(fileInfo.FullName, _context.IsWine);
+        var fsType = GetFilesystemType(fileInfo.FullName, _dalamudUtilService.IsWine);

-        if (fsType == FilesystemType.NTFS && !_context.IsWine)
+        if (fsType == FilesystemType.NTFS && !_dalamudUtilService.IsWine)
        {
            (bool flowControl, long value) = GetFileSizeNTFS(fileInfo);
            if (!flowControl)
@@ -321,7 +290,7 @@ public sealed partial class FileCompactor : IDisposable
    {
        try
        {
-            var blockSize = GetBlockSizeForPath(fileInfo.FullName, _logger, _context.IsWine);
+            var blockSize = GetBlockSizeForPath(fileInfo.FullName, _logger, _dalamudUtilService.IsWine);
            if (blockSize <= 0)
                throw new InvalidOperationException($"Invalid block size {blockSize} for {fileInfo.FullName}");

@@ -361,7 +330,7 @@ public sealed partial class FileCompactor : IDisposable
            return;
        }

-        var fsType = GetFilesystemType(filePath, _context.IsWine);
+        var fsType = GetFilesystemType(filePath, _dalamudUtilService.IsWine);
        var oldSize = fi.Length;
        int blockSize = (int)(GetFileSizeOnDisk(fi) / 512);

@@ -377,7 +346,7 @@ public sealed partial class FileCompactor : IDisposable
            return;
        }

-        if (fsType == FilesystemType.NTFS && !_context.IsWine)
+        if (fsType == FilesystemType.NTFS && !_dalamudUtilService.IsWine)
        {
            if (!IsWOFCompactedFile(filePath))
            {
@@ -433,9 +402,9 @@ public sealed partial class FileCompactor : IDisposable
    private void DecompressFile(string filePath, int workerId)
    {
        _logger.LogDebug("[W{worker}] Decompress request: {file}", workerId, filePath);
-        var fsType = GetFilesystemType(filePath, _context.IsWine);
+        var fsType = GetFilesystemType(filePath, _dalamudUtilService.IsWine);

-        if (fsType == FilesystemType.NTFS && !_context.IsWine)
+        if (fsType == FilesystemType.NTFS && !_dalamudUtilService.IsWine)
        {
            try
            {
@@ -479,7 +448,7 @@ public sealed partial class FileCompactor : IDisposable
        {
            try
            {
-                bool isWine = _context.IsWine;
+                bool isWine = _dalamudUtilService?.IsWine ?? false;
                string linuxPath = isWine ? ToLinuxPathIfWine(path, isWine) : path;

                var opts = GetMountOptionsForPath(linuxPath);
@@ -992,7 +961,7 @@ public sealed partial class FileCompactor : IDisposable
        if (finished != bothTasks)
            return KillProcess(proc, outTask, errTask, token);

-        bool isWine = _context.IsWine;
+        bool isWine = _dalamudUtilService?.IsWine ?? false;
        if (!isWine)
        {
            try { proc.WaitForExit(); } catch { /* ignore quirks */ }
@@ -1036,7 +1005,7 @@ public sealed partial class FileCompactor : IDisposable
        if (string.IsNullOrWhiteSpace(filePath))
            return;

-        if (!_context.UseCompactor)
+        if (!_lightlessConfigService.Current.UseCompactor)
            return;

        if (!File.Exists(filePath))
@@ -1048,7 +1017,7 @@ public sealed partial class FileCompactor : IDisposable
        bool enqueued = false;
        try
        {
-            bool isWine = _context.IsWine;
+            bool isWine = _dalamudUtilService?.IsWine ?? false;
            var fsType = GetFilesystemType(filePath, isWine);

            // If under Wine, we should skip NTFS because its not Windows but might return NTFS.
@@ -1101,11 +1070,8 @@ public sealed partial class FileCompactor : IDisposable

                        try
                        {
-                            if (_context.UseCompactor && File.Exists(filePath))
-                            {
-                                if (!_compactionExecutor.TryCompact(filePath))
-                                    CompactFile(filePath, workerId);
-                            }
+                            if (_lightlessConfigService.Current.UseCompactor && File.Exists(filePath))
+                                CompactFile(filePath, workerId);
                        }
                        finally
                        {
--- a/LightlessSync/FileCache/PluginCompactorContext.cs
+++ b/LightlessSync/FileCache/PluginCompactorContext.cs
@@ -1,20 +0,0 @@
-using LightlessSync.LightlessConfiguration;
-using LightlessSync.Services;
-
-namespace LightlessSync.FileCache;
-
-internal sealed class PluginCompactorContext : ICompactorContext
-{
-    private readonly LightlessConfigService _configService;
-    private readonly DalamudUtilService _dalamudUtilService;
-
-    public PluginCompactorContext(LightlessConfigService configService, DalamudUtilService dalamudUtilService)
-    {
-        _configService = configService;
-        _dalamudUtilService = dalamudUtilService;
-    }
-
-    public bool UseCompactor => _configService.Current.UseCompactor;
-    public string CacheFolder => _configService.Current.CacheFolder;
-    public bool IsWine => _dalamudUtilService.IsWine;
-}
--- a/LightlessSync/FileCache/TransientResourceManager.cs
+++ b/LightlessSync/FileCache/TransientResourceManager.cs
@@ -25,6 +25,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
    private readonly object _ownedHandlerLock = new();
    private readonly string[] _handledFileTypes = ["tmb", "pap", "avfx", "atex", "sklb", "eid", "phyb", "scd", "skp", "shpk", "kdb"];
    private readonly string[] _handledRecordingFileTypes = ["tex", "mdl", "mtrl"];
+    private readonly string[] _handledFileTypesWithRecording;
    private readonly HashSet<GameObjectHandler> _playerRelatedPointers = [];
    private readonly object _playerRelatedLock = new();
    private readonly ConcurrentDictionary<nint, GameObjectHandler> _playerRelatedByAddress = new();
@@ -41,6 +42,8 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
        _dalamudUtil = dalamudUtil;
        _actorObjectService = actorObjectService;
        _gameObjectHandlerFactory = gameObjectHandlerFactory;
+        _handledFileTypesWithRecording = _handledRecordingFileTypes.Concat(_handledFileTypes).ToArray();
+
        Mediator.Subscribe<PenumbraResourceLoadMessage>(this, Manager_PenumbraResourceLoadEvent);
        Mediator.Subscribe<ActorTrackedMessage>(this, msg => HandleActorTracked(msg.Descriptor));
        Mediator.Subscribe<ActorUntrackedMessage>(this, msg => HandleActorUntracked(msg.Descriptor));
@@ -294,7 +297,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase

    private void DalamudUtil_FrameworkUpdate()
    {
-        _ = Task.Run(() => RefreshPlayerRelatedAddressMap());
+        RefreshPlayerRelatedAddressMap();

        lock (_cacheAdditionLock)
        {
@@ -303,64 +306,20 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase

        if (_lastClassJobId != _dalamudUtil.ClassJobId)
        {
-            UpdateClassJobCache();
-        }
-
-        CleanupAbsentObjects();
-    }
-
-    private void RefreshPlayerRelatedAddressMap()
-    {
-        var tempMap = new ConcurrentDictionary<nint, GameObjectHandler>();
-        var updatedFrameAddresses = new ConcurrentDictionary<nint, ObjectKind>();
-
-        lock (_playerRelatedLock)
-        {
-            foreach (var handler in _playerRelatedPointers)
+            _lastClassJobId = _dalamudUtil.ClassJobId;
+            if (SemiTransientResources.TryGetValue(ObjectKind.Pet, out HashSet<string>? value))
            {
-                var address = (nint)handler.Address;
-                if (address != nint.Zero)
-                {
-                    tempMap[address] = handler;
-                    updatedFrameAddresses[address] = handler.ObjectKind;
-                }
+                value?.Clear();
            }
+
+            PlayerConfig.JobSpecificCache.TryGetValue(_dalamudUtil.ClassJobId, out var jobSpecificData);
+            SemiTransientResources[ObjectKind.Player] = PlayerConfig.GlobalPersistentCache.Concat(jobSpecificData ?? []).ToHashSet(StringComparer.OrdinalIgnoreCase);
+            PlayerConfig.JobSpecificPetCache.TryGetValue(_dalamudUtil.ClassJobId, out var petSpecificData);
+            SemiTransientResources[ObjectKind.Pet] = new HashSet<string>(
+                petSpecificData ?? [],
+                StringComparer.OrdinalIgnoreCase);
        }

-        _playerRelatedByAddress.Clear();
-        foreach (var kvp in tempMap)
-        {
-            _playerRelatedByAddress[kvp.Key] = kvp.Value;
-        }
-
-        _cachedFrameAddresses.Clear();
-        foreach (var kvp in updatedFrameAddresses)
-        {
-            _cachedFrameAddresses[kvp.Key] = kvp.Value;
-        }
-    }
-
-    private void UpdateClassJobCache()
-    {
-        _lastClassJobId = _dalamudUtil.ClassJobId;
-        if (SemiTransientResources.TryGetValue(ObjectKind.Pet, out HashSet<string>? value))
-        {
-            value?.Clear();
-        }
-
-        PlayerConfig.JobSpecificCache.TryGetValue(_dalamudUtil.ClassJobId, out var jobSpecificData);
-        SemiTransientResources[ObjectKind.Player] = PlayerConfig.GlobalPersistentCache
-            .Concat(jobSpecificData ?? [])
-            .ToHashSet(StringComparer.OrdinalIgnoreCase);
-
-        PlayerConfig.JobSpecificPetCache.TryGetValue(_dalamudUtil.ClassJobId, out var petSpecificData);
-        SemiTransientResources[ObjectKind.Pet] = new HashSet<string>(
-            petSpecificData ?? [],
-            StringComparer.OrdinalIgnoreCase);
-    }
-
-    private void CleanupAbsentObjects()
-    {
        foreach (var kind in Enum.GetValues(typeof(ObjectKind)).Cast<ObjectKind>())
        {
            if (!_cachedFrameAddresses.Any(k => k.Value == kind) && TransientResources.Remove(kind, out _))
@@ -390,6 +349,26 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
        _semiTransientResources = null;
    }

+    private void RefreshPlayerRelatedAddressMap()
+    {
+        _playerRelatedByAddress.Clear();
+        var updatedFrameAddresses = new ConcurrentDictionary<nint, ObjectKind>();
+        lock (_playerRelatedLock)
+        {
+            foreach (var handler in _playerRelatedPointers)
+            {
+                var address = (nint)handler.Address;
+                if (address != nint.Zero)
+                {
+                    _playerRelatedByAddress[address] = handler;
+                    updatedFrameAddresses[address] = handler.ObjectKind;
+                }
+            }
+        }
+
+        _cachedFrameAddresses = updatedFrameAddresses;
+    }
+
    private void HandleActorTracked(ActorObjectService.ActorDescriptor descriptor)
    {
        if (descriptor.IsInGpose)
@@ -520,51 +499,46 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase

    private void Manager_PenumbraResourceLoadEvent(PenumbraResourceLoadMessage msg)
    {
-        var gamePath = msg.GamePath.ToLowerInvariant();
        var gameObjectAddress = msg.GameObject;
-        var filePath = msg.FilePath;
-
-        // ignore files already processed this frame
-        if (_cachedHandledPaths.Contains(gamePath)) return;
-
-        lock (_cacheAdditionLock)
+        if (!_cachedFrameAddresses.TryGetValue(gameObjectAddress, out var objectKind))
        {
-            _cachedHandledPaths.Add(gamePath);
+            if (_actorObjectService.TryGetOwnedKind(gameObjectAddress, out var ownedKind))
+            {
+                objectKind = ownedKind;
+            }
+            else
+            {
+                return;
+            }
        }

-        // replace individual mtrl stuff
-        if (filePath.StartsWith("|", StringComparison.OrdinalIgnoreCase))
-        {
-            filePath = filePath.Split("|")[2];
-        }
-        // replace filepath
-        filePath = filePath.ToLowerInvariant().Replace("\\", "/", StringComparison.OrdinalIgnoreCase);
-
-        // ignore files that are the same
-        var replacedGamePath = gamePath.ToLowerInvariant().Replace("\\", "/", StringComparison.OrdinalIgnoreCase);
-        if (string.Equals(filePath, replacedGamePath, StringComparison.OrdinalIgnoreCase))
+        var gamePath = NormalizeGamePath(msg.GamePath);
+        if (string.IsNullOrEmpty(gamePath))
        {
            return;
        }

+        // ignore files already processed this frame
+        lock (_cacheAdditionLock)
+        {
+            if (!_cachedHandledPaths.Add(gamePath))
+            {
+                return;
+            }
+        }
+
        // ignore files to not handle
-        var handledTypes = IsTransientRecording ? _handledRecordingFileTypes.Concat(_handledFileTypes) : _handledFileTypes;
-        if (!handledTypes.Any(type => gamePath.EndsWith(type, StringComparison.OrdinalIgnoreCase)))
+        var handledTypes = IsTransientRecording ? _handledFileTypesWithRecording : _handledFileTypes;
+        if (!HasHandledFileType(gamePath, handledTypes))
        {
-            lock (_cacheAdditionLock)
-            {
-                _cachedHandledPaths.Add(gamePath);
-            }
            return;
        }

-        // ignore files not belonging to anything player related
-        if (!_cachedFrameAddresses.TryGetValue(gameObjectAddress, out var objectKind))
+        var filePath = NormalizeFilePath(msg.FilePath);
+
+        // ignore files that are the same
+        if (string.Equals(filePath, gamePath, StringComparison.Ordinal))
        {
-            lock (_cacheAdditionLock)
-            {
-                _cachedHandledPaths.Add(gamePath);
-            }
            return;
        }

@@ -579,13 +553,12 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
        _playerRelatedByAddress.TryGetValue(gameObjectAddress, out var owner);
        bool alreadyTransient = false;

-        bool transientContains = transientResources.Contains(replacedGamePath);
-        bool semiTransientContains = SemiTransientResources.SelectMany(k => k.Value)
-            .Any(f => string.Equals(f, gamePath, StringComparison.OrdinalIgnoreCase));
+        bool transientContains = transientResources.Contains(gamePath);
+        bool semiTransientContains = SemiTransientResources.Values.Any(value => value.Contains(gamePath));
        if (transientContains || semiTransientContains)
        {
            if (!IsTransientRecording)
-                Logger.LogTrace("Not adding {replacedPath} => {filePath}, Reason: Transient: {contains}, SemiTransient: {contains2}", replacedGamePath, filePath,
+                Logger.LogTrace("Not adding {replacedPath} => {filePath}, Reason: Transient: {contains}, SemiTransient: {contains2}", gamePath, filePath,
                    transientContains, semiTransientContains);
            alreadyTransient = true;
        }
@@ -593,10 +566,10 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
        {
            if (!IsTransientRecording)
            {
-                bool isAdded = transientResources.Add(replacedGamePath);
+                bool isAdded = transientResources.Add(gamePath);
                if (isAdded)
                {
-                    Logger.LogDebug("Adding {replacedGamePath} for {gameObject} ({filePath})", replacedGamePath, owner?.ToString() ?? gameObjectAddress.ToString("X"), filePath);
+                    Logger.LogDebug("Adding {replacedGamePath} for {gameObject} ({filePath})", gamePath, owner?.ToString() ?? gameObjectAddress.ToString("X"), filePath);
                    SendTransients(gameObjectAddress, objectKind);
                }
            }
@@ -604,7 +577,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase

        if (owner != null && IsTransientRecording)
        {
-            _recordedTransients.Add(new TransientRecord(owner, replacedGamePath, filePath, alreadyTransient) { AddTransient = !alreadyTransient });
+            _recordedTransients.Add(new TransientRecord(owner, gamePath, filePath, alreadyTransient) { AddTransient = !alreadyTransient });
        }
    }

@@ -703,4 +676,4 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
    {
        public bool AddTransient { get; set; }
    }
-}
+}
--- a/LightlessSync/Interop/InteropModel/Enums/ResidentialAetheryteKind.cs
+++ b/LightlessSync/Interop/InteropModel/Enums/ResidentialAetheryteKind.cs
@@ -1,11 +0,0 @@
-namespace Lifestream.Enums;
-
-public enum ResidentialAetheryteKind
-{
-    None = -1,
-    Uldah = 9,
-    Gridania = 2,
-    Limsa = 8,
-    Foundation = 70,
-    Kugane = 111,
-}
--- a/LightlessSync/Interop/InteropModel/Enums/TerritoryTypeIdHousing.cs
+++ b/LightlessSync/Interop/InteropModel/Enums/TerritoryTypeIdHousing.cs
@@ -1,51 +0,0 @@
-namespace Lifestream.Enums;
-
-public enum TerritoryTypeIdHousing
-{
-    None = -1,
-    
-    // Mist (Limsa Lominsa)
-    Mist = 339,
-    MistSmall = 282,
-    MistMedium = 283,
-    MistLarge = 284,
-    MistFCRoom = 384,
-    MistFCWorkshop = 423,
-    MistApartment = 608,
-    
-    // Lavender Beds (Gridania)
-    Lavender = 340,
-    LavenderSmall = 342,
-    LavenderMedium = 343,
-    LavenderLarge = 344,
-    LavenderFCRoom = 385,
-    LavenderFCWorkshop = 425,
-    LavenderApartment = 609,
-    
-    // Goblet (Ul'dah)
-    Goblet = 341,
-    GobletSmall = 345,
-    GobletMedium = 346,
-    GobletLarge = 347,
-    GobletFCRoom = 386,
-    GobletFCWorkshop = 424,
-    GobletApartment = 610,
-    
-    // Shirogane (Kugane)
-    Shirogane = 641,
-    ShiroganeSmall = 649,
-    ShiroganeMedium = 650,
-    ShiroganeLarge = 651,
-    ShiroganeFCRoom = 652,
-    ShiroganeFCWorkshop = 653,
-    ShiroganeApartment = 655,
-    
-    // Empyreum (Ishgard)
-    Empyream = 979,
-    EmpyreamSmall = 980,
-    EmpyreamMedium = 981,
-    EmpyreamLarge = 982,
-    EmpyreamFCRoom = 983,
-    EmpyreamFCWorkshop = 984,
-    EmpyreamApartment = 999,
-}
--- a/LightlessSync/Interop/InteropModel/GlobalModels.cs
+++ b/LightlessSync/Interop/InteropModel/GlobalModels.cs
@@ -1 +0,0 @@
-global using AddressBookEntryTuple = (string Name, int World, int City, int Ward, int PropertyType, int Plot, int Apartment, bool ApartmentSubdivision, bool AliasEnabled, string Alias);
--- a/LightlessSync/Interop/Ipc/IpcCallerLifestream.cs
+++ b/LightlessSync/Interop/Ipc/IpcCallerLifestream.cs
@@ -1,129 +0,0 @@
-using Dalamud.Plugin;
-using Dalamud.Plugin.Ipc;
-using Lifestream.Enums;
-using LightlessSync.Interop.Ipc.Framework;
-using LightlessSync.Services.Mediator;
-using Microsoft.Extensions.Logging;
-
-
-namespace LightlessSync.Interop.Ipc;
-
-public sealed class IpcCallerLifestream : IpcServiceBase
-{
-    private static readonly IpcServiceDescriptor LifestreamDescriptor = new("Lifestream", "Lifestream", new Version(0, 0, 0, 0));
-
-    private readonly ICallGateSubscriber<string, object> _executeLifestreamCommand;
-    private readonly ICallGateSubscriber<AddressBookEntryTuple, bool> _isHere;
-    private readonly ICallGateSubscriber<AddressBookEntryTuple, object> _goToHousingAddress;
-    private readonly ICallGateSubscriber<bool> _isBusy;
-    private readonly ICallGateSubscriber<object> _abort;
-    private readonly ICallGateSubscriber<string, bool> _changeWorld;
-    private readonly ICallGateSubscriber<uint, bool> _changeWorldById;
-    private readonly ICallGateSubscriber<string, bool> _aetheryteTeleport;
-    private readonly ICallGateSubscriber<uint, bool> _aetheryteTeleportById;
-    private readonly ICallGateSubscriber<bool> _canChangeInstance;
-    private readonly ICallGateSubscriber<int> _getCurrentInstance;
-    private readonly ICallGateSubscriber<int> _getNumberOfInstances;
-    private readonly ICallGateSubscriber<int, object> _changeInstance;
-    private readonly ICallGateSubscriber<(ResidentialAetheryteKind, int, int)> _getCurrentPlotInfo;
-
-    public IpcCallerLifestream(IDalamudPluginInterface pi, LightlessMediator lightlessMediator, ILogger<IpcCallerLifestream> logger)
-        : base(logger, lightlessMediator, pi, LifestreamDescriptor)
-    {
-        _executeLifestreamCommand = pi.GetIpcSubscriber<string, object>("Lifestream.ExecuteCommand");
-        _isHere = pi.GetIpcSubscriber<AddressBookEntryTuple, bool>("Lifestream.IsHere");
-        _goToHousingAddress = pi.GetIpcSubscriber<AddressBookEntryTuple, object>("Lifestream.GoToHousingAddress");
-        _isBusy = pi.GetIpcSubscriber<bool>("Lifestream.IsBusy");
-        _abort = pi.GetIpcSubscriber<object>("Lifestream.Abort");
-        _changeWorld = pi.GetIpcSubscriber<string, bool>("Lifestream.ChangeWorld");
-        _changeWorldById = pi.GetIpcSubscriber<uint, bool>("Lifestream.ChangeWorldById");
-        _aetheryteTeleport = pi.GetIpcSubscriber<string, bool>("Lifestream.AetheryteTeleport");
-        _aetheryteTeleportById = pi.GetIpcSubscriber<uint, bool>("Lifestream.AetheryteTeleportById");
-        _canChangeInstance = pi.GetIpcSubscriber<bool>("Lifestream.CanChangeInstance");
-        _getCurrentInstance = pi.GetIpcSubscriber<int>("Lifestream.GetCurrentInstance");
-        _getNumberOfInstances = pi.GetIpcSubscriber<int>("Lifestream.GetNumberOfInstances");
-        _changeInstance = pi.GetIpcSubscriber<int, object>("Lifestream.ChangeInstance");
-        _getCurrentPlotInfo = pi.GetIpcSubscriber<(ResidentialAetheryteKind, int, int)>("Lifestream.GetCurrentPlotInfo");
-        CheckAPI();
-    }
-
-    public void ExecuteLifestreamCommand(string command)
-    {
-        if (!APIAvailable) return;
-        _executeLifestreamCommand.InvokeAction(command);
-    }
-
-    public bool IsHere(AddressBookEntryTuple entry)
-    {
-        if (!APIAvailable) return false;
-        return _isHere.InvokeFunc(entry);
-    }
-
-    public void GoToHousingAddress(AddressBookEntryTuple entry)
-    {
-        if (!APIAvailable) return;
-        _goToHousingAddress.InvokeAction(entry);
-    }
-
-    public bool IsBusy()
-    {
-        if (!APIAvailable) return false;
-        return _isBusy.InvokeFunc();
-    }
-
-    public void Abort()
-    {
-        if (!APIAvailable) return;
-        _abort.InvokeAction();
-    }
-
-    public bool ChangeWorld(string worldName)
-    {
-        if (!APIAvailable) return false;
-        return _changeWorld.InvokeFunc(worldName);
-    }
-
-    public bool AetheryteTeleport(string aetheryteName)
-    {
-        if (!APIAvailable) return false;
-        return _aetheryteTeleport.InvokeFunc(aetheryteName);
-    }
-
-    public bool ChangeWorldById(uint worldId)
-    {
-        if (!APIAvailable) return false;
-        return _changeWorldById.InvokeFunc(worldId);
-    }
-
-    public bool AetheryteTeleportById(uint aetheryteId)
-    {
-        if (!APIAvailable) return false;
-        return _aetheryteTeleportById.InvokeFunc(aetheryteId);
-    }
-
-    public bool CanChangeInstance()
-    {
-        if (!APIAvailable) return false;
-        return _canChangeInstance.InvokeFunc();
-    }
-    public int GetCurrentInstance()
-    {
-        if (!APIAvailable) return -1;
-        return _getCurrentInstance.InvokeFunc();
-    }
-    public int GetNumberOfInstances()
-    {
-        if (!APIAvailable) return -1;
-        return _getNumberOfInstances.InvokeFunc();
-    }
-    public void ChangeInstance(int instanceNumber)
-    {
-        if (!APIAvailable) return;
-        _changeInstance.InvokeAction(instanceNumber);
-    }
-    public (ResidentialAetheryteKind, int, int)? GetCurrentPlotInfo()
-    {
-        if (!APIAvailable) return (ResidentialAetheryteKind.None, -1, -1);
-        return _getCurrentPlotInfo.InvokeFunc();
-    }
-}
--- a/LightlessSync/Interop/Ipc/IpcCallerPenumbra.cs
+++ b/LightlessSync/Interop/Ipc/IpcCallerPenumbra.cs
@@ -4,6 +4,7 @@ using LightlessSync.Interop.Ipc.Penumbra;
 using LightlessSync.LightlessConfiguration.Models;
 using LightlessSync.PlayerData.Handlers;
 using LightlessSync.Services;
+using LightlessSync.Services.ActorTracking;
 using LightlessSync.Services.Mediator;
 using Microsoft.Extensions.Logging;
 using Penumbra.Api.Enums;
@@ -35,7 +36,8 @@ public sealed class IpcCallerPenumbra : IpcServiceBase
        IDalamudPluginInterface pluginInterface,
        DalamudUtilService dalamudUtil,
        LightlessMediator mediator,
-        RedrawManager redrawManager) : base(logger, mediator, pluginInterface, PenumbraDescriptor)
+        RedrawManager redrawManager,
+        ActorObjectService actorObjectService) : base(logger, mediator, pluginInterface, PenumbraDescriptor)
    {
        _penumbraEnabled = new GetEnabledState(pluginInterface);
        _penumbraGetModDirectory = new GetModDirectory(pluginInterface);
@@ -44,7 +46,7 @@ public sealed class IpcCallerPenumbra : IpcServiceBase
        _penumbraModSettingChanged = ModSettingChanged.Subscriber(pluginInterface, HandlePenumbraModSettingChanged);

        _collections = RegisterInterop(new PenumbraCollections(logger, pluginInterface, dalamudUtil, mediator));
-        _resources = RegisterInterop(new PenumbraResource(logger, pluginInterface, dalamudUtil, mediator));
+        _resources = RegisterInterop(new PenumbraResource(logger, pluginInterface, dalamudUtil, mediator, actorObjectService));
        _redraw = RegisterInterop(new PenumbraRedraw(logger, pluginInterface, dalamudUtil, mediator, redrawManager));
        _textures = RegisterInterop(new PenumbraTexture(logger, pluginInterface, dalamudUtil, mediator, _redraw));

@@ -102,11 +104,8 @@ public sealed class IpcCallerPenumbra : IpcServiceBase
    public Task RedrawAsync(ILogger logger, GameObjectHandler handler, Guid applicationId, CancellationToken token)
        => _redraw.RedrawAsync(logger, handler, applicationId, token);

-    public void RequestImmediateRedraw(int objectIndex, RedrawType redrawType)
-        => _redraw.RequestImmediateRedraw(objectIndex, redrawType);
-
-    public Task ConvertTextureFiles(ILogger logger, IReadOnlyList<TextureConversionJob> jobs, IProgress<TextureConversionProgress>? progress, CancellationToken token, bool requestRedraw = true)
-        => _textures.ConvertTextureFilesAsync(logger, jobs, progress, token, requestRedraw);
+    public Task ConvertTextureFiles(ILogger logger, IReadOnlyList<TextureConversionJob> jobs, IProgress<TextureConversionProgress>? progress, CancellationToken token)
+        => _textures.ConvertTextureFilesAsync(logger, jobs, progress, token);

    public Task ConvertTextureFileDirectAsync(TextureConversionJob job, CancellationToken token)
        => _textures.ConvertTextureFileDirectAsync(job, token);
--- a/LightlessSync/Interop/Ipc/IpcManager.cs
+++ b/LightlessSync/Interop/Ipc/IpcManager.cs
@@ -9,8 +9,7 @@ public sealed partial class IpcManager : DisposableMediatorSubscriberBase

    public IpcManager(ILogger<IpcManager> logger, LightlessMediator mediator,
        IpcCallerPenumbra penumbraIpc, IpcCallerGlamourer glamourerIpc, IpcCallerCustomize customizeIpc, IpcCallerHeels heelsIpc,
-        IpcCallerHonorific honorificIpc, IpcCallerMoodles moodlesIpc, IpcCallerPetNames ipcCallerPetNames, IpcCallerBrio ipcCallerBrio,
-        IpcCallerLifestream ipcCallerLifestream) : base(logger, mediator)
+        IpcCallerHonorific honorificIpc, IpcCallerMoodles moodlesIpc, IpcCallerPetNames ipcCallerPetNames, IpcCallerBrio ipcCallerBrio) : base(logger, mediator)
    {
        CustomizePlus = customizeIpc;
        Heels = heelsIpc;
@@ -20,7 +19,6 @@ public sealed partial class IpcManager : DisposableMediatorSubscriberBase
        Moodles = moodlesIpc;
        PetNames = ipcCallerPetNames;
        Brio = ipcCallerBrio;
-        Lifestream = ipcCallerLifestream;

        _wasInitialized = Initialized;
        if (_wasInitialized)
@@ -49,8 +47,8 @@ public sealed partial class IpcManager : DisposableMediatorSubscriberBase
    public IpcCallerPenumbra Penumbra { get; }
    public IpcCallerMoodles Moodles { get; }
    public IpcCallerPetNames PetNames { get; }
+
    public IpcCallerBrio Brio { get; }
-    public IpcCallerLifestream Lifestream { get; }

    private void PeriodicApiStateCheck()
    {
@@ -71,6 +69,5 @@ public sealed partial class IpcManager : DisposableMediatorSubscriberBase
        }

        _wasInitialized = initialized;
-        Lifestream.CheckAPI();
    }
 }
--- a/LightlessSync/Interop/Ipc/Penumbra/PenumbraCollections.cs
+++ b/LightlessSync/Interop/Ipc/Penumbra/PenumbraCollections.cs
@@ -1,8 +1,10 @@
+using System.Collections.Concurrent;
 using Dalamud.Plugin;
 using LightlessSync.Interop.Ipc.Framework;
 using LightlessSync.Services;
 using LightlessSync.Services.Mediator;
 using Microsoft.Extensions.Logging;
+using Penumbra.Api.Enums;
 using Penumbra.Api.IpcSubscribers;

 namespace LightlessSync.Interop.Ipc.Penumbra;
@@ -14,6 +16,10 @@ public sealed class PenumbraCollections : PenumbraBase
    private readonly DeleteTemporaryCollection _removeTemporaryCollection;
    private readonly AddTemporaryMod _addTemporaryMod;
    private readonly RemoveTemporaryMod _removeTemporaryMod;
+    private readonly GetCollections _getCollections;
+    private readonly ConcurrentDictionary<Guid, string> _activeTemporaryCollections = new();
+
+    private int _cleanupScheduled;

    public PenumbraCollections(
        ILogger logger,
@@ -26,6 +32,7 @@ public sealed class PenumbraCollections : PenumbraBase
        _removeTemporaryCollection = new DeleteTemporaryCollection(pluginInterface);
        _addTemporaryMod = new AddTemporaryMod(pluginInterface);
        _removeTemporaryMod = new RemoveTemporaryMod(pluginInterface);
+        _getCollections = new GetCollections(pluginInterface);
    }

    public override string Name => "Penumbra.Collections";
@@ -55,11 +62,16 @@ public sealed class PenumbraCollections : PenumbraBase
        var (collectionId, collectionName) = await DalamudUtil.RunOnFrameworkThread(() =>
        {
            var name = $"Lightless_{uid}";
-            var createResult = _createNamedTemporaryCollection.Invoke(name, name, out var tempCollectionId);
-            logger.LogTrace("Creating Temp Collection {CollectionName}, GUID: {CollectionId}, Result: {Result}", name, tempCollectionId, createResult);
+            _createNamedTemporaryCollection.Invoke(name, name, out var tempCollectionId);
+            logger.LogTrace("Creating Temp Collection {CollectionName}, GUID: {CollectionId}", name, tempCollectionId);
            return (tempCollectionId, name);
        }).ConfigureAwait(false);

+        if (collectionId != Guid.Empty)
+        {
+            _activeTemporaryCollections[collectionId] = collectionName;
+        }
+
        return collectionId;
    }

@@ -77,6 +89,7 @@ public sealed class PenumbraCollections : PenumbraBase
            logger.LogTrace("[{ApplicationId}] RemoveTemporaryCollection: {Result}", applicationId, result);
        }).ConfigureAwait(false);

+        _activeTemporaryCollections.TryRemove(collectionId, out _);
    }

    public async Task SetTemporaryModsAsync(ILogger logger, Guid applicationId, Guid collectionId, Dictionary<string, string> modPaths)
@@ -118,5 +131,67 @@ public sealed class PenumbraCollections : PenumbraBase

    protected override void HandleStateChange(IpcConnectionState previous, IpcConnectionState current)
    {
+        if (current == IpcConnectionState.Available)
+        {
+            ScheduleCleanup();
+        }
+        else if (previous == IpcConnectionState.Available && current != IpcConnectionState.Available)
+        {
+            Interlocked.Exchange(ref _cleanupScheduled, 0);
+        }
    }
+
+    private void ScheduleCleanup()
+    {
+        if (Interlocked.Exchange(ref _cleanupScheduled, 1) != 0)
+        {
+            return;
+        }
+
+        _ = Task.Run(CleanupTemporaryCollectionsAsync);
+    }
+
+    private async Task CleanupTemporaryCollectionsAsync()
+    {
+        if (!IsAvailable)
+        {
+            return;
+        }
+
+        try
+        {
+            var collections = await DalamudUtil.RunOnFrameworkThread(() => _getCollections.Invoke()).ConfigureAwait(false);
+            foreach (var (collectionId, name) in collections)
+            {
+                if (!IsLightlessCollectionName(name) || _activeTemporaryCollections.ContainsKey(collectionId))
+                {
+                    continue;
+                }
+
+                Logger.LogDebug("Cleaning up stale temporary collection {CollectionName} ({CollectionId})", name, collectionId);
+                var deleteResult = await DalamudUtil.RunOnFrameworkThread(() =>
+                {
+                    var result = (PenumbraApiEc)_removeTemporaryCollection.Invoke(collectionId);
+                    Logger.LogTrace("Cleanup RemoveTemporaryCollection result for {CollectionName} ({CollectionId}): {Result}", name, collectionId, result);
+                    return result;
+                }).ConfigureAwait(false);
+
+                if (deleteResult == PenumbraApiEc.Success)
+                {
+                    _activeTemporaryCollections.TryRemove(collectionId, out _);
+                }
+                else
+                {
+                    Logger.LogDebug("Skipped removing temporary collection {CollectionName} ({CollectionId}). Result: {Result}", name, collectionId, deleteResult);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogWarning(ex, "Failed to clean up Penumbra temporary collections");
+        }
+    }
+
+    private static bool IsLightlessCollectionName(string? name)
+        => !string.IsNullOrEmpty(name) && name.StartsWith("Lightless_", StringComparison.Ordinal);
 }
--- a/LightlessSync/Interop/Ipc/Penumbra/PenumbraResource.cs
+++ b/LightlessSync/Interop/Ipc/Penumbra/PenumbraResource.cs
@@ -2,10 +2,9 @@ using Dalamud.Plugin;
 using LightlessSync.Interop.Ipc.Framework;
 using LightlessSync.PlayerData.Handlers;
 using LightlessSync.Services;
+using LightlessSync.Services.ActorTracking;
 using LightlessSync.Services.Mediator;
 using Microsoft.Extensions.Logging;
-using System.Diagnostics;
-using System.Globalization;
 using Penumbra.Api.Helpers;
 using Penumbra.Api.IpcSubscribers;

@@ -13,6 +12,7 @@ namespace LightlessSync.Interop.Ipc.Penumbra;

 public sealed class PenumbraResource : PenumbraBase
 {
+    private readonly ActorObjectService _actorObjectService;
    private readonly GetGameObjectResourcePaths _gameObjectResourcePaths;
    private readonly ResolveGameObjectPath _resolveGameObjectPath;
    private readonly ReverseResolveGameObjectPath _reverseResolveGameObjectPath;
@@ -24,8 +24,10 @@ public sealed class PenumbraResource : PenumbraBase
        ILogger logger,
        IDalamudPluginInterface pluginInterface,
        DalamudUtilService dalamudUtil,
-        LightlessMediator mediator) : base(logger, pluginInterface, dalamudUtil, mediator)
+        LightlessMediator mediator,
+        ActorObjectService actorObjectService) : base(logger, pluginInterface, dalamudUtil, mediator)
    {
+        _actorObjectService = actorObjectService;
        _gameObjectResourcePaths = new GetGameObjectResourcePaths(pluginInterface);
        _resolveGameObjectPath = new ResolveGameObjectPath(pluginInterface);
        _reverseResolveGameObjectPath = new ReverseResolveGameObjectPath(pluginInterface);
@@ -43,33 +45,17 @@ public sealed class PenumbraResource : PenumbraBase
            return null;
        }

-        var requestId = Guid.NewGuid();
-        var totalTimer = Stopwatch.StartNew();
-        logger.LogTrace("[{requestId}] Requesting Penumbra.GetGameObjectResourcePaths for {handler}", requestId, handler);
-
-        var result = await DalamudUtil.RunOnFrameworkThread(() =>
+        return await DalamudUtil.RunOnFrameworkThread(() =>
        {
+            logger.LogTrace("Calling On IPC: Penumbra.GetGameObjectResourcePaths");
            var idx = handler.GetGameObject()?.ObjectIndex;
            if (idx == null)
            {
-                logger.LogTrace("[{requestId}] GetGameObjectResourcePaths aborted (missing object index) for {handler}", requestId, handler);
                return null;
            }

-            logger.LogTrace("[{requestId}] Invoking Penumbra.GetGameObjectResourcePaths for index {index}", requestId, idx.Value);
-            var invokeTimer = Stopwatch.StartNew();
-            var data = _gameObjectResourcePaths.Invoke(idx.Value)[0];
-            invokeTimer.Stop();
-            logger.LogTrace("[{requestId}] Penumbra.GetGameObjectResourcePaths returned {count} entries in {elapsedMs}ms",
-                requestId, data?.Count ?? 0, invokeTimer.ElapsedMilliseconds);
-            return data;
+            return _gameObjectResourcePaths.Invoke(idx.Value)[0];
        }).ConfigureAwait(false);
-
-        totalTimer.Stop();
-        logger.LogTrace("[{requestId}] Penumbra.GetGameObjectResourcePaths finished in {elapsedMs}ms (null: {isNull})",
-            requestId, totalTimer.ElapsedMilliseconds, result is null);
-
-        return result;
    }

    public string GetMetaManipulations()
@@ -93,10 +79,22 @@ public sealed class PenumbraResource : PenumbraBase

    private void HandleResourceLoaded(nint ptr, string gamePath, string resolvedPath)
    {
-        if (ptr != nint.Zero && string.Compare(gamePath, resolvedPath, ignoreCase: true, CultureInfo.InvariantCulture) != 0)
+        if (ptr == nint.Zero)
        {
-            Mediator.Publish(new PenumbraResourceLoadMessage(ptr, gamePath, resolvedPath));
+            return;
        }
+
+        if (!_actorObjectService.TryGetOwnedKind(ptr, out _))
+        {
+            return;
+        }
+
+        if (string.Compare(gamePath, resolvedPath, StringComparison.OrdinalIgnoreCase) == 0)
+        {
+            return;
+        }
+
+        Mediator.Publish(new PenumbraResourceLoadMessage(ptr, gamePath, resolvedPath));
    }

    protected override void HandleStateChange(IpcConnectionState previous, IpcConnectionState current)
--- a/LightlessSync/Interop/Ipc/Penumbra/PenumbraTexture.cs
+++ b/LightlessSync/Interop/Ipc/Penumbra/PenumbraTexture.cs
@@ -26,7 +26,7 @@ public sealed class PenumbraTexture : PenumbraBase

    public override string Name => "Penumbra.Textures";

-    public async Task ConvertTextureFilesAsync(ILogger logger, IReadOnlyList<TextureConversionJob> jobs, IProgress<TextureConversionProgress>? progress, CancellationToken token, bool requestRedraw)
+    public async Task ConvertTextureFilesAsync(ILogger logger, IReadOnlyList<TextureConversionJob> jobs, IProgress<TextureConversionProgress>? progress, CancellationToken token)
    {
        if (!IsAvailable || jobs.Count == 0)
        {
@@ -57,7 +57,7 @@ public sealed class PenumbraTexture : PenumbraBase
            Mediator.Publish(new ResumeScanMessage(nameof(ConvertTextureFilesAsync)));
        }

-        if (requestRedraw && completedJobs > 0 && !token.IsCancellationRequested)
+        if (completedJobs > 0 && !token.IsCancellationRequested)
        {
            await DalamudUtil.RunOnFrameworkThread(async () =>
            {
@@ -92,7 +92,7 @@ public sealed class PenumbraTexture : PenumbraBase
    {
        token.ThrowIfCancellationRequested();

-        logger.LogDebug("Converting texture {Input} -> {Output} ({Target})", job.InputFile, job.OutputFile, job.TargetType);
+        logger.LogInformation("Converting texture {Input} -> {Output} ({Target})", job.InputFile, job.OutputFile, job.TargetType);
        var convertTask = _convertTextureFile.Invoke(job.InputFile, job.OutputFile, job.TargetType, job.IncludeMipMaps);
        await convertTask.ConfigureAwait(false);

--- a/LightlessSync/LightlessConfiguration/ConfigurationMigrator.cs
+++ b/LightlessSync/LightlessConfiguration/ConfigurationMigrator.cs
@@ -1,17 +1,11 @@
-using System.Globalization;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using LightlessSync.LightlessConfiguration.Configurations;
-using LightlessSync.LightlessConfiguration.Models;
-using LightlessSync.WebAPI;
+using LightlessSync.WebAPI;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;

 namespace LightlessSync.LightlessConfiguration;

 public class ConfigurationMigrator(ILogger<ConfigurationMigrator> logger, TransientConfigService transientConfigService,
-    ServerConfigService serverConfigService, TempCollectionConfigService tempCollectionConfigService,
-    LightlessConfigService lightlessConfigService) : IHostedService
+    ServerConfigService serverConfigService) : IHostedService
 {
    private readonly ILogger<ConfigurationMigrator> _logger = logger;

@@ -57,8 +51,6 @@ public class ConfigurationMigrator(ILogger<ConfigurationMigrator> logger, Transi
            serverConfigService.Current.Version = 2;
            serverConfigService.Save();
        }
-
-        MigrateTempCollectionConfig(tempCollectionConfigService, lightlessConfigService);
    }

    public Task StartAsync(CancellationToken cancellationToken)
@@ -71,273 +63,4 @@ public class ConfigurationMigrator(ILogger<ConfigurationMigrator> logger, Transi
    {
        return Task.CompletedTask;
    }
-
-    private void MigrateTempCollectionConfig(TempCollectionConfigService tempCollectionConfigService, LightlessConfigService lightlessConfigService)
-    {
-        var now = DateTime.UtcNow;
-        TempCollectionConfig tempConfig = tempCollectionConfigService.Current;
-        var tempChanged = false;
-        var tempNeedsSave = false;
-
-        if (TryReadTempCollectionData(lightlessConfigService.ConfigurationPath, out var root, out var ids, out var entries))
-        {
-            tempChanged |= MergeTempCollectionData(tempConfig, ids, entries, now);
-            var removed = root.Remove("OrphanableTempCollections");
-            removed |= root.Remove("OrphanableTempCollectionEntries");
-            if (removed)
-            {
-                try
-                {
-                    string updatedJson = root.ToJsonString(new JsonSerializerOptions
-                    {
-                        WriteIndented = true
-                    });
-                    File.WriteAllText(lightlessConfigService.ConfigurationPath, updatedJson);
-                    lightlessConfigService.UpdateLastWriteTime();
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogWarning(ex, "Failed to rewrite {config} after temp collection migration", lightlessConfigService.ConfigurationPath);
-                    return;
-                }
-            }
-
-            if (ids.Count > 0 || entries.Count > 0)
-            {
-                _logger.LogInformation("Migrated {ids} temp collection ids and {entries} entries to {configName}",
-                    ids.Count, entries.Count, tempCollectionConfigService.ConfigurationName);
-            }
-        }
-
-        if (TryReadTempCollectionData(tempCollectionConfigService.ConfigurationPath, out var tempRoot, out var tempIds, out var tempEntries))
-        {
-            tempChanged |= MergeTempCollectionData(tempConfig, tempIds, tempEntries, now);
-            if (tempRoot.Remove("OrphanableTempCollections"))
-            {
-                tempNeedsSave = true;
-            }
-        }
-
-        if (tempChanged || tempNeedsSave)
-        {
-            tempCollectionConfigService.Save();
-        }
-    }
-
-    private bool TryReadTempCollectionData(string configPath, out JsonObject root, out HashSet<Guid> ids, out List<OrphanableTempCollectionEntry> entries)
-    {
-        root = new JsonObject();
-        ids = [];
-        entries = [];
-
-        if (!File.Exists(configPath))
-        {
-            return false;
-        }
-
-        try
-        {
-            root = JsonNode.Parse(File.ReadAllText(configPath)) as JsonObject ?? new JsonObject();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Failed to read temp collection data from {config}", configPath);
-            return false;
-        }
-
-        root.TryGetPropertyValue("OrphanableTempCollections", out JsonNode? idsNode);
-        root.TryGetPropertyValue("OrphanableTempCollectionEntries", out JsonNode? entriesNode);
-
-        if (idsNode == null && entriesNode == null)
-        {
-            return false;
-        }
-
-        ids = ParseGuidSet(idsNode);
-        entries = ParseEntries(entriesNode);
-        return true;
-    }
-
-    private static HashSet<Guid> ParseGuidSet(JsonNode? node)
-    {
-        HashSet<Guid> ids = [];
-        if (node is not JsonArray array)
-        {
-            return ids;
-        }
-
-        foreach (JsonNode? item in array)
-        {
-            Guid id = ParseGuid(item);
-            if (id != Guid.Empty)
-            {
-                ids.Add(id);
-            }
-        }
-
-        return ids;
-    }
-
-    private static List<OrphanableTempCollectionEntry> ParseEntries(JsonNode? node)
-    {
-        List<OrphanableTempCollectionEntry> entries = [];
-        if (node is not JsonArray array)
-        {
-            return entries;
-        }
-
-        foreach (JsonNode? item in array)
-        {
-            if (item is not JsonObject obj)
-            {
-                continue;
-            }
-
-            Guid id = ParseGuid(obj["Id"]);
-            if (id == Guid.Empty)
-            {
-                continue;
-            }
-
-            DateTime registeredAtUtc = DateTime.MinValue;
-            if (TryParseDateTime(obj["RegisteredAtUtc"], out DateTime parsed))
-            {
-                registeredAtUtc = parsed;
-            }
-
-            entries.Add(new OrphanableTempCollectionEntry
-            {
-                Id = id,
-                RegisteredAtUtc = registeredAtUtc
-            });
-        }
-
-        return entries;
-    }
-
-    private static Guid ParseGuid(JsonNode? node)
-    {
-        if (node is JsonValue value)
-        {
-            if (value.TryGetValue<string>(out string? stringValue) && Guid.TryParse(stringValue, out Guid parsed))
-            {
-                return parsed;
-            }
-        }
-
-        return Guid.Empty;
-    }
-
-    private static bool TryParseDateTime(JsonNode? node, out DateTime value)
-    {
-        value = DateTime.MinValue;
-        if (node is not JsonValue val)
-        {
-            return false;
-        }
-
-        if (val.TryGetValue<DateTime>(out DateTime direct))
-        {
-            value = direct;
-            return true;
-        }
-
-        if (val.TryGetValue<string>(out string? stringValue)
-            && DateTime.TryParse(stringValue, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out DateTime parsed))
-        {
-            value = parsed;
-            return true;
-        }
-
-        return false;
-    }
-
-    private static bool MergeTempCollectionData(TempCollectionConfig config, HashSet<Guid> ids, List<OrphanableTempCollectionEntry> entries, DateTime now)
-    {
-        bool changed = false;
-        Dictionary<Guid, OrphanableTempCollectionEntry> entryLookup = new();
-        for (var i = config.OrphanableTempCollectionEntries.Count - 1; i >= 0; i--)
-        {
-            var entry = config.OrphanableTempCollectionEntries[i];
-            if (entry.Id == Guid.Empty)
-            {
-                config.OrphanableTempCollectionEntries.RemoveAt(i);
-                changed = true;
-                continue;
-            }
-
-            if (entryLookup.TryGetValue(entry.Id, out var existing))
-            {
-                if (entry.RegisteredAtUtc != DateTime.MinValue
-                    && (existing.RegisteredAtUtc == DateTime.MinValue || entry.RegisteredAtUtc < existing.RegisteredAtUtc))
-                {
-                    existing.RegisteredAtUtc = entry.RegisteredAtUtc;
-                    changed = true;
-                }
-
-                config.OrphanableTempCollectionEntries.RemoveAt(i);
-                changed = true;
-                continue;
-            }
-
-            entryLookup[entry.Id] = entry;
-        }
-
-        foreach (OrphanableTempCollectionEntry entry in entries)
-        {
-            if (entry.Id == Guid.Empty)
-            {
-                continue;
-            }
-
-            if (!entryLookup.TryGetValue(entry.Id, out OrphanableTempCollectionEntry? existing))
-            {
-                var added = new OrphanableTempCollectionEntry
-                {
-                    Id = entry.Id,
-                    RegisteredAtUtc = entry.RegisteredAtUtc
-                };
-                config.OrphanableTempCollectionEntries.Add(added);
-                entryLookup[entry.Id] = added;
-                changed = true;
-                continue;
-            }
-
-            if (entry.RegisteredAtUtc != DateTime.MinValue
-                && (existing.RegisteredAtUtc == DateTime.MinValue || entry.RegisteredAtUtc < existing.RegisteredAtUtc))
-            {
-                existing.RegisteredAtUtc = entry.RegisteredAtUtc;
-                changed = true;
-            }
-        }
-
-        foreach (Guid id in ids)
-        {
-            if (id == Guid.Empty)
-            {
-                continue;
-            }
-
-            if (!entryLookup.TryGetValue(id, out OrphanableTempCollectionEntry? existing))
-            {
-                var added = new OrphanableTempCollectionEntry
-                {
-                    Id = id,
-                    RegisteredAtUtc = now
-                };
-                config.OrphanableTempCollectionEntries.Add(added);
-                entryLookup[id] = added;
-                changed = true;
-                continue;
-            }
-
-            if (existing.RegisteredAtUtc == DateTime.MinValue)
-            {
-                existing.RegisteredAtUtc = now;
-                changed = true;
-            }
-        }
-
-        return changed;
-    }
 }
--- a/LightlessSync/LightlessConfiguration/ConfigurationSaveService.cs
+++ b/LightlessSync/LightlessConfiguration/ConfigurationSaveService.cs
@@ -72,41 +72,37 @@ public class ConfigurationSaveService : IHostedService
    {
        _logger.LogTrace("Saving {configName}", config.ConfigurationName);
        var configDir = config.ConfigurationPath.Replace(config.ConfigurationName, string.Empty);
-        var isTempCollections = string.Equals(config.ConfigurationName, TempCollectionConfigService.ConfigName, StringComparison.OrdinalIgnoreCase);

-        if (!isTempCollections)
+        try
        {
-            try
-            {
-                var configBackupFolder = Path.Join(configDir, BackupFolder);
-                if (!Directory.Exists(configBackupFolder))
-                    Directory.CreateDirectory(configBackupFolder);
+            var configBackupFolder = Path.Join(configDir, BackupFolder);
+            if (!Directory.Exists(configBackupFolder))
+                Directory.CreateDirectory(configBackupFolder);

-                var configNameSplit = config.ConfigurationName.Split(".");
-                var existingConfigs = Directory.EnumerateFiles(
-                    configBackupFolder,
-                    configNameSplit[0] + "*")
-                    .Select(c => new FileInfo(c))
-                    .OrderByDescending(c => c.LastWriteTime).ToList();
-                if (existingConfigs.Skip(10).Any())
+            var configNameSplit = config.ConfigurationName.Split(".");
+            var existingConfigs = Directory.EnumerateFiles(
+                configBackupFolder,
+                configNameSplit[0] + "*")
+                .Select(c => new FileInfo(c))
+                .OrderByDescending(c => c.LastWriteTime).ToList();
+            if (existingConfigs.Skip(10).Any())
+            {
+                foreach (var oldBak in existingConfigs.Skip(10).ToList())
                {
-                    foreach (var oldBak in existingConfigs.Skip(10).ToList())
-                    {
-                        oldBak.Delete();
-                    }
+                    oldBak.Delete();
                }
+            }

-                string backupPath = Path.Combine(configBackupFolder, configNameSplit[0] + "." + DateTime.Now.ToString("yyyyMMddHHmmss") + "." + configNameSplit[1]);
-                _logger.LogTrace("Backing up current config to {backupPath}", backupPath);
-                File.Copy(config.ConfigurationPath, backupPath, overwrite: true);
-                FileInfo fi = new(backupPath);
-                fi.LastWriteTimeUtc = DateTime.UtcNow;
-            }
-            catch (Exception ex)
-            {
-                // ignore if file cannot be backupped
-                _logger.LogWarning(ex, "Could not create backup for {config}", config.ConfigurationPath);
-            }
+            string backupPath = Path.Combine(configBackupFolder, configNameSplit[0] + "." + DateTime.Now.ToString("yyyyMMddHHmmss") + "." + configNameSplit[1]);
+            _logger.LogTrace("Backing up current config to {backupPath}", backupPath);
+            File.Copy(config.ConfigurationPath, backupPath, overwrite: true);
+            FileInfo fi = new(backupPath);
+            fi.LastWriteTimeUtc = DateTime.UtcNow;
+        }
+        catch (Exception ex)
+        {
+            // ignore if file cannot be backupped
+            _logger.LogWarning(ex, "Could not create backup for {config}", config.ConfigurationPath);
        }

        var temp = config.ConfigurationPath + ".tmp";
@@ -114,7 +110,7 @@ public class ConfigurationSaveService : IHostedService
        {
            await File.WriteAllTextAsync(temp, JsonSerializer.Serialize(config.Current, typeof(T), new JsonSerializerOptions()
            {
-                WriteIndented = !isTempCollections
+                WriteIndented = true
            })).ConfigureAwait(false);
            File.Move(temp, config.ConfigurationPath, true);
            config.UpdateLastWriteTime();
--- a/LightlessSync/LightlessConfiguration/Configurations/ChatConfig.cs
+++ b/LightlessSync/LightlessConfiguration/Configurations/ChatConfig.cs
@@ -12,9 +12,6 @@ public sealed class ChatConfig : ILightlessConfiguration
    public bool ShowMessageTimestamps { get; set; } = true;
    public bool ShowNotesInSyncshellChat { get; set; } = true;
    public bool EnableAnimatedEmotes { get; set; } = true;
-    public float EmoteScale { get; set; } = 1.5f;
-    public bool EnableMentionNotifications { get; set; } = true;
-    public bool AutoOpenChatOnNewMessage { get; set; } = false;
    public float ChatWindowOpacity { get; set; } = .97f;
    public bool FadeWhenUnfocused { get; set; } = false;
    public float UnfocusedWindowOpacity { get; set; } = 0.6f;
@@ -26,9 +23,6 @@ public sealed class ChatConfig : ILightlessConfiguration
    public bool ShowWhenUiHidden { get; set; } = true;
    public bool ShowInCutscenes { get; set; } = true;
    public bool ShowInGpose { get; set; } = true;
-    public bool PersistSyncshellHistory { get; set; } = false;
    public List<string> ChannelOrder { get; set; } = new();
-    public Dictionary<string, bool> HiddenChannels { get; set; } = new(StringComparer.Ordinal);
-    public Dictionary<string, string> SyncshellChannelHistory { get; set; } = new(StringComparer.Ordinal);
    public Dictionary<string, bool> PreferNotesForChannels { get; set; } = new(StringComparer.Ordinal);
 }
--- a/LightlessSync/LightlessConfiguration/Configurations/LightlessConfig.cs
+++ b/LightlessSync/LightlessConfiguration/Configurations/LightlessConfig.cs
@@ -4,7 +4,6 @@ using LightlessSync.LightlessConfiguration.Models;
 using LightlessSync.UI;
 using LightlessSync.UI.Models;
 using Microsoft.Extensions.Logging;
-using LightlessSync.PlayerData.Factories;

 namespace LightlessSync.LightlessConfiguration.Configurations;

@@ -32,8 +31,6 @@ public class LightlessConfig : ILightlessConfiguration
    public DtrEntry.Colors DtrColorsLightfinderUnavailable { get; set; } = new(Foreground: 0x000000u, Glow: 0x000000u);
    public LightfinderDtrDisplayMode LightfinderDtrDisplayMode { get; set; } = LightfinderDtrDisplayMode.PendingPairRequests;
    public bool UseLightlessRedesign { get; set; } = true;
-    public bool ShowUiWhenUiHidden { get; set; } = true;
-    public bool ShowUiInGpose { get; set; } = true;
    public bool EnableRightClickMenus { get; set; } = true;
    public NotificationLocation ErrorNotification { get; set; } = NotificationLocation.Both;
    public string ExportFolder { get; set; } = string.Empty;
@@ -159,8 +156,5 @@ public class LightlessConfig : ILightlessConfiguration
    public bool SyncshellFinderEnabled { get; set; } = false;
    public string? SelectedFinderSyncshell { get; set; } = null;
    public string LastSeenVersion { get; set; } = string.Empty;
-    public bool EnableParticleEffects { get; set; } = true;
-    public AnimationValidationMode AnimationValidationMode { get; set; } = AnimationValidationMode.Unsafe;
-    public bool AnimationAllowOneBasedShift { get; set; } = false;
-    public bool AnimationAllowNeighborIndexTolerance { get; set; } = false;
+    public HashSet<Guid> OrphanableTempCollections { get; set; } = [];
 }
--- a/LightlessSync/LightlessConfiguration/Configurations/ModelDecimationSettings.cs
+++ b/LightlessSync/LightlessConfiguration/Configurations/ModelDecimationSettings.cs
@@ -1,156 +0,0 @@
-namespace LightlessSync.LightlessConfiguration.Configurations;
-
-public static class ModelDecimationDefaults
-{
-    public const bool EnableAutoDecimation = false;
-    public const int TriangleThreshold = 15_000;
-    public const double TargetRatio = 0.8;
-    public const bool NormalizeTangents = true;
-    public const bool AvoidBodyIntersection = true;
-
-    /// <summary>Default triangle threshold for batch decimation (0 = no threshold).</summary>
-    public const int BatchTriangleThreshold = 0;
-
-    /// <summary>Default target triangle ratio for batch decimation.</summary>
-    public const double BatchTargetRatio = 0.8;
-
-    /// <summary>Default tangent normalization toggle for batch decimation.</summary>
-    public const bool BatchNormalizeTangents = true;
-
-    /// <summary>Default body collision guard toggle for batch decimation.</summary>
-    public const bool BatchAvoidBodyIntersection = true;
-
-    /// <summary>Default display for the batch decimation warning overlay.</summary>
-    public const bool ShowBatchDecimationWarning = true;
-
-    public const bool KeepOriginalModelFiles = true;
-    public const bool SkipPreferredPairs = true;
-    public const bool AllowBody = false;
-    public const bool AllowFaceHead = false;
-    public const bool AllowTail = false;
-    public const bool AllowClothing = true;
-    public const bool AllowAccessories = true;
-}
-
-public sealed class ModelDecimationAdvancedSettings
-{
-    /// <summary>Minimum triangles per connected component before skipping decimation.</summary>
-    public const int DefaultMinComponentTriangles = 6;
-
-    /// <summary>Average-edge multiplier used to cap collapses.</summary>
-    public const float DefaultMaxCollapseEdgeLengthFactor = 1.25f;
-
-    /// <summary>Maximum normal deviation (degrees) allowed for a collapse.</summary>
-    public const float DefaultNormalSimilarityThresholdDegrees = 60f;
-
-    /// <summary>Minimum bone-weight overlap required to allow a collapse.</summary>
-    public const float DefaultBoneWeightSimilarityThreshold = 0.85f;
-
-    /// <summary>UV similarity threshold to protect seams.</summary>
-    public const float DefaultUvSimilarityThreshold = 0.02f;
-
-    /// <summary>UV seam cosine threshold for blocking seam collapses.</summary>
-    public const float DefaultUvSeamAngleCos = 0.99f;
-
-    /// <summary>Whether to block UV seam vertices from collapsing.</summary>
-    public const bool DefaultBlockUvSeamVertices = true;
-
-    /// <summary>Whether to allow collapses on boundary edges.</summary>
-    public const bool DefaultAllowBoundaryCollapses = false;
-
-    /// <summary>Body collision distance factor for the primary pass.</summary>
-    public const float DefaultBodyCollisionDistanceFactor = 0.75f;
-
-    /// <summary>Body collision distance factor for the relaxed fallback pass.</summary>
-    public const float DefaultBodyCollisionNoOpDistanceFactor = 0.25f;
-
-    /// <summary>Relax multiplier applied when the mesh is close to the body.</summary>
-    public const float DefaultBodyCollisionAdaptiveRelaxFactor = 1.0f;
-
-    /// <summary>Ratio of near-body vertices required to trigger relaxation.</summary>
-    public const float DefaultBodyCollisionAdaptiveNearRatio = 0.4f;
-
-    /// <summary>UV threshold for relaxed body-collision mode.</summary>
-    public const float DefaultBodyCollisionAdaptiveUvThreshold = 0.08f;
-
-    /// <summary>UV seam cosine threshold for relaxed body-collision mode.</summary>
-    public const float DefaultBodyCollisionNoOpUvSeamAngleCos = 0.98f;
-
-    /// <summary>Expansion factor for protected vertices near the body.</summary>
-    public const float DefaultBodyCollisionProtectionFactor = 1.5f;
-
-    /// <summary>Minimum ratio used when decimating the body proxy.</summary>
-    public const float DefaultBodyProxyTargetRatioMin = 0.85f;
-
-    /// <summary>Inflation applied to body collision distances.</summary>
-    public const float DefaultBodyCollisionProxyInflate = 0.0005f;
-
-    /// <summary>Body collision penetration factor used during collapse checks.</summary>
-    public const float DefaultBodyCollisionPenetrationFactor = 0.75f;
-
-    /// <summary>Minimum body collision distance threshold.</summary>
-    public const float DefaultMinBodyCollisionDistance = 0.0001f;
-
-    /// <summary>Minimum cell size for body collision spatial hashing.</summary>
-    public const float DefaultMinBodyCollisionCellSize = 0.0001f;
-
-    /// <summary>Minimum triangles per connected component before skipping decimation.</summary>
-    public int MinComponentTriangles { get; set; } = DefaultMinComponentTriangles;
-
-    /// <summary>Average-edge multiplier used to cap collapses.</summary>
-    public float MaxCollapseEdgeLengthFactor { get; set; } = DefaultMaxCollapseEdgeLengthFactor;
-
-    /// <summary>Maximum normal deviation (degrees) allowed for a collapse.</summary>
-    public float NormalSimilarityThresholdDegrees { get; set; } = DefaultNormalSimilarityThresholdDegrees;
-
-    /// <summary>Minimum bone-weight overlap required to allow a collapse.</summary>
-    public float BoneWeightSimilarityThreshold { get; set; } = DefaultBoneWeightSimilarityThreshold;
-
-    /// <summary>UV similarity threshold to protect seams.</summary>
-    public float UvSimilarityThreshold { get; set; } = DefaultUvSimilarityThreshold;
-
-    /// <summary>UV seam cosine threshold for blocking seam collapses.</summary>
-    public float UvSeamAngleCos { get; set; } = DefaultUvSeamAngleCos;
-
-    /// <summary>Whether to block UV seam vertices from collapsing.</summary>
-    public bool BlockUvSeamVertices { get; set; } = DefaultBlockUvSeamVertices;
-
-    /// <summary>Whether to allow collapses on boundary edges.</summary>
-    public bool AllowBoundaryCollapses { get; set; } = DefaultAllowBoundaryCollapses;
-
-    /// <summary>Body collision distance factor for the primary pass.</summary>
-    public float BodyCollisionDistanceFactor { get; set; } = DefaultBodyCollisionDistanceFactor;
-
-    /// <summary>Body collision distance factor for the relaxed fallback pass.</summary>
-    public float BodyCollisionNoOpDistanceFactor { get; set; } = DefaultBodyCollisionNoOpDistanceFactor;
-
-    /// <summary>Relax multiplier applied when the mesh is close to the body.</summary>
-    public float BodyCollisionAdaptiveRelaxFactor { get; set; } = DefaultBodyCollisionAdaptiveRelaxFactor;
-
-    /// <summary>Ratio of near-body vertices required to trigger relaxation.</summary>
-    public float BodyCollisionAdaptiveNearRatio { get; set; } = DefaultBodyCollisionAdaptiveNearRatio;
-
-    /// <summary>UV threshold for relaxed body-collision mode.</summary>
-    public float BodyCollisionAdaptiveUvThreshold { get; set; } = DefaultBodyCollisionAdaptiveUvThreshold;
-
-    /// <summary>UV seam cosine threshold for relaxed body-collision mode.</summary>
-    public float BodyCollisionNoOpUvSeamAngleCos { get; set; } = DefaultBodyCollisionNoOpUvSeamAngleCos;
-
-    /// <summary>Expansion factor for protected vertices near the body.</summary>
-    public float BodyCollisionProtectionFactor { get; set; } = DefaultBodyCollisionProtectionFactor;
-
-    /// <summary>Minimum ratio used when decimating the body proxy.</summary>
-    public float BodyProxyTargetRatioMin { get; set; } = DefaultBodyProxyTargetRatioMin;
-
-    /// <summary>Inflation applied to body collision distances.</summary>
-    public float BodyCollisionProxyInflate { get; set; } = DefaultBodyCollisionProxyInflate;
-
-    /// <summary>Body collision penetration factor used during collapse checks.</summary>
-    public float BodyCollisionPenetrationFactor { get; set; } = DefaultBodyCollisionPenetrationFactor;
-
-    /// <summary>Minimum body collision distance threshold.</summary>
-    public float MinBodyCollisionDistance { get; set; } = DefaultMinBodyCollisionDistance;
-
-    /// <summary>Minimum cell size for body collision spatial hashing.</summary>
-    public float MinBodyCollisionCellSize { get; set; } = DefaultMinBodyCollisionCellSize;
-}
--- a/LightlessSync/LightlessConfiguration/Configurations/PlayerPerformanceConfig.cs
+++ b/LightlessSync/LightlessConfiguration/Configurations/PlayerPerformanceConfig.cs
@@ -21,26 +21,16 @@ public class PlayerPerformanceConfig : ILightlessConfiguration
    public bool EnableIndexTextureDownscale { get; set; } = false;
    public int TextureDownscaleMaxDimension { get; set; } = 2048;
    public bool OnlyDownscaleUncompressedTextures { get; set; } = true;
-    public bool EnableUncompressedTextureCompression { get; set; } = false;
-    public bool SkipUncompressedTextureCompressionMipMaps { get; set; } = false;
    public bool KeepOriginalTextureFiles { get; set; } = false;
    public bool SkipTextureDownscaleForPreferredPairs { get; set; } = true;
-    public bool EnableModelDecimation { get; set; } = ModelDecimationDefaults.EnableAutoDecimation;
-    public int ModelDecimationTriangleThreshold { get; set; } = ModelDecimationDefaults.TriangleThreshold;
-    public double ModelDecimationTargetRatio { get; set; } = ModelDecimationDefaults.TargetRatio;
-    public bool ModelDecimationNormalizeTangents { get; set; } = ModelDecimationDefaults.NormalizeTangents;
-    public bool ModelDecimationAvoidBodyIntersection { get; set; } = ModelDecimationDefaults.AvoidBodyIntersection;
-    public ModelDecimationAdvancedSettings ModelDecimationAdvanced { get; set; } = new();
-    public int BatchModelDecimationTriangleThreshold { get; set; } = ModelDecimationDefaults.BatchTriangleThreshold;
-    public double BatchModelDecimationTargetRatio { get; set; } = ModelDecimationDefaults.BatchTargetRatio;
-    public bool BatchModelDecimationNormalizeTangents { get; set; } = ModelDecimationDefaults.BatchNormalizeTangents;
-    public bool BatchModelDecimationAvoidBodyIntersection { get; set; } = ModelDecimationDefaults.BatchAvoidBodyIntersection;
-    public bool ShowBatchModelDecimationWarning { get; set; } = ModelDecimationDefaults.ShowBatchDecimationWarning;
-    public bool KeepOriginalModelFiles { get; set; } = ModelDecimationDefaults.KeepOriginalModelFiles;
-    public bool SkipModelDecimationForPreferredPairs { get; set; } = ModelDecimationDefaults.SkipPreferredPairs;
-    public bool ModelDecimationAllowBody { get; set; } = ModelDecimationDefaults.AllowBody;
-    public bool ModelDecimationAllowFaceHead { get; set; } = ModelDecimationDefaults.AllowFaceHead;
-    public bool ModelDecimationAllowTail { get; set; } = ModelDecimationDefaults.AllowTail;
-    public bool ModelDecimationAllowClothing { get; set; } = ModelDecimationDefaults.AllowClothing;
-    public bool ModelDecimationAllowAccessories { get; set; } = ModelDecimationDefaults.AllowAccessories;
+    public bool EnableModelDecimation { get; set; } = false;
+    public int ModelDecimationTriangleThreshold { get; set; } = 20_000;
+    public double ModelDecimationTargetRatio { get; set; } = 0.8;
+    public bool KeepOriginalModelFiles { get; set; } = true;
+    public bool SkipModelDecimationForPreferredPairs { get; set; } = true;
+    public bool ModelDecimationAllowBody { get; set; } = false;
+    public bool ModelDecimationAllowFaceHead { get; set; } = false;
+    public bool ModelDecimationAllowTail { get; set; } = false;
+    public bool ModelDecimationAllowClothing { get; set; } = true;
+    public bool ModelDecimationAllowAccessories { get; set; } = true;
 }
--- a/LightlessSync/LightlessConfiguration/Configurations/TempCollectionConfig.cs
+++ b/LightlessSync/LightlessConfiguration/Configurations/TempCollectionConfig.cs
@@ -1,10 +0,0 @@
-using LightlessSync.LightlessConfiguration.Models;
-
-namespace LightlessSync.LightlessConfiguration.Configurations;
-
-[Serializable]
-public sealed class TempCollectionConfig : ILightlessConfiguration
-{
-    public int Version { get; set; } = 1;
-    public List<OrphanableTempCollectionEntry> OrphanableTempCollectionEntries { get; set; } = [];
-}
--- a/LightlessSync/LightlessConfiguration/Models/OrphanableTempCollectionEntry.cs
+++ b/LightlessSync/LightlessConfiguration/Models/OrphanableTempCollectionEntry.cs
@@ -1,7 +0,0 @@
-namespace LightlessSync.LightlessConfiguration.Models;
-
-public sealed class OrphanableTempCollectionEntry
-{
-    public Guid Id { get; set; }
-    public DateTime RegisteredAtUtc { get; set; } = DateTime.MinValue;
-}
--- a/LightlessSync/LightlessConfiguration/TempCollectionConfigService.cs
+++ b/LightlessSync/LightlessConfiguration/TempCollectionConfigService.cs
@@ -1,12 +0,0 @@
-using LightlessSync.LightlessConfiguration.Configurations;
-
-namespace LightlessSync.LightlessConfiguration;
-
-public sealed class TempCollectionConfigService : ConfigurationServiceBase<TempCollectionConfig>
-{
-    public const string ConfigName = "tempcollections.json";
-
-    public TempCollectionConfigService(string configDir) : base(configDir) { }
-
-    public override string ConfigurationName => ConfigName;
-}
--- a/LightlessSync/LightlessSync.csproj
+++ b/LightlessSync/LightlessSync.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <Authors></Authors>
    <Company></Company>
-    <Version>2.0.2.83</Version>
+    <Version>2.0.3</Version>
    <Description></Description>
    <Copyright></Copyright>
    <PackageProjectUrl>https://github.com/Light-Public-Syncshells/LightlessClient</PackageProjectUrl>
@@ -24,15 +24,6 @@
    <Compile Remove="PlayerData\Export\**" />
    <EmbeddedResource Remove="PlayerData\Export\**" />
    <None Remove="PlayerData\Export\**" />
-    <EmbeddedResource Update="Resources\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <Compile Update="Resources\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
  </ItemGroup>

  <ItemGroup>
@@ -77,6 +68,8 @@
    </None>
    <EmbeddedResource Include="Changelog\changelog.yaml" />
    <EmbeddedResource Include="Changelog\credits.yaml" />
+    <EmbeddedResource Include="Localization\de.json" />
+    <EmbeddedResource Include="Localization\fr.json" />
  </ItemGroup>

  <ItemGroup>
@@ -85,8 +78,6 @@

  <ItemGroup>
    <ProjectReference Include="..\LightlessAPI\LightlessSyncAPI\LightlessSync.API.csproj" />
-    <ProjectReference Include="..\LightlessCompactor\LightlessCompactor.csproj" />
-    <ProjectReference Include="..\LightlessCompactorWorker\LightlessCompactorWorker.csproj" ReferenceOutputAssembly="false" />
    <ProjectReference Include="..\Penumbra.Api\Penumbra.Api.csproj" />
    <ProjectReference Include="..\Penumbra.GameData\Penumbra.GameData.csproj" />
    <ProjectReference Include="..\Penumbra.String\Penumbra.String.csproj" />
@@ -110,13 +101,5 @@
  <ItemGroup>
    <PackageReference Update="DalamudPackager" Version="14.0.1" />
  </ItemGroup>
-
-  <ItemGroup>
-    <CompactorWorkerFiles Include="..\LightlessCompactorWorker\bin\$(Configuration)\net10.0\*.*" />
-  </ItemGroup>
-
-  <Target Name="CopyCompactorWorker" AfterTargets="Build">
-    <Copy SourceFiles="@(CompactorWorkerFiles)" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true" />
-  </Target>
 	
 </Project>
--- a/LightlessSync/LightlessSync.csproj.DotSettings
+++ b/LightlessSync/LightlessSync.csproj.DotSettings
@@ -1,3 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeEditing/Localization/Localizable/@EntryValue">Yes</s:String>
-	<s:String x:Key="/Default/CodeEditing/Localization/LocalizableInspector/@EntryValue">Pessimistic</s:String></wpf:ResourceDictionary>
--- a/LightlessSync/Localization/Strings.cs
+++ b/LightlessSync/Localization/Strings.cs
@@ -0,0 +1,44 @@
+using CheapLoc;
+
+namespace LightlessSync.Localization;
+
+public static class Strings
+{
+    public static ToSStrings ToS { get; set; } = new();
+
+    public class ToSStrings
+    {
+        public readonly string AgreeLabel = Loc.Localize("AgreeLabel", "I agree");
+        public readonly string AgreementLabel = Loc.Localize("AgreementLabel", "Agreement of Usage of Service");
+        public readonly string ButtonWillBeAvailableIn = Loc.Localize("ButtonWillBeAvailableIn", "'I agree' button will be available in");
+        public readonly string LanguageLabel = Loc.Localize("LanguageLabel", "Language");
+
+        public readonly string Paragraph1 = Loc.Localize("Paragraph1",
+            "All of the mod files currently active on your character as well as your current character state will be uploaded to the service you registered yourself at automatically. " +
+            "The plugin will exclusively upload the necessary mod files and not the whole mod.");
+
+        public readonly string Paragraph2 = Loc.Localize("Paragraph2",
+            "If you are on a data capped internet connection, higher fees due to data usage depending on the amount of downloaded and uploaded mod files might occur. " +
+            "Mod files will be compressed on up- and download to save on bandwidth usage. Due to varying up- and download speeds, changes in characters might not be visible immediately. " +
+            "Files present on the service that already represent your active mod files will not be uploaded again.");
+
+        public readonly string Paragraph3 = Loc.Localize("Paragraph3",
+            "The mod files you are uploading are confidential and will not be distributed to parties other than the ones who are requesting the exact same mod files. " +
+            "Please think about who you are going to pair since it is unavoidable that they will receive and locally cache the necessary mod files that you have currently in use. " +
+            "Locally cached mod files will have arbitrary file names to discourage attempts at replicating the original mod.");
+
+        public readonly string Paragraph4 = Loc.Localize("Paragraph4",
+            "The plugin creator tried their best to keep you secure. However, there is no guarantee for 100% security. Do not blindly pair your client with everyone.");
+
+        public readonly string Paragraph5 = Loc.Localize("Paragraph5",
+            "Mod files that are saved on the service will remain on the service as long as there are requests for the files from clients. " +
+            "After a period of not being used, the mod files will be automatically deleted. " +
+            "You will also be able to wipe all the files you have personally uploaded on request. " +
+            "The service holds no information about which mod files belong to which mod.");
+
+        public readonly string Paragraph6 = Loc.Localize("Paragraph6",
+            "This service is provided as-is. In case of abuse join the Lightless Sync Discord.");
+
+        public readonly string ReadLabel = Loc.Localize("ReadLabel", "READ THIS CAREFULLY");
+    }
+}
--- a/LightlessSync/Localization/de.json
+++ b/LightlessSync/Localization/de.json
@@ -0,0 +1,46 @@
+{
+  "LanguageLabel": {
+    "message": "Language",
+    "description": "ToSStrings..ctor"
+  },
+  "AgreementLabel": {
+    "message": "Nutzungsbedingungen",
+    "description": "ToSStrings..ctor"
+  },
+  "ReadLabel": {
+    "message": "BITTE LIES DIES SORGFÄLTIG",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph1": {
+    "message": "Alle Moddateien, die aktuell auf deinem Charakter aktiv sind und dein Charakterzustand werden automatisch zu dem Service, an dem du dich registriert hast, hochgeladen. Das Plugin wird ausschließlich die nötigen Moddateien hochladen und nicht die gesamte Modifikation.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph2": {
+    "message": "Falls du mit einer getakteten Internetverbindung verbunden bist, können durch den Datentransfer von Hoch- und Runtergeladenen Moddateien höhere Kosten entstehen. Moddateien werden beim Hoch- und Runterladen komprimiert um Bandbreite zu sparen. Durch unterschiedliche Hoch- und Runterladgeschwindigkeiten ist es möglich, dass Änderungen an Charakteren nicht sofort sichtbar sind. Dateien die bereits auf dem Service existieren, werden nicht nochmals hochgeladen.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph3": {
+    "message": "Die Moddateien die du hochlädst sind vertraulich und werden nicht mit anderen Nutzern geteilt, die nicht die exakt selben Dateien anfordern. Bitte überlege dir sorgfältig mit wem du deinen Identifikationscode teilst, da es unvermeidlich ist, dass die andere Person deine Moddateien erhält und lokal zwischenspeichert. Lokal zwischengespeicherte Dateien haben willkürrliche Namen um vor Versuchen abzuschrecken die originalen Moddateien aus diesen wiederherzustellen.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph4": {
+    "message": "Der Ersteller des Plugins hat sein Bestes getan, um deine Sicherheit zu gewährleisten. Es gibt jedoch keine Garantie für 100%ige Sicherheit. Teile deinen Identifikationscode nicht blind mit jedem.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph5": {
+    "message": "Moddateien, die auf dem Service gespeichert sind, verbleiben auf dem Service, solange es Anforderungen für diese Dateien gibt. Nach einer Zeitspanne in der die Dateien nicht verwendet wurden, werden diese automatisch gelöscht. Du hast auch die Möglichkeit manuell alle Dateien auf dem Service zu löschen. Der Service hat keine Informationen welche Moddateien zu welcher Modifikation gehören.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph6": {
+    "message": "Dieser Dienst wird ohne Gewähr angeboten. Im Falle eines Missbrauchs tretet dem Lightless Sync Discord bei.",
+    "description": "ToSStrings..ctor"
+  },
+  "AgreeLabel": {
+    "message": "Ich Stimme zu",
+    "description": "ToSStrings..ctor"
+  },
+  "ButtonWillBeAvailableIn": {
+    "message": "\"Ich stimme zu\" Knopf verfügbar in",
+    "description": "ToSStrings..ctor"
+  }
+}
--- a/LightlessSync/Localization/fr.json
+++ b/LightlessSync/Localization/fr.json
@@ -0,0 +1,46 @@
+{
+  "LanguageLabel": {
+    "message": "Language",
+    "description": "ToSStrings..ctor"
+  },
+  "AgreementLabel": {
+    "message": "Conditions d'Utilisation",
+    "description": "ToSStrings..ctor"
+  },
+  "ReadLabel": {
+    "message": "LISEZ CES INFORMATIONS ATTENTIVEMENT",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph1": {
+    "message": "Tous les fichiers moddés actuellement en cours d'utilisation ainsi que le statut actuel de votre personnage vont être mix en ligne via le service sur lequel vous vous êtes automatiquement enregistré. Seuls les fichiers nécessaires seront téléversés par le plugin et non pas le mod en entier.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph2": {
+    "message": "Si le débit de votre connexion internet est limité, le téléchargement et téléversement d'un grand nombre de fichiers peut entraîner des coûts supplémentaires. Les fichiers seront compressés au chargement et versement pour réduire l'impact sur votre bande passants. Selon la rapidité de vos téléchargements et téléversements, les changements ne seront peut-être pas visibles instantanément sur les personnages. Les fichiers déja présents sur le service qui correspondent à ceux de vos mods en cours d'utilisation ne seront pas remis en ligne.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph3": {
+    "message": "Les fichiers que vous allez partager sont confidentiels et ne seront envoyés qu'aux utilisateurs qui feront une requête exacte de ceux-çi. Nous vous demandons de (re)considérer qui sera synchronisé avec vous, puisqu'ils recevront et stockeront inévitablement en local les fichiers nécéssaires utilisés à cet instant. Les noms des fichiers stockés localement sont changés de manière arbitraire afin de décourager toute tentative de réplication des originaux.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph4": {
+    "message": "Le créateur de ce plugin a tenté de sécuriser l'application du mieux possible. Cependant, il ne peut pas garantir une protection 100% infaillible. Pour votre sécurité, ne vous synchronisez pas aveuglément et avec n'importe qui.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph5": {
+    "message": "Les fichiers sauvegardés sur le service resteront en ligne tant que des utilisateurs en feront usage. Ils seront effacés automatiquement après une certaine période d'inactivité. Vous pouvez également demander l'effacement de tous les fichiers que vous avez mis en ligne vous-même. Le service en soi ne contient aucune information pouvant identifier quel fichier appartient à quel mod.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph6": {
+    "message": "Ce service et ses composants vous sont fournis en l'état. En cas d'abus rejoindre le serveur Discord Lightless Sync.",
+    "description": "ToSStrings..ctor"
+  },
+  "AgreeLabel": {
+    "message": "J'accept",
+    "description": "ToSStrings..ctor"
+  },
+  "ButtonWillBeAvailableIn": {
+    "message": "Bouton \"J'accept\" disposible dans",
+    "description": "ToSStrings..ctor"
+  }
+}
--- a/LightlessSync/PlayerData/Factories/AnimationValidationMode.cs
+++ b/LightlessSync/PlayerData/Factories/AnimationValidationMode.cs
@@ -1,9 +0,0 @@
-namespace LightlessSync.PlayerData.Factories
-{
-    public enum AnimationValidationMode
-    {
-        Unsafe = 0,
-        Safe = 1,
-        Safest = 2,
-    }
-}
--- a/LightlessSync/PlayerData/Factories/FileDownloadManagerFactory.cs
+++ b/LightlessSync/PlayerData/Factories/FileDownloadManagerFactory.cs
@@ -19,7 +19,6 @@ public class FileDownloadManagerFactory
    private readonly TextureDownscaleService _textureDownscaleService;
    private readonly ModelDecimationService _modelDecimationService;
    private readonly TextureMetadataHelper _textureMetadataHelper;
-    private readonly FileDownloadDeduplicator _downloadDeduplicator;

    public FileDownloadManagerFactory(
        ILoggerFactory loggerFactory,
@@ -30,8 +29,7 @@ public class FileDownloadManagerFactory
        LightlessConfigService configService,
        TextureDownscaleService textureDownscaleService,
        ModelDecimationService modelDecimationService,
-        TextureMetadataHelper textureMetadataHelper,
-        FileDownloadDeduplicator downloadDeduplicator)
+        TextureMetadataHelper textureMetadataHelper)
    {
        _loggerFactory = loggerFactory;
        _lightlessMediator = lightlessMediator;
@@ -42,7 +40,6 @@ public class FileDownloadManagerFactory
        _textureDownscaleService = textureDownscaleService;
        _modelDecimationService = modelDecimationService;
        _textureMetadataHelper = textureMetadataHelper;
-        _downloadDeduplicator = downloadDeduplicator;
    }

    public FileDownloadManager Create()
@@ -56,7 +53,6 @@ public class FileDownloadManagerFactory
            _configService,
            _textureDownscaleService,
            _modelDecimationService,
-            _textureMetadataHelper,
-            _downloadDeduplicator);
+            _textureMetadataHelper);
    }
 }
--- a/LightlessSync/PlayerData/Factories/PlayerDataFactory.cs
+++ b/LightlessSync/PlayerData/Factories/PlayerDataFactory.cs
@@ -1,19 +1,13 @@
-using Dalamud.Utility;
-using FFXIVClientStructs.FFXIV.Client.Game.Object;
+using FFXIVClientStructs.FFXIV.Client.Game.Character;
+using LightlessSync.API.Data.Enum;
 using LightlessSync.FileCache;
 using LightlessSync.Interop.Ipc;
-using LightlessSync.LightlessConfiguration;
 using LightlessSync.LightlessConfiguration.Models;
 using LightlessSync.PlayerData.Data;
 using LightlessSync.PlayerData.Handlers;
 using LightlessSync.Services;
 using LightlessSync.Services.Mediator;
-using LightlessSync.Utils;
 using Microsoft.Extensions.Logging;
-using System.Collections.Concurrent;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using ObjectKind = LightlessSync.API.Data.Enum.ObjectKind;

 namespace LightlessSync.PlayerData.Factories;

@@ -24,34 +18,13 @@ public class PlayerDataFactory
    private readonly IpcManager _ipcManager;
    private readonly ILogger<PlayerDataFactory> _logger;
    private readonly PerformanceCollectorService _performanceCollector;
-    private readonly LightlessConfigService _configService;
    private readonly XivDataAnalyzer _modelAnalyzer;
    private readonly LightlessMediator _lightlessMediator;
    private readonly TransientResourceManager _transientResourceManager;
-    private static readonly SemaphoreSlim _papParseLimiter = new(1, 1);

-    // Transient resolved entries threshold
-    private const int _maxTransientResolvedEntries = 1000;
-
-    // Character build caches
-    private readonly TaskRegistry<nint> _characterBuildInflight = new();
-    private readonly ConcurrentDictionary<nint, CacheEntry> _characterBuildCache = new();
-
-    // Time out thresholds
-    private static readonly TimeSpan _characterCacheTtl = TimeSpan.FromMilliseconds(750);
-    private static readonly TimeSpan _softReturnIfBusyAfter = TimeSpan.FromMilliseconds(250);
-    private static readonly TimeSpan _hardBuildTimeout = TimeSpan.FromSeconds(30);
-
-    public PlayerDataFactory(
-        ILogger<PlayerDataFactory> logger,
-        DalamudUtilService dalamudUtil,
-        IpcManager ipcManager,
-        TransientResourceManager transientResourceManager,
-        FileCacheManager fileReplacementFactory,
-        PerformanceCollectorService performanceCollector,
-        XivDataAnalyzer modelAnalyzer,
-        LightlessMediator lightlessMediator,
-        LightlessConfigService configService)
+    public PlayerDataFactory(ILogger<PlayerDataFactory> logger, DalamudUtilService dalamudUtil, IpcManager ipcManager,
+        TransientResourceManager transientResourceManager, FileCacheManager fileReplacementFactory,
+        PerformanceCollectorService performanceCollector, XivDataAnalyzer modelAnalyzer, LightlessMediator lightlessMediator)
    {
        _logger = logger;
        _dalamudUtil = dalamudUtil;
@@ -61,15 +34,15 @@ public class PlayerDataFactory
        _performanceCollector = performanceCollector;
        _modelAnalyzer = modelAnalyzer;
        _lightlessMediator = lightlessMediator;
-        _configService = configService;
        _logger.LogTrace("Creating {this}", nameof(PlayerDataFactory));
    }
-    private sealed record CacheEntry(CharacterDataFragment Fragment, DateTime CreatedUtc);

    public async Task<CharacterDataFragment?> BuildCharacterData(GameObjectHandler playerRelatedObject, CancellationToken token)
    {
        if (!_ipcManager.Initialized)
+        {
            throw new InvalidOperationException("Penumbra or Glamourer is not connected");
+        }

        if (playerRelatedObject == null) return null;

@@ -94,17 +67,16 @@ public class PlayerDataFactory

        if (pointerIsZero)
        {
-            _logger.LogTrace("Pointer was zero for {objectKind}; couldn't build character", playerRelatedObject.ObjectKind);
+            _logger.LogTrace("Pointer was zero for {objectKind}", playerRelatedObject.ObjectKind);
            return null;
        }

        try
        {
-            return await _performanceCollector.LogPerformance(
-                this,
-                $"CreateCharacterData>{playerRelatedObject.ObjectKind}",
-                async () => await CreateCharacterData(playerRelatedObject, token).ConfigureAwait(false)
-            ).ConfigureAwait(false);
+            return await _performanceCollector.LogPerformance(this, $"CreateCharacterData>{playerRelatedObject.ObjectKind}", async () =>
+            {
+                return await CreateCharacterData(playerRelatedObject, token).ConfigureAwait(false);
+            }).ConfigureAwait(true);
        }
        catch (OperationCanceledException)
        {
@@ -119,207 +91,118 @@ public class PlayerDataFactory
        return null;
    }

-    private static readonly int _drawObjectOffset =
-        (int)Marshal.OffsetOf<GameObject>(nameof(GameObject.DrawObject));
-
    private async Task<bool> CheckForNullDrawObject(IntPtr playerPointer)
-        => await _dalamudUtil.RunOnFrameworkThread(() =>
-        {
-            nint basePtr = playerPointer;
-
-            if (!PtrGuard.LooksLikePtr(basePtr))
-                return true;
-
-            nint drawObjAddr = basePtr + _drawObjectOffset;
-
-            if (!PtrGuard.IsReadable(drawObjAddr, (nuint)IntPtr.Size))
-                return true;
-
-            if (!PtrGuard.TryReadIntPtr(drawObjAddr, out var drawObj))
-                return true;
-
-            if (drawObj != 0 && !PtrGuard.LooksLikePtr(drawObj))
-                return true;
-
-            return drawObj == 0;
-        }).ConfigureAwait(false);
-
-    private static bool IsCacheFresh(CacheEntry entry)
-        => (DateTime.UtcNow - entry.CreatedUtc) <= _characterCacheTtl;
-
-    private Task<CharacterDataFragment> CreateCharacterData(GameObjectHandler playerRelatedObject, CancellationToken ct)
-        => CreateCharacterDataCoalesced(playerRelatedObject, ct);
-
-    private async Task<CharacterDataFragment> CreateCharacterDataCoalesced(GameObjectHandler obj, CancellationToken ct)
    {
-        var key = obj.Address;
-
-        if (_characterBuildCache.TryGetValue(key, out CacheEntry cached) && IsCacheFresh(cached) && !_characterBuildInflight.TryGetExisting(key, out _))
-            return cached.Fragment;
-
-        Task<CharacterDataFragment> buildTask = _characterBuildInflight.GetOrStart(key, () => BuildAndCacheAsync(obj, key));
-
-        if (_characterBuildCache.TryGetValue(key, out cached))
-        {
-            var completed = await Task.WhenAny(buildTask, Task.Delay(_softReturnIfBusyAfter, ct)).ConfigureAwait(false);
-            if (completed != buildTask && (DateTime.UtcNow - cached.CreatedUtc) <= TimeSpan.FromSeconds(5))
-            {
-                return cached.Fragment;
-            }
-        }
-
-        return await WithCancellation(buildTask, ct).ConfigureAwait(false);
+        return await _dalamudUtil.RunOnFrameworkThread(() => CheckForNullDrawObjectUnsafe(playerPointer)).ConfigureAwait(false);
    }

-    private async Task<CharacterDataFragment> BuildAndCacheAsync(GameObjectHandler obj, nint key)
+    private unsafe bool CheckForNullDrawObjectUnsafe(IntPtr playerPointer)
    {
-        using var cts = new CancellationTokenSource(_hardBuildTimeout);
-        CharacterDataFragment fragment = await CreateCharacterDataInternal(obj, cts.Token).ConfigureAwait(false);
+        if (playerPointer == IntPtr.Zero)
+            return true;

-        _characterBuildCache[key] = new CacheEntry(fragment, DateTime.UtcNow);
-        PruneCharacterCacheIfNeeded();
+        var character = (Character*)playerPointer;

-        return fragment;
+        if (character == null)
+            return true;
+
+        var gameObject = &character->GameObject;
+        if (gameObject == null)
+            return true;
+
+        return gameObject->DrawObject == null;
    }

-    private void PruneCharacterCacheIfNeeded()
-    {
-        if (_characterBuildCache.Count < 2048) return;
-
-        var cutoff = DateTime.UtcNow - TimeSpan.FromSeconds(10);
-        foreach (var kv in _characterBuildCache)
-        {
-            if (kv.Value.CreatedUtc < cutoff)
-                _characterBuildCache.TryRemove(kv.Key, out _);
-        }
-    }
-
-    private static async Task<T> WithCancellation<T>(Task<T> task, CancellationToken ct)
-        => await task.WaitAsync(ct).ConfigureAwait(false);
-
-    private async Task<CharacterDataFragment> CreateCharacterDataInternal(GameObjectHandler playerRelatedObject, CancellationToken ct)
+    private async Task<CharacterDataFragment> CreateCharacterData(GameObjectHandler playerRelatedObject, CancellationToken ct)
    {
        var objectKind = playerRelatedObject.ObjectKind;
        CharacterDataFragment fragment = objectKind == ObjectKind.Player ? new CharacterDataFragmentPlayer() : new();

-        var logDebug = _logger.IsEnabled(LogLevel.Debug);
-        var sw = Stopwatch.StartNew();
-
        _logger.LogDebug("Building character data for {obj}", playerRelatedObject);
+        var logDebug = _logger.IsEnabled(LogLevel.Debug);

-        await EnsureObjectPresentAsync(playerRelatedObject, ct).ConfigureAwait(false);
-        ct.ThrowIfCancellationRequested();
-
-        var waitRecordingTask = _transientResourceManager.WaitForRecording(ct);
-
-        await _dalamudUtil.WaitWhileCharacterIsDrawing(_logger, playerRelatedObject, Guid.NewGuid(), 30000, ct: ct)
-            .ConfigureAwait(false);
-
-        // get all remaining paths and resolve them
-        ct.ThrowIfCancellationRequested();
-
-        if (await CheckForNullDrawObject(playerRelatedObject.Address).ConfigureAwait(false))
-            throw new InvalidOperationException("DrawObject became null during build (actor despawned)");
-
-        Task<string> getGlamourerData = _ipcManager.Glamourer.GetCharacterCustomizationAsync(playerRelatedObject.Address);
-        Task<string?> getCustomizeData = _ipcManager.CustomizePlus.GetScaleAsync(playerRelatedObject.Address);
-        Task<string?>? getMoodlesData = null;
-        Task<string>? getHeelsOffset = null;
-        Task<string>? getHonorificTitle = null;
-
-        if (objectKind == ObjectKind.Player)
+        // wait until chara is not drawing and present so nothing spontaneously explodes
+        await _dalamudUtil.WaitWhileCharacterIsDrawing(_logger, playerRelatedObject, Guid.NewGuid(), 30000, ct: ct).ConfigureAwait(false);
+        int totalWaitTime = 10000;
+        while (!await _dalamudUtil.IsObjectPresentAsync(await _dalamudUtil.CreateGameObjectAsync(playerRelatedObject.Address).ConfigureAwait(false)).ConfigureAwait(false) && totalWaitTime > 0)
        {
-            getHeelsOffset = _ipcManager.Heels.GetOffsetAsync();
-            getHonorificTitle = _ipcManager.Honorific.GetTitle();
-            getMoodlesData = _ipcManager.Moodles.GetStatusAsync(playerRelatedObject.Address);
+            _logger.LogTrace("Character is null but it shouldn't be, waiting");
+            await Task.Delay(50, ct).ConfigureAwait(false);
+            totalWaitTime -= 50;
        }

-        Guid penumbraRequestId = Guid.Empty;
-        Stopwatch? penumbraSw = null;
-        if (logDebug)
-        {
-            penumbraRequestId = Guid.NewGuid();
-            penumbraSw = Stopwatch.StartNew();
-            _logger.LogDebug("Penumbra GetCharacterData start {id} for {obj}", penumbraRequestId, playerRelatedObject);
-        }
-
-        var resolvedPaths = await _ipcManager.Penumbra.GetCharacterData(_logger, playerRelatedObject).ConfigureAwait(false);
-
-        if (logDebug)
-        {
-            penumbraSw!.Stop();
-            _logger.LogDebug("Penumbra GetCharacterData done {id} in {elapsedMs}ms (count={count})",
-                penumbraRequestId,
-                penumbraSw.ElapsedMilliseconds,
-                resolvedPaths?.Count ?? -1);
-        }
-
-        if (resolvedPaths == null)
-            throw new InvalidOperationException("Penumbra returned null data; couldn't proceed with character");
        ct.ThrowIfCancellationRequested();

-        var staticBuildTask = Task.Run(() => BuildStaticReplacements(resolvedPaths), ct);
+        DateTime start = DateTime.UtcNow;

-        fragment.FileReplacements = await staticBuildTask.ConfigureAwait(false);
+        // penumbra call, it's currently broken
+        Dictionary<string, HashSet<string>>? resolvedPaths;
+
+        resolvedPaths = (await _ipcManager.Penumbra.GetCharacterData(_logger, playerRelatedObject).ConfigureAwait(false));
+        if (resolvedPaths == null) throw new InvalidOperationException("Penumbra returned null data");
+
+        ct.ThrowIfCancellationRequested();
+
+        fragment.FileReplacements =
+                new HashSet<FileReplacement>(resolvedPaths.Select(c => new FileReplacement([.. c.Value], c.Key)), FileReplacementComparer.Instance)
+                .Where(p => p.HasFileReplacement).ToHashSet();
+        var allowedExtensions = CacheMonitor.AllowedFileExtensions;
+        fragment.FileReplacements.RemoveWhere(c => c.GamePaths.Any(g => !allowedExtensions.Any(e => g.EndsWith(e, StringComparison.OrdinalIgnoreCase))));
+
+        ct.ThrowIfCancellationRequested();

        if (logDebug)
        {
            _logger.LogDebug("== Static Replacements ==");
-            foreach (var replacement in fragment.FileReplacements
-                         .Where(i => i.HasFileReplacement)
-                         .OrderBy(i => i.GamePaths.First(), StringComparer.OrdinalIgnoreCase))
+            foreach (var replacement in fragment.FileReplacements.Where(i => i.HasFileReplacement).OrderBy(i => i.GamePaths.First(), StringComparer.OrdinalIgnoreCase))
            {
                _logger.LogDebug("=> {repl}", replacement);
                ct.ThrowIfCancellationRequested();
            }
        }
-
-        var staticReplacements = new HashSet<FileReplacement>(fragment.FileReplacements, FileReplacementComparer.Instance);
-
-        var transientTask = ResolveTransientReplacementsAsync(
-            playerRelatedObject,
-            objectKind,
-            staticReplacements,
-            waitRecordingTask,
-            ct);
-
-        fragment.GlamourerString = await getGlamourerData.ConfigureAwait(false);
-        _logger.LogDebug("Glamourer is now: {data}", fragment.GlamourerString);
-
-        var customizeScale = await getCustomizeData.ConfigureAwait(false);
-        fragment.CustomizePlusScale = customizeScale ?? string.Empty;
-        _logger.LogDebug("Customize is now: {data}", fragment.CustomizePlusScale);
-
-        if (objectKind == ObjectKind.Player)
+        else
        {
-            CharacterDataFragmentPlayer? playerFragment = fragment as CharacterDataFragmentPlayer ?? throw new InvalidOperationException("Failed to cast CharacterDataFragment to Player variant");
+            foreach (var replacement in fragment.FileReplacements.Where(i => i.HasFileReplacement))
+            {
+                ct.ThrowIfCancellationRequested();
+            }
+        }

-            playerFragment.ManipulationString = _ipcManager.Penumbra.GetMetaManipulations();
-            playerFragment.HonorificData = await getHonorificTitle!.ConfigureAwait(false);
-            _logger.LogDebug("Honorific is now: {data}", playerFragment!.HonorificData);
+        await _transientResourceManager.WaitForRecording(ct).ConfigureAwait(false);

-            playerFragment.PetNamesData = _ipcManager.PetNames.GetLocalNames();
-            _logger.LogDebug("Pet Nicknames is now: {petnames}", playerFragment!.PetNamesData);
+        // if it's pet then it's summoner, if it's summoner we actually want to keep all filereplacements alive at all times
+        // or we get into redraw city for every change and nothing works properly
+        if (objectKind == ObjectKind.Pet)
+        {
+            foreach (var item in fragment.FileReplacements.Where(i => i.HasFileReplacement).SelectMany(p => p.GamePaths))
+            {
+                if (_transientResourceManager.AddTransientResource(objectKind, item))
+                {
+                    _logger.LogDebug("Marking static {item} for Pet as transient", item);
+                }
+            }

-            playerFragment.HeelsData = await getHeelsOffset!.ConfigureAwait(false);
-            _logger.LogDebug("Heels is now: {heels}", playerFragment!.HeelsData);
-
-            playerFragment.MoodlesData = (await getMoodlesData!.ConfigureAwait(false)) ?? string.Empty;
-            _logger.LogDebug("Moodles is now: {moodles}", playerFragment!.MoodlesData);
+            _logger.LogTrace("Clearing {count} Static Replacements for Pet", fragment.FileReplacements.Count);
+            fragment.FileReplacements.Clear();
        }

        ct.ThrowIfCancellationRequested();

-        var (resolvedTransientPaths, clearedForPet) = await transientTask.ConfigureAwait(false);
-        if (clearedForPet != null)
-            fragment.FileReplacements.Clear();
+        _logger.LogDebug("Handling transient update for {obj}", playerRelatedObject);
+
+        // remove all potentially gathered paths from the transient resource manager that are resolved through static resolving
+        _transientResourceManager.ClearTransientPaths(objectKind, fragment.FileReplacements.SelectMany(c => c.GamePaths).ToList());
+
+        // get all remaining paths and resolve them
+        var transientPaths = ManageSemiTransientData(objectKind);
+        var resolvedTransientPaths = transientPaths.Count == 0
+            ? new Dictionary<string, string[]>(StringComparer.OrdinalIgnoreCase).AsReadOnly()
+            : await GetFileReplacementsFromPaths(playerRelatedObject, transientPaths, new HashSet<string>(StringComparer.Ordinal)).ConfigureAwait(false);

        if (logDebug)
        {
            _logger.LogDebug("== Transient Replacements ==");
-            foreach (var replacement in resolvedTransientPaths
-                         .Select(c => new FileReplacement([.. c.Value], c.Key))
-                         .OrderBy(f => f.ResolvedPath, StringComparer.Ordinal))
+            foreach (var replacement in resolvedTransientPaths.Select(c => new FileReplacement([.. c.Value], c.Key)).OrderBy(f => f.ResolvedPath, StringComparer.Ordinal))
            {
                _logger.LogDebug("=> {repl}", replacement);
                fragment.FileReplacements.Add(replacement);
@@ -328,64 +211,85 @@ public class PlayerDataFactory
        else
        {
            foreach (var replacement in resolvedTransientPaths.Select(c => new FileReplacement([.. c.Value], c.Key)))
+            {
                fragment.FileReplacements.Add(replacement);
+            }
        }

+        // clean up all semi transient resources that don't have any file replacement (aka null resolve)
        _transientResourceManager.CleanUpSemiTransientResources(objectKind, [.. fragment.FileReplacements]);

-        fragment.FileReplacements = new HashSet<FileReplacement>(
-            fragment.FileReplacements
-                .Where(v => v.HasFileReplacement)
-                .OrderBy(v => v.ResolvedPath, StringComparer.Ordinal),
-            FileReplacementComparer.Instance);
+        ct.ThrowIfCancellationRequested();
+
+        // make sure we only return data that actually has file replacements
+        fragment.FileReplacements = new HashSet<FileReplacement>(fragment.FileReplacements.Where(v => v.HasFileReplacement).OrderBy(v => v.ResolvedPath, StringComparer.Ordinal), FileReplacementComparer.Instance);
+
+        // gather up data from ipc
+        Task<string> getHeelsOffset = _ipcManager.Heels.GetOffsetAsync();
+        Task<string> getGlamourerData = _ipcManager.Glamourer.GetCharacterCustomizationAsync(playerRelatedObject.Address);
+        Task<string?> getCustomizeData = _ipcManager.CustomizePlus.GetScaleAsync(playerRelatedObject.Address);
+        Task<string> getHonorificTitle = _ipcManager.Honorific.GetTitle();
+        fragment.GlamourerString = await getGlamourerData.ConfigureAwait(false);
+        _logger.LogDebug("Glamourer is now: {data}", fragment.GlamourerString);
+        var customizeScale = await getCustomizeData.ConfigureAwait(false);
+        fragment.CustomizePlusScale = customizeScale ?? string.Empty;
+        _logger.LogDebug("Customize is now: {data}", fragment.CustomizePlusScale);
+
+        if (objectKind == ObjectKind.Player)
+        {
+            var playerFragment = (fragment as CharacterDataFragmentPlayer)!;
+            playerFragment.ManipulationString = _ipcManager.Penumbra.GetMetaManipulations();
+
+            playerFragment!.HonorificData = await getHonorificTitle.ConfigureAwait(false);
+            _logger.LogDebug("Honorific is now: {data}", playerFragment!.HonorificData);
+
+            playerFragment!.HeelsData = await getHeelsOffset.ConfigureAwait(false);
+            _logger.LogDebug("Heels is now: {heels}", playerFragment!.HeelsData);
+
+            playerFragment!.MoodlesData = await _ipcManager.Moodles.GetStatusAsync(playerRelatedObject.Address).ConfigureAwait(false) ?? string.Empty;
+            _logger.LogDebug("Moodles is now: {moodles}", playerFragment!.MoodlesData);
+
+            playerFragment!.PetNamesData = _ipcManager.PetNames.GetLocalNames();
+            _logger.LogDebug("Pet Nicknames is now: {petnames}", playerFragment!.PetNamesData);
+        }

        ct.ThrowIfCancellationRequested();

        var toCompute = fragment.FileReplacements.Where(f => !f.IsFileSwap).ToArray();
        _logger.LogDebug("Getting Hashes for {amount} Files", toCompute.Length);
-
-        await Task.Run(() =>
+        var computedPaths = _fileCacheManager.GetFileCachesByPaths(toCompute.Select(c => c.ResolvedPath).ToArray());
+        foreach (var file in toCompute)
        {
-            var computedPaths = _fileCacheManager.GetFileCachesByPaths([.. toCompute.Select(c => c.ResolvedPath)]);
-            foreach (var file in toCompute)
-            {
-                ct.ThrowIfCancellationRequested();
-                file.Hash = computedPaths[file.ResolvedPath]?.Hash ?? string.Empty;
-            }
-        }, ct).ConfigureAwait(false);
-
+            ct.ThrowIfCancellationRequested();
+            file.Hash = computedPaths[file.ResolvedPath]?.Hash ?? string.Empty;
+        }
        var removed = fragment.FileReplacements.RemoveWhere(f => !f.IsFileSwap && string.IsNullOrEmpty(f.Hash));
        if (removed > 0)
+        {
            _logger.LogDebug("Removed {amount} of invalid files", removed);
+        }

        ct.ThrowIfCancellationRequested();

        Dictionary<string, List<ushort>>? boneIndices = null;
        var hasPapFiles = false;
-
        if (objectKind == ObjectKind.Player)
        {
            hasPapFiles = fragment.FileReplacements.Any(f =>
-                !f.IsFileSwap && f.GamePaths.Any(p => p.EndsWith(".pap", StringComparison.OrdinalIgnoreCase)));
-
+                !f.IsFileSwap && f.GamePaths.First().EndsWith("pap", StringComparison.OrdinalIgnoreCase));
            if (hasPapFiles)
            {
-                boneIndices = await _dalamudUtil
-                    .RunOnFrameworkThread(() => _modelAnalyzer.GetSkeletonBoneIndices(playerRelatedObject))
-                    .ConfigureAwait(false);
+                boneIndices = await _dalamudUtil.RunOnFrameworkThread(() => _modelAnalyzer.GetSkeletonBoneIndices(playerRelatedObject)).ConfigureAwait(false);
            }
+        }

+        if (objectKind == ObjectKind.Player)
+        {
            try
            {
-#if DEBUG
-                if (hasPapFiles && boneIndices != null)
-                    _modelAnalyzer.DumpLocalSkeletonIndices(playerRelatedObject);
-#endif
-
                if (hasPapFiles)
                {
-                    await VerifyPlayerAnimationBones(boneIndices, (CharacterDataFragmentPlayer)fragment, ct)
-                        .ConfigureAwait(false);
+                    await VerifyPlayerAnimationBones(boneIndices, (fragment as CharacterDataFragmentPlayer)!, ct).ConfigureAwait(false);
                }
            }
            catch (OperationCanceledException e)
@@ -399,285 +303,80 @@ public class PlayerDataFactory
            }
        }

-        _logger.LogInformation("Building character data for {obj} took {time}ms",
-            objectKind, sw.Elapsed.TotalMilliseconds);
+        _logger.LogInformation("Building character data for {obj} took {time}ms", objectKind, TimeSpan.FromTicks(DateTime.UtcNow.Ticks - start.Ticks).TotalMilliseconds);

        return fragment;
    }

-    private async Task EnsureObjectPresentAsync(GameObjectHandler handler, CancellationToken ct)
+    private async Task VerifyPlayerAnimationBones(Dictionary<string, List<ushort>>? boneIndices, CharacterDataFragmentPlayer fragment, CancellationToken ct)
    {
-        var remaining = 10000;
-        while (remaining > 0)
-        {
-            ct.ThrowIfCancellationRequested();
-
-            var obj = await _dalamudUtil.CreateGameObjectAsync(handler.Address).ConfigureAwait(false);
-            if (await _dalamudUtil.IsObjectPresentAsync(obj).ConfigureAwait(false))
-                return;
-
-            _logger.LogTrace("Character is null but it shouldn't be, waiting");
-            await Task.Delay(50, ct).ConfigureAwait(false);
-            remaining -= 50;
-        }
-    }
-
-    private static HashSet<FileReplacement> BuildStaticReplacements(Dictionary<string, HashSet<string>> resolvedPaths)
-    {
-        var set = new HashSet<FileReplacement>(FileReplacementComparer.Instance);
-
-        foreach (var kvp in resolvedPaths)
-        {
-            var fr = new FileReplacement([.. kvp.Value], kvp.Key);
-            if (!fr.HasFileReplacement) continue;
-
-            var allAllowed = fr.GamePaths.All(g =>
-                CacheMonitor.AllowedFileExtensions.Any(e => g.EndsWith(e, StringComparison.OrdinalIgnoreCase)));
-
-            if (!allAllowed) continue;
-
-            set.Add(fr);
-        }
-
-        return set;
-    }
-
-    private async Task<(IReadOnlyDictionary<string, string[]> ResolvedPaths, HashSet<FileReplacement>? ClearedReplacements)>
-        ResolveTransientReplacementsAsync(
-            GameObjectHandler obj,
-            ObjectKind objectKind,
-            HashSet<FileReplacement> staticReplacements,
-            Task waitRecordingTask,
-            CancellationToken ct)
-    {
-        await waitRecordingTask.ConfigureAwait(false);
-
-        HashSet<FileReplacement>? clearedReplacements = null;
-
-        if (objectKind == ObjectKind.Pet)
-        {
-            foreach (var item in staticReplacements.Where(i => i.HasFileReplacement).SelectMany(p => p.GamePaths))
-            {
-                if (_transientResourceManager.AddTransientResource(objectKind, item))
-                    _logger.LogDebug("Marking static {item} for Pet as transient", item);
-            }
-
-            _logger.LogTrace("Clearing {count} Static Replacements for Pet", staticReplacements.Count);
-            clearedReplacements = staticReplacements;
-        }
-
-        ct.ThrowIfCancellationRequested();
-
-        _transientResourceManager.ClearTransientPaths(objectKind, [.. staticReplacements.SelectMany(c => c.GamePaths)]);
-
-        var transientPaths = ManageSemiTransientData(objectKind);
-        if (transientPaths.Count == 0)
-            return (new Dictionary<string, string[]>(StringComparer.Ordinal), clearedReplacements);
-
-        var resolved = await GetFileReplacementsFromPaths(transientPaths, new HashSet<string>(StringComparer.Ordinal))
-            .ConfigureAwait(false);
-
-        if (_maxTransientResolvedEntries > 0 && resolved.Count > _maxTransientResolvedEntries)
-        {
-            _logger.LogWarning("Transient entries ({resolved}) are above the threshold {max}; Please consider disable some mods (VFX have heavy load) to reduce transient load",
-                resolved.Count,
-                _maxTransientResolvedEntries);
-        }
-
-        return (resolved, clearedReplacements);
-    }
-
-
-    private async Task VerifyPlayerAnimationBones(
-        Dictionary<string, List<ushort>>? playerBoneIndices,
-        CharacterDataFragmentPlayer fragment,
-        CancellationToken ct)
-    {
-        var mode = _configService.Current.AnimationValidationMode;
-        var allowBasedShift = _configService.Current.AnimationAllowOneBasedShift;
-        var allownNightIndex = _configService.Current.AnimationAllowNeighborIndexTolerance;
-
-        if (mode == AnimationValidationMode.Unsafe)
-            return;
-
-        if (playerBoneIndices == null || playerBoneIndices.Count == 0)
-            return;
-
-        var localBoneSets = new Dictionary<string, HashSet<ushort>>(StringComparer.OrdinalIgnoreCase);
-
-        foreach (var (rawLocalKey, indices) in playerBoneIndices)
-        {
-            if (indices is not { Count: > 0 })
-                continue;
-
-            var key = XivDataAnalyzer.CanonicalizeSkeletonKey(rawLocalKey);
-            if (string.IsNullOrEmpty(key))
-                continue;
-
-            if (!localBoneSets.TryGetValue(key, out var set))
-                localBoneSets[key] = set = [];
-
-            foreach (var idx in indices)
-                set.Add(idx);
-        }
-
-        if (localBoneSets.Count == 0)
-            return;
+        if (boneIndices == null) return;

        if (_logger.IsEnabled(LogLevel.Debug))
        {
-            _logger.LogDebug("SEND local buckets: {b}",
-                string.Join(", ", localBoneSets.Keys.Order(StringComparer.Ordinal)));
-
-            foreach (var kvp in localBoneSets.OrderBy(k => k.Key, StringComparer.OrdinalIgnoreCase))
+            foreach (var kvp in boneIndices)
            {
-                var min = kvp.Value.Count > 0 ? kvp.Value.Min() : 0;
-                var max = kvp.Value.Count > 0 ? kvp.Value.Max() : 0;
-                _logger.LogDebug("Local bucket {bucket}: count={count} min={min} max={max}",
-                    kvp.Key, kvp.Value.Count, min, max);
+                _logger.LogDebug("Found {skellyname} ({idx} bone indices) on player: {bones}", kvp.Key, kvp.Value.Any() ? kvp.Value.Max() : 0, string.Join(',', kvp.Value));
            }
        }

-        var papGroups = fragment.FileReplacements
-            .Where(f => !f.IsFileSwap
-                        && !string.IsNullOrEmpty(f.Hash)
-                        && f.GamePaths is { Count: > 0 }
-                        && f.GamePaths.Any(p => p.EndsWith(".pap", StringComparison.OrdinalIgnoreCase)))
-            .GroupBy(f => f.Hash!, StringComparer.OrdinalIgnoreCase)
-            .ToList();
+        var maxPlayerBoneIndex = boneIndices.SelectMany(kvp => kvp.Value).DefaultIfEmpty().Max();
+        if (maxPlayerBoneIndex <= 0) return;

        int noValidationFailed = 0;
-
-        foreach (var g in papGroups)
+        foreach (var file in fragment.FileReplacements.Where(f => !f.IsFileSwap && f.GamePaths.First().EndsWith("pap", StringComparison.OrdinalIgnoreCase)).ToList())
        {
            ct.ThrowIfCancellationRequested();

-            var hash = g.Key;
-
-            var resolvedPath = g.Select(f => f.ResolvedPath).Distinct(StringComparer.OrdinalIgnoreCase);
-            var papPathSummary = string.Join(", ", resolvedPath);
-            if (papPathSummary.IsNullOrEmpty())
-                papPathSummary = "<unknown pap path>";
-
-            Dictionary<string, List<ushort>>? papIndices = null;
-
-            await _papParseLimiter.WaitAsync(ct).ConfigureAwait(false);
-            try
+            var skeletonIndices = await _dalamudUtil.RunOnFrameworkThread(() => _modelAnalyzer.GetBoneIndicesFromPap(file.Hash)).ConfigureAwait(false);
+            bool validationFailed = false;
+            if (skeletonIndices != null)
            {
-                var cacheEntity = _fileCacheManager.GetFileCacheByHash(hash);
-                var papPath = cacheEntity?.ResolvedFilepath;
-
-                if (!string.IsNullOrEmpty(papPath) && File.Exists(papPath))
+                // 105 is the maximum vanilla skellington spoopy bone index
+                if (skeletonIndices.All(k => k.Value.Max() <= 105))
                {
-                    var havokBytes = await Task.Run(() => XivDataAnalyzer.ReadHavokBytesFromPap(papPath), ct)
-                        .ConfigureAwait(false);
+                    _logger.LogTrace("All indices of {path} are <= 105, ignoring", file.ResolvedPath);
+                    continue;
+                }

-                    if (havokBytes is { Length: > 8 })
+                _logger.LogDebug("Verifying bone indices for {path}, found {x} skeletons", file.ResolvedPath, skeletonIndices.Count);
+
+                foreach (var boneCount in skeletonIndices)
+                {
+                    var maxAnimationIndex = boneCount.Value.DefaultIfEmpty().Max();
+                    if (maxAnimationIndex > maxPlayerBoneIndex)
                    {
-                        papIndices = await _dalamudUtil.RunOnFrameworkThread(
-                                () => _modelAnalyzer.ParseHavokBytesOnFrameworkThread(havokBytes, hash, persistToConfig: false))
-                            .ConfigureAwait(false);
+                        _logger.LogWarning("Found more bone indices on the animation {path} skeleton {skl} (max indice {idx}) than on any player related skeleton (max indice {idx2})",
+                            file.ResolvedPath, boneCount.Key, maxAnimationIndex, maxPlayerBoneIndex);
+                        validationFailed = true;
+                        break;
                    }
                }
            }
-            finally
+
+            if (validationFailed)
            {
-                _papParseLimiter.Release();
-            }
-
-            if (papIndices == null || papIndices.Count == 0)
-                continue;
-
-            if (_logger.IsEnabled(LogLevel.Debug))
-            {
-                try
+                noValidationFailed++;
+                _logger.LogDebug("Removing {file} from sent file replacements and transient data", file.ResolvedPath);
+                fragment.FileReplacements.Remove(file);
+                foreach (var gamePath in file.GamePaths)
                {
-                    var papBuckets = papIndices
-                        .Where(kvp => kvp.Value is { Count: > 0 })
-                        .Select(kvp => new
-                        {
-                            Raw = kvp.Key,
-                            Key = XivDataAnalyzer.CanonicalizeSkeletonKey(kvp.Key),
-                            Indices = kvp.Value
-                        })
-                        .Where(x => x.Indices is { Count: > 0 })
-                        .GroupBy(x => string.IsNullOrEmpty(x.Key) ? x.Raw : x.Key!, StringComparer.OrdinalIgnoreCase)
-                        .Select(grp =>
-                        {
-                            var all = grp.SelectMany(v => v.Indices).ToList();
-                            var min = all.Count > 0 ? all.Min() : 0;
-                            var max = all.Count > 0 ? all.Max() : 0;
-                            var raws = string.Join(',', grp.Select(v => v.Raw).Distinct(StringComparer.OrdinalIgnoreCase));
-                            return $"{grp.Key}(min={min},max={max},raw=[{raws}])";
-                        })
-                        .ToList();
-
-                    _logger.LogDebug("SEND pap buckets for hash={hash}: {b}",
-                        hash,
-                        string.Join(" | ", papBuckets));
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogDebug(ex, "Error logging PAP bucket details for hash={hash}", hash);
+                    _transientResourceManager.RemoveTransientResource(ObjectKind.Player, gamePath);
                }
            }

-            bool isCompatible = false;
-            string reason = string.Empty;
-            try
-            {
-                isCompatible = XivDataAnalyzer.IsPapCompatible(localBoneSets, papIndices, mode, allowBasedShift, allownNightIndex, out reason);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Error checking PAP compatibility for hash={hash}, path={path}. Treating as incompatible.", hash, papPathSummary);
-                reason = $"Exception during compatibility check: {ex.Message}";
-                isCompatible = false;
-            }
-
-            if (isCompatible)
-                continue;
-
-            noValidationFailed++;
-
-            _logger.LogWarning(
-                "Animation PAP is not compatible with local skeletons; dropping mappings for {papPath}. Reason: {reason}",
-                papPathSummary,
-                reason);
-
-            var removedGamePaths = fragment.FileReplacements
-                .Where(fr => !fr.IsFileSwap
-                             && string.Equals(fr.Hash, hash, StringComparison.OrdinalIgnoreCase)
-                             && fr.GamePaths.Any(p => p.EndsWith(".pap", StringComparison.OrdinalIgnoreCase)))
-                .SelectMany(fr => fr.GamePaths.Where(p => p.EndsWith(".pap", StringComparison.OrdinalIgnoreCase)))
-                .Distinct(StringComparer.OrdinalIgnoreCase)
-                .ToList();
-
-            fragment.FileReplacements.RemoveWhere(fr =>
-                !fr.IsFileSwap
-                && string.Equals(fr.Hash, hash, StringComparison.OrdinalIgnoreCase)
-                && fr.GamePaths.Any(p => p.EndsWith(".pap", StringComparison.OrdinalIgnoreCase)));
-
-            foreach (var gp in removedGamePaths)
-                _transientResourceManager.RemoveTransientResource(ObjectKind.Player, gp);
        }

        if (noValidationFailed > 0)
        {
-            _lightlessMediator.Publish(new NotificationMessage(
-                "Invalid Skeleton Setup",
-                $"Your client is attempting to send {noValidationFailed} animation files that don't match your current skeleton validation mode ({mode}). " +
-                "Please adjust your skeleton/mods or change the validation mode if this is unexpected. " +
-                "Those animation files have been removed from your sent (player) data. (Check /xllog for details).",
-                NotificationType.Warning,
-                TimeSpan.FromSeconds(10)));
+            _lightlessMediator.Publish(new NotificationMessage("Invalid Skeleton Setup",
+                $"Your client is attempting to send {noValidationFailed} animation files with invalid bone data. Those animation files have been removed from your sent data. " +
+                $"Verify that you are using the correct skeleton for those animation files (Check /xllog for more information).",
+                NotificationType.Warning, TimeSpan.FromSeconds(10)));
        }
    }

-
-    private async Task<IReadOnlyDictionary<string, string[]>> GetFileReplacementsFromPaths(
-        HashSet<string> forwardResolve,
-        HashSet<string> reverseResolve)
+    private async Task<IReadOnlyDictionary<string, string[]>> GetFileReplacementsFromPaths(GameObjectHandler handler, HashSet<string> forwardResolve, HashSet<string> reverseResolve)
    {
        var forwardPaths = forwardResolve.ToArray();
        var reversePaths = reverseResolve.ToArray();
@@ -686,19 +385,89 @@ public class PlayerDataFactory
            return new Dictionary<string, string[]>(StringComparer.OrdinalIgnoreCase).AsReadOnly();
        }

-        var forwardPathsLower = forwardPaths.Length == 0 ? [] : forwardPaths.Select(p => p.ToLowerInvariant()).ToArray();
-        var reversePathsLower = reversePaths.Length == 0 ? [] : reversePaths.Select(p => p.ToLowerInvariant()).ToArray();
+        var forwardPathsLower = forwardPaths.Length == 0 ? Array.Empty<string>() : forwardPaths.Select(p => p.ToLowerInvariant()).ToArray();
+        var reversePathsLower = reversePaths.Length == 0 ? Array.Empty<string>() : reversePaths.Select(p => p.ToLowerInvariant()).ToArray();

        Dictionary<string, List<string>> resolvedPaths = new(forwardPaths.Length + reversePaths.Length, StringComparer.Ordinal);
-        var (forward, reverse) = await _ipcManager.Penumbra.ResolvePathsAsync(forwardPaths, reversePaths).ConfigureAwait(false);
+        if (handler.ObjectKind != ObjectKind.Player)
+        {
+            var (objectIndex, forwardResolved, reverseResolved) = await _dalamudUtil.RunOnFrameworkThread(() =>
+            {
+                var idx = handler.GetGameObject()?.ObjectIndex;
+                if (!idx.HasValue)
+                {
+                    return ((int?)null, Array.Empty<string>(), Array.Empty<string[]>());
+                }

+                var resolvedForward = new string[forwardPaths.Length];
+                for (int i = 0; i < forwardPaths.Length; i++)
+                {
+                    resolvedForward[i] = _ipcManager.Penumbra.ResolveGameObjectPath(forwardPaths[i], idx.Value);
+                }
+
+                var resolvedReverse = new string[reversePaths.Length][];
+                for (int i = 0; i < reversePaths.Length; i++)
+                {
+                    resolvedReverse[i] = _ipcManager.Penumbra.ReverseResolveGameObjectPath(reversePaths[i], idx.Value);
+                }
+
+                return (idx, resolvedForward, resolvedReverse);
+            }).ConfigureAwait(false);
+
+            if (objectIndex.HasValue)
+            {
+                for (int i = 0; i < forwardPaths.Length; i++)
+                {
+                    var filePath = forwardResolved[i]?.ToLowerInvariant();
+                    if (string.IsNullOrEmpty(filePath))
+                    {
+                        continue;
+                    }
+
+                    if (resolvedPaths.TryGetValue(filePath, out var list))
+                    {
+                        list.Add(forwardPathsLower[i]);
+                    }
+                    else
+                    {
+                        resolvedPaths[filePath] = [forwardPathsLower[i]];
+                    }
+                }
+
+                for (int i = 0; i < reversePaths.Length; i++)
+                {
+                    var filePath = reversePathsLower[i];
+                    var reverseResolvedLower = new string[reverseResolved[i].Length];
+                    for (var j = 0; j < reverseResolvedLower.Length; j++)
+                    {
+                        reverseResolvedLower[j] = reverseResolved[i][j].ToLowerInvariant();
+                    }
+                    if (resolvedPaths.TryGetValue(filePath, out var list))
+                    {
+                        list.AddRange(reverseResolvedLower);
+                    }
+                    else
+                    {
+                        resolvedPaths[filePath] = new List<string>(reverseResolvedLower);
+                    }
+                }
+
+                return resolvedPaths.ToDictionary(k => k.Key, k => k.Value.ToArray(), StringComparer.OrdinalIgnoreCase).AsReadOnly();
+            }
+        }
+
+        var (forward, reverse) = await _ipcManager.Penumbra.ResolvePathsAsync(forwardPaths, reversePaths).ConfigureAwait(false);
        for (int i = 0; i < forwardPaths.Length; i++)
        {
            var filePath = forward[i].ToLowerInvariant();
            if (resolvedPaths.TryGetValue(filePath, out var list))
-                list.Add(forwardPaths[i].ToLowerInvariant());
+            {
+                list.Add(forwardPathsLower[i]);
+            }
            else
-                resolvedPaths[filePath] = [forwardPaths[i].ToLowerInvariant()];
+            {
+                resolvedPaths[filePath] = [forwardPathsLower[i]];
+            }
        }

        for (int i = 0; i < reversePaths.Length; i++)
@@ -710,9 +479,13 @@ public class PlayerDataFactory
                reverseResolvedLower[j] = reverse[i][j].ToLowerInvariant();
            }
            if (resolvedPaths.TryGetValue(filePath, out var list))
-                list.AddRange(reverse[i].Select(c => c.ToLowerInvariant()));
+            {
+                list.AddRange(reverseResolvedLower);
+            }
            else
-                resolvedPaths[filePath] = [.. reverse[i].Select(c => c.ToLowerInvariant()).ToList()];
+            {
+                resolvedPaths[filePath] = new List<string>(reverseResolvedLower);
+            }
        }

        return resolvedPaths.ToDictionary(k => k.Key, k => k.Value.ToArray(), StringComparer.OrdinalIgnoreCase).AsReadOnly();
@@ -723,29 +496,11 @@ public class PlayerDataFactory
        _transientResourceManager.PersistTransientResources(objectKind);

        HashSet<string> pathsToResolve = new(StringComparer.Ordinal);
-
-        int scanned = 0, skippedEmpty = 0, skippedVfx = 0;
-
-        foreach (var path in _transientResourceManager.GetSemiTransientResources(objectKind))
+        foreach (var path in _transientResourceManager.GetSemiTransientResources(objectKind).Where(path => !string.IsNullOrEmpty(path)))
        {
-            scanned++;
-
-            if (string.IsNullOrEmpty(path))
-            {
-                skippedEmpty++;
-                continue;
-            }
-
            pathsToResolve.Add(path);
        }

-        if (_logger.IsEnabled(LogLevel.Debug))
-        {
-            _logger.LogDebug(
-                "ManageSemiTransientData({kind}): scanned={scanned}, added={added}, skippedEmpty={skippedEmpty}, skippedVfx={skippedVfx}",
-                objectKind, scanned, pathsToResolve.Count, skippedEmpty, skippedVfx);
-        }
-
        return pathsToResolve;
    }
-}
+}
--- a/LightlessSync/PlayerData/Handlers/GameObjectHandler.cs
+++ b/LightlessSync/PlayerData/Handlers/GameObjectHandler.cs
@@ -2,12 +2,11 @@
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using LightlessSync.Services;
 using LightlessSync.Services.Mediator;
-using LightlessSync.Utils;
 using Microsoft.Extensions.Logging;
 using System.Runtime.CompilerServices;
 using static FFXIVClientStructs.FFXIV.Client.Game.Character.DrawDataContainer;
-using ObjectKind = LightlessSync.API.Data.Enum.ObjectKind;
 using VisibilityFlags = FFXIVClientStructs.FFXIV.Client.Game.Object.VisibilityFlags;
+using ObjectKind = LightlessSync.API.Data.Enum.ObjectKind;

 namespace LightlessSync.PlayerData.Handlers;

@@ -114,16 +113,16 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
    public async Task ActOnFrameworkAfterEnsureNoDrawAsync(Action<Dalamud.Game.ClientState.Objects.Types.ICharacter> act, CancellationToken token)
    {
        while (await _dalamudUtil.RunOnFrameworkThread(() =>
-        {
-            EnsureLatestObjectState();
-            if (CurrentDrawCondition != DrawCondition.None) return true;
-            var gameObj = _dalamudUtil.CreateGameObject(Address);
-            if (gameObj is Dalamud.Game.ClientState.Objects.Types.ICharacter chara)
-            {
-                act.Invoke(chara);
-            }
-            return false;
-        }).ConfigureAwait(false))
+               {
+                   EnsureLatestObjectState();
+                   if (CurrentDrawCondition != DrawCondition.None) return true;
+                   var gameObj = _dalamudUtil.CreateGameObject(Address);
+                   if (gameObj is Dalamud.Game.ClientState.Objects.Types.ICharacter chara)
+                   {
+                       act.Invoke(chara);
+                   }
+                   return false;
+               }).ConfigureAwait(false))
        {
            await Task.Delay(250, token).ConfigureAwait(false);
        }
@@ -170,114 +169,81 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
        return $"{owned}/{ObjectKind}:{Name} ({Address:X},{DrawObjectAddress:X})";
    }

-    private void CheckAndUpdateObject() => CheckAndUpdateObject(allowPublish: true);
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);

-    private unsafe void CheckAndUpdateObject(bool allowPublish)
+        Mediator.Publish(new GameObjectHandlerDestroyedMessage(this, _isOwnedObject));
+    }
+
+    private unsafe void CheckAndUpdateObject()
    {
        var prevAddr = Address;
        var prevDrawObj = DrawObjectAddress;
-        string? nameString = null;
-
-        var nextAddr = _getAddress();
-
-        if (nextAddr != IntPtr.Zero && !PtrGuard.LooksLikePtr(nextAddr))
-        {
-            nextAddr = IntPtr.Zero;
-        }
-
-        if (nextAddr != IntPtr.Zero &&
-            !PtrGuard.IsReadable(nextAddr, (nuint)sizeof(FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject)))
-        {
-            nextAddr = IntPtr.Zero;
-        }
-
-        Address = nextAddr;

+        Address = _getAddress();
        if (Address != IntPtr.Zero)
        {
            var gameObject = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)Address;
-
-            var draw = (nint)gameObject->DrawObject;
-
-            if (!PtrGuard.LooksLikePtr(draw) || !PtrGuard.IsReadable(draw, (nuint)sizeof(DrawObject)))
-                draw = 0;
-
-            DrawObjectAddress = draw;
+            var drawObjAddr = (IntPtr)gameObject->DrawObject;
+            DrawObjectAddress = drawObjAddr;
            EntityId = gameObject->EntityId;
-
-            if (PtrGuard.IsReadable(Address, (nuint)sizeof(Character)))
-            {
-                var chara = (Character*)Address;
-                nameString = chara->GameObject.NameString;
-
-                if (!string.IsNullOrEmpty(nameString) && !string.Equals(nameString, Name, StringComparison.Ordinal))
-                    Name = nameString;
-            }
+            CurrentDrawCondition = DrawCondition.None;
        }
        else
        {
            DrawObjectAddress = IntPtr.Zero;
            EntityId = uint.MaxValue;
+            CurrentDrawCondition = DrawCondition.DrawObjectZero;
        }

-        CurrentDrawCondition = (Address != IntPtr.Zero && DrawObjectAddress != IntPtr.Zero)
-            ? IsBeingDrawnUnsafe()
-            : DrawCondition.DrawObjectZero;
+        CurrentDrawCondition = IsBeingDrawnUnsafe();

-        if (_haltProcessing || !allowPublish) return;
+        if (_haltProcessing) return;

        bool drawObjDiff = DrawObjectAddress != prevDrawObj;
        bool addrDiff = Address != prevAddr;

-        if (Address != IntPtr.Zero && DrawObjectAddress != IntPtr.Zero
-            && PtrGuard.IsReadable(Address, (nuint)sizeof(Character))
-            && PtrGuard.IsReadable(DrawObjectAddress, (nuint)sizeof(DrawObject)))
+        if (Address != IntPtr.Zero && DrawObjectAddress != IntPtr.Zero)
        {
            var chara = (Character*)Address;
-            var drawObj = (DrawObject*)DrawObjectAddress;
-
-            var objType = drawObj->Object.GetObjectType();
-            var isHuman = objType == ObjectType.CharacterBase
-                          && ((CharacterBase*)drawObj)->GetModelType() == CharacterBase.ModelType.Human;
-
-            nameString ??= chara->GameObject.NameString;
-            var nameChange = !string.Equals(nameString, Name, StringComparison.Ordinal);
-            if (nameChange) Name = nameString;
-
+            var name = chara->GameObject.NameString;
+            bool nameChange = !string.Equals(name, Name, StringComparison.Ordinal);
+            if (nameChange)
+            {
+                Name = name;
+            }
            bool equipDiff = false;

-            if (isHuman)
+            if (((DrawObject*)DrawObjectAddress)->Object.GetObjectType() == ObjectType.CharacterBase
+                && ((CharacterBase*)DrawObjectAddress)->GetModelType() == CharacterBase.ModelType.Human)
            {
-                if (PtrGuard.IsReadable(DrawObjectAddress, (nuint)sizeof(Human)))
+                var classJob = chara->CharacterData.ClassJob;
+                if (classJob != _classJob)
                {
-                    var classJob = chara->CharacterData.ClassJob;
-                    if (classJob != _classJob)
-                    {
-                        Logger.LogTrace("[{this}] classjob changed from {old} to {new}", this, _classJob, classJob);
-                        _classJob = classJob;
-                        Mediator.Publish(new ClassJobChangedMessage(this));
-                    }
-
-                    equipDiff = CompareAndUpdateEquipByteData((byte*)&((Human*)drawObj)->Head);
-
-                    ref var mh = ref chara->DrawData.Weapon(WeaponSlot.MainHand);
-                    ref var oh = ref chara->DrawData.Weapon(WeaponSlot.OffHand);
-
-                    equipDiff |= CompareAndUpdateMainHand((Weapon*)mh.DrawObject);
-                    equipDiff |= CompareAndUpdateOffHand((Weapon*)oh.DrawObject);
-                }
-                else
-                {
-                    isHuman = false;
+                    Logger.LogTrace("[{this}] classjob changed from {old} to {new}", this, _classJob, classJob);
+                    _classJob = classJob;
+                    Mediator.Publish(new ClassJobChangedMessage(this));
                }
+
+                equipDiff = CompareAndUpdateEquipByteData((byte*)&((Human*)DrawObjectAddress)->Head);
+
+                ref var mh = ref chara->DrawData.Weapon(WeaponSlot.MainHand);
+                ref var oh = ref chara->DrawData.Weapon(WeaponSlot.OffHand);
+                equipDiff |= CompareAndUpdateMainHand((Weapon*)mh.DrawObject);
+                equipDiff |= CompareAndUpdateOffHand((Weapon*)oh.DrawObject);
+
+                if (equipDiff)
+                    Logger.LogTrace("Checking [{this}] equip data as human from draw obj, result: {diff}", this, equipDiff);
            }
-
-            if (!isHuman)
+            else
            {
                equipDiff = CompareAndUpdateEquipByteData((byte*)Unsafe.AsPointer(ref chara->DrawData.EquipmentModelIds[0]));
+                if (equipDiff)
+                    Logger.LogTrace("Checking [{this}] equip data from game obj, result: {diff}", this, equipDiff);
            }

-            if (equipDiff && !_isOwnedObject)
+            if (equipDiff && !_isOwnedObject) // send the message out immediately and cancel out, no reason to continue if not self
            {
                Logger.LogTrace("[{this}] Changed", this);
                return;
@@ -285,13 +251,12 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP

            bool customizeDiff = false;

-            if (isHuman && PtrGuard.IsReadable(DrawObjectAddress, (nuint)sizeof(Human)))
+            if (((DrawObject*)DrawObjectAddress)->Object.GetObjectType() == ObjectType.CharacterBase
+                && ((CharacterBase*)DrawObjectAddress)->GetModelType() == CharacterBase.ModelType.Human)
            {
-                var human = (Human*)drawObj;
-
-                var gender = human->Customize.Sex;
-                var raceId = human->Customize.Race;
-                var tribeId = human->Customize.Tribe;
+                var gender = ((Human*)DrawObjectAddress)->Customize.Sex;
+                var raceId = ((Human*)DrawObjectAddress)->Customize.Race;
+                var tribeId = ((Human*)DrawObjectAddress)->Customize.Tribe;

                if (_isOwnedObject && ObjectKind == ObjectKind.Player
                    && (gender != Gender || raceId != RaceId || tribeId != TribeId))
@@ -302,11 +267,15 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
                    TribeId = tribeId;
                }

-                customizeDiff = CompareAndUpdateCustomizeData(human->Customize.Data);
+                customizeDiff = CompareAndUpdateCustomizeData(((Human*)DrawObjectAddress)->Customize.Data);
+                if (customizeDiff)
+                    Logger.LogTrace("Checking [{this}] customize data as human from draw obj, result: {diff}", this, customizeDiff);
            }
            else
            {
                customizeDiff = CompareAndUpdateCustomizeData(chara->DrawData.CustomizeData.Data);
+                if (customizeDiff)
+                    Logger.LogTrace("Checking [{this}] customize data from game obj, result: {diff}", this, equipDiff);
            }

            if ((addrDiff || drawObjDiff || equipDiff || customizeDiff || nameChange) && _isOwnedObject)
@@ -320,11 +289,12 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
            CurrentDrawCondition = DrawCondition.DrawObjectZero;
            Logger.LogTrace("[{this}] Changed", this);
            if (_isOwnedObject && ObjectKind != ObjectKind.Player)
+            {
                Mediator.Publish(new ClearCacheForObjectMessage(this));
+            }
        }
    }

-
    private unsafe bool CompareAndUpdateCustomizeData(Span<byte> customizeData)
    {
        bool hasChanges = false;
@@ -360,10 +330,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP

    private unsafe bool CompareAndUpdateMainHand(Weapon* weapon)
    {
-        var p = (nint)weapon;
-        if (!PtrGuard.LooksLikePtr(p) || !PtrGuard.IsReadable(p, (nuint)sizeof(Weapon)))
-            return false;
-
+        if ((nint)weapon == nint.Zero) return false;
        bool hasChanges = false;
        hasChanges |= weapon->ModelSetId != MainHandData[0];
        MainHandData[0] = weapon->ModelSetId;
@@ -376,10 +343,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP

    private unsafe bool CompareAndUpdateOffHand(Weapon* weapon)
    {
-        var p = (nint)weapon;
-        if (!PtrGuard.LooksLikePtr(p) || !PtrGuard.IsReadable(p, (nuint)sizeof(Weapon)))
-            return false;
-
+        if ((nint)weapon == nint.Zero) return false;
        bool hasChanges = false;
        hasChanges |= weapon->ModelSetId != OffHandData[0];
        OffHandData[0] = weapon->ModelSetId;
@@ -392,10 +356,12 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP

    private void FrameworkUpdate()
    {
+        if (!_delayedZoningTask?.IsCompleted ?? false) return;
+
        try
        {
-            var zoningDelayActive = !(_delayedZoningTask?.IsCompleted ?? true);
-            _performanceCollector.LogPerformance(this, $"CheckAndUpdateObject>{(_isOwnedObject ? "Self" : "Other")}+{ObjectKind}/{(string.IsNullOrEmpty(Name) ? "Unk" : Name)}", () => CheckAndUpdateObject(allowPublish: !zoningDelayActive));
+            _performanceCollector.LogPerformance(this, $"CheckAndUpdateObject>{(_isOwnedObject ? "Self" : "Other")}+{ObjectKind}/{(string.IsNullOrEmpty(Name) ? "Unk" : Name)}"
+                + $"+{Address.ToString("X")}", CheckAndUpdateObject);
        }
        catch (Exception ex)
        {
@@ -496,6 +462,6 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
                Logger.LogDebug("[{this}] Delay after zoning complete", this);
                _zoningCts.Dispose();
            }
-        }, _zoningCts.Token);
+        });
    }
 }
--- a/LightlessSync/PlayerData/Pairs/IPairHandlerAdapter.cs
+++ b/LightlessSync/PlayerData/Pairs/IPairHandlerAdapter.cs
@@ -1,42 +1,43 @@
-using LightlessSync.API.Data;
+    using LightlessSync.API.Data;

-namespace LightlessSync.PlayerData.Pairs;
+    namespace LightlessSync.PlayerData.Pairs;

-/// <summary>
-///     orchestrates the lifecycle of a paired character
-/// </summary>
-public interface IPairHandlerAdapter : IDisposable, IPairPerformanceSubject
-{
-    new string Ident { get; }
-    bool Initialized { get; }
-    bool IsVisible { get; }
-    bool ScheduledForDeletion { get; set; }
-    CharacterData? LastReceivedCharacterData { get; }
-    long LastAppliedDataBytes { get; }
-    new string? PlayerName { get; }
-    string PlayerNameHash { get; }
-    uint PlayerCharacterId { get; }
-    DateTime? LastDataReceivedAt { get; }
-    DateTime? LastApplyAttemptAt { get; }
-    DateTime? LastSuccessfulApplyAt { get; }
-    string? LastFailureReason { get; }
-    IReadOnlyList<string> LastBlockingConditions { get; }
-    bool IsApplying { get; }
-    bool IsDownloading { get; }
-    int PendingDownloadCount { get; }
-    int ForbiddenDownloadCount { get; }
-    bool PendingModReapply { get; }
-    bool ModApplyDeferred { get; }
-    int MissingCriticalMods { get; }
-    int MissingNonCriticalMods { get; }
-    int MissingForbiddenMods { get; }
+    /// <summary>
+    ///     orchestrates the lifecycle of a paired character
+    /// </summary>
+    public interface IPairHandlerAdapter : IDisposable, IPairPerformanceSubject
+    {
+        new string Ident { get; }
+        bool Initialized { get; }
+        bool IsVisible { get; }
+        bool ScheduledForDeletion { get; set; }
+        CharacterData? LastReceivedCharacterData { get; }
+        long LastAppliedDataBytes { get; }
+        new string? PlayerName { get; }
+        string PlayerNameHash { get; }
+        uint PlayerCharacterId { get; }
+        DateTime? LastDataReceivedAt { get; }
+        DateTime? LastApplyAttemptAt { get; }
+        DateTime? LastSuccessfulApplyAt { get; }
+        string? LastFailureReason { get; }
+        IReadOnlyList<string> LastBlockingConditions { get; }
+        bool IsApplying { get; }
+        bool IsDownloading { get; }
+        int PendingDownloadCount { get; }
+        int ForbiddenDownloadCount { get; }
+        bool PendingModReapply { get; }
+        bool ModApplyDeferred { get; }
+        int MissingCriticalMods { get; }
+        int MissingNonCriticalMods { get; }
+        int MissingForbiddenMods { get; }
+        DateTime? InvisibleSinceUtc { get; }
+        DateTime? VisibilityEvictionDueAtUtc { get; }

    void Initialize();
-    void ApplyData(CharacterData data);
-    void ApplyLastReceivedData(bool forced = false);
-    Task EnsurePerformanceMetricsAsync(CancellationToken cancellationToken);
-    bool FetchPerformanceMetricsFromCache();
-    void LoadCachedCharacterData(CharacterData data);
-    void SetUploading(bool uploading);
-    void SetPaused(bool paused);
-}
+        void ApplyData(CharacterData data);
+        void ApplyLastReceivedData(bool forced = false);
+        bool FetchPerformanceMetricsFromCache();
+        void LoadCachedCharacterData(CharacterData data);
+        void SetUploading(bool uploading);
+        void SetPaused(bool paused);
+    }
--- a/LightlessSync/PlayerData/Pairs/Pair.cs
+++ b/LightlessSync/PlayerData/Pairs/Pair.cs
@@ -217,6 +217,12 @@ public class Pair
        if (handler is null)
            return PairDebugInfo.Empty;

+        var now = DateTime.UtcNow;
+        var dueAt = handler.VisibilityEvictionDueAtUtc;
+        var remainingSeconds = dueAt.HasValue
+            ? Math.Max(0, (dueAt.Value - now).TotalSeconds)
+            : (double?)null;
+
        return new PairDebugInfo(
            true,
            handler.Initialized,
@@ -225,6 +231,9 @@ public class Pair
            handler.LastDataReceivedAt,
            handler.LastApplyAttemptAt,
            handler.LastSuccessfulApplyAt,
+            handler.InvisibleSinceUtc,
+            handler.VisibilityEvictionDueAtUtc,
+            remainingSeconds,
            handler.LastFailureReason,
            handler.LastBlockingConditions,
            handler.IsApplying,
--- a/LightlessSync/PlayerData/Pairs/PairCoordinator.Users.cs
+++ b/LightlessSync/PlayerData/Pairs/PairCoordinator.Users.cs
@@ -137,7 +137,7 @@ public sealed partial class PairCoordinator
            _pendingCharacterData.TryRemove(user.UID, out _);
            if (registrationResult.Value.CharacterIdent is not null)
            {
-                _ = _handlerRegistry.DeregisterOfflinePair(registrationResult.Value, forceDisposal: true);
+                _ = _handlerRegistry.DeregisterOfflinePair(registrationResult.Value);
            }

            _mediator.Publish(new ClearProfileUserDataMessage(user));
--- a/LightlessSync/PlayerData/Pairs/PairDebugInfo.cs
+++ b/LightlessSync/PlayerData/Pairs/PairDebugInfo.cs
@@ -8,6 +8,9 @@ public sealed record PairDebugInfo(
    DateTime? LastDataReceivedAt,
    DateTime? LastApplyAttemptAt,
    DateTime? LastSuccessfulApplyAt,
+    DateTime? InvisibleSinceUtc,
+    DateTime? VisibilityEvictionDueAtUtc,
+    double? VisibilityEvictionRemainingSeconds,
    string? LastFailureReason,
    IReadOnlyList<string> BlockingConditions,
    bool IsApplying,
@@ -29,6 +32,9 @@ public sealed record PairDebugInfo(
        null,
        null,
        null,
+        null,
+        null,
+        null,
        Array.Empty<string>(),
        false,
        false,
--- a/LightlessSync/PlayerData/Pairs/PairHandlerAdapter.cs
+++ b/LightlessSync/PlayerData/Pairs/PairHandlerAdapter.cs
--- a/LightlessSync/PlayerData/Pairs/PairHandlerAdapterFactory.cs
+++ b/LightlessSync/PlayerData/Pairs/PairHandlerAdapterFactory.cs
@@ -37,8 +37,6 @@ internal sealed class PairHandlerAdapterFactory : IPairHandlerAdapterFactory
    private readonly PairStateCache _pairStateCache;
    private readonly PairPerformanceMetricsCache _pairPerformanceMetricsCache;
    private readonly PenumbraTempCollectionJanitor _tempCollectionJanitor;
-    private readonly LightlessConfigService _configService;
-    private readonly XivDataAnalyzer _modelAnalyzer;
    private readonly IFramework _framework;

    public PairHandlerAdapterFactory(
@@ -61,9 +59,7 @@ internal sealed class PairHandlerAdapterFactory : IPairHandlerAdapterFactory
        ModelDecimationService modelDecimationService,
        PairStateCache pairStateCache,
        PairPerformanceMetricsCache pairPerformanceMetricsCache,
-        PenumbraTempCollectionJanitor tempCollectionJanitor,
-        XivDataAnalyzer modelAnalyzer,
-        LightlessConfigService configService)
+        PenumbraTempCollectionJanitor tempCollectionJanitor)
    {
        _loggerFactory = loggerFactory;
        _mediator = mediator;
@@ -85,8 +81,6 @@ internal sealed class PairHandlerAdapterFactory : IPairHandlerAdapterFactory
        _pairStateCache = pairStateCache;
        _pairPerformanceMetricsCache = pairPerformanceMetricsCache;
        _tempCollectionJanitor = tempCollectionJanitor;
-        _modelAnalyzer = modelAnalyzer;
-        _configService = configService;
    }

    public IPairHandlerAdapter Create(string ident)
@@ -116,8 +110,6 @@ internal sealed class PairHandlerAdapterFactory : IPairHandlerAdapterFactory
            _modelDecimationService,
            _pairStateCache,
            _pairPerformanceMetricsCache,
-            _tempCollectionJanitor,
-            _modelAnalyzer,
-            _configService);
+            _tempCollectionJanitor);
    }
 }
--- a/LightlessSync/PlayerData/Pairs/PairHandlerRegistry.cs
+++ b/LightlessSync/PlayerData/Pairs/PairHandlerRegistry.cs
@@ -136,7 +136,6 @@ public sealed class PairHandlerRegistry : IDisposable
            if (TryFinalizeHandlerRemoval(handler))
            {
                handler.Dispose();
-                _pairStateCache.Clear(registration.CharacterIdent);
            }
        }
        else if (shouldScheduleRemoval && handler is not null)
@@ -357,7 +356,6 @@ public sealed class PairHandlerRegistry : IDisposable
            finally
            {
                _pairPerformanceMetricsCache.Clear(handler.Ident);
-                _pairStateCache.Clear(handler.Ident);
            }
        }
    }
@@ -379,7 +377,6 @@ public sealed class PairHandlerRegistry : IDisposable
        {
            handler.Dispose();
            _pairPerformanceMetricsCache.Clear(handler.Ident);
-            _pairStateCache.Clear(handler.Ident);
        }
    }

@@ -404,7 +401,6 @@ public sealed class PairHandlerRegistry : IDisposable
        if (TryFinalizeHandlerRemoval(handler))
        {
            handler.Dispose();
-            _pairStateCache.Clear(handler.Ident);
        }
    }

--- a/LightlessSync/PlayerData/Pairs/PairLedger.cs
+++ b/LightlessSync/PlayerData/Pairs/PairLedger.cs
@@ -271,20 +271,7 @@ public sealed class PairLedger : DisposableMediatorSubscriberBase

            try
            {
-                _ = Task.Run(async () =>
-                {
-                    try
-                    {
-                        await handler.EnsurePerformanceMetricsAsync(CancellationToken.None).ConfigureAwait(false);
-                    }
-                    catch (Exception ex)
-                    {
-                        if (_logger.IsEnabled(LogLevel.Debug))
-                        {
-                            _logger.LogDebug(ex, "Failed to ensure performance metrics for {Ident}", handler.Ident);
-                        }
-                    }
-                });
+                handler.ApplyLastReceivedData(forced: true);
            }
            catch (Exception ex)
            {
--- a/LightlessSync/PlayerData/Pairs/PairManager.cs
+++ b/LightlessSync/PlayerData/Pairs/PairManager.cs
@@ -160,9 +160,8 @@ public sealed class PairManager
                return PairOperationResult<PairRegistration>.Fail($"Pair {user.UID} not found.");
            }

-            var ident = connection.Ident;
            connection.SetOffline();
-            return PairOperationResult<PairRegistration>.Ok(new PairRegistration(new PairUniqueIdentifier(user.UID), ident));
+            return PairOperationResult<PairRegistration>.Ok(new PairRegistration(new PairUniqueIdentifier(user.UID), connection.Ident));
        }
    }

@@ -531,7 +530,6 @@ public sealed class PairManager
            return null;
        }

-        var ident = connection.Ident;
        if (connection.IsOnline)
        {
            connection.SetOffline();
@@ -544,7 +542,7 @@ public sealed class PairManager
            shell.Users.Remove(userId);
        }

-        return new PairRegistration(new PairUniqueIdentifier(userId), ident);
+        return new PairRegistration(new PairUniqueIdentifier(userId), connection.Ident);
    }

    public static PairConnection CreateFromFullData(UserFullPairDto dto)
--- a/LightlessSync/PlayerData/Pairs/PairModels.cs
+++ b/LightlessSync/PlayerData/Pairs/PairModels.cs
@@ -76,7 +76,6 @@ public sealed class PairConnection
    public void SetOffline()
    {
        IsOnline = false;
-        Ident = null;
    }

    public void UpdatePermissions(UserPermissions own, UserPermissions other)
--- a/LightlessSync/Plugin.cs
+++ b/LightlessSync/Plugin.cs
@@ -123,23 +123,19 @@ public sealed class Plugin : IDalamudPlugin
        services.AddSingleton<HubFactory>();
        services.AddSingleton<FileUploadManager>();
        services.AddSingleton<FileTransferOrchestrator>();
+        services.AddSingleton<FileDownloadDeduplicator>();
        services.AddSingleton<LightlessPlugin>();
        services.AddSingleton<LightlessProfileManager>();
-        services.AddSingleton<TextureProcessingQueue>();
-        services.AddSingleton<ModelProcessingQueue>();
        services.AddSingleton<TextureCompressionService>();
        services.AddSingleton<TextureDownscaleService>();
        services.AddSingleton<ModelDecimationService>();
        services.AddSingleton<GameObjectHandlerFactory>();
-        services.AddSingleton<FileDownloadDeduplicator>();
        services.AddSingleton<FileDownloadManagerFactory>();
        services.AddSingleton<PairProcessingLimiter>();
        services.AddSingleton<XivDataAnalyzer>();
        services.AddSingleton<CharacterAnalyzer>();
        services.AddSingleton<TokenProvider>();
        services.AddSingleton<PluginWarningNotificationService>();
-        services.AddSingleton<ICompactorContext, PluginCompactorContext>();
-        services.AddSingleton<ICompactionExecutor, ExternalCompactionExecutor>();
        services.AddSingleton<FileCompactor>();
        services.AddSingleton<TagHandler>();
        services.AddSingleton<PairRequestService>();
@@ -336,7 +332,8 @@ public sealed class Plugin : IDalamudPlugin
            pluginInterface,
            sp.GetRequiredService<DalamudUtilService>(),
            sp.GetRequiredService<LightlessMediator>(),
-            sp.GetRequiredService<RedrawManager>()));
+            sp.GetRequiredService<RedrawManager>(),
+            sp.GetRequiredService<ActorObjectService>()));

        services.AddSingleton(sp => new IpcCallerGlamourer(
            sp.GetRequiredService<ILogger<IpcCallerGlamourer>>(),
@@ -381,11 +378,6 @@ public sealed class Plugin : IDalamudPlugin
            sp.GetRequiredService<DalamudUtilService>(),
            sp.GetRequiredService<LightlessMediator>()));

-        services.AddSingleton(sp => new IpcCallerLifestream(
-            pluginInterface,
-            sp.GetRequiredService<LightlessMediator>(),
-            sp.GetRequiredService<ILogger<IpcCallerLifestream>>()));
-
        services.AddSingleton(sp => new IpcManager(
            sp.GetRequiredService<ILogger<IpcManager>>(),
            sp.GetRequiredService<LightlessMediator>(),
@@ -396,9 +388,7 @@ public sealed class Plugin : IDalamudPlugin
            sp.GetRequiredService<IpcCallerHonorific>(),
            sp.GetRequiredService<IpcCallerMoodles>(),
            sp.GetRequiredService<IpcCallerPetNames>(),
-            sp.GetRequiredService<IpcCallerBrio>(),
-            sp.GetRequiredService<IpcCallerLifestream>()
-            ));
+            sp.GetRequiredService<IpcCallerBrio>()));

        // Notifications / HTTP
        services.AddSingleton(sp => new NotificationService(
@@ -431,7 +421,6 @@ public sealed class Plugin : IDalamudPlugin
            LightlessSync.UI.Style.MainStyle.Init(cfg, theme);
            return cfg;
        });
-        services.AddSingleton(sp => new TempCollectionConfigService(configDir));
        services.AddSingleton(sp => new ServerConfigService(configDir));
        services.AddSingleton(sp => new NotesConfigService(configDir));
        services.AddSingleton(sp => new PairTagConfigService(configDir));
@@ -445,7 +434,6 @@ public sealed class Plugin : IDalamudPlugin
        services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<LightlessConfigService>());
        services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<UiThemeConfigService>());
        services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<ChatConfigService>());
-        services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<TempCollectionConfigService>());
        services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<ServerConfigService>());
        services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<NotesConfigService>());
        services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<PairTagConfigService>());
@@ -498,11 +486,19 @@ public sealed class Plugin : IDalamudPlugin
            sp.GetRequiredService<UiSharedService>(),
            sp.GetRequiredService<ApiController>(),
            sp.GetRequiredService<LightFinderScannerService>(),
+            sp.GetRequiredService<LightFinderPlateHandler>()));
+
+        services.AddScoped<WindowMediatorSubscriberBase, SyncshellFinderUI>(sp => new SyncshellFinderUI(
+            sp.GetRequiredService<ILogger<SyncshellFinderUI>>(),
+            sp.GetRequiredService<LightlessMediator>(),
+            sp.GetRequiredService<PerformanceCollectorService>(),
+            sp.GetRequiredService<LightFinderService>(),
+            sp.GetRequiredService<UiSharedService>(),
+            sp.GetRequiredService<ApiController>(),
+            sp.GetRequiredService<LightFinderScannerService>(),
            sp.GetRequiredService<PairUiService>(),
            sp.GetRequiredService<DalamudUtilService>(),
-            sp.GetRequiredService<LightlessProfileManager>(),
-            sp.GetRequiredService<ActorObjectService>(),
-            sp.GetRequiredService<LightFinderPlateHandler>()));
+            sp.GetRequiredService<LightlessProfileManager>()));

        services.AddScoped<IPopupHandler, BanUserPopupHandler>();
        services.AddScoped<IPopupHandler, CensusPopupHandler>();
@@ -522,7 +518,6 @@ public sealed class Plugin : IDalamudPlugin
            sp.GetRequiredService<ILogger<UiService>>(),
            pluginInterface.UiBuilder,
            sp.GetRequiredService<LightlessConfigService>(),
-            sp.GetRequiredService<DalamudUtilService>(),
            sp.GetRequiredService<WindowSystem>(),
            sp.GetServices<WindowMediatorSubscriberBase>(),
            sp.GetRequiredService<UiFactory>(),
@@ -589,6 +584,7 @@ public sealed class Plugin : IDalamudPlugin

    public void Dispose()
    {
-        _host.StopAsync().ContinueWith(_ => _host.Dispose()).Wait(TimeSpan.FromSeconds(5));
+        _host.StopAsync().GetAwaiter().GetResult();
+        _host.Dispose();
    }
 }
--- a/LightlessSync/Resources/LocalizationExtention.cs
+++ b/LightlessSync/Resources/LocalizationExtention.cs
@@ -1,9 +0,0 @@
-namespace LightlessSync.Resources;
-
-public static class LocalizationExtensions
-{
-    public static string F(this string mask, params object[] args)
-    {
-        return string.Format(mask, args);
-    }
-}
--- a/LightlessSync/Resources/Resources.Designer.cs
+++ b/LightlessSync/Resources/Resources.Designer.cs
@@ -1,171 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace LightlessSync.Resources {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LightlessSync.Resources.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to I agree.
-        /// </summary>
-        public static string ToSStrings_AgreeLabel {
-            get {
-                return ResourceManager.GetString("ToSStrings_AgreeLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Agreement of Usage of Service.
-        /// </summary>
-        public static string ToSStrings_AgreementLabel {
-            get {
-                return ResourceManager.GetString("ToSStrings_AgreementLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;I agree&apos; button will be available in.
-        /// </summary>
-        public static string ToSStrings_ButtonWillBeAvailableIn {
-            get {
-                return ResourceManager.GetString("ToSStrings_ButtonWillBeAvailableIn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Language.
-        /// </summary>
-        public static string ToSStrings_LanguageLabel {
-            get {
-                return ResourceManager.GetString("ToSStrings_LanguageLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to All of the mod files currently active on your character as well as your current character state will be uploaded to the service you registered yourself at automatically. The plugin will exclusively upload the necessary mod files and not the whole mod..
-        /// </summary>
-        public static string ToSStrings_Paragraph1 {
-            get {
-                return ResourceManager.GetString("ToSStrings_Paragraph1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to If you are on a data capped internet connection, higher fees due to data usage depending on the amount of downloaded and uploaded mod files might occur. Mod files will be compressed on up- and download to save on bandwidth usage. Due to varying up- and download speeds, changes in characters might not be visible immediately. Files present on the service that already represent your active mod files will not be uploaded again..
-        /// </summary>
-        public static string ToSStrings_Paragraph2 {
-            get {
-                return ResourceManager.GetString("ToSStrings_Paragraph2", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The mod files you are uploading are confidential and will not be distributed to parties other than the ones who are requesting the exact same mod files. Please think about who you are going to pair since it is unavoidable that they will receive and locally cache the necessary mod files that you have currently in use. Locally cached mod files will have arbitrary file names to discourage attempts at replicating the original mod..
-        /// </summary>
-        public static string ToSStrings_Paragraph3 {
-            get {
-                return ResourceManager.GetString("ToSStrings_Paragraph3", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The plugin creator tried their best to keep you secure. However, there is no guarantee for 100% security. Do not blindly pair your client with everyone..
-        /// </summary>
-        public static string ToSStrings_Paragraph4 {
-            get {
-                return ResourceManager.GetString("ToSStrings_Paragraph4", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Mod files that are saved on the service will remain on the service as long as there are requests for the files from clients. After a period of not being used, the mod files will be automatically deleted. You will also be able to wipe all the files you have personally uploaded on request. The service holds no information about which mod files belong to which mod..
-        /// </summary>
-        public static string ToSStrings_Paragraph5 {
-            get {
-                return ResourceManager.GetString("ToSStrings_Paragraph5", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to This service is provided as-is. In case of abuse join the Lightless Sync Discord..
-        /// </summary>
-        public static string ToSStrings_Paragraph6 {
-            get {
-                return ResourceManager.GetString("ToSStrings_Paragraph6", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to READ THIS CAREFULLY.
-        /// </summary>
-        public static string ToSStrings_ReadLabel {
-            get {
-                return ResourceManager.GetString("ToSStrings_ReadLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Users Online.
-        /// </summary>
-        public static string Users_Online {
-            get {
-                return ResourceManager.GetString("Users_Online", resourceCulture);
-            }
-        }
-    }
-}
--- a/LightlessSync/Resources/Resources.de.resx
+++ b/LightlessSync/Resources/Resources.de.resx
@@ -1,47 +0,0 @@
-<root>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="ToSStrings_LanguageLabel" xml:space="preserve">
-        <value>Language</value>
-    </data>
-    <data name="ToSStrings_AgreementLabel" xml:space="preserve">
-        <value>Nutzungsbedingungen</value>
-    </data>
-    <data name="ToSStrings_ReadLabel" xml:space="preserve">
-        <value>BITTE LIES DIES SORGFÄLTIG</value>
-    </data>
-    <data name="ToSStrings_Paragraph1" xml:space="preserve">
-        <value>Alle Moddateien, die aktuell auf deinem Charakter aktiv sind und dein Charakterzustand werden automatisch zu dem Service, an dem du dich registriert hast, hochgeladen. Das Plugin wird ausschließlich die nötigen Moddateien hochladen und nicht die gesamte Modifikation.</value>
-    </data>
-    <data name="ToSStrings_Paragraph2" xml:space="preserve">
-        <value>Falls du mit einer getakteten Internetverbindung verbunden bist, können durch den Datentransfer von Hoch- und Runtergeladenen Moddateien höhere Kosten entstehen. Moddateien werden beim Hoch- und Runterladen komprimiert um Bandbreite zu sparen. Durch unterschiedliche Hoch- und Runterladgeschwindigkeiten ist es möglich, dass Änderungen an Charakteren nicht sofort sichtbar sind. Dateien die bereits auf dem Service existieren, werden nicht nochmals hochgeladen.</value>
-    </data>
-    <data name="ToSStrings_Paragraph3" xml:space="preserve">
-        <value>Die Moddateien die du hochlädst sind vertraulich und werden nicht mit anderen Nutzern geteilt, die nicht die exakt selben Dateien anfordern. Bitte überlege dir sorgfältig mit wem du deinen Identifikationscode teilst, da es unvermeidlich ist, dass die andere Person deine Moddateien erhält und lokal zwischenspeichert. Lokal zwischengespeicherte Dateien haben willkürrliche Namen um vor Versuchen abzuschrecken die originalen Moddateien aus diesen wiederherzustellen.</value>
-    </data>
-    <data name="ToSStrings_Paragraph4" xml:space="preserve">
-        <value>Der Ersteller des Plugins hat sein Bestes getan, um deine Sicherheit zu gewährleisten. Es gibt jedoch keine Garantie für 100%ige Sicherheit. Teile deinen Identifikationscode nicht blind mit jedem.</value>
-    </data>
-    <data name="ToSStrings_Paragraph5" xml:space="preserve">
-        <value>Moddateien, die auf dem Service gespeichert sind, verbleiben auf dem Service, solange es Anforderungen für diese Dateien gibt. Nach einer Zeitspanne in der die Dateien nicht verwendet wurden, werden diese automatisch gelöscht. Du hast auch die Möglichkeit manuell alle Dateien auf dem Service zu löschen. Der Service hat keine Informationen welche Moddateien zu welcher Modifikation gehören.</value>
-    </data>
-    <data name="ToSStrings_Paragraph6" xml:space="preserve">
-        <value>Dieser Dienst wird ohne Gewähr angeboten. Im Falle eines Missbrauchs tretet dem Lightless Sync Discord bei.</value>
-    </data>
-    <data name="ToSStrings_AgreeLabel" xml:space="preserve">
-        <value>Ich Stimme zu</value>
-    </data>
-    <data name="ToSStrings_ButtonWillBeAvailableIn" xml:space="preserve">
-        <value>"Ich stimme zu" Knopf verfügbar in</value>
-    </data>
-</root>
--- a/LightlessSync/Resources/Resources.fr.resx
+++ b/LightlessSync/Resources/Resources.fr.resx
@@ -1,47 +0,0 @@
-<root>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="ToSStrings_LanguageLabel" xml:space="preserve">
-        <value>Language</value>
-    </data>
-    <data name="ToSStrings_AgreementLabel" xml:space="preserve">
-        <value>Conditions d'Utilisation</value>
-    </data>
-    <data name="ToSStrings_ReadLabel" xml:space="preserve">
-        <value>LISEZ CES INFORMATIONS ATTENTIVEMENT</value>
-    </data>
-    <data name="ToSStrings_Paragraph1" xml:space="preserve">
-        <value>Tous les fichiers moddés actuellement en cours d'utilisation ainsi que le statut actuel de votre personnage vont être mix en ligne via le service sur lequel vous vous êtes automatiquement enregistré. Seuls les fichiers nécessaires seront téléversés par le plugin et non pas le mod en entier.</value>
-    </data>
-    <data name="ToSStrings_Paragraph2" xml:space="preserve">
-        <value>Si le débit de votre connexion internet est limité, le téléchargement et téléversement d'un grand nombre de fichiers peut entraîner des coûts supplémentaires. Les fichiers seront compressés au chargement et versement pour réduire l'impact sur votre bande passants. Selon la rapidité de vos téléchargements et téléversements, les changements ne seront peut-être pas visibles instantanément sur les personnages. Les fichiers déja présents sur le service qui correspondent à ceux de vos mods en cours d'utilisation ne seront pas remis en ligne.</value>
-    </data>
-    <data name="ToSStrings_Paragraph3" xml:space="preserve">
-        <value>Les fichiers que vous allez partager sont confidentiels et ne seront envoyés qu'aux utilisateurs qui feront une requête exacte de ceux-çi. Nous vous demandons de (re)considérer qui sera synchronisé avec vous, puisqu'ils recevront et stockeront inévitablement en local les fichiers nécéssaires utilisés à cet instant. Les noms des fichiers stockés localement sont changés de manière arbitraire afin de décourager toute tentative de réplication des originaux.</value>
-    </data>
-    <data name="ToSStrings_Paragraph4" xml:space="preserve">
-        <value>Le créateur de ce plugin a tenté de sécuriser l'application du mieux possible. Cependant, il ne peut pas garantir une protection 100% infaillible. Pour votre sécurité, ne vous synchronisez pas aveuglément et avec n'importe qui.</value>
-    </data>
-    <data name="ToSStrings_Paragraph5" xml:space="preserve">
-        <value>Les fichiers sauvegardés sur le service resteront en ligne tant que des utilisateurs en feront usage. Ils seront effacés automatiquement après une certaine période d'inactivité. Vous pouvez également demander l'effacement de tous les fichiers que vous avez mis en ligne vous-même. Le service en soi ne contient aucune information pouvant identifier quel fichier appartient à quel mod.</value>
-    </data>
-    <data name="ToSStrings_Paragraph6" xml:space="preserve">
-        <value>Ce service et ses composants vous sont fournis en l'état. En cas d'abus rejoindre le serveur Discord Lightless Sync.</value>
-    </data>
-    <data name="ToSStrings_AgreeLabel" xml:space="preserve">
-        <value>J'accept</value>
-    </data>
-    <data name="ToSStrings_ButtonWillBeAvailableIn" xml:space="preserve">
-        <value>Bouton "J'accept" disposible dans</value>
-    </data>
-</root>
--- a/LightlessSync/Resources/Resources.resx
+++ b/LightlessSync/Resources/Resources.resx
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<root>
-    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-        <xsd:element name="root" msdata:IsDataSet="true">
-            
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="ToSStrings_AgreeLabel" xml:space="preserve">
-        <value>I agree</value>
-    </data>
-    <data name="ToSStrings_AgreementLabel" xml:space="preserve">
-        <value>Agreement of Usage of Service</value>
-    </data>
-    <data name="ToSStrings_ButtonWillBeAvailableIn" xml:space="preserve">
-        <value>'I agree' button will be available in</value>
-    </data>
-    <data name="ToSStrings_Paragraph1" xml:space="preserve">
-        <value>All of the mod files currently active on your character as well as your current character state will be uploaded to the service you registered yourself at automatically. The plugin will exclusively upload the necessary mod files and not the whole mod.</value>
-    </data>
-    <data name="ToSStrings_Paragraph2" xml:space="preserve">
-        <value>If you are on a data capped internet connection, higher fees due to data usage depending on the amount of downloaded and uploaded mod files might occur. Mod files will be compressed on up- and download to save on bandwidth usage. Due to varying up- and download speeds, changes in characters might not be visible immediately. Files present on the service that already represent your active mod files will not be uploaded again.</value>
-    </data>
-    <data name="ToSStrings_Paragraph3" xml:space="preserve">
-        <value>The mod files you are uploading are confidential and will not be distributed to parties other than the ones who are requesting the exact same mod files. Please think about who you are going to pair since it is unavoidable that they will receive and locally cache the necessary mod files that you have currently in use. Locally cached mod files will have arbitrary file names to discourage attempts at replicating the original mod.</value>
-    </data>
-    <data name="ToSStrings_Paragraph4" xml:space="preserve">
-        <value>The plugin creator tried their best to keep you secure. However, there is no guarantee for 100% security. Do not blindly pair your client with everyone.</value>
-    </data>
-    <data name="ToSStrings_Paragraph5" xml:space="preserve">
-        <value>Mod files that are saved on the service will remain on the service as long as there are requests for the files from clients. After a period of not being used, the mod files will be automatically deleted. You will also be able to wipe all the files you have personally uploaded on request. The service holds no information about which mod files belong to which mod.</value>
-    </data>
-    <data name="ToSStrings_Paragraph6" xml:space="preserve">
-        <value>This service is provided as-is. In case of abuse join the Lightless Sync Discord.</value>
-    </data>
-    <data name="ToSStrings_ReadLabel" xml:space="preserve">
-        <value>READ THIS CAREFULLY</value>
-    </data>
-    <data name="ToSStrings_LanguageLabel" xml:space="preserve">
-        <value>Language</value>
-    </data>
-    <data name="Users_Online" xml:space="preserve">
-        <value>Users Online</value>
-    </data>
-</root>
--- a/LightlessSync/Resources/Resources.zh.resx
+++ b/LightlessSync/Resources/Resources.zh.resx
@@ -1,20 +0,0 @@
-<root>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="ToSStrings_LanguageLabel" xml:space="preserve">
-        <value>语言</value>
-    </data>
-    <data name="Users_Online" xml:space="preserve">
-        <value>用户在线</value>
-    </data>
-</root>
--- a/LightlessSync/Services/ActorTracking/ActorObjectService.cs
+++ b/LightlessSync/Services/ActorTracking/ActorObjectService.cs
@@ -93,7 +93,6 @@ public sealed class ActorObjectService : IHostedService, IDisposable, IMediatorS
            }
            RefreshTrackedActors(force: true);
        });
-        _mediator.Subscribe<DalamudLogoutMessage>(this, _ => ClearTrackingState());
    }

    private bool IsZoning => _condition[ConditionFlag.BetweenAreas] || _condition[ConditionFlag.BetweenAreas51];
@@ -343,8 +342,18 @@ public sealed class ActorObjectService : IHostedService, IDisposable, IMediatorS
    public Task StopAsync(CancellationToken cancellationToken)
    {
        DisposeHooks();
-        ClearTrackingState();
+        _activePlayers.Clear();
+        _gposePlayers.Clear();
+        _actorsByHash.Clear();
+        _actorsByName.Clear();
+        _pendingHashResolutions.Clear();
        _mediator.UnsubscribeAll(this);
+        lock (_playerRelatedHandlerLock)
+        {
+            _playerRelatedHandlers.Clear();
+        }
+        Volatile.Write(ref _snapshot, ActorSnapshot.Empty);
+        Volatile.Write(ref _gposeSnapshot, GposeSnapshot.Empty);
        return Task.CompletedTask;
    }

@@ -571,19 +580,36 @@ public sealed class ActorObjectService : IHostedService, IDisposable, IMediatorS
        if (localPlayerAddress == nint.Zero)
            return nint.Zero;

+        var playerObject = (GameObject*)localPlayerAddress;
+        var candidateAddress = _objectTable.GetObjectAddress(playerObject->ObjectIndex + 1);
        if (ownerEntityId == 0)
            return nint.Zero;

-        var playerObject = (GameObject*)localPlayerAddress;
-        var candidateAddress = _objectTable.GetObjectAddress(playerObject->ObjectIndex + 1);
-        if (candidateAddress == nint.Zero)
-            return nint.Zero;
+        if (candidateAddress != nint.Zero)
+        {
+            var candidate = (GameObject*)candidateAddress;
+            var candidateKind = (DalamudObjectKind)candidate->ObjectKind;
+            if (candidateKind is DalamudObjectKind.MountType or DalamudObjectKind.Companion)
+            {
+                if (ResolveOwnerId(candidate) == ownerEntityId)
+                    return candidateAddress;
+            }
+        }

-        var candidate = (GameObject*)candidateAddress;
-        var candidateKind = (DalamudObjectKind)candidate->ObjectKind;
-        return candidateKind is DalamudObjectKind.MountType or DalamudObjectKind.Companion
-            ? candidateAddress
-            : nint.Zero;
+        foreach (var obj in _objectTable)
+        {
+            if (obj is null || obj.Address == nint.Zero || obj.Address == localPlayerAddress)
+                continue;
+
+            if (obj.ObjectKind is not (DalamudObjectKind.MountType or DalamudObjectKind.Companion))
+                continue;
+
+            var candidate = (GameObject*)obj.Address;
+            if (ResolveOwnerId(candidate) == ownerEntityId)
+                return obj.Address;
+        }
+
+        return nint.Zero;
    }

    private unsafe nint GetPetAddress(nint localPlayerAddress, uint ownerEntityId)
@@ -603,6 +629,22 @@ public sealed class ActorObjectService : IHostedService, IDisposable, IMediatorS
            }
        }

+        foreach (var obj in _objectTable)
+        {
+            if (obj is null || obj.Address == nint.Zero || obj.Address == localPlayerAddress)
+                continue;
+
+            if (obj.ObjectKind != DalamudObjectKind.BattleNpc)
+                continue;
+
+            var candidate = (GameObject*)obj.Address;
+            if (candidate->BattleNpcSubKind != BattleNpcSubKind.Pet)
+                continue;
+
+            if (ResolveOwnerId(candidate) == ownerEntityId)
+                return obj.Address;
+        }
+
        return nint.Zero;
    }

@@ -622,6 +664,23 @@ public sealed class ActorObjectService : IHostedService, IDisposable, IMediatorS
                    return candidate;
            }
        }
+
+        foreach (var obj in _objectTable)
+        {
+            if (obj is null || obj.Address == nint.Zero || obj.Address == localPlayerAddress)
+                continue;
+
+            if (obj.ObjectKind != DalamudObjectKind.BattleNpc)
+                continue;
+
+            var candidate = (GameObject*)obj.Address;
+            if (candidate->BattleNpcSubKind != BattleNpcSubKind.Buddy)
+                continue;
+
+            if (ResolveOwnerId(candidate) == ownerEntityId)
+                return obj.Address;
+        }
+
        return nint.Zero;
    }

@@ -1018,22 +1077,6 @@ public sealed class ActorObjectService : IHostedService, IDisposable, IMediatorS
        }
    }

-    private void ClearTrackingState()
-    {
-        _activePlayers.Clear();
-        _gposePlayers.Clear();
-        _actorsByHash.Clear();
-        _actorsByName.Clear();
-        _pendingHashResolutions.Clear();
-        lock (_playerRelatedHandlerLock)
-        {
-            _playerRelatedHandlers.Clear();
-        }
-        Volatile.Write(ref _snapshot, ActorSnapshot.Empty);
-        Volatile.Write(ref _gposeSnapshot, GposeSnapshot.Empty);
-        _nextRefreshAllowed = DateTime.MinValue;
-    }
-
    public void Dispose()
    {
        DisposeHooks();
--- a/LightlessSync/Services/AssetProcessingQueue.cs
+++ b/LightlessSync/Services/AssetProcessingQueue.cs
@@ -1,93 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System.Collections.Concurrent;
-
-namespace LightlessSync.Services;
-
-public sealed class AssetProcessingQueue : IDisposable
-{
-    private readonly BlockingCollection<WorkItem> _queue = new();
-    private readonly Thread _worker;
-    private readonly ILogger _logger;
-    private bool _disposed;
-
-    public AssetProcessingQueue(ILogger logger, string name)
-    {
-        _logger = logger;
-        _worker = new Thread(Run)
-        {
-            IsBackground = true,
-            Name = string.IsNullOrWhiteSpace(name) ? "LightlessSync.AssetProcessing" : name
-        };
-        _worker.Start();
-    }
-
-    public Task Enqueue(Func<CancellationToken, Task> work, CancellationToken token = default)
-    {
-        if (work is null)
-        {
-            throw new ArgumentNullException(nameof(work));
-        }
-
-        var completion = new TaskCompletionSource<object?>(TaskCreationOptions.RunContinuationsAsynchronously);
-        if (token.IsCancellationRequested)
-        {
-            completion.TrySetCanceled(token);
-            return completion.Task;
-        }
-
-        if (_queue.IsAddingCompleted || _disposed)
-        {
-            completion.TrySetException(new ObjectDisposedException(nameof(AssetProcessingQueue)));
-            return completion.Task;
-        }
-
-        _queue.Add(new WorkItem(work, token, completion));
-        return completion.Task;
-    }
-
-    private void Run()
-    {
-        foreach (var item in _queue.GetConsumingEnumerable())
-        {
-            if (item.Token.IsCancellationRequested)
-            {
-                item.Completion.TrySetCanceled(item.Token);
-                continue;
-            }
-
-            try
-            {
-                item.Work(item.Token).GetAwaiter().GetResult();
-                item.Completion.TrySetResult(null);
-            }
-            catch (OperationCanceledException ex)
-            {
-                var token = ex.CancellationToken.IsCancellationRequested ? ex.CancellationToken : item.Token;
-                item.Completion.TrySetCanceled(token);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Asset processing job failed.");
-                item.Completion.TrySetException(ex);
-            }
-        }
-    }
-
-    public void Dispose()
-    {
-        if (_disposed)
-        {
-            return;
-        }
-
-        _disposed = true;
-        _queue.CompleteAdding();
-        _worker.Join(TimeSpan.FromSeconds(2));
-        _queue.Dispose();
-    }
-
-    private readonly record struct WorkItem(
-        Func<CancellationToken, Task> Work,
-        CancellationToken Token,
-        TaskCompletionSource<object?> Completion);
-}
--- a/LightlessSync/Services/CharacterAnalyzer.cs
+++ b/LightlessSync/Services/CharacterAnalyzer.cs
@@ -28,7 +28,7 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
        {
            _baseAnalysisCts = _baseAnalysisCts.CancelRecreate();
            var token = _baseAnalysisCts.Token;
-            _ = Task.Run(async () => await BaseAnalysis(msg.CharacterData, token).ConfigureAwait(false), token);
+            _ = BaseAnalysis(msg.CharacterData, token);
        });
        _fileCacheManager = fileCacheManager;
        _xivDataAnalyzer = modelAnalyzer;
@@ -106,7 +106,7 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
        _baseAnalysisCts.Dispose();
    }

-    public async Task UpdateFileEntriesAsync(IEnumerable<string> filePaths, CancellationToken token, bool force = false)
+    public async Task UpdateFileEntriesAsync(IEnumerable<string> filePaths, CancellationToken token)
    {
        var normalized = new HashSet<string>(
            filePaths.Where(path => !string.IsNullOrWhiteSpace(path)),
@@ -115,8 +115,6 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
        {
            return;
        }
-
-        var updated = false;
        foreach (var objectEntries in LastAnalysis.Values)
        {
            foreach (var entry in objectEntries.Values)
@@ -126,26 +124,9 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
                    continue;
                }
                token.ThrowIfCancellationRequested();
-                await entry.ComputeSizes(_fileCacheManager, token, force).ConfigureAwait(false);
-
-                if (string.Equals(entry.FileType, "mdl", StringComparison.OrdinalIgnoreCase))
-                {
-                    var sourcePath = entry.FilePaths.FirstOrDefault(path => !string.IsNullOrWhiteSpace(path));
-                    if (!string.IsNullOrWhiteSpace(sourcePath))
-                    {
-                        entry.UpdateTriangles(_xivDataAnalyzer.RefreshTrianglesForPath(entry.Hash, sourcePath));
-                    }
-                }
-
-                updated = true;
+                await entry.ComputeSizes(_fileCacheManager, token).ConfigureAwait(false);
            }
        }
-
-        if (updated)
-        {
-            RecalculateSummary();
-            Mediator.Publish(new CharacterDataAnalyzedMessage());
-        }
    }

    private async Task BaseAnalysis(CharacterData charaData, CancellationToken token)
@@ -330,10 +311,6 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
            var original = new FileInfo(path).Length;

            var compressedLen = await fileCacheManager.GetCompressedSizeAsync(Hash, token).ConfigureAwait(false);
-            if (compressedLen <= 0 && !string.Equals(FileType, "tex", StringComparison.OrdinalIgnoreCase))
-            {
-                compressedLen = original;
-            }

            fileCacheManager.SetSizeInfo(Hash, original, compressedLen);
            FileCacheManager.ApplySizesToEntries(CacheEntries, original, compressedLen);
@@ -349,7 +326,6 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
        private Lazy<string>? _format;

        public void RefreshFormat() => _format = CreateFormatValue();
-        public void UpdateTriangles(long triangles) => Triangles = triangles;

        private Lazy<string> CreateFormatValue()
            => new(() =>
--- a/LightlessSync/Services/Chat/ZoneChatService.cs
+++ b/LightlessSync/Services/Chat/ZoneChatService.cs
@@ -8,26 +8,18 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using LightlessSync.UI.Services;
 using LightlessSync.LightlessConfiguration;
-using LightlessSync.LightlessConfiguration.Models;
-using System.Text.Json;
-using System.Text.Json.Serialization;

 namespace LightlessSync.Services.Chat;

 public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedService
 {
-    private const int MaxMessageHistory = 200;
+    private const int MaxMessageHistory = 150;
    internal const int MaxOutgoingLength = 200;
    private const int MaxUnreadCount = 999;
    private const string ZoneUnavailableMessage = "Zone chat is only available in major cities.";
    private const string ZoneChannelKey = "zone";
    private const int MaxReportReasonLength = 100;
    private const int MaxReportContextLength = 1000;
-    private static readonly JsonSerializerOptions PersistedHistorySerializerOptions = new()
-    {
-        PropertyNameCaseInsensitive = true,
-        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-    };

    private readonly ApiController _apiController;
    private readonly DalamudUtilService _dalamudUtilService;
@@ -384,7 +376,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS

    public Task StartAsync(CancellationToken cancellationToken)
    {
-        LoadPersistedSyncshellHistory();
        Mediator.Subscribe<DalamudLoginMessage>(this, _ => HandleLogin());
        Mediator.Subscribe<DalamudLogoutMessage>(this, _ => HandleLogout());
        Mediator.Subscribe<ZoneSwitchEndMessage>(this, _ => ScheduleZonePresenceUpdate());
@@ -1009,22 +1000,11 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS

    private void OnChatMessageReceived(ChatMessageDto dto)
    {
-        ChatChannelDescriptor descriptor = dto.Channel.WithNormalizedCustomKey();
-        string key = descriptor.Type == ChatChannelType.Zone ? ZoneChannelKey : BuildChannelKey(descriptor);
-        bool fromSelf = IsMessageFromSelf(dto, key);
-        ChatMessageEntry message = BuildMessage(dto, fromSelf);
-        bool mentionNotificationsEnabled = _chatConfigService.Current.EnableMentionNotifications;
-        bool notifyMention = mentionNotificationsEnabled
-            && !fromSelf
-            && descriptor.Type == ChatChannelType.Group
-            && TryGetSelfMentionToken(dto.Message, out _);
-
-        string? mentionChannelName = null;
-        string? mentionSenderName = null;
+        var descriptor = dto.Channel.WithNormalizedCustomKey();
+        var key = descriptor.Type == ChatChannelType.Zone ? ZoneChannelKey : BuildChannelKey(descriptor);
+        var fromSelf = IsMessageFromSelf(dto, key);
+        var message = BuildMessage(dto, fromSelf);
        bool publishChannelList = false;
-        bool shouldPersistHistory = _chatConfigService.Current.PersistSyncshellHistory;
-        List<PersistedChatMessage>? persistedMessages = null;
-        string? persistedChannelKey = null;

        using (_sync.EnterScope())
        {
@@ -1062,12 +1042,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
                state.Messages.RemoveAt(0);
            }

-            if (notifyMention)
-            {
-                mentionChannelName = state.DisplayName;
-                mentionSenderName = message.DisplayName;
-            }
-
            if (string.Equals(_activeChannelKey, key, StringComparison.Ordinal))
            {
                state.HasUnread = false;
@@ -1084,29 +1058,10 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
            }

            MarkChannelsSnapshotDirtyLocked();
-
-            if (shouldPersistHistory && state.Type == ChatChannelType.Group)
-            {
-                persistedChannelKey = state.Key;
-                persistedMessages = BuildPersistedHistoryLocked(state);
-            }
        }

        Mediator.Publish(new ChatChannelMessageAdded(key, message));

-        if (persistedMessages is not null && persistedChannelKey is not null)
-        {
-            PersistSyncshellHistory(persistedChannelKey, persistedMessages);
-        }
-
-        if (notifyMention)
-        {
-            string channelName = mentionChannelName ?? "Syncshell";
-            string senderName = mentionSenderName ?? "Someone";
-            string notificationText = $"You were mentioned by {senderName} in {channelName}.";
-            Mediator.Publish(new NotificationMessage("Syncshell mention", notificationText, NotificationType.Info));
-        }
-
        if (publishChannelList)
        {
            using (_sync.EnterScope())
@@ -1153,113 +1108,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
        return false;
    }

-    private bool TryGetSelfMentionToken(string message, out string matchedToken)
-    {
-        matchedToken = string.Empty;
-        if (string.IsNullOrWhiteSpace(message))
-        {
-            return false;
-        }
-
-        HashSet<string> tokens = BuildSelfMentionTokens();
-        if (tokens.Count == 0)
-        {
-            return false;
-        }
-
-        return TryFindMentionToken(message, tokens, out matchedToken);
-    }
-
-    private HashSet<string> BuildSelfMentionTokens()
-    {
-        HashSet<string> tokens = new(StringComparer.OrdinalIgnoreCase);
-        string uid = _apiController.UID;
-        if (IsValidMentionToken(uid))
-        {
-            tokens.Add(uid);
-        }
-
-        string displayName = _apiController.DisplayName;
-        if (IsValidMentionToken(displayName))
-        {
-            tokens.Add(displayName);
-        }
-
-        return tokens;
-    }
-
-    private static bool IsValidMentionToken(string value)
-    {
-        if (string.IsNullOrWhiteSpace(value))
-        {
-            return false;
-        }
-
-        for (int i = 0; i < value.Length; i++)
-        {
-            if (!IsMentionChar(value[i]))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private static bool TryFindMentionToken(string message, IReadOnlyCollection<string> tokens, out string matchedToken)
-    {
-        matchedToken = string.Empty;
-        if (tokens.Count == 0 || string.IsNullOrEmpty(message))
-        {
-            return false;
-        }
-
-        int index = 0;
-        while (index < message.Length)
-        {
-            if (message[index] != '@')
-            {
-                index++;
-                continue;
-            }
-
-            if (index > 0 && IsMentionChar(message[index - 1]))
-            {
-                index++;
-                continue;
-            }
-
-            int start = index + 1;
-            int end = start;
-            while (end < message.Length && IsMentionChar(message[end]))
-            {
-                end++;
-            }
-
-            if (end == start)
-            {
-                index++;
-                continue;
-            }
-
-            string token = message.Substring(start, end - start);
-            if (tokens.Contains(token))
-            {
-                matchedToken = token;
-                return true;
-            }
-
-            index = end;
-        }
-
-        return false;
-    }
-
-    private static bool IsMentionChar(char value)
-    {
-        return char.IsLetterOrDigit(value) || value == '_' || value == '-' || value == '\'';
-    }
-
    private ChatMessageEntry BuildMessage(ChatMessageDto dto, bool fromSelf)
    {
        var displayName = ResolveDisplayName(dto, fromSelf);
@@ -1516,313 +1364,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
        return 0;
    }

-    private void LoadPersistedSyncshellHistory()
-    {
-        if (!_chatConfigService.Current.PersistSyncshellHistory)
-        {
-            return;
-        }
-
-        Dictionary<string, string> persisted = _chatConfigService.Current.SyncshellChannelHistory;
-        if (persisted.Count == 0)
-        {
-            return;
-        }
-
-        List<string> invalidKeys = new();
-        foreach (KeyValuePair<string, string> entry in persisted)
-        {
-            if (string.IsNullOrWhiteSpace(entry.Key) || string.IsNullOrWhiteSpace(entry.Value))
-            {
-                invalidKeys.Add(entry.Key);
-                continue;
-            }
-
-            if (!TryDecodePersistedHistory(entry.Value, out List<PersistedChatMessage> persistedMessages))
-            {
-                invalidKeys.Add(entry.Key);
-                continue;
-            }
-
-            if (persistedMessages.Count == 0)
-            {
-                invalidKeys.Add(entry.Key);
-                continue;
-            }
-
-            if (persistedMessages.Count > MaxMessageHistory)
-            {
-                int startIndex = Math.Max(0, persistedMessages.Count - MaxMessageHistory);
-                persistedMessages = persistedMessages.GetRange(startIndex, persistedMessages.Count - startIndex);
-            }
-
-            List<ChatMessageEntry> restoredMessages = new(persistedMessages.Count);
-            foreach (PersistedChatMessage persistedMessage in persistedMessages)
-            {
-                if (!TryBuildRestoredMessage(entry.Key, persistedMessage, out ChatMessageEntry restoredMessage))
-                {
-                    continue;
-                }
-
-                restoredMessages.Add(restoredMessage);
-            }
-
-            if (restoredMessages.Count == 0)
-            {
-                invalidKeys.Add(entry.Key);
-                continue;
-            }
-
-            using (_sync.EnterScope())
-            {
-                _messageHistoryCache[entry.Key] = restoredMessages;
-            }
-        }
-
-        if (invalidKeys.Count > 0)
-        {
-            foreach (string key in invalidKeys)
-            {
-                persisted.Remove(key);
-            }
-
-            _chatConfigService.Save();
-        }
-    }
-
-    private List<PersistedChatMessage> BuildPersistedHistoryLocked(ChatChannelState state)
-    {
-        int startIndex = Math.Max(0, state.Messages.Count - MaxMessageHistory);
-        List<PersistedChatMessage> persistedMessages = new(state.Messages.Count - startIndex);
-        for (int i = startIndex; i < state.Messages.Count; i++)
-        {
-            ChatMessageEntry entry = state.Messages[i];
-            if (entry.Payload is not { } payload)
-            {
-                continue;
-            }
-
-            persistedMessages.Add(new PersistedChatMessage(
-                payload.Message,
-                entry.DisplayName,
-                entry.FromSelf,
-                entry.ReceivedAtUtc,
-                payload.SentAtUtc));
-        }
-
-        return persistedMessages;
-    }
-
-    private void PersistSyncshellHistory(string channelKey, List<PersistedChatMessage> persistedMessages)
-    {
-        if (!_chatConfigService.Current.PersistSyncshellHistory)
-        {
-            return;
-        }
-
-        Dictionary<string, string> persisted = _chatConfigService.Current.SyncshellChannelHistory;
-        if (persistedMessages.Count == 0)
-        {
-            if (persisted.Remove(channelKey))
-            {
-                _chatConfigService.Save();
-            }
-
-            return;
-        }
-
-        string? base64 = EncodePersistedMessages(persistedMessages);
-        if (string.IsNullOrWhiteSpace(base64))
-        {
-            if (persisted.Remove(channelKey))
-            {
-                _chatConfigService.Save();
-            }
-
-            return;
-        }
-
-        persisted[channelKey] = base64;
-        _chatConfigService.Save();
-    }
-
-    private static string? EncodePersistedMessages(List<PersistedChatMessage> persistedMessages)
-    {
-        if (persistedMessages.Count == 0)
-        {
-            return null;
-        }
-
-        byte[] jsonBytes = JsonSerializer.SerializeToUtf8Bytes(persistedMessages, PersistedHistorySerializerOptions);
-        return Convert.ToBase64String(jsonBytes);
-    }
-
-    private static bool TryDecodePersistedHistory(string base64, out List<PersistedChatMessage> persistedMessages)
-    {
-        persistedMessages = new List<PersistedChatMessage>();
-        if (string.IsNullOrWhiteSpace(base64))
-        {
-            return false;
-        }
-
-        try
-        {
-            byte[] jsonBytes = Convert.FromBase64String(base64);
-            List<PersistedChatMessage>? decoded = JsonSerializer.Deserialize<List<PersistedChatMessage>>(jsonBytes, PersistedHistorySerializerOptions);
-            if (decoded is null)
-            {
-                return false;
-            }
-
-            persistedMessages = decoded;
-            return true;
-        }
-        catch
-        {
-            return false;
-        }
-    }
-
-    private static bool TryBuildRestoredMessage(string channelKey, PersistedChatMessage persistedMessage, out ChatMessageEntry restoredMessage)
-    {
-        restoredMessage = default;
-        string messageText = persistedMessage.Message;
-        DateTime sentAtUtc = persistedMessage.SentAtUtc;
-        if (string.IsNullOrWhiteSpace(messageText) && persistedMessage.LegacyPayload is { } legacy)
-        {
-            messageText = legacy.Message;
-            sentAtUtc = legacy.SentAtUtc;
-        }
-
-        if (string.IsNullOrWhiteSpace(messageText))
-        {
-            return false;
-        }
-
-        ChatChannelDescriptor descriptor = BuildDescriptorFromChannelKey(channelKey);
-        ChatSenderDescriptor sender = new ChatSenderDescriptor(
-            ChatSenderKind.Anonymous,
-            string.Empty,
-            null,
-            null,
-            null,
-            false);
-
-        ChatMessageDto payload = new ChatMessageDto(descriptor, sender, messageText, sentAtUtc, string.Empty);
-        restoredMessage = new ChatMessageEntry(payload, persistedMessage.DisplayName, persistedMessage.FromSelf, persistedMessage.ReceivedAtUtc);
-        return true;
-    }
-
-    private static ChatChannelDescriptor BuildDescriptorFromChannelKey(string channelKey)
-    {
-        if (string.Equals(channelKey, ZoneChannelKey, StringComparison.Ordinal))
-        {
-            return new ChatChannelDescriptor { Type = ChatChannelType.Zone };
-        }
-
-        int separatorIndex = channelKey.IndexOf(':', StringComparison.Ordinal);
-        if (separatorIndex <= 0 || separatorIndex >= channelKey.Length - 1)
-        {
-            return new ChatChannelDescriptor { Type = ChatChannelType.Group };
-        }
-
-        string typeValue = channelKey[..separatorIndex];
-        if (!int.TryParse(typeValue, out int parsedType))
-        {
-            return new ChatChannelDescriptor { Type = ChatChannelType.Group };
-        }
-
-        string customKey = channelKey[(separatorIndex + 1)..];
-        ChatChannelType channelType = parsedType switch
-        {
-            (int)ChatChannelType.Zone => ChatChannelType.Zone,
-            (int)ChatChannelType.Group => ChatChannelType.Group,
-            _ => ChatChannelType.Group
-        };
-
-        return new ChatChannelDescriptor
-        {
-            Type = channelType,
-            CustomKey = customKey
-        };
-    }
-
-    public void ClearPersistedSyncshellHistory(bool clearLoadedMessages)
-    {
-        bool shouldPublish = false;
-        bool saveConfig = false;
-
-        using (_sync.EnterScope())
-        {
-            Dictionary<string, List<ChatMessageEntry>> cache = _messageHistoryCache;
-            if (cache.Count > 0)
-            {
-                List<string> keysToRemove = new();
-                foreach (string key in cache.Keys)
-                {
-                    if (!string.Equals(key, ZoneChannelKey, StringComparison.Ordinal))
-                    {
-                        keysToRemove.Add(key);
-                    }
-                }
-
-                foreach (string key in keysToRemove)
-                {
-                    cache.Remove(key);
-                }
-
-                if (keysToRemove.Count > 0)
-                {
-                    shouldPublish = true;
-                }
-            }
-
-            if (clearLoadedMessages)
-            {
-                foreach (ChatChannelState state in _channels.Values)
-                {
-                    if (state.Type != ChatChannelType.Group)
-                    {
-                        continue;
-                    }
-
-                    if (state.Messages.Count == 0 && state.UnreadCount == 0 && !state.HasUnread)
-                    {
-                        continue;
-                    }
-
-                    state.Messages.Clear();
-                    state.HasUnread = false;
-                    state.UnreadCount = 0;
-                    _lastReadCounts[state.Key] = 0;
-                    shouldPublish = true;
-                }
-            }
-
-            Dictionary<string, string> persisted = _chatConfigService.Current.SyncshellChannelHistory;
-            if (persisted.Count > 0)
-            {
-                persisted.Clear();
-                saveConfig = true;
-            }
-
-            if (shouldPublish)
-            {
-                MarkChannelsSnapshotDirtyLocked();
-            }
-        }
-
-        if (saveConfig)
-        {
-            _chatConfigService.Save();
-        }
-
-        if (shouldPublish)
-        {
-            PublishChannelListChanged();
-        }
-    }
-
    private sealed class ChatChannelState
    {
        public ChatChannelState(string key, ChatChannelType type, string displayName, ChatChannelDescriptor descriptor)
@@ -1859,12 +1400,4 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
        bool IsOwner);

    private readonly record struct PendingSelfMessage(string ChannelKey, string Message);
-
-    public sealed record PersistedChatMessage(
-        string Message = "",
-        string DisplayName = "",
-        bool FromSelf = false,
-        DateTime ReceivedAtUtc = default,
-        DateTime SentAtUtc = default,
-        [property: JsonPropertyName("Payload")] ChatMessageDto? LegacyPayload = null);
 }
--- a/LightlessCompactor/Services/Compactor/BatchFileFragService.cs
+++ b/LightlessCompactor/Services/Compactor/BatchFileFragService.cs
--- a/LightlessSync/Services/DalamudUtilService.cs
+++ b/LightlessSync/Services/DalamudUtilService.cs
@@ -91,7 +91,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
        {
            return gameData.GetExcelSheet<Lumina.Excel.Sheets.World>(clientLanguage)!
                .Where(w => !w.Name.IsEmpty && w.DataCenter.RowId != 0 && (w.IsPublic || char.IsUpper(w.Name.ToString()[0])
-                    || w is { RowId: > 1000, UserType: 101 or 201 }))
+                    || w is { RowId: > 1000, Region: 101 or 201 }))
                .ToDictionary(w => (ushort)w.RowId, w => w.Name.ToString());
        });
        JobData = new(() =>
@@ -227,28 +227,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
        _ = RunOnFrameworkThread(ReleaseFocusUnsafe);
    }

-    public void TargetPlayerByAddress(nint address)
-    {
-        if (address == nint.Zero) return;
-        if (_clientState.IsPvP) return;
-
-        _ = RunOnFrameworkThread(() =>
-        {
-            var gameObject = CreateGameObject(address);
-            if (gameObject is null) return;
-
-            var useFocusTarget = _configService.Current.UseFocusTarget;
-            if (useFocusTarget)
-            {
-                _targetManager.FocusTarget = gameObject;
-            }
-            else
-            {
-                _targetManager.Target = gameObject;
-            }
-        });
-    }
-
    private void FocusPairUnsafe(nint address, PairUniqueIdentifier pairIdent)
    {
        var target = CreateGameObject(address);
@@ -424,7 +402,38 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
        if (playerPointer == IntPtr.Zero) return IntPtr.Zero;

        var playerAddress = playerPointer.Value;
-        return _objectTable.GetObjectAddress(((GameObject*)playerAddress)->ObjectIndex + 1);
+        var ownerEntityId = ((Character*)playerAddress)->EntityId;
+        var candidateAddress = _objectTable.GetObjectAddress(((GameObject*)playerAddress)->ObjectIndex + 1);
+        if (ownerEntityId == 0) return candidateAddress;
+
+        if (playerAddress == _actorObjectService.LocalPlayerAddress)
+        {
+            var localOwned = _actorObjectService.LocalMinionOrMountAddress;
+            if (localOwned != nint.Zero)
+            {
+                return localOwned;
+            }
+        }
+
+        if (candidateAddress != nint.Zero)
+        {
+            var candidate = (GameObject*)candidateAddress;
+            var candidateKind = (DalamudObjectKind)candidate->ObjectKind;
+            if ((candidateKind == DalamudObjectKind.MountType || candidateKind == DalamudObjectKind.Companion)
+                && ResolveOwnerId(candidate) == ownerEntityId)
+            {
+                return candidateAddress;
+            }
+        }
+
+        var ownedObject = FindOwnedObject(ownerEntityId, playerAddress, static kind =>
+            kind == DalamudObjectKind.MountType || kind == DalamudObjectKind.Companion);
+        if (ownedObject != nint.Zero)
+        {
+            return ownedObject;
+        }
+
+        return candidateAddress;
    }

    public async Task<IntPtr> GetMinionOrMountAsync(IntPtr? playerPointer = null)
@@ -454,7 +463,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
            }
        }

-        return IntPtr.Zero;
+        return FindOwnedPet(ownerEntityId, ownerAddress);
    }

    public async Task<IntPtr> GetPetAsync(IntPtr? playerPointer = null)
@@ -462,6 +471,69 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
        return await RunOnFrameworkThread(() => GetPetPtr(playerPointer)).ConfigureAwait(false);
    }

+    private unsafe nint FindOwnedObject(uint ownerEntityId, nint ownerAddress, Func<DalamudObjectKind, bool> matchesKind)
+    {
+        if (ownerEntityId == 0)
+        {
+            return nint.Zero;
+        }
+
+        foreach (var obj in _objectTable)
+        {
+            if (obj is null || obj.Address == nint.Zero || obj.Address == ownerAddress)
+            {
+                continue;
+            }
+
+            if (!matchesKind(obj.ObjectKind))
+            {
+                continue;
+            }
+
+            var candidate = (GameObject*)obj.Address;
+            if (ResolveOwnerId(candidate) == ownerEntityId)
+            {
+                return obj.Address;
+            }
+        }
+
+        return nint.Zero;
+    }
+
+    private unsafe nint FindOwnedPet(uint ownerEntityId, nint ownerAddress)
+    {
+        if (ownerEntityId == 0)
+        {
+            return nint.Zero;
+        }
+
+        foreach (var obj in _objectTable)
+        {
+            if (obj is null || obj.Address == nint.Zero || obj.Address == ownerAddress)
+            {
+                continue;
+            }
+
+            if (obj.ObjectKind != DalamudObjectKind.BattleNpc)
+            {
+                continue;
+            }
+
+            var candidate = (GameObject*)obj.Address;
+            if (candidate->BattleNpcSubKind != BattleNpcSubKind.Pet)
+            {
+                continue;
+            }
+
+            if (ResolveOwnerId(candidate) == ownerEntityId)
+            {
+                return obj.Address;
+            }
+        }
+
+        return nint.Zero;
+    }
+
    private static unsafe bool IsPetMatch(GameObject* candidate, uint ownerEntityId)
    {
        if (candidate == null)
@@ -560,37 +632,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
        return true;
    }

-    public bool TryGetHashedCIDFromAddress(nint address, out string hashedCid)
-    {
-        hashedCid = string.Empty;
-        if (address == nint.Zero)
-            return false;
-
-        if (_framework.IsInFrameworkUpdateThread)
-        {
-            return TryGetHashedCIDFromAddressInternal(address, out hashedCid);
-        }
-
-        var result = _framework.RunOnFrameworkThread(() =>
-        {
-            var success = TryGetHashedCIDFromAddressInternal(address, out var resolved);
-            return (success, resolved);
-        }).GetAwaiter().GetResult();
-
-        hashedCid = result.resolved;
-        return result.success;
-    }
-
-    private bool TryGetHashedCIDFromAddressInternal(nint address, out string hashedCid)
-    {
-        hashedCid = string.Empty;
-        var player = _objectTable.CreateObjectReference(address) as IPlayerCharacter;
-        if (player == null || player.Address != address)
-            return false;
-
-        return TryGetHashedCID(player, out hashedCid);
-    }
-
    public unsafe static string GetHashedCIDFromPlayerPointer(nint ptr)
    {
        return ((BattleChara*)ptr)->Character.ContentId.ToString().GetHash256();
@@ -623,7 +664,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber

        var location = new LocationInfo();
        location.ServerId = _playerState.CurrentWorld.RowId;
-        location.InstanceId = UIState.Instance()->PublicInstance.InstanceId;
+        location.InstanceId = UIState.Instance()->PublicInstance.InstanceId; 
        location.TerritoryId = _clientState.TerritoryType;
        location.MapId = _clientState.MapId;
        if (houseMan != null)
@@ -656,13 +697,13 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
        }
        return location;
    }
-
+    
    public string LocationToString(LocationInfo location)
    {
        if (location.ServerId is 0 || location.TerritoryId is 0) return String.Empty;
        var str = WorldData.Value[(ushort)location.ServerId];

-        if (ContentFinderData.Value.TryGetValue(location.TerritoryId, out var dutyName))
+        if (ContentFinderData.Value.TryGetValue(location.TerritoryId , out var dutyName))
        {
            str += $" - [In Duty]{dutyName}";
        }
@@ -701,23 +742,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                str += $" Room #{location.RoomId}";
            }
        }
-        return str;
-    }

-    public string LocationToLifestream(LocationInfo location)
-    {
-        if (location.ServerId is 0 || location.TerritoryId is 0 || ContentFinderData.Value.ContainsKey(location.TerritoryId)) return String.Empty;
-        var str = WorldData.Value[(ushort)location.ServerId];
-        if (location.HouseId is 0 && location.MapId is not 0)
-        {
-            var mapName = MapData.Value[(ushort)location.MapId].MapName;
-            var parts = mapName.Split(" - ", StringSplitOptions.RemoveEmptyEntries);
-            var locationName = parts.Length > 0 ? parts[^1] : mapName;
-            str += $", tp {locationName}";
-            string message = $"LocationToLifestream: {str}";
-            _logger.LogInformation(message);
-
-        }
        return str;
    }

@@ -789,12 +814,9 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
    {
        _logger.LogInformation("Starting DalamudUtilService");
        _framework.Update += FrameworkOnUpdate;
-        _clientState.Login += OnClientLogin;
-        _clientState.Logout += OnClientLogout;
-
-        if (_clientState.IsLoggedIn)
+        if (IsLoggedIn)
        {
-            OnClientLogin();
+            _classJobId = _objectTable.LocalPlayer!.ClassJob.RowId;
        }

        _logger.LogInformation("Started DalamudUtilService");
@@ -807,8 +829,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber

        Mediator.UnsubscribeAll(this);
        _framework.Update -= FrameworkOnUpdate;
-        _clientState.Login -= OnClientLogin;
-        _clientState.Logout -= OnClientLogout;
        if (_FocusPairIdent.HasValue)
        {
            if (_framework.IsInFrameworkUpdateThread)
@@ -823,45 +843,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
        return Task.CompletedTask;
    }

-    private void OnClientLogin()
-    {
-        if (IsLoggedIn)
-            return;
-
-        _ = RunOnFrameworkThread(() =>
-        {
-            if (IsLoggedIn)
-                return;
-
-            var localPlayer = _objectTable.LocalPlayer;
-            IsLoggedIn = true;
-            _lastZone = _clientState.TerritoryType;
-            if (localPlayer != null)
-            {
-                _lastWorldId = (ushort)localPlayer.CurrentWorld.RowId;
-                _classJobId = localPlayer.ClassJob.RowId;
-            }
-
-            _cid = RebuildCID();
-            Mediator.Publish(new DalamudLoginMessage());
-        });
-    }
-
-    private void OnClientLogout(int type, int code)
-    {
-        if (!IsLoggedIn)
-            return;
-        _ = RunOnFrameworkThread(() =>
-        {
-            if (!IsLoggedIn)
-                return;
-
-            IsLoggedIn = false;
-            _lastWorldId = 0;
-            Mediator.Publish(new DalamudLogoutMessage());
-        });
-    }
-
    public async Task WaitWhileCharacterIsDrawing(ILogger logger, GameObjectHandler handler, Guid redrawId, int timeOut = 5000, CancellationToken? ct = null)
    {
        if (!_clientState.IsLoggedIn) return;
@@ -929,11 +910,11 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
    public string? GetWorldNameFromPlayerAddress(nint address)
    {
        if (address == nint.Zero) return null;
-
+        
        EnsureIsOnFramework();
        var playerCharacter = _objectTable.OfType<IPlayerCharacter>().FirstOrDefault(p => p.Address == address);
        if (playerCharacter == null) return null;
-
+        
        var worldId = (ushort)playerCharacter.HomeWorld.RowId;
        return WorldData.Value.TryGetValue(worldId, out var worldName) ? worldName : null;
    }
@@ -999,39 +980,16 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber

    private unsafe void FrameworkOnUpdateInternal()
    {
-        var localPlayer = _objectTable.LocalPlayer;
-        if ((localPlayer?.IsDead ?? false) && _condition[ConditionFlag.BoundByDuty])
+        if ((_objectTable.LocalPlayer?.IsDead ?? false) && _condition[ConditionFlag.BoundByDuty])
        {
            return;
        }

        bool isNormalFrameworkUpdate = DateTime.UtcNow < _delayedFrameworkUpdateCheck.AddSeconds(1);
-        var clientLoggedIn = _clientState.IsLoggedIn;

        _performanceCollector.LogPerformance(this, $"FrameworkOnUpdateInternal+{(isNormalFrameworkUpdate ? "Regular" : "Delayed")}", () =>
        {
            IsAnythingDrawing = false;
-
-            if (!isNormalFrameworkUpdate)
-            {
-                if (_gameConfig != null
-                    && _gameConfig.TryGet(Dalamud.Game.Config.SystemConfigOption.LodType_DX11, out bool lodEnabled))
-                {
-                    IsLodEnabled = lodEnabled;
-                }
-
-                if (IsInCombat || IsPerforming || IsInInstance)
-                    Mediator.Publish(new FrameworkUpdateMessage());
-
-                Mediator.Publish(new DelayedFrameworkUpdateMessage());
-
-                _delayedFrameworkUpdateCheck = DateTime.UtcNow;
-            }
-
-            if (!clientLoggedIn)
-            {
-                return;
-            }
            _performanceCollector.LogPerformance(this, $"TrackedActorsToState",
                () =>
                {
@@ -1040,46 +998,36 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                        _actorObjectService.RefreshTrackedActors();
                    }

-                    if (_clientState.IsLoggedIn && localPlayer != null)
+                    var playerDescriptors = _actorObjectService.PlayerDescriptors;
+                    for (var i = 0; i < playerDescriptors.Count; i++)
                    {
-                        var playerDescriptors = _actorObjectService.PlayerDescriptors;
-                        for (var i = 0; i < playerDescriptors.Count; i++)
+                        var actor = playerDescriptors[i];
+
+                        var playerAddress = actor.Address;
+                        if (playerAddress == nint.Zero)
+                            continue;
+
+                        if (actor.ObjectIndex >= 200)
+                            continue;
+
+                        if (_blockedCharacterHandler.IsCharacterBlocked(playerAddress, actor.ObjectIndex, out bool firstTime) && firstTime)
                        {
-                            var actor = playerDescriptors[i];
+                            _logger.LogTrace("Skipping character {addr}, blocked/muted", playerAddress.ToString("X"));
+                            continue;
+                        }

-                            var playerAddress = actor.Address;
-                            if (playerAddress == nint.Zero)
-                                continue;
-
-                            if (actor.ObjectIndex >= 200)
-                                continue;
-
-                            var obj = _objectTable[actor.ObjectIndex];
-                            if (obj is not IPlayerCharacter player || player.Address != playerAddress)
-                                continue;
-
-                            if (_blockedCharacterHandler.IsCharacterBlocked(playerAddress, actor.ObjectIndex, out bool firstTime) && firstTime)
-                            {
-                                _logger.LogTrace("Skipping character {addr}, blocked/muted", playerAddress.ToString("X"));
-                                continue;
-                            }
-
-                            if (!IsAnythingDrawing)
-                            {
-                                var charaName = player.Name.TextValue;
-                                if (string.IsNullOrEmpty(charaName))
-                                {
-                                    charaName = actor.Name;
-                                }
-
-                                CheckCharacterForDrawing(playerAddress, charaName);
-                                if (IsAnythingDrawing)
-                                    break;
-                            }
-                            else
-                            {
+                        if (!IsAnythingDrawing)
+                        {
+                            var gameObj = (GameObject*)playerAddress;
+                            var currentName = gameObj != null ? gameObj->NameString ?? string.Empty : string.Empty;
+                            var charaName = string.IsNullOrEmpty(currentName) ? actor.Name : currentName;
+                            CheckCharacterForDrawing(playerAddress, charaName);
+                            if (IsAnythingDrawing)
                                break;
-                            }
+                        }
+                        else
+                        {
+                            break;
                        }
                    }
                });
@@ -1149,7 +1097,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                });

            // Cutscene
-            HandleStateTransition(() => IsInCutscene, v => IsInCutscene = v, shouldBeInCutscene, "Cutscene",
+            HandleStateTransition(() => IsInCutscene,v => IsInCutscene = v, shouldBeInCutscene, "Cutscene",
                onEnter: () =>
                {
                    Mediator.Publish(new CutsceneStartMessage());
@@ -1192,7 +1140,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                Mediator.Publish(new ZoneSwitchEndMessage());
                Mediator.Publish(new ResumeScanMessage(nameof(ConditionFlag.BetweenAreas)));
            }
-
+            
            //Map
            if (!_sentBetweenAreas)
            {
@@ -1203,8 +1151,9 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                    Mediator.Publish(new MapChangedMessage(mapid));
                }
            }
+            

-
+            var localPlayer = _objectTable.LocalPlayer;
            if (localPlayer != null)
            {
                _classJobId = localPlayer.ClassJob.RowId;
@@ -1226,6 +1175,39 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                Mediator.Publish(new FrameworkUpdateMessage());

            Mediator.Publish(new PriorityFrameworkUpdateMessage());
+
+            if (isNormalFrameworkUpdate)
+                return;
+
+            if (localPlayer != null && !IsLoggedIn)
+            {
+                _logger.LogDebug("Logged in");
+                IsLoggedIn = true;
+                _lastZone = _clientState.TerritoryType;
+                _lastWorldId = (ushort)localPlayer.CurrentWorld.RowId;
+                _cid = RebuildCID();
+                Mediator.Publish(new DalamudLoginMessage());
+            }
+            else if (localPlayer == null && IsLoggedIn)
+            {
+                _logger.LogDebug("Logged out");
+                IsLoggedIn = false;
+                _lastWorldId = 0;
+                Mediator.Publish(new DalamudLogoutMessage());
+            }
+
+            if (_gameConfig != null
+                && _gameConfig.TryGet(Dalamud.Game.Config.SystemConfigOption.LodType_DX11, out bool lodEnabled))
+            {
+                IsLodEnabled = lodEnabled;
+            }
+
+            if (IsInCombat || IsPerforming || IsInInstance)
+                Mediator.Publish(new FrameworkUpdateMessage());
+
+            Mediator.Publish(new DelayedFrameworkUpdateMessage());
+
+            _delayedFrameworkUpdateCheck = DateTime.UtcNow;
        });
    }

--- a/LightlessSync/Services/LightFinder/LightFinderScannerService.cs
+++ b/LightlessSync/Services/LightFinder/LightFinderScannerService.cs
@@ -1,4 +1,4 @@
-using Dalamud.Plugin.Services;
+using Dalamud.Plugin.Services;
 using LightlessSync.API.Dto.User;
 using LightlessSync.Services.ActorTracking;
 using LightlessSync.Services.Mediator;
@@ -23,7 +23,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
    private readonly HashSet<string> _syncshellCids = [];
    private volatile bool _pendingLocalBroadcast;
    private TimeSpan? _pendingLocalTtl;
-    private string? _pendingLocalGid;

    private static readonly TimeSpan _maxAllowedTtl = TimeSpan.FromMinutes(4);
    private static readonly TimeSpan _retryDelay = TimeSpan.FromMinutes(1);
@@ -37,7 +36,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
    private const int _maxQueueSize = 100;

    private volatile bool _batchRunning = false;
-    private volatile bool _disposed = false;

    public IReadOnlyDictionary<string, BroadcastEntry> BroadcastCache => _broadcastCache;
    public readonly record struct BroadcastEntry(bool IsBroadcasting, DateTime ExpiryTime, string? GID);
@@ -70,9 +68,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase

    public void Update()
    {
-        if (_disposed)
-            return;
-
        _frameCounter++;
        var lookupsThisFrame = 0;

@@ -116,14 +111,7 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase

    private async Task BatchUpdateBroadcastCacheAsync(List<string> cids)
    {
-        if (_disposed)
-            return;
-
        var results = await _broadcastService.AreUsersBroadcastingAsync(cids).ConfigureAwait(false);
-        
-        if (_disposed)
-            return;
-
        var now = DateTime.UtcNow;

        foreach (var (cid, info) in results)
@@ -142,9 +130,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
                (_, old) => new BroadcastEntry(info.IsBroadcasting, expiry, info.GID));
        }

-        if (_disposed)
-            return;
-
        var activeCids = _broadcastCache
            .Where(e => e.Value.IsBroadcasting && e.Value.ExpiryTime > now)
            .Select(e => e.Key)
@@ -157,9 +142,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase

    private void OnBroadcastStatusChanged(BroadcastStatusChangedMessage msg)
    {
-        if (_disposed)
-            return;
-
        if (!msg.Enabled)
        {
            _broadcastCache.Clear();
@@ -176,7 +158,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase

        _pendingLocalBroadcast = true;
        _pendingLocalTtl = msg.Ttl;
-        _pendingLocalGid = msg.Gid;
        TryPrimeLocalBroadcastCache();
    }

@@ -192,12 +173,11 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
        var expiry = DateTime.UtcNow + ttl;

        _broadcastCache.AddOrUpdate(localCid,
-            new BroadcastEntry(true, expiry, _pendingLocalGid),
-            (_, old) => new BroadcastEntry(true, expiry, _pendingLocalGid ?? old.GID));
+            new BroadcastEntry(true, expiry, null),
+            (_, old) => new BroadcastEntry(true, expiry, old.GID));

        _pendingLocalBroadcast = false;
        _pendingLocalTtl = null;
-        _pendingLocalGid = null;

        var now = DateTime.UtcNow;
        var activeCids = _broadcastCache
@@ -207,14 +187,10 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase

        _lightFinderPlateHandler.UpdateBroadcastingCids(activeCids);
        _lightFinderNativePlateHandler.UpdateBroadcastingCids(activeCids);
-        UpdateSyncshellBroadcasts();
    }

    private void UpdateSyncshellBroadcasts()
    {
-        if (_disposed)
-            return;
-
        var now = DateTime.UtcNow;
        var nearbyCids = GetNearbyHashedCids(out _);
        var newSet = nearbyCids.Count == 0
@@ -348,35 +324,17 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase

    protected override void Dispose(bool disposing)
    {
-        _disposed = true;
        base.Dispose(disposing);
        _framework.Update -= OnFrameworkUpdate;
-        
-        try
+        if (_cleanupTask != null)
        {
-            _cleanupCts.Cancel();
-        }
-        catch (ObjectDisposedException)
-        {
-            // Already disposed, can be ignored :)
+            _cleanupTask?.Wait(100, _cleanupCts.Token);
        }

-        try
-        {
-            _cleanupTask?.Wait(100);
-        }
-        catch (Exception)
-        {
-            // Task may have already completed or been cancelled?
-        }
+        _cleanupCts.Cancel();
+        _cleanupCts.Dispose();

-        try
-        {
-            _cleanupCts.Dispose();
-        }
-        catch (ObjectDisposedException)
-        {
-            // Already disposed, ignore
-        }
+        _cleanupTask?.Wait(100);
+        _cleanupCts.Dispose();
    }
 }
--- a/LightlessSync/Services/LightFinder/LightFinderService.cs
+++ b/LightlessSync/Services/LightFinder/LightFinderService.cs
@@ -1,4 +1,4 @@
-using Dalamud.Interface;
+using Dalamud.Interface;
 using LightlessSync.API.Dto.Group;
 using LightlessSync.API.Dto.User;
 using LightlessSync.LightlessConfiguration;
@@ -121,10 +121,7 @@ public class LightFinderService : IHostedService, IMediatorSubscriber
        _waitingForTtlFetch = false;

        if (!wasEnabled || previousRemaining != validTtl)
-        {
-            var gid = _config.Current.SyncshellFinderEnabled ? _config.Current.SelectedFinderSyncshell : null;
-            _mediator.Publish(new BroadcastStatusChangedMessage(true, validTtl, gid));
-        }
+            _mediator.Publish(new BroadcastStatusChangedMessage(true, validTtl));

        _logger.LogInformation("Lightfinder broadcast enabled ({Context}), TTL: {TTL}", context, validTtl);
        return true;
--- a/LightlessSync/Services/LocationShareService.cs
+++ b/LightlessSync/Services/LocationShareService.cs
@@ -1,4 +1,3 @@
-using Lifestream.Enums;
 using LightlessSync.API.Data;
 using LightlessSync.API.Dto.CharaData;
 using LightlessSync.API.Dto.User;
@@ -109,144 +108,6 @@ namespace LightlessSync.Services
            }
        }

-        public LocationInfo? GetLocationForLifestreamByUid(string uid)
-        {
-            try
-            {
-                if (_locations.TryGetValue<LocationInfo>(uid, out var location))
-                {    
-                    return location;
-                }
-                return null;
-            }
-            catch (Exception e)
-            {
-                Logger.LogError(e,"GetLocationInfoByUid error : ");
-                throw;
-            }
-        }
-
-        public AddressBookEntryTuple? GetAddressBookEntryByLocation(LocationInfo location)
-        {
-            if (location.ServerId is 0 || location.TerritoryId is 0)
-            {
-                return null;
-            }
-
-            var territoryHousing = (TerritoryTypeIdHousing)location.TerritoryId;
-
-            if (territoryHousing == TerritoryTypeIdHousing.None || !Enum.IsDefined(typeof(TerritoryTypeIdHousing), territoryHousing))
-            {
-                return null;
-            }
-
-            var city = GetResidentialAetheryteKind(territoryHousing);
-
-            if (city == ResidentialAetheryteKind.None)
-            {
-                return null;
-            }
-
-            if (location.HouseId is not 0 and not 100)
-            {
-                AddressBookEntryTuple addressEntry = (
-                    Name: "",
-                    World: (int)location.ServerId,
-                    City: (int)city,
-                    Ward: (int)location.WardId,
-                    PropertyType: 0,
-                    Plot: (int)location.HouseId,
-                    Apartment: 0,
-                    ApartmentSubdivision: location.DivisionId == 2,
-                    AliasEnabled: false,
-                    Alias: ""
-                );
-                return addressEntry;
-            }
-            else if (location.HouseId is 100)
-            {
-                AddressBookEntryTuple addressEntry = (
-                    Name: "",
-                    World: (int)location.ServerId,
-                    City: (int)city,
-                    Ward: (int)location.WardId,
-                    PropertyType: 1,
-                    Plot: 0,
-                    Apartment: (int)location.RoomId,
-                    ApartmentSubdivision: location.DivisionId == 2,
-                    AliasEnabled: false,
-                    Alias: ""
-                );
-                return addressEntry;
-            }
-
-            return null;
-        }
-
-        private ResidentialAetheryteKind GetResidentialAetheryteKind(TerritoryTypeIdHousing territoryHousing)
-        {
-            return territoryHousing switch
-            {
-                TerritoryTypeIdHousing.Shirogane or
-                TerritoryTypeIdHousing.ShiroganeApartment or
-                TerritoryTypeIdHousing.ShiroganeSmall or
-                TerritoryTypeIdHousing.ShiroganeMedium or
-                TerritoryTypeIdHousing.ShiroganeLarge or
-                TerritoryTypeIdHousing.ShiroganeFCRoom or
-                TerritoryTypeIdHousing.ShiroganeFCWorkshop
-                => ResidentialAetheryteKind.Kugane,
-                
-                TerritoryTypeIdHousing.Lavender or
-                TerritoryTypeIdHousing.LavenderSmall or
-                TerritoryTypeIdHousing.LavenderMedium or
-                TerritoryTypeIdHousing.LavenderLarge or
-                TerritoryTypeIdHousing.LavenderApartment or
-                TerritoryTypeIdHousing.LavenderFCRoom or
-                TerritoryTypeIdHousing.LavenderFCWorkshop
-                => ResidentialAetheryteKind.Gridania,
-                
-                TerritoryTypeIdHousing.Mist or
-                TerritoryTypeIdHousing.MistSmall or
-                TerritoryTypeIdHousing.MistMedium or
-                TerritoryTypeIdHousing.MistLarge or
-                TerritoryTypeIdHousing.MistApartment or
-                TerritoryTypeIdHousing.MistFCRoom or
-                TerritoryTypeIdHousing.MistFCWorkshop
-                => ResidentialAetheryteKind.Limsa,
-                
-                TerritoryTypeIdHousing.Goblet or
-                TerritoryTypeIdHousing.GobletSmall or
-                TerritoryTypeIdHousing.GobletMedium or
-                TerritoryTypeIdHousing.GobletLarge or
-                TerritoryTypeIdHousing.GobletApartment or
-                TerritoryTypeIdHousing.GobletFCRoom or
-                TerritoryTypeIdHousing.GobletFCWorkshop
-                => ResidentialAetheryteKind.Uldah,
-                
-                TerritoryTypeIdHousing.Empyream or
-                TerritoryTypeIdHousing.EmpyreamSmall or
-                TerritoryTypeIdHousing.EmpyreamMedium or
-                TerritoryTypeIdHousing.EmpyreamLarge or
-                TerritoryTypeIdHousing.EmpyreamApartment or
-                TerritoryTypeIdHousing.EmpyreamFCRoom or
-                TerritoryTypeIdHousing.EmpyreamFCWorkshop
-                => ResidentialAetheryteKind.Foundation,
-                
-                _ => ResidentialAetheryteKind.None
-            };
-        }
-
-        public string? GetMapAddressByLocation(LocationInfo location)
-        {
-            string? liString = null;
-            var territoryHousing = (TerritoryTypeIdHousing)location.TerritoryId;
-            if (GetResidentialAetheryteKind(territoryHousing) == ResidentialAetheryteKind.None)
-            {
-                liString = _dalamudUtilService.LocationToLifestream(location);
-            }
-            return liString;
-        }
-
        public DateTimeOffset GetSharingStatus(string uid)
        {
            try
--- a/LightlessSync/Services/Mediator/LightlessMediator.cs
+++ b/LightlessSync/Services/Mediator/LightlessMediator.cs
@@ -63,31 +63,23 @@ public sealed class LightlessMediator : IHostedService

        _ = Task.Run(async () =>
        {
-            try
+            while (!_loopCts.Token.IsCancellationRequested)
            {
-                while (!_loopCts.Token.IsCancellationRequested)
+                while (!_processQueue)
                {
-                    while (!_processQueue)
-                    {
-                        await Task.Delay(100, _loopCts.Token).ConfigureAwait(false);
-                    }
-
                    await Task.Delay(100, _loopCts.Token).ConfigureAwait(false);
-
-                    HashSet<MessageBase> processedMessages = [];
-                    while (_messageQueue.TryDequeue(out var message))
-                    {
-                        if (processedMessages.Contains(message)) { continue; }
-
-                        processedMessages.Add(message);
-
-                        ExecuteMessage(message);
-                    }
                }
-            }
-            catch (OperationCanceledException)
-            {
-                _logger.LogInformation("LightlessMediator stopped");
+
+                await Task.Delay(100, _loopCts.Token).ConfigureAwait(false);
+
+                HashSet<MessageBase> processedMessages = [];
+                while (_messageQueue.TryDequeue(out var message))
+                {
+                    if (processedMessages.Contains(message)) { continue; }
+                    processedMessages.Add(message);
+
+                    ExecuteMessage(message);
+                }
            }
        });

--- a/LightlessSync/Services/Mediator/Messages.cs
+++ b/LightlessSync/Services/Mediator/Messages.cs
@@ -21,12 +21,6 @@ public record SwitchToIntroUiMessage : MessageBase;
 public record SwitchToMainUiMessage : MessageBase;
 public record OpenSettingsUiMessage : MessageBase;
 public record OpenLightfinderSettingsMessage : MessageBase;
-public enum PerformanceSettingsSection
-{
-    TextureOptimization,
-    ModelOptimization,
-}
-public record OpenPerformanceSettingsMessage(PerformanceSettingsSection Section) : MessageBase;
 public record DalamudLoginMessage : MessageBase;
 public record DalamudLogoutMessage : MessageBase;
 public record ActorTrackedMessage(ActorObjectService.ActorDescriptor Descriptor) : SameThreadMessage;
@@ -130,7 +124,7 @@ public record GPoseLobbyReceivePoseData(UserData UserData, PoseData PoseData) :
 public record GPoseLobbyReceiveWorldData(UserData UserData, WorldData WorldData) : MessageBase;
 public record OpenCharaDataHubWithFilterMessage(UserData UserData) : MessageBase;
 public record EnableBroadcastMessage(string HashedCid, bool Enabled) : MessageBase;
-public record BroadcastStatusChangedMessage(bool Enabled, TimeSpan? Ttl, string? Gid = null) : MessageBase;
+public record BroadcastStatusChangedMessage(bool Enabled, TimeSpan? Ttl) : MessageBase;
 public record UserLeftSyncshell(string gid) : MessageBase;
 public record UserJoinedSyncshell(string gid) : MessageBase;
 public record SyncshellBroadcastsUpdatedMessage : MessageBase;
--- a/LightlessSync/Services/ModelDecimation/MdlDecimator.cs
+++ b/LightlessSync/Services/ModelDecimation/MdlDecimator.cs
--- a/LightlessSync/Services/ModelDecimation/ModelDecimationFilters.cs
+++ b/LightlessSync/Services/ModelDecimation/ModelDecimationFilters.cs
@@ -1,132 +0,0 @@
-namespace LightlessSync.Services.ModelDecimation;
-
-internal static class ModelDecimationFilters
-{
-    // MODELS ONLY HERE, NOT MATERIALS
-    internal static readonly string[] HairPaths =
-    [
-        "/hair/",
-        "hir.mdl",
-    ];
-
-    internal static readonly string[] ClothingPaths =
-    [
-        "chara/equipment/",
-        "/equipment/",
-
-        "met.mdl",
-        "top.mdl",
-        "glv.mdl",
-        "dwn.mdl",
-        "sho.mdl",
-    ];
-
-    internal static readonly string[] AccessoryPaths =
-    [
-        "/accessory/",
-        "chara/accessory/",
-
-        "ear.mdl",
-        "nek.mdl",
-        "wrs.mdl",
-        "ril.mdl",
-        "rir.mdl",
-    ];
-
-    internal static readonly string[] BodyPaths =
-    [
-        "/body/",
-        "chara/equipment/e0000/model/",
-        "chara/equipment/e9903/model/",
-        "chara/equipment/e9903/model/",
-        "chara/equipment/e0279/model/",
-    ];
-
-    internal static readonly string[] FaceHeadPaths =
-    [
-        "/face/",
-        "/obj/face/",
-        "/head/",
-        "fac.mdl",
-    ];
-
-    internal static readonly string[] TailOrEarPaths =
-    [
-        "/tail/",
-        "/obj/tail/",
-        "/zear/",
-        "/obj/zear/",
-
-        "til.mdl",
-        "zer.mdl",
-    ];
-
-    // BODY MATERIALS ONLY, NOT MESHES
-    internal static readonly string[] BodyMaterials =
-    [
-        "b0001_bibo.mtrl",
-        "b0101_bibo.mtrl",
-
-        "b0001_a.mtrl",
-        "b0001_b.mtrl",
-
-        "b0101_a.mtrl",
-        "b0101_b.mtrl",
-    ];
-
-    internal static string NormalizePath(string path)
-        => path.Replace('\\', '/').ToLowerInvariant();
-
-    internal static bool IsHairPath(string normalizedPath)
-        => ContainsAny(normalizedPath, HairPaths);
-
-    internal static bool IsClothingPath(string normalizedPath)
-        => ContainsAny(normalizedPath, ClothingPaths);
-
-    internal static bool IsAccessoryPath(string normalizedPath)
-        => ContainsAny(normalizedPath, AccessoryPaths);
-
-
-    internal static bool IsBodyPath(string normalizedPath)
-        => ContainsAny(normalizedPath, BodyPaths);
-
-    internal static bool IsFaceHeadPath(string normalizedPath)
-        => ContainsAny(normalizedPath, FaceHeadPaths);
-
-    internal static bool IsTailOrEarPath(string normalizedPath)
-        => ContainsAny(normalizedPath, TailOrEarPaths);
-
-    internal static bool ContainsAny(string normalizedPath, IReadOnlyList<string> markers)
-    {
-        for (var i = 0; i < markers.Count; i++)
-        {
-            if (normalizedPath.Contains(markers[i], StringComparison.Ordinal))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    internal static bool IsBodyMaterial(string materialPath)
-    {
-        if (string.IsNullOrWhiteSpace(materialPath))
-        {
-            return false;
-        }
-
-        var normalized = NormalizePath(materialPath);
-        var nameStart = normalized.LastIndexOf('/');
-        var fileName = nameStart >= 0 ? normalized[(nameStart + 1)..] : normalized;
-        foreach (var marker in BodyMaterials)
-        {
-            if (fileName.Contains(marker, StringComparison.Ordinal))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
--- a/LightlessSync/Services/ModelDecimation/ModelDecimationService.cs
+++ b/LightlessSync/Services/ModelDecimation/ModelDecimationService.cs
@@ -1,8 +1,5 @@
 using LightlessSync.FileCache;
 using LightlessSync.LightlessConfiguration;
-using LightlessSync.LightlessConfiguration.Configurations;
-using LightlessSync.Services;
-using LightlessSync.Utils;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
 using System.Globalization;
@@ -20,10 +17,9 @@ public sealed class ModelDecimationService
    private readonly FileCacheManager _fileCacheManager;
    private readonly PlayerPerformanceConfigService _performanceConfigService;
    private readonly XivDataStorageService _xivDataStorageService;
-    private readonly ModelProcessingQueue _processingQueue;
    private readonly SemaphoreSlim _decimationSemaphore = new(MaxConcurrentJobs);

-    private readonly TaskRegistry<string> _decimationDeduplicator = new();
+    private readonly ConcurrentDictionary<string, Task> _activeJobs = new(StringComparer.OrdinalIgnoreCase);
    private readonly ConcurrentDictionary<string, string> _decimatedPaths = new(StringComparer.OrdinalIgnoreCase);
    private readonly ConcurrentDictionary<string, byte> _failedHashes = new(StringComparer.OrdinalIgnoreCase);

@@ -32,15 +28,13 @@ public sealed class ModelDecimationService
        LightlessConfigService configService,
        FileCacheManager fileCacheManager,
        PlayerPerformanceConfigService performanceConfigService,
-        XivDataStorageService xivDataStorageService,
-        ModelProcessingQueue processingQueue)
+        XivDataStorageService xivDataStorageService)
    {
        _logger = logger;
        _configService = configService;
        _fileCacheManager = fileCacheManager;
        _performanceConfigService = performanceConfigService;
        _xivDataStorageService = xivDataStorageService;
-        _processingQueue = processingQueue;
    }

    public void ScheduleDecimation(string hash, string filePath, string? gamePath = null)
@@ -50,16 +44,16 @@ public sealed class ModelDecimationService
            return;
        }

-        if (_decimatedPaths.ContainsKey(hash) || _failedHashes.ContainsKey(hash) || _decimationDeduplicator.TryGetExisting(hash, out _))
+        if (_decimatedPaths.ContainsKey(hash) || _failedHashes.ContainsKey(hash) || _activeJobs.ContainsKey(hash))
        {
            return;
        }

-        _logger.LogDebug("Queued model decimation for {Hash}", hash);
+        _logger.LogInformation("Queued model decimation for {Hash}", hash);

-        _decimationDeduplicator.GetOrStart(hash, () => _processingQueue.Enqueue(async token =>
+        _activeJobs[hash] = Task.Run(async () =>
        {
-            await _decimationSemaphore.WaitAsync(token).ConfigureAwait(false);
+            await _decimationSemaphore.WaitAsync().ConfigureAwait(false);
            try
            {
                await DecimateInternalAsync(hash, filePath).ConfigureAwait(false);
@@ -72,54 +66,16 @@ public sealed class ModelDecimationService
            finally
            {
                _decimationSemaphore.Release();
+                _activeJobs.TryRemove(hash, out _);
            }
-        }, CancellationToken.None));
-    }
-
-    public void ScheduleBatchDecimation(string hash, string filePath, ModelDecimationSettings settings)
-    {
-        if (!ShouldScheduleBatchDecimation(hash, filePath, settings))
-        {
-            return;
-        }
-
-        if (_decimationDeduplicator.TryGetExisting(hash, out _))
-        {
-            return;
-        }
-
-        _failedHashes.TryRemove(hash, out _);
-        _decimatedPaths.TryRemove(hash, out _);
-
-        _logger.LogInformation("Queued batch model decimation for {Hash}", hash);
-
-        _decimationDeduplicator.GetOrStart(hash, () => _processingQueue.Enqueue(async token =>
-        {
-            await _decimationSemaphore.WaitAsync(token).ConfigureAwait(false);
-            try
-            {
-                await DecimateInternalAsync(hash, filePath, settings, allowExisting: false, destinationOverride: filePath, registerDecimatedPath: false).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                _failedHashes[hash] = 1;
-                _logger.LogWarning(ex, "Batch model decimation failed for {Hash}", hash);
-            }
-            finally
-            {
-                _decimationSemaphore.Release();
-            }
-        }, CancellationToken.None));
+        }, CancellationToken.None);
    }

    public bool ShouldScheduleDecimation(string hash, string filePath, string? gamePath = null)
-    {
-        var threshold = Math.Max(0, _performanceConfigService.Current.ModelDecimationTriangleThreshold);
-        return IsDecimationEnabled()
+        => IsDecimationEnabled()
            && filePath.EndsWith(".mdl", StringComparison.OrdinalIgnoreCase)
            && IsDecimationAllowed(gamePath)
-            && !ShouldSkipByTriangleCache(hash, threshold);
-    }
+            && !ShouldSkipByTriangleCache(hash);

    public string GetPreferredPath(string hash, string originalPath)
    {
@@ -160,7 +116,7 @@ public sealed class ModelDecimationService
                continue;
            }

-            if (_decimationDeduplicator.TryGetExisting(hash, out var job))
+            if (_activeJobs.TryGetValue(hash, out var job))
            {
                pending.Add(job);
            }
@@ -175,23 +131,6 @@ public sealed class ModelDecimationService
    }

    private Task DecimateInternalAsync(string hash, string sourcePath)
-    {
-        if (!TryGetDecimationSettings(out var settings))
-        {
-            _logger.LogDebug("Model decimation disabled or invalid settings for {Hash}", hash);
-            return Task.CompletedTask;
-        }
-
-        return DecimateInternalAsync(hash, sourcePath, settings, allowExisting: true);
-    }
-
-    private Task DecimateInternalAsync(
-        string hash,
-        string sourcePath,
-        ModelDecimationSettings settings,
-        bool allowExisting,
-        string? destinationOverride = null,
-        bool registerDecimatedPath = true)
    {
        if (!File.Exists(sourcePath))
        {
@@ -200,48 +139,30 @@ public sealed class ModelDecimationService
            return Task.CompletedTask;
        }

-        if (!TryNormalizeSettings(settings, out var normalized))
+        if (!TryGetDecimationSettings(out var triangleThreshold, out var targetRatio))
        {
-            _logger.LogDebug("Model decimation skipped for {Hash}; invalid settings.", hash);
+            _logger.LogInformation("Model decimation disabled or invalid settings for {Hash}", hash);
            return Task.CompletedTask;
        }

-        _logger.LogDebug(
-            "Starting model decimation for {Hash} (threshold {Threshold}, ratio {Ratio:0.##}, normalize tangents {NormalizeTangents}, avoid body intersection {AvoidBodyIntersection})",
-            hash,
-            normalized.TriangleThreshold,
-            normalized.TargetRatio,
-            normalized.NormalizeTangents,
-            normalized.AvoidBodyIntersection);
+        _logger.LogInformation("Starting model decimation for {Hash} (threshold {Threshold}, ratio {Ratio:0.##})", hash, triangleThreshold, targetRatio);

-        var destination = destinationOverride ?? Path.Combine(GetDecimatedDirectory(), $"{hash}.mdl");
-        var inPlace = string.Equals(destination, sourcePath, StringComparison.OrdinalIgnoreCase);
-        if (!inPlace && File.Exists(destination))
-        {
-            if (allowExisting)
-            {
-                if (registerDecimatedPath)
-                {
-                    RegisterDecimatedModel(hash, sourcePath, destination);
-                }
-                return Task.CompletedTask;
-            }
-
-            TryDelete(destination);
-        }
-
-        if (!MdlDecimator.TryDecimate(sourcePath, destination, normalized, _logger))
-        {
-            _failedHashes[hash] = 1;
-            _logger.LogDebug("Model decimation skipped for {Hash}", hash);
-            return Task.CompletedTask;
-        }
-
-        if (registerDecimatedPath)
+        var destination = Path.Combine(GetDecimatedDirectory(), $"{hash}.mdl");
+        if (File.Exists(destination))
        {
            RegisterDecimatedModel(hash, sourcePath, destination);
+            return Task.CompletedTask;
        }
-        _logger.LogDebug("Decimated model {Hash} -> {Path}", hash, destination);
+
+        if (!MdlDecimator.TryDecimate(sourcePath, destination, triangleThreshold, targetRatio, _logger))
+        {
+            _failedHashes[hash] = 1;
+            _logger.LogInformation("Model decimation skipped for {Hash}", hash);
+            return Task.CompletedTask;
+        }
+
+        RegisterDecimatedModel(hash, sourcePath, destination);
+        _logger.LogInformation("Decimated model {Hash} -> {Path}", hash, destination);
        return Task.CompletedTask;
    }

@@ -329,7 +250,7 @@ public sealed class ModelDecimationService
    private bool IsDecimationEnabled()
        => _performanceConfigService.Current.EnableModelDecimation;

-    private bool ShouldSkipByTriangleCache(string hash, int triangleThreshold)
+    private bool ShouldSkipByTriangleCache(string hash)
    {
        if (string.IsNullOrEmpty(hash))
        {
@@ -341,7 +262,7 @@ public sealed class ModelDecimationService
            return false;
        }

-        var threshold = Math.Max(0, triangleThreshold);
+        var threshold = Math.Max(0, _performanceConfigService.Current.ModelDecimationTriangleThreshold);
        return threshold > 0 && cachedTris < threshold;
    }

@@ -352,48 +273,50 @@ public sealed class ModelDecimationService
            return true;
        }

-        var normalized = ModelDecimationFilters.NormalizePath(gamePath);
-        if (ModelDecimationFilters.IsHairPath(normalized))
+        var normalized = NormalizeGamePath(gamePath);
+        if (normalized.Contains("/hair/", StringComparison.Ordinal))
        {
            return false;
        }

-        if (ModelDecimationFilters.IsClothingPath(normalized))
+        if (normalized.Contains("/chara/equipment/", StringComparison.Ordinal))
        {
            return _performanceConfigService.Current.ModelDecimationAllowClothing;
        }

-        if (ModelDecimationFilters.IsAccessoryPath(normalized))
+        if (normalized.Contains("/chara/accessory/", StringComparison.Ordinal))
        {
            return _performanceConfigService.Current.ModelDecimationAllowAccessories;
        }

-        if (ModelDecimationFilters.IsBodyPath(normalized))
+        if (normalized.Contains("/chara/human/", StringComparison.Ordinal))
        {
-            return _performanceConfigService.Current.ModelDecimationAllowBody;
-        }
+            if (normalized.Contains("/body/", StringComparison.Ordinal))
+            {
+                return _performanceConfigService.Current.ModelDecimationAllowBody;
+            }

-        if (ModelDecimationFilters.IsFaceHeadPath(normalized))
-        {
-            return _performanceConfigService.Current.ModelDecimationAllowFaceHead;
-        }
+            if (normalized.Contains("/face/", StringComparison.Ordinal) || normalized.Contains("/head/", StringComparison.Ordinal))
+            {
+                return _performanceConfigService.Current.ModelDecimationAllowFaceHead;
+            }

-        if (ModelDecimationFilters.IsTailOrEarPath(normalized))
-        {
-            return _performanceConfigService.Current.ModelDecimationAllowTail;
+            if (normalized.Contains("/tail/", StringComparison.Ordinal))
+            {
+                return _performanceConfigService.Current.ModelDecimationAllowTail;
+            }
        }

        return true;
    }

-    private bool TryGetDecimationSettings(out ModelDecimationSettings settings)
+    private static string NormalizeGamePath(string path)
+        => path.Replace('\\', '/').ToLowerInvariant();
+
+    private bool TryGetDecimationSettings(out int triangleThreshold, out double targetRatio)
    {
-        settings = new ModelDecimationSettings(
-            ModelDecimationDefaults.TriangleThreshold,
-            ModelDecimationDefaults.TargetRatio,
-            ModelDecimationDefaults.NormalizeTangents,
-            ModelDecimationDefaults.AvoidBodyIntersection,
-            new ModelDecimationAdvancedSettings());
+        triangleThreshold = 15_000;
+        targetRatio = 0.8;

        var config = _performanceConfigService.Current;
        if (!config.EnableModelDecimation)
@@ -401,86 +324,14 @@ public sealed class ModelDecimationService
            return false;
        }

-        var advanced = NormalizeAdvancedSettings(config.ModelDecimationAdvanced);
-        settings = new ModelDecimationSettings(
-            Math.Max(0, config.ModelDecimationTriangleThreshold),
-            config.ModelDecimationTargetRatio,
-            config.ModelDecimationNormalizeTangents,
-            config.ModelDecimationAvoidBodyIntersection,
-            advanced);
-
-        return TryNormalizeSettings(settings, out settings);
-    }
-
-    private static bool TryNormalizeSettings(ModelDecimationSettings settings, out ModelDecimationSettings normalized)
-    {
-        var ratio = settings.TargetRatio;
-        if (double.IsNaN(ratio) || double.IsInfinity(ratio))
-        {
-            normalized = default;
-            return false;
-        }
-
-        ratio = Math.Clamp(ratio, MinTargetRatio, MaxTargetRatio);
-        var advanced = NormalizeAdvancedSettings(settings.Advanced);
-        normalized = new ModelDecimationSettings(
-            Math.Max(0, settings.TriangleThreshold),
-            ratio,
-            settings.NormalizeTangents,
-            settings.AvoidBodyIntersection,
-            advanced);
-        return true;
-    }
-
-    private static ModelDecimationAdvancedSettings NormalizeAdvancedSettings(ModelDecimationAdvancedSettings? settings)
-    {
-        var source = settings ?? new ModelDecimationAdvancedSettings();
-        return new ModelDecimationAdvancedSettings
-        {
-            MinComponentTriangles = Math.Clamp(source.MinComponentTriangles, 0, 1000),
-            MaxCollapseEdgeLengthFactor = ClampFloat(source.MaxCollapseEdgeLengthFactor, 0.1f, 10f, ModelDecimationAdvancedSettings.DefaultMaxCollapseEdgeLengthFactor),
-            NormalSimilarityThresholdDegrees = ClampFloat(source.NormalSimilarityThresholdDegrees, 0f, 180f, ModelDecimationAdvancedSettings.DefaultNormalSimilarityThresholdDegrees),
-            BoneWeightSimilarityThreshold = ClampFloat(source.BoneWeightSimilarityThreshold, 0f, 1f, ModelDecimationAdvancedSettings.DefaultBoneWeightSimilarityThreshold),
-            UvSimilarityThreshold = ClampFloat(source.UvSimilarityThreshold, 0f, 1f, ModelDecimationAdvancedSettings.DefaultUvSimilarityThreshold),
-            UvSeamAngleCos = ClampFloat(source.UvSeamAngleCos, -1f, 1f, ModelDecimationAdvancedSettings.DefaultUvSeamAngleCos),
-            BlockUvSeamVertices = source.BlockUvSeamVertices,
-            AllowBoundaryCollapses = source.AllowBoundaryCollapses,
-            BodyCollisionDistanceFactor = ClampFloat(source.BodyCollisionDistanceFactor, 0f, 10f, ModelDecimationAdvancedSettings.DefaultBodyCollisionDistanceFactor),
-            BodyCollisionNoOpDistanceFactor = ClampFloat(source.BodyCollisionNoOpDistanceFactor, 0f, 10f, ModelDecimationAdvancedSettings.DefaultBodyCollisionNoOpDistanceFactor),
-            BodyCollisionAdaptiveRelaxFactor = ClampFloat(source.BodyCollisionAdaptiveRelaxFactor, 0f, 10f, ModelDecimationAdvancedSettings.DefaultBodyCollisionAdaptiveRelaxFactor),
-            BodyCollisionAdaptiveNearRatio = ClampFloat(source.BodyCollisionAdaptiveNearRatio, 0f, 1f, ModelDecimationAdvancedSettings.DefaultBodyCollisionAdaptiveNearRatio),
-            BodyCollisionAdaptiveUvThreshold = ClampFloat(source.BodyCollisionAdaptiveUvThreshold, 0f, 1f, ModelDecimationAdvancedSettings.DefaultBodyCollisionAdaptiveUvThreshold),
-            BodyCollisionNoOpUvSeamAngleCos = ClampFloat(source.BodyCollisionNoOpUvSeamAngleCos, -1f, 1f, ModelDecimationAdvancedSettings.DefaultBodyCollisionNoOpUvSeamAngleCos),
-            BodyCollisionProtectionFactor = ClampFloat(source.BodyCollisionProtectionFactor, 0f, 10f, ModelDecimationAdvancedSettings.DefaultBodyCollisionProtectionFactor),
-            BodyProxyTargetRatioMin = ClampFloat(source.BodyProxyTargetRatioMin, 0f, 1f, ModelDecimationAdvancedSettings.DefaultBodyProxyTargetRatioMin),
-            BodyCollisionProxyInflate = ClampFloat(source.BodyCollisionProxyInflate, 0f, 0.1f, ModelDecimationAdvancedSettings.DefaultBodyCollisionProxyInflate),
-            BodyCollisionPenetrationFactor = ClampFloat(source.BodyCollisionPenetrationFactor, 0f, 1f, ModelDecimationAdvancedSettings.DefaultBodyCollisionPenetrationFactor),
-            MinBodyCollisionDistance = ClampFloat(source.MinBodyCollisionDistance, 1e-6f, 1f, ModelDecimationAdvancedSettings.DefaultMinBodyCollisionDistance),
-            MinBodyCollisionCellSize = ClampFloat(source.MinBodyCollisionCellSize, 1e-6f, 1f, ModelDecimationAdvancedSettings.DefaultMinBodyCollisionCellSize),
-        };
-    }
-
-    private static float ClampFloat(float value, float min, float max, float fallback)
-    {
-        if (float.IsNaN(value) || float.IsInfinity(value))
-        {
-            return fallback;
-        }
-
-        return Math.Clamp(value, min, max);
-    }
-
-    private bool ShouldScheduleBatchDecimation(string hash, string filePath, ModelDecimationSettings settings)
-    {
-        if (string.IsNullOrWhiteSpace(filePath) || !filePath.EndsWith(".mdl", StringComparison.OrdinalIgnoreCase))
+        triangleThreshold = Math.Max(0, config.ModelDecimationTriangleThreshold);
+        targetRatio = config.ModelDecimationTargetRatio;
+        if (double.IsNaN(targetRatio) || double.IsInfinity(targetRatio))
        {
            return false;
        }

-        if (!TryNormalizeSettings(settings, out _))
-        {
-            return false;
-        }
+        targetRatio = Math.Clamp(targetRatio, MinTargetRatio, MaxTargetRatio);
        return true;
    }

--- a/LightlessSync/Services/ModelDecimation/ModelDecimationSettings.cs
+++ b/LightlessSync/Services/ModelDecimation/ModelDecimationSettings.cs
@@ -1,10 +0,0 @@
-using LightlessSync.LightlessConfiguration.Configurations;
-
-namespace LightlessSync.Services.ModelDecimation;
-
-public readonly record struct ModelDecimationSettings(
-    int TriangleThreshold,
-    double TargetRatio,
-    bool NormalizeTangents,
-    bool AvoidBodyIntersection,
-    ModelDecimationAdvancedSettings Advanced);
--- a/LightlessSync/Services/ModelProcessingQueue.cs
+++ b/LightlessSync/Services/ModelProcessingQueue.cs
@@ -1,19 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace LightlessSync.Services;
-
-public sealed class ModelProcessingQueue : IDisposable
-{
-    private readonly AssetProcessingQueue _queue;
-
-    public ModelProcessingQueue(ILogger<ModelProcessingQueue> logger)
-    {
-        _queue = new AssetProcessingQueue(logger, "LightlessSync.ModelProcessing");
-    }
-
-    public Task Enqueue(Func<CancellationToken, Task> work, CancellationToken token = default)
-        => _queue.Enqueue(work, token);
-
-    public void Dispose()
-        => _queue.Dispose();
-}
--- a/LightlessSync/Services/PenumbraTempCollectionJanitor.cs
+++ b/LightlessSync/Services/PenumbraTempCollectionJanitor.cs
@@ -1,6 +1,4 @@
-using System.Linq;
-using LightlessSync.Interop.Ipc;
-using LightlessSync.LightlessConfiguration.Models;
+using LightlessSync.Interop.Ipc;
 using LightlessSync.LightlessConfiguration;
 using LightlessSync.Services.Mediator;
 using Microsoft.Extensions.Logging;
@@ -10,18 +8,14 @@ namespace LightlessSync.Services;
 public sealed class PenumbraTempCollectionJanitor : DisposableMediatorSubscriberBase
 {
    private readonly IpcManager _ipc;
-    private readonly TempCollectionConfigService _config;
-    private readonly CancellationTokenSource _cleanupCts = new();
+    private readonly LightlessConfigService _config; 
    private int _ran;
-    private const int CleanupBatchSize = 50;
-    private static readonly TimeSpan CleanupBatchDelay = TimeSpan.FromMilliseconds(50);
-    private static readonly TimeSpan OrphanCleanupDelay = TimeSpan.FromDays(1);

    public PenumbraTempCollectionJanitor(
        ILogger<PenumbraTempCollectionJanitor> logger,
        LightlessMediator mediator,
        IpcManager ipc,
-        TempCollectionConfigService config) : base(logger, mediator)
+        LightlessConfigService config) : base(logger, mediator)
    {
        _ipc = ipc;
        _config = config;
@@ -32,41 +26,15 @@ public sealed class PenumbraTempCollectionJanitor : DisposableMediatorSubscriber
    public void Register(Guid id)
    {
        if (id == Guid.Empty) return;
-        var changed = false;
-        var config = _config.Current;
-
-        var now = DateTime.UtcNow;
-        var existing = config.OrphanableTempCollectionEntries.FirstOrDefault(entry => entry.Id == id);
-        if (existing is null)
-        {
-            config.OrphanableTempCollectionEntries.Add(new OrphanableTempCollectionEntry
-            {
-                Id = id,
-                RegisteredAtUtc = now
-            });
-            changed = true;
-        }
-        else if (existing.RegisteredAtUtc == DateTime.MinValue)
-        {
-            existing.RegisteredAtUtc = now;
-            changed = true;
-        }
-
-        if (changed)
-        {
+        if (_config.Current.OrphanableTempCollections.Add(id))
            _config.Save();
-        }
    }

    public void Unregister(Guid id)
    {
        if (id == Guid.Empty) return;
-        var config = _config.Current;
-        var changed = RemoveEntry(config.OrphanableTempCollectionEntries, id) > 0;
-        if (changed)
-        {
+        if (_config.Current.OrphanableTempCollections.Remove(id))
            _config.Save();
-        }
    }

    private void CleanupOrphansOnBoot()
@@ -77,139 +45,27 @@ public sealed class PenumbraTempCollectionJanitor : DisposableMediatorSubscriber
        if (!_ipc.Penumbra.APIAvailable)
            return;

-        _ = Task.Run(async () =>
-        {
-            try
-            {
-                await CleanupOrphansOnBootAsync(_cleanupCts.Token).ConfigureAwait(false);
-            }
-            catch (OperationCanceledException)
-            {
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex, "Error cleaning orphaned temp collections");
-            }
-        });
-    }
-
-    private async Task CleanupOrphansOnBootAsync(CancellationToken token)
-    {
-        var config = _config.Current;
-        var entries = config.OrphanableTempCollectionEntries;
-        if (entries.Count == 0)
+        var ids = _config.Current.OrphanableTempCollections.ToArray();
+        if (ids.Length == 0)
            return;

-        var now = DateTime.UtcNow;
-        var changed = EnsureEntryTimes(entries, now);
-        var cutoff = now - OrphanCleanupDelay;
-        var expired = entries
-            .Where(entry => entry.Id != Guid.Empty && entry.RegisteredAtUtc != DateTime.MinValue && entry.RegisteredAtUtc <= cutoff)
-            .Select(entry => entry.Id)
-            .Distinct()
-            .ToList();
-        if (expired.Count == 0)
-        {
-            if (changed)
-            {
-                _config.Save();
-            }
-            return;
-        }
-
        var appId = Guid.NewGuid();
-        Logger.LogInformation("Cleaning up {count} orphaned Lightless temp collections older than {delay}", expired.Count, OrphanCleanupDelay);
+        Logger.LogInformation("Cleaning up {count} orphaned Lightless temp collections found in configuration", ids.Length);

-        List<Guid> removedIds = [];
-        foreach (var id in expired)
+        foreach (var id in ids)
        {
-            if (token.IsCancellationRequested)
-            {
-                break;
-            }
-
            try
            {
-                await _ipc.Penumbra.RemoveTemporaryCollectionAsync(Logger, appId, id).ConfigureAwait(false);
+                _ipc.Penumbra.RemoveTemporaryCollectionAsync(Logger, appId, id)
+                    .GetAwaiter().GetResult();
            }
            catch (Exception ex)
            {
                Logger.LogDebug(ex, "Failed removing orphaned temp collection {id}", id);
            }
-
-            removedIds.Add(id);
-            if (removedIds.Count % CleanupBatchSize == 0)
-            {
-                try
-                {
-                    await Task.Delay(CleanupBatchDelay, token).ConfigureAwait(false);
-                }
-                catch (OperationCanceledException)
-                {
-                    break;
-                }
-            }
-        }
-
-        if (removedIds.Count == 0)
-        {
-            if (changed)
-            {
-                _config.Save();
-            }
-            return;
-        }
-
-        foreach (var id in removedIds)
-        {
-            RemoveEntry(entries, id);
        }

+        _config.Current.OrphanableTempCollections.Clear();
        _config.Save();
    }
-
-    protected override void Dispose(bool disposing)
-    {
-        if (disposing)
-        {
-            _cleanupCts.Cancel();
-            _cleanupCts.Dispose();
-        }
-
-        base.Dispose(disposing);
-    }
-
-    private static int RemoveEntry(List<OrphanableTempCollectionEntry> entries, Guid id)
-    {
-        var removed = 0;
-        for (var i = entries.Count - 1; i >= 0; i--)
-        {
-            if (entries[i].Id != id)
-            {
-                continue;
-            }
-
-            entries.RemoveAt(i);
-            removed++;
-        }
-
-        return removed;
-    }
-
-    private static bool EnsureEntryTimes(List<OrphanableTempCollectionEntry> entries, DateTime now)
-    {
-        var changed = false;
-        foreach (var entry in entries)
-        {
-            if (entry.Id == Guid.Empty || entry.RegisteredAtUtc != DateTime.MinValue)
-            {
-                continue;
-            }
-
-            entry.RegisteredAtUtc = now;
-            changed = true;
-        }
-
-        return changed;
-    }
-}
+}
--- a/LightlessSync/Services/PerformanceCollectorService.cs
+++ b/LightlessSync/Services/PerformanceCollectorService.cs
@@ -131,10 +131,7 @@ public sealed class PerformanceCollectorService : IHostedService
                DrawSeparator(sb, longestCounterName);
            }

-            var snapshot = entry.Value.Snapshot();
-            var pastEntries = limitBySeconds > 0
-                ? snapshot.Where(e => e.Item1.AddMinutes(limitBySeconds / 60.0d) >= TimeOnly.FromDateTime(DateTime.Now)).ToList()
-                : snapshot;
+            var pastEntries = limitBySeconds > 0 ? entry.Value.Where(e => e.Item1.AddMinutes(limitBySeconds / 60.0d) >= TimeOnly.FromDateTime(DateTime.Now)).ToList() : [.. entry.Value];

            if (pastEntries.Any())
            {
@@ -192,11 +189,7 @@ public sealed class PerformanceCollectorService : IHostedService
            {
                try
                {
-                    if (!entries.Value.TryGetLast(out var last))
-                    {
-                        continue;
-                    }
-
+                    var last = entries.Value.ToList()[^1];
                    if (last.Item1.AddMinutes(10) < TimeOnly.FromDateTime(DateTime.Now) && !PerformanceCounters.TryRemove(entries.Key, out _))
                    {
                        _logger.LogDebug("Could not remove performance counter {counter}", entries.Key);
--- a/LightlessSync/Services/TextureCompression/TextureCompressionService.cs
+++ b/LightlessSync/Services/TextureCompression/TextureCompressionService.cs
@@ -2,7 +2,6 @@ using LightlessSync.Interop.Ipc;
 using LightlessSync.FileCache;
 using Microsoft.Extensions.Logging;
 using Penumbra.Api.Enums;
-using System.Globalization;

 namespace LightlessSync.Services.TextureCompression;

@@ -28,9 +27,7 @@ public sealed class TextureCompressionService
    public async Task ConvertTexturesAsync(
        IReadOnlyList<TextureCompressionRequest> requests,
        IProgress<TextureConversionProgress>? progress,
-        CancellationToken token,
-        bool requestRedraw = true,
-        bool includeMipMaps = true)
+        CancellationToken token)
    {
        if (requests.Count == 0)
        {
@@ -51,7 +48,7 @@ public sealed class TextureCompressionService
                continue;
            }

-            await RunPenumbraConversionAsync(request, textureType, total, completed, progress, token, requestRedraw, includeMipMaps).ConfigureAwait(false);
+            await RunPenumbraConversionAsync(request, textureType, total, completed, progress, token).ConfigureAwait(false);

            completed++;
        }
@@ -68,16 +65,14 @@ public sealed class TextureCompressionService
        int total,
        int completedBefore,
        IProgress<TextureConversionProgress>? progress,
-        CancellationToken token,
-        bool requestRedraw,
-        bool includeMipMaps)
+        CancellationToken token)
    {
        var primaryPath = request.PrimaryFilePath;
        var displayJob = new TextureConversionJob(
            primaryPath,
            primaryPath,
            targetType,
-            IncludeMipMaps: includeMipMaps,
+            IncludeMipMaps: true,
            request.DuplicateFilePaths);

        var backupPath = CreateBackupCopy(primaryPath);
@@ -88,7 +83,7 @@ public sealed class TextureCompressionService
        try
        {
            WaitForAccess(primaryPath);
-            await _ipcManager.Penumbra.ConvertTextureFiles(_logger, new[] { conversionJob }, null, token, requestRedraw).ConfigureAwait(false);
+            await _ipcManager.Penumbra.ConvertTextureFiles(_logger, new[] { conversionJob }, null, token).ConfigureAwait(false);

            if (!IsValidConversionResult(displayJob.OutputFile))
            {
@@ -133,46 +128,19 @@ public sealed class TextureCompressionService
        var cacheEntries = _fileCacheManager.GetFileCachesByPaths(paths.ToArray());
        foreach (var path in paths)
        {
-            var hasExpectedHash = TryGetExpectedHashFromPath(path, out var expectedHash);
            if (!cacheEntries.TryGetValue(path, out var entry) || entry is null)
            {
-                if (hasExpectedHash)
-                {
-                    entry = _fileCacheManager.CreateCacheEntryWithKnownHash(path, expectedHash);
-                }
-
-                entry ??= _fileCacheManager.CreateFileEntry(path);
+                entry = _fileCacheManager.CreateFileEntry(path);
                if (entry is null)
                {
                    _logger.LogWarning("Unable to locate cache entry for {Path}; skipping hash refresh", path);
                    continue;
                }
            }
-            else if (hasExpectedHash && entry.IsCacheEntry && !string.Equals(entry.Hash, expectedHash, StringComparison.OrdinalIgnoreCase))
-            {
-                _logger.LogDebug("Fixing cache hash mismatch for {Path}: {Current} -> {Expected}", path, entry.Hash, expectedHash);
-                _fileCacheManager.RemoveHashedFile(entry.Hash, entry.PrefixedFilePath, removeDerivedFiles: false);
-                var corrected = _fileCacheManager.CreateCacheEntryWithKnownHash(path, expectedHash);
-                if (corrected is not null)
-                {
-                    entry = corrected;
-                }
-            }

            try
            {
-                if (entry.IsCacheEntry)
-                {
-                    var info = new FileInfo(path);
-                    entry.Size = info.Length;
-                    entry.CompressedSize = null;
-                    entry.LastModifiedDateTicks = info.LastWriteTimeUtc.Ticks.ToString(CultureInfo.InvariantCulture);
-                    _fileCacheManager.UpdateHashedFile(entry, computeProperties: false);
-                }
-                else
-                {
-                    _fileCacheManager.UpdateHashedFile(entry);
-                }
+                _fileCacheManager.UpdateHashedFile(entry);
            }
            catch (Exception ex)
            {
@@ -181,35 +149,6 @@ public sealed class TextureCompressionService
        }
    }

-    private static bool TryGetExpectedHashFromPath(string path, out string hash)
-    {
-        hash = Path.GetFileNameWithoutExtension(path);
-        if (string.IsNullOrWhiteSpace(hash))
-        {
-            return false;
-        }
-
-        if (hash.Length is not (40 or 64))
-        {
-            return false;
-        }
-
-        for (var i = 0; i < hash.Length; i++)
-        {
-            var c = hash[i];
-            var isHex = (c >= '0' && c <= '9')
-                || (c >= 'a' && c <= 'f')
-                || (c >= 'A' && c <= 'F');
-            if (!isHex)
-            {
-                return false;
-            }
-        }
-
-        hash = hash.ToUpperInvariant();
-        return true;
-    }
-
    private static readonly string WorkingDirectory =
        Path.Combine(Path.GetTempPath(), "LightlessSync.TextureCompression");

--- a/LightlessSync/Services/TextureCompression/TextureDownscaleService.cs
+++ b/LightlessSync/Services/TextureCompression/TextureDownscaleService.cs
@@ -4,12 +4,9 @@ using System.Buffers.Binary;
 using System.Globalization;
 using System.IO;
 using System.Runtime.InteropServices;
-using System.Threading;
 using OtterTex;
 using OtterImage = OtterTex.Image;
 using LightlessSync.LightlessConfiguration;
-using LightlessSync.Services;
-using LightlessSync.Utils;
 using LightlessSync.FileCache;
 using Microsoft.Extensions.Logging;
 using Lumina.Data.Files;
@@ -33,13 +30,10 @@ public sealed class TextureDownscaleService
    private readonly LightlessConfigService _configService;
    private readonly PlayerPerformanceConfigService _playerPerformanceConfigService;
    private readonly FileCacheManager _fileCacheManager;
-    private readonly TextureCompressionService _textureCompressionService;
-    private readonly TextureProcessingQueue _processingQueue;

-    private readonly TaskRegistry<string> _downscaleDeduplicator = new();
+    private readonly ConcurrentDictionary<string, Task> _activeJobs = new(StringComparer.OrdinalIgnoreCase);
    private readonly ConcurrentDictionary<string, string> _downscaledPaths = new(StringComparer.OrdinalIgnoreCase);
    private readonly SemaphoreSlim _downscaleSemaphore = new(4);
-    private readonly SemaphoreSlim _compressionSemaphore = new(1);
    private static readonly IReadOnlyDictionary<int, TextureCompressionTarget> BlockCompressedFormatMap =
        new Dictionary<int, TextureCompressionTarget>
        {
@@ -74,16 +68,12 @@ public sealed class TextureDownscaleService
        ILogger<TextureDownscaleService> logger,
        LightlessConfigService configService,
        PlayerPerformanceConfigService playerPerformanceConfigService,
-        FileCacheManager fileCacheManager,
-        TextureCompressionService textureCompressionService,
-        TextureProcessingQueue processingQueue)
+        FileCacheManager fileCacheManager)
    {
        _logger = logger;
        _configService = configService;
        _playerPerformanceConfigService = playerPerformanceConfigService;
        _fileCacheManager = fileCacheManager;
-        _textureCompressionService = textureCompressionService;
-        _processingQueue = processingQueue;
    }

    public void ScheduleDownscale(string hash, string filePath, TextureMapKind mapKind)
@@ -92,9 +82,9 @@ public sealed class TextureDownscaleService
    public void ScheduleDownscale(string hash, string filePath, Func<TextureMapKind> mapKindFactory)
    {
        if (!filePath.EndsWith(".tex", StringComparison.OrdinalIgnoreCase)) return;
-        if (_downscaleDeduplicator.TryGetExisting(hash, out _)) return;
+        if (_activeJobs.ContainsKey(hash)) return;

-        _downscaleDeduplicator.GetOrStart(hash, () => _processingQueue.Enqueue(async token =>
+        _activeJobs[hash] = Task.Run(async () =>
        {
            TextureMapKind mapKind;
            try
@@ -108,7 +98,7 @@ public sealed class TextureDownscaleService
            }

            await DownscaleInternalAsync(hash, filePath, mapKind).ConfigureAwait(false);
-        }, CancellationToken.None));
+        }, CancellationToken.None);
    }

    public bool ShouldScheduleDownscale(string filePath)
@@ -117,9 +107,7 @@ public sealed class TextureDownscaleService
            return false;

        var performanceConfig = _playerPerformanceConfigService.Current;
-        return performanceConfig.EnableNonIndexTextureMipTrim
-            || performanceConfig.EnableIndexTextureDownscale
-            || performanceConfig.EnableUncompressedTextureCompression;
+        return performanceConfig.EnableNonIndexTextureMipTrim || performanceConfig.EnableIndexTextureDownscale;
    }

    public string GetPreferredPath(string hash, string originalPath)
@@ -156,7 +144,7 @@ public sealed class TextureDownscaleService
                continue;
            }

-            if (_downscaleDeduplicator.TryGetExisting(hash, out var job))
+            if (_activeJobs.TryGetValue(hash, out var job))
            {
                pending.Add(job);
            }
@@ -194,18 +182,10 @@ public sealed class TextureDownscaleService
            targetMaxDimension = ResolveTargetMaxDimension();
            onlyDownscaleUncompressed = performanceConfig.OnlyDownscaleUncompressedTextures;

-            if (onlyDownscaleUncompressed && !headerInfo.HasValue)
-            {
-                _downscaledPaths[hash] = sourcePath;
-                _logger.LogTrace("Skipping downscale for texture {Hash}; format unknown and only-uncompressed enabled.", hash);
-                return;
-            }
-
            destination = Path.Combine(GetDownscaledDirectory(), $"{hash}.tex");
            if (File.Exists(destination))
            {
                RegisterDownscaledTexture(hash, sourcePath, destination);
-                await TryAutoCompressAsync(hash, destination, mapKind, null).ConfigureAwait(false);
                return;
            }

@@ -216,7 +196,6 @@ public sealed class TextureDownscaleService
                if (performanceConfig.EnableNonIndexTextureMipTrim
                    && await TryDropTopMipAsync(hash, sourcePath, destination, targetMaxDimension, onlyDownscaleUncompressed, headerInfo).ConfigureAwait(false))
                {
-                    await TryAutoCompressAsync(hash, destination, mapKind, null).ConfigureAwait(false);
                    return;
                }

@@ -227,7 +206,6 @@ public sealed class TextureDownscaleService

                _downscaledPaths[hash] = sourcePath;
                _logger.LogTrace("Skipping downscale for non-index texture {Hash}; no mip reduction required.", hash);
-                await TryAutoCompressAsync(hash, sourcePath, mapKind, headerInfo).ConfigureAwait(false);
                return;
            }

@@ -235,7 +213,6 @@ public sealed class TextureDownscaleService
            {
                _downscaledPaths[hash] = sourcePath;
                _logger.LogTrace("Skipping downscale for index texture {Hash}; feature disabled.", hash);
-                await TryAutoCompressAsync(hash, sourcePath, mapKind, headerInfo).ConfigureAwait(false);
                return;
            }

@@ -245,7 +222,6 @@ public sealed class TextureDownscaleService
            {
                _downscaledPaths[hash] = sourcePath;
                _logger.LogTrace("Skipping downscale for index texture {Hash}; header dimensions {Width}x{Height} within target.", hash, headerValue.Width, headerValue.Height);
-                await TryAutoCompressAsync(hash, sourcePath, mapKind, headerInfo).ConfigureAwait(false);
                return;
            }

@@ -253,12 +229,10 @@ public sealed class TextureDownscaleService
            {
                _downscaledPaths[hash] = sourcePath;
                _logger.LogTrace("Skipping downscale for index texture {Hash}; block compressed format {Format}.", hash, headerInfo.Value.Format);
-                await TryAutoCompressAsync(hash, sourcePath, mapKind, headerInfo).ConfigureAwait(false);
                return;
            }

            using var sourceScratch = TexFileHelper.Load(sourcePath);
-            var sourceFormat = sourceScratch.Meta.Format;
            using var rgbaScratch = sourceScratch.GetRGBA(out var rgbaInfo).ThrowIfError(rgbaInfo);

            var bytesPerPixel = rgbaInfo.Meta.Format.BitsPerPixel() / 8;
@@ -274,39 +248,16 @@ public sealed class TextureDownscaleService
            {
                _downscaledPaths[hash] = sourcePath;
                _logger.LogTrace("Skipping downscale for index texture {Hash}; already within bounds.", hash);
-                await TryAutoCompressAsync(hash, sourcePath, mapKind, headerInfo).ConfigureAwait(false);
                return;
            }

            using var resized = IndexDownscaler.Downscale(originalImage, targetSize.width, targetSize.height, BlockMultiple);

-            var canReencodeWithPenumbra = TryResolveCompressionTarget(headerInfo, sourceFormat, out var compressionTarget);
            using var resizedScratch = CreateScratchImage(resized, targetSize.width, targetSize.height);
-            if (!TryConvertForSave(resizedScratch, sourceFormat, out var finalScratch, canReencodeWithPenumbra))
-            {
-                if (canReencodeWithPenumbra
-                    && await TryReencodeWithPenumbraAsync(hash, sourcePath, destination, resizedScratch, compressionTarget).ConfigureAwait(false))
-                {
-                    await TryAutoCompressAsync(hash, destination, mapKind, null).ConfigureAwait(false);
-                    return;
-                }
+            using var finalScratch = resizedScratch.Convert(DXGIFormat.B8G8R8A8UNorm);

-                _downscaledPaths[hash] = sourcePath;
-                _logger.LogTrace(
-                    "Skipping downscale for index texture {Hash}; failed to re-encode to {Format}.",
-                    hash,
-                    sourceFormat);
-                await TryAutoCompressAsync(hash, sourcePath, mapKind, headerInfo).ConfigureAwait(false);
-                return;
-            }
-
-            using (finalScratch)
-            {
-                TexFileHelper.Save(destination, finalScratch);
-                RegisterDownscaledTexture(hash, sourcePath, destination);
-            }
-
-            await TryAutoCompressAsync(hash, destination, mapKind, null).ConfigureAwait(false);
+            TexFileHelper.Save(destination, finalScratch);
+            RegisterDownscaledTexture(hash, sourcePath, destination);
        }
        catch (Exception ex)
        {
@@ -326,6 +277,7 @@ public sealed class TextureDownscaleService
        finally
        {
            _downscaleSemaphore.Release();
+            _activeJobs.TryRemove(hash, out _);
        }
    }

@@ -378,164 +330,6 @@ public sealed class TextureDownscaleService
        }
    }

-    private bool TryConvertForSave(
-        ScratchImage source,
-        DXGIFormat sourceFormat,
-        out ScratchImage result,
-        bool attemptPenumbraFallback)
-    {
-        var isCompressed = sourceFormat.IsCompressed();
-        var targetFormat = isCompressed ? sourceFormat : DXGIFormat.B8G8R8A8UNorm;
-        _logger.LogDebug(
-            "Downscale convert target {TargetFormat} (source {SourceFormat}, compressed {IsCompressed}, penumbraFallback {PenumbraFallback})",
-            targetFormat,
-            sourceFormat,
-            isCompressed,
-            attemptPenumbraFallback);
-        try
-        {
-            result = source.Convert(targetFormat);
-            return true;
-        }
-        catch (Exception ex)
-        {
-            var compressedFallback = attemptPenumbraFallback
-                ? " Attempting Penumbra re-encode."
-                : " Skipping downscale.";
-            _logger.LogWarning(
-                ex,
-                "Failed to convert downscaled texture to {Format}.{Fallback}",
-                targetFormat,
-                isCompressed ? compressedFallback : " Falling back to B8G8R8A8.");
-            if (isCompressed)
-            {
-                result = default!;
-                return false;
-            }
-
-            result = source.Convert(DXGIFormat.B8G8R8A8UNorm);
-            return true;
-        }
-    }
-
-    private bool TryResolveCompressionTarget(TexHeaderInfo? headerInfo, DXGIFormat sourceFormat, out TextureCompressionTarget target)
-    {
-        if (headerInfo is { } info && TryGetCompressionTarget(info.Format, out target))
-        {
-            return _textureCompressionService.IsTargetSelectable(target);
-        }
-
-        if (sourceFormat.IsCompressed() && BlockCompressedFormatMap.TryGetValue((int)sourceFormat, out target))
-        {
-            return _textureCompressionService.IsTargetSelectable(target);
-        }
-
-        target = default;
-        return false;
-    }
-
-    private async Task<bool> TryReencodeWithPenumbraAsync(
-        string hash,
-        string sourcePath,
-        string destination,
-        ScratchImage resizedScratch,
-        TextureCompressionTarget target)
-    {
-        try
-        {
-            _logger.LogDebug("Downscale Penumbra re-encode target {Target} for {Hash}.", target, hash);
-            using var uncompressed = resizedScratch.Convert(DXGIFormat.B8G8R8A8UNorm);
-            TexFileHelper.Save(destination, uncompressed);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Failed to save uncompressed downscaled texture for {Hash}. Skipping downscale.", hash);
-            TryDelete(destination);
-            return false;
-        }
-
-        await _compressionSemaphore.WaitAsync().ConfigureAwait(false);
-        try
-        {
-            var request = new TextureCompressionRequest(destination, Array.Empty<string>(), target);
-            await _textureCompressionService
-                .ConvertTexturesAsync(new[] { request }, null, CancellationToken.None, requestRedraw: false)
-                .ConfigureAwait(false);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Failed to re-encode downscaled texture {Hash} to {Target}. Skipping downscale.", hash, target);
-            TryDelete(destination);
-            return false;
-        }
-        finally
-        {
-            _compressionSemaphore.Release();
-        }
-
-        RegisterDownscaledTexture(hash, sourcePath, destination);
-        _logger.LogDebug("Downscaled texture {Hash} -> {Path} (re-encoded via Penumbra).", hash, destination);
-        return true;
-    }
-
-    private async Task TryAutoCompressAsync(string hash, string texturePath, TextureMapKind mapKind, TexHeaderInfo? headerInfo)
-    {
-        var performanceConfig = _playerPerformanceConfigService.Current;
-        if (!performanceConfig.EnableUncompressedTextureCompression)
-        {
-            return;
-        }
-
-        if (string.IsNullOrEmpty(texturePath) || !File.Exists(texturePath))
-        {
-            return;
-        }
-
-        var info = headerInfo ?? (TryReadTexHeader(texturePath, out var header) ? header : (TexHeaderInfo?)null);
-        if (!info.HasValue)
-        {
-            _logger.LogTrace("Skipping auto-compress for texture {Hash}; unable to read header.", hash);
-            return;
-        }
-
-        if (IsBlockCompressedFormat(info.Value.Format))
-        {
-            _logger.LogTrace("Skipping auto-compress for texture {Hash}; already block-compressed.", hash);
-            return;
-        }
-
-        var suggestion = TextureMetadataHelper.GetSuggestedTarget(info.Value.Format.ToString(), mapKind, texturePath);
-        if (suggestion is null)
-        {
-            return;
-        }
-
-        var target = _textureCompressionService.NormalizeTarget(suggestion.Value.Target);
-        if (!_textureCompressionService.IsTargetSelectable(target))
-        {
-            _logger.LogTrace("Skipping auto-compress for texture {Hash}; target {Target} not supported.", hash, target);
-            return;
-        }
-
-        await _compressionSemaphore.WaitAsync().ConfigureAwait(false);
-        try
-        {
-            var includeMipMaps = !performanceConfig.SkipUncompressedTextureCompressionMipMaps;
-            var request = new TextureCompressionRequest(texturePath, Array.Empty<string>(), target);
-            await _textureCompressionService
-                .ConvertTexturesAsync(new[] { request }, null, CancellationToken.None, requestRedraw: false, includeMipMaps: includeMipMaps)
-                .ConfigureAwait(false);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Auto-compress failed for texture {Hash} ({Path})", hash, texturePath);
-        }
-        finally
-        {
-            _compressionSemaphore.Release();
-        }
-    }
-
    private static bool IsIndexMap(TextureMapKind kind)
        => kind is TextureMapKind.Mask
            or TextureMapKind.Index;
--- a/LightlessSync/Services/TextureProcessingQueue.cs
+++ b/LightlessSync/Services/TextureProcessingQueue.cs
@@ -1,19 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace LightlessSync.Services;
-
-public sealed class TextureProcessingQueue : IDisposable
-{
-    private readonly AssetProcessingQueue _queue;
-
-    public TextureProcessingQueue(ILogger<TextureProcessingQueue> logger)
-    {
-        _queue = new AssetProcessingQueue(logger, "LightlessSync.TextureProcessing");
-    }
-
-    public Task Enqueue(Func<CancellationToken, Task> work, CancellationToken token = default)
-        => _queue.Enqueue(work, token);
-
-    public void Dispose()
-        => _queue.Dispose();
-}
--- a/LightlessSync/Services/UiFactory.cs
+++ b/LightlessSync/Services/UiFactory.cs
@@ -8,7 +8,6 @@ using LightlessSync.UI.Tags;
 using LightlessSync.WebAPI;
 using LightlessSync.UI.Services;
 using Microsoft.Extensions.Logging;
-using LightlessSync.PlayerData.Factories;

 namespace LightlessSync.Services;

@@ -24,7 +23,6 @@ public class UiFactory
    private readonly PerformanceCollectorService _performanceCollectorService;
    private readonly ProfileTagService _profileTagService;
    private readonly DalamudUtilService _dalamudUtilService;
-    private readonly PairFactory _pairFactory;

    public UiFactory(
        ILoggerFactory loggerFactory,
@@ -36,8 +34,7 @@ public class UiFactory
        LightlessProfileManager lightlessProfileManager,
        PerformanceCollectorService performanceCollectorService,
        ProfileTagService profileTagService,
-        DalamudUtilService dalamudUtilService,
-        PairFactory pairFactory)
+        DalamudUtilService dalamudUtilService)
    {
        _loggerFactory = loggerFactory;
        _lightlessMediator = lightlessMediator;
@@ -49,7 +46,6 @@ public class UiFactory
        _performanceCollectorService = performanceCollectorService;
        _profileTagService = profileTagService;
        _dalamudUtilService = dalamudUtilService;
-        _pairFactory = pairFactory;
    }

    public SyncshellAdminUI CreateSyncshellAdminUi(GroupFullInfoDto dto)
@@ -62,8 +58,7 @@ public class UiFactory
            _pairUiService,
            dto,
            _performanceCollectorService,
-            _lightlessProfileManager,
-            _pairFactory);
+            _lightlessProfileManager);
    }

    public StandaloneProfileUi CreateStandaloneProfileUi(Pair pair)
--- a/LightlessSync/Services/UiService.cs
+++ b/LightlessSync/Services/UiService.cs
@@ -13,20 +13,16 @@ namespace LightlessSync.Services;
 public sealed class UiService : DisposableMediatorSubscriberBase
 {
    private readonly List<WindowMediatorSubscriberBase> _createdWindows = [];
-    private readonly List<WindowMediatorSubscriberBase> _registeredWindows = [];
-    private readonly HashSet<WindowMediatorSubscriberBase> _uiHiddenWindows = [];
    private readonly IUiBuilder _uiBuilder;
    private readonly FileDialogManager _fileDialogManager;
    private readonly ILogger<UiService> _logger;
    private readonly LightlessConfigService _lightlessConfigService;
-    private readonly DalamudUtilService _dalamudUtilService;
    private readonly WindowSystem _windowSystem;
    private readonly UiFactory _uiFactory;
    private readonly PairFactory _pairFactory;
-    private bool _uiHideActive;

    public UiService(ILogger<UiService> logger, IUiBuilder uiBuilder,
-        LightlessConfigService lightlessConfigService, DalamudUtilService dalamudUtilService, WindowSystem windowSystem,
+        LightlessConfigService lightlessConfigService, WindowSystem windowSystem,
        IEnumerable<WindowMediatorSubscriberBase> windows,
        UiFactory uiFactory, FileDialogManager fileDialogManager,
        LightlessMediator lightlessMediator, PairFactory pairFactory) : base(logger, lightlessMediator)
@@ -35,7 +31,6 @@ public sealed class UiService : DisposableMediatorSubscriberBase
        _logger.LogTrace("Creating {type}", GetType().Name);
        _uiBuilder = uiBuilder;
        _lightlessConfigService = lightlessConfigService;
-        _dalamudUtilService = dalamudUtilService;
        _windowSystem = windowSystem;
        _uiFactory = uiFactory;
        _pairFactory = pairFactory;
@@ -48,7 +43,6 @@ public sealed class UiService : DisposableMediatorSubscriberBase

        foreach (var window in windows)
        {
-            _registeredWindows.Add(window);
            _windowSystem.AddWindow(window);
        }

@@ -182,8 +176,6 @@ public sealed class UiService : DisposableMediatorSubscriberBase
        {
            _windowSystem.RemoveWindow(msg.Window);
            _createdWindows.Remove(msg.Window);
-            _registeredWindows.Remove(msg.Window);
-            _uiHiddenWindows.Remove(msg.Window);
            msg.Window.Dispose();
        });
    }
@@ -227,72 +219,12 @@ public sealed class UiService : DisposableMediatorSubscriberBase
        MainStyle.PushStyle();
        try
        {
-            var hideOtherUi = ShouldHideOtherUi();
-            UpdateUiHideState(hideOtherUi);
            _windowSystem.Draw();
-            if (!hideOtherUi)
-                _fileDialogManager.Draw();
+            _fileDialogManager.Draw();
        }
        finally
        {
            MainStyle.PopStyle();
        }
    }
-
-    private bool ShouldHideOtherUi()
-    {
-        var config = _lightlessConfigService.Current;
-        if (!config.ShowUiWhenUiHidden && _dalamudUtilService.IsGameUiHidden)
-            return true;
-
-        if (!config.ShowUiInGpose && _dalamudUtilService.IsInGpose)
-            return true;
-
-        return false;
-    }
-
-    private void UpdateUiHideState(bool hideOtherUi)
-    {
-        if (!hideOtherUi)
-        {
-            if (_uiHideActive)
-            {
-                foreach (var window in _uiHiddenWindows)
-                {
-                    window.IsOpen = true;
-                }
-
-                _uiHiddenWindows.Clear();
-                _uiHideActive = false;
-            }
-
-            return;
-        }
-
-        _uiHideActive = true;
-        foreach (var window in EnumerateManagedWindows())
-        {
-            if (window is ZoneChatUi)
-                continue;
-
-            if (!window.IsOpen)
-                continue;
-
-            _uiHiddenWindows.Add(window);
-            window.IsOpen = false;
-        }
-    }
-
-    private IEnumerable<WindowMediatorSubscriberBase> EnumerateManagedWindows()
-    {
-        foreach (var window in _registeredWindows)
-        {
-            yield return window;
-        }
-
-        foreach (var window in _createdWindows)
-        {
-            yield return window;
-        }
-    }
-}
+}
--- a/LightlessSync/Services/XivDataAnalyzer.cs
+++ b/LightlessSync/Services/XivDataAnalyzer.cs
@@ -1,24 +1,19 @@
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
-using FFXIVClientStructs.Havok.Common.Serialize.Resource;
 using FFXIVClientStructs.Havok.Animation;
 using FFXIVClientStructs.Havok.Common.Base.Types;
-using FFXIVClientStructs.Havok.Common.Serialize.Resource;
 using FFXIVClientStructs.Havok.Common.Serialize.Util;
 using LightlessSync.FileCache;
 using LightlessSync.Interop.GameModel;
 using LightlessSync.LightlessConfiguration;
-using LightlessSync.PlayerData.Factories;
 using LightlessSync.PlayerData.Handlers;
 using Microsoft.Extensions.Logging;
-using OtterGui.Text.EndObjects;
 using System.Collections.Concurrent;
 using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;

 namespace LightlessSync.Services;

-public sealed partial class XivDataAnalyzer
+public sealed class XivDataAnalyzer
 {
    private readonly ILogger<XivDataAnalyzer> _logger;
    private readonly FileCacheManager _fileCacheManager;
@@ -36,435 +31,127 @@ public sealed partial class XivDataAnalyzer

    public unsafe Dictionary<string, List<ushort>>? GetSkeletonBoneIndices(GameObjectHandler handler)
    {
-        if (handler is null || handler.Address == nint.Zero)
-            return null;
-
-        Dictionary<string, HashSet<ushort>> sets = new(StringComparer.OrdinalIgnoreCase);
-
+        if (handler.Address == nint.Zero) return null;
+        var chara = (CharacterBase*)(((Character*)handler.Address)->GameObject.DrawObject);
+        if (chara->GetModelType() != CharacterBase.ModelType.Human) return null;
+        var resHandles = chara->Skeleton->SkeletonResourceHandles;
+        Dictionary<string, List<ushort>> outputIndices = [];
        try
        {
-            var drawObject = ((Character*)handler.Address)->GameObject.DrawObject;
-            if (drawObject == null)
-                return null;
-
-            var chara = (CharacterBase*)drawObject;
-            if (chara->GetModelType() != CharacterBase.ModelType.Human)
-                return null;
-
-            var skeleton = chara->Skeleton;
-            if (skeleton == null)
-                return null;
-
-            var resHandles = skeleton->SkeletonResourceHandles;
-            var partialCount = skeleton->PartialSkeletonCount;
-            if (partialCount <= 0)
-                return null;
-
-            for (int i = 0; i < partialCount; i++)
+            for (int i = 0; i < chara->Skeleton->PartialSkeletonCount; i++)
            {
                var handle = *(resHandles + i);
-                if ((nint)handle == nint.Zero)
-                    continue;
-
-                if (handle->FileName.Length > 1024)
-                    continue;
-
-                var rawName = handle->FileName.ToString();
-                if (string.IsNullOrWhiteSpace(rawName))
-                    continue;
-
-                var skeletonKey = CanonicalizeSkeletonKey(rawName);
-                if (string.IsNullOrEmpty(skeletonKey))
-                    continue;
-
-                var boneCount = handle->BoneCount;
-                if (boneCount == 0)
-                    continue;
-
-                var havokSkel = handle->HavokSkeleton;
-                if ((nint)havokSkel == nint.Zero)
-                    continue;
-
-                if (!sets.TryGetValue(skeletonKey, out var set))
+                _logger.LogTrace("Iterating over SkeletonResourceHandle #{i}:{x}", i, ((nint)handle).ToString("X"));
+                if ((nint)handle == nint.Zero) continue;
+                var curBones = handle->BoneCount;
+                // this is unrealistic, the filename shouldn't ever be that long
+                if (handle->FileName.Length > 1024) continue;
+                var skeletonName = handle->FileName.ToString();
+                if (string.IsNullOrEmpty(skeletonName)) continue;
+                outputIndices[skeletonName] = [];
+                for (ushort boneIdx = 0; boneIdx < curBones; boneIdx++)
                {
-                    set = [];
-                    sets[skeletonKey] = set;
+                    var boneName = handle->HavokSkeleton->Bones[boneIdx].Name.String;
+                    if (boneName == null) continue;
+                    outputIndices[skeletonName].Add((ushort)(boneIdx + 1));
                }
-
-                uint maxExclusive = boneCount;
-                uint ushortExclusive = (uint)ushort.MaxValue + 1u;
-                if (maxExclusive > ushortExclusive)
-                    maxExclusive = ushortExclusive;
-
-                for (uint boneIdx = 0; boneIdx < maxExclusive; boneIdx++)
-                {
-                    var name = havokSkel->Bones[boneIdx].Name.String;
-                    if (name == null)
-                        continue;
-
-                    set.Add((ushort)boneIdx);
-                }
-
-                _logger.LogTrace("Local skeleton raw file='{raw}', key='{key}', boneCount={count}",
-                    rawName, skeletonKey, boneCount);
            }
        }
        catch (Exception ex)
        {
            _logger.LogWarning(ex, "Could not process skeleton data");
-            return null;
        }

-        if (sets.Count == 0)
-            return null;
-
-        var output = new Dictionary<string, List<ushort>>(sets.Count, StringComparer.OrdinalIgnoreCase);
-        foreach (var (key, set) in sets)
-        {
-            if (set.Count == 0)
-                continue;
-
-            var list = set.ToList();
-            list.Sort();
-            output[key] = list;
-        }
-
-        return (output.Count != 0 && output.Values.All(v => v.Count > 0)) ? output : null;
+        return (outputIndices.Count != 0 && outputIndices.Values.All(u => u.Count > 0)) ? outputIndices : null;
    }

-    public static byte[]? ReadHavokBytesFromPap(string papPath)
+    public unsafe Dictionary<string, List<ushort>>? GetBoneIndicesFromPap(string hash)
    {
-        using var fs = File.Open(papPath, FileMode.Open, FileAccess.Read, FileShare.Read);
-        using var reader = new BinaryReader(fs);
+        if (_configService.Current.BonesDictionary.TryGetValue(hash, out var bones)) return bones;

-        _ = reader.ReadInt32();
-        _ = reader.ReadInt32();
-        _ = reader.ReadInt16();
-        _ = reader.ReadInt16();
+        var cacheEntity = _fileCacheManager.GetFileCacheByHash(hash);
+        if (cacheEntity == null) return null;

-        var type = reader.ReadByte();
-        if (type != 0) return null;
+        using BinaryReader reader = new(File.Open(cacheEntity.ResolvedFilepath, FileMode.Open, FileAccess.Read, FileShare.Read));

-        _ = reader.ReadByte();
-        _ = reader.ReadInt32();
+        // most of this shit is from vfxeditor, surely nothing will change in the pap format :copium:
+        reader.ReadInt32(); // ignore
+        reader.ReadInt32(); // ignore
+        reader.ReadInt16(); // read 2 (num animations)
+        reader.ReadInt16(); // read 2 (modelid)
+        var type = reader.ReadByte();// read 1 (type)
+        if (type != 0) return null; // it's not human, just ignore it, whatever

+        reader.ReadByte(); // read 1 (variant)
+        reader.ReadInt32(); // ignore
        var havokPosition = reader.ReadInt32();
        var footerPosition = reader.ReadInt32();
+        var havokDataSize = footerPosition - havokPosition;
+        reader.BaseStream.Position = havokPosition;
+        var havokData = reader.ReadBytes(havokDataSize);
+        if (havokData.Length <= 8) return null; // no havok data

-        if (havokPosition <= 0 || footerPosition <= havokPosition || footerPosition > fs.Length)
-            return null;
-
-        var sizeLong = (long)footerPosition - havokPosition;
-        if (sizeLong <= 8 || sizeLong > int.MaxValue)
-            return null;
-
-        var size = (int)sizeLong;
-
-        fs.Position = havokPosition;
-        var bytes = reader.ReadBytes(size);
-        return bytes.Length > 8 ? bytes : null;
-    }
-
-    public unsafe Dictionary<string, List<ushort>>? ParseHavokBytesOnFrameworkThread(
-    byte[] havokData,
-    string hash,
-    bool persistToConfig)
-    {
-        var tempSets = new Dictionary<string, HashSet<ushort>>(StringComparer.OrdinalIgnoreCase);
-
-        var tempHkxPath = Path.Combine(Path.GetTempPath(), $"lightless_{Guid.NewGuid():N}.hkx");
-        IntPtr pathAnsi = IntPtr.Zero;
+        var output = new Dictionary<string, List<ushort>>(StringComparer.OrdinalIgnoreCase);
+        var tempHavokDataPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()) + ".hkx";
+        var tempHavokDataPathAnsi = Marshal.StringToHGlobalAnsi(tempHavokDataPath);

        try
        {
-            File.WriteAllBytes(tempHkxPath, havokData);
+            File.WriteAllBytes(tempHavokDataPath, havokData);

-            pathAnsi = Marshal.StringToHGlobalAnsi(tempHkxPath);
-
-            hkSerializeUtil.LoadOptions loadOptions = default;
-            loadOptions.TypeInfoRegistry = hkBuiltinTypeRegistry.Instance()->GetTypeInfoRegistry();
-            loadOptions.ClassNameRegistry = hkBuiltinTypeRegistry.Instance()->GetClassNameRegistry();
-            loadOptions.Flags = new hkFlags<hkSerializeUtil.LoadOptionBits, int>
+            var loadoptions = stackalloc hkSerializeUtil.LoadOptions[1];
+            loadoptions->TypeInfoRegistry = hkBuiltinTypeRegistry.Instance()->GetTypeInfoRegistry();
+            loadoptions->ClassNameRegistry = hkBuiltinTypeRegistry.Instance()->GetClassNameRegistry();
+            loadoptions->Flags = new hkFlags<hkSerializeUtil.LoadOptionBits, int>
            {
-                Storage = (int)hkSerializeUtil.LoadOptionBits.Default
+                Storage = (int)(hkSerializeUtil.LoadOptionBits.Default)
            };

-            hkSerializeUtil.LoadOptions* pOpts = &loadOptions;
-
-            var resource = hkSerializeUtil.LoadFromFile((byte*)pathAnsi, errorResult: null, pOpts);
+            var resource = hkSerializeUtil.LoadFromFile((byte*)tempHavokDataPathAnsi, null, loadoptions);
            if (resource == null)
-                return null;
+            {
+                throw new InvalidOperationException("Resource was null after loading");
+            }

            var rootLevelName = @"hkRootLevelContainer"u8;
            fixed (byte* n1 = rootLevelName)
            {
-                var container = (hkRootLevelContainer*)resource->GetContentsPointer(
-                    n1, hkBuiltinTypeRegistry.Instance()->GetTypeInfoRegistry());
-
-                if (container == null) return null;
-
+                var container = (hkRootLevelContainer*)resource->GetContentsPointer(n1, hkBuiltinTypeRegistry.Instance()->GetTypeInfoRegistry());
                var animationName = @"hkaAnimationContainer"u8;
                fixed (byte* n2 = animationName)
                {
                    var animContainer = (hkaAnimationContainer*)container->findObjectByName(n2, null);
-                    if (animContainer == null) return null;
-
                    for (int i = 0; i < animContainer->Bindings.Length; i++)
                    {
                        var binding = animContainer->Bindings[i].ptr;
-                        if (binding == null) continue;
-
-                        var rawSkel = binding->OriginalSkeletonName.String;
-                        var skeletonKey = CanonicalizeSkeletonKey(rawSkel);
-                        if (string.IsNullOrEmpty(skeletonKey)) continue;
-
                        var boneTransform = binding->TransformTrackToBoneIndices;
-                        if (boneTransform.Length <= 0) continue;
-
-                        if (!tempSets.TryGetValue(skeletonKey, out var set))
-                            tempSets[skeletonKey] = set = [];
-
+                        string name = binding->OriginalSkeletonName.String! + "_" + i;
+                        output[name] = [];
                        for (int boneIdx = 0; boneIdx < boneTransform.Length; boneIdx++)
                        {
-                            var v = boneTransform[boneIdx];
-                            if (v < 0) continue;
-                            set.Add((ushort)v);
+                            output[name].Add((ushort)boneTransform[boneIdx]);
                        }
+                        output[name].Sort();
                    }
+
                }
            }
        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Could not load havok file in {path}", tempHavokDataPath);
+        }
        finally
        {
-            if (pathAnsi != IntPtr.Zero)
-                Marshal.FreeHGlobal(pathAnsi);
-
-            try { if (File.Exists(tempHkxPath)) File.Delete(tempHkxPath); }
-            catch { /* ignore */ }
+            Marshal.FreeHGlobal(tempHavokDataPathAnsi);
+            File.Delete(tempHavokDataPath);
        }

-        if (tempSets.Count == 0) return null;
-
-        var output = new Dictionary<string, List<ushort>>(tempSets.Count, StringComparer.OrdinalIgnoreCase);
-        foreach (var (key, set) in tempSets)
-        {
-            if (set.Count == 0) continue;
-            var list = set.ToList();
-            list.Sort();
-            output[key] = list;
-        }
-
-        if (output.Count == 0) return null;
-
        _configService.Current.BonesDictionary[hash] = output;
-        if (persistToConfig) _configService.Save();
-
+        _configService.Save();
        return output;
    }

-    public static string CanonicalizeSkeletonKey(string? raw)
-    {
-        if (string.IsNullOrWhiteSpace(raw))
-            return string.Empty;
-
-        var s = raw.Replace('\\', '/').Trim();
-
-        var underscore = s.LastIndexOf('_');
-        if (underscore > 0 && underscore + 1 < s.Length && char.IsDigit(s[underscore + 1]))
-            s = s[..underscore];
-
-        if (s.StartsWith("skeleton", StringComparison.OrdinalIgnoreCase))
-            return "skeleton";
-
-        var m = _bucketPathRegex.Match(s);
-        if (m.Success)
-            return m.Groups["bucket"].Value.ToLowerInvariant();
-
-        m = _bucketSklRegex.Match(s);
-        if (m.Success)
-            return m.Groups["bucket"].Value.ToLowerInvariant();
-
-        m = _bucketLooseRegex.Match(s);
-        if (m.Success)
-            return m.Groups["bucket"].Value.ToLowerInvariant();
-
-        return string.Empty;
-    }
-
-    public static bool ContainsIndexCompat(
-        HashSet<ushort> available,
-        ushort idx,
-        bool papLikelyOneBased,
-        bool allowOneBasedShift,
-        bool allowNeighborTolerance)
-    {
-        Span<ushort> candidates = stackalloc ushort[2];
-        int count = 0;
-
-        candidates[count++] = idx;
-
-        if (allowOneBasedShift && papLikelyOneBased && idx > 0)
-            candidates[count++] = (ushort)(idx - 1);
-
-        for (int i = 0; i < count; i++)
-        {
-            var c = candidates[i];
-
-            if (available.Contains(c))
-                return true;
-
-            if (allowNeighborTolerance)
-            {
-                if (c > 0 && available.Contains((ushort)(c - 1)))
-                    return true;
-
-                if (c < ushort.MaxValue && available.Contains((ushort)(c + 1)))
-                    return true;
-            }
-        }
-
-        return false;
-    }
-
-    public static bool IsPapCompatible(
-        IReadOnlyDictionary<string, HashSet<ushort>> localBoneSets,
-        IReadOnlyDictionary<string, List<ushort>> papBoneIndices,
-        AnimationValidationMode mode,
-        bool allowOneBasedShift,
-        bool allowNeighborTolerance,
-        out string reason)
-    {
-        reason = string.Empty;
-
-        if (mode == AnimationValidationMode.Unsafe)
-            return true;
-
-        var papByBucket = new Dictionary<string, List<ushort>>(StringComparer.OrdinalIgnoreCase);
-
-        foreach (var (rawKey, list) in papBoneIndices)
-        {
-            var key = CanonicalizeSkeletonKey(rawKey);
-            if (string.IsNullOrEmpty(key))
-                continue;
-
-            if (string.Equals(key, "skeleton", StringComparison.OrdinalIgnoreCase))
-                key = "__any__";
-
-            if (!papByBucket.TryGetValue(key, out var acc))
-                papByBucket[key] = acc = [];
-
-            if (list is { Count: > 0 })
-                acc.AddRange(list);
-        }
-
-        foreach (var k in papByBucket.Keys.ToList())
-            papByBucket[k] = papByBucket[k].Distinct().ToList();
-
-        if (papByBucket.Count == 0)
-        {
-            reason = "No skeleton bucket bindings found in the PAP";
-            return false;
-        }
-
-        static bool AllIndicesOk(
-            HashSet<ushort> available,
-            List<ushort> indices,
-            bool papLikelyOneBased,
-            bool allowOneBasedShift,
-            bool allowNeighborTolerance,
-            out ushort missing)
-        {
-            foreach (var idx in indices)
-            {
-                if (!ContainsIndexCompat(available, idx, papLikelyOneBased, allowOneBasedShift, allowNeighborTolerance))
-                {
-                    missing = idx;
-                    return false;
-                }
-            }
-
-            missing = 0;
-            return true;
-        }
-
-        foreach (var (bucket, indices) in papByBucket)
-        {
-            if (indices.Count == 0)
-                continue;
-
-            bool has0 = false, has1 = false;
-            ushort min = ushort.MaxValue;
-            foreach (var v in indices)
-            {
-                if (v == 0) has0 = true;
-                if (v == 1) has1 = true;
-                if (v < min) min = v;
-            }
-            bool papLikelyOneBased = allowOneBasedShift && (min == 1) && has1 && !has0;
-
-            if (string.Equals(bucket, "__any__", StringComparison.OrdinalIgnoreCase))
-            {
-                foreach (var (lk, ls) in localBoneSets)
-                {
-                    if (AllIndicesOk(ls, indices, papLikelyOneBased, allowOneBasedShift, allowNeighborTolerance, out _))
-                        goto nextBucket; 
-                }
-
-                reason = $"No compatible local skeleton bucket for generic PAP skeleton '{bucket}'. Local buckets: {string.Join(", ", localBoneSets.Keys)}";
-                return false;
-            }
-
-            if (!localBoneSets.TryGetValue(bucket, out var available))
-            {
-                reason = $"Missing skeleton bucket '{bucket}' on local actor.";
-                return false;
-            }
-
-            if (!AllIndicesOk(available, indices, papLikelyOneBased, allowOneBasedShift, allowNeighborTolerance, out var missing))
-            {
-                reason = $"No compatible local skeleton for PAP '{bucket}': missing bone index {missing}.";
-                return false;
-            }
-
-        nextBucket:
-            ;
-        }
-
-        return true;
-    }
-
-    public void DumpLocalSkeletonIndices(GameObjectHandler handler, string? filter = null)
-    {
-        var skels = GetSkeletonBoneIndices(handler);
-        if (skels == null)
-        {
-            _logger.LogTrace("DumpLocalSkeletonIndices: local skeleton indices are null or not found");
-            return;
-        }
-        
-        var keys = skels.Keys
-            .Order(StringComparer.OrdinalIgnoreCase)
-            .ToArray();
-
-        _logger.LogTrace("Local skeleton indices found ({count}): {keys}",
-            keys.Length,
-            string.Join(", ", keys));
-
-        if (!string.IsNullOrWhiteSpace(filter))
-        {
-            var hits = keys.Where(k =>
-                k.Equals(filter, StringComparison.OrdinalIgnoreCase) ||
-                k.StartsWith(filter + "_", StringComparison.OrdinalIgnoreCase) ||
-                 filter.StartsWith(k + "_", StringComparison.OrdinalIgnoreCase) ||
-                k.Contains(filter, StringComparison.OrdinalIgnoreCase))
-                .ToArray();
-
-            _logger.LogTrace("Matches found for '{filter}': {hits}",
-                filter,
-                hits.Length == 0 ? "<none>" : string.Join(", ", hits));
-        }
-    }
-
    public async Task<long> GetTrianglesByHash(string hash)
    {
        if (_configService.Current.TriangleDictionary.TryGetValue(hash, out var cachedTris) && cachedTris > 0)
@@ -480,20 +167,6 @@ public sealed partial class XivDataAnalyzer
        return CalculateTrianglesFromPath(hash, path.ResolvedFilepath, _configService.Current.TriangleDictionary, _failedCalculatedTris);
    }

-    public long RefreshTrianglesForPath(string hash, string filePath)
-    {
-        if (string.IsNullOrEmpty(filePath)
-            || !filePath.EndsWith(".mdl", StringComparison.OrdinalIgnoreCase)
-            || !File.Exists(filePath))
-        {
-            return 0;
-        }
-
-        _failedCalculatedTris.RemoveAll(entry => entry.Equals(hash, StringComparison.Ordinal));
-        _configService.Current.TriangleDictionary.TryRemove(hash, out _);
-        return CalculateTrianglesFromPath(hash, filePath, _configService.Current.TriangleDictionary, _failedCalculatedTris);
-    }
-
    public async Task<long> GetEffectiveTrianglesByHash(string hash, string filePath)
    {
        if (_configService.Current.EffectiveTriangleDictionary.TryGetValue(hash, out var cachedTris) && cachedTris > 0)
@@ -566,23 +239,4 @@ public sealed partial class XivDataAnalyzer
            return 0;
        }
    }
-
-    // Regexes for canonicalizing skeleton keys
-    private static readonly Regex _bucketPathRegex =
-    BucketRegex();
-
-    private static readonly Regex _bucketSklRegex =
-        SklRegex();
-
-    private static readonly Regex _bucketLooseRegex =
-        LooseBucketRegex();
-
-    [GeneratedRegex(@"(?i)(?:^|/)(?<bucket>c\d{4})(?:/|$)", RegexOptions.Compiled, "en-NL")]
-    private static partial Regex BucketRegex();
-
-    [GeneratedRegex(@"(?i)\bskl_(?<bucket>c\d{4})[a-z]\d{4}\b", RegexOptions.Compiled, "en-NL")]
-    private static partial Regex SklRegex();
-
-    [GeneratedRegex(@"(?i)(?<![a-z0-9])(?<bucket>c\d{4})(?!\d)", RegexOptions.Compiled, "en-NL")]
-    private static partial Regex LooseBucketRegex();
 }
--- a/LightlessSync/ThirdParty/MeshDecimator/Algorithms/DecimationAlgorithm.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Algorithms/DecimationAlgorithm.cs
@@ -0,0 +1,169 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace MeshDecimator.Algorithms
+{
+    /// <summary>
+    /// A decimation algorithm.
+    /// </summary>
+    public abstract class DecimationAlgorithm
+    {
+        #region Delegates
+        /// <summary>
+        /// A callback for decimation status reports.
+        /// </summary>
+        /// <param name="iteration">The current iteration, starting at zero.</param>
+        /// <param name="originalTris">The original count of triangles.</param>
+        /// <param name="currentTris">The current count of triangles.</param>
+        /// <param name="targetTris">The target count of triangles.</param>
+        public delegate void StatusReportCallback(int iteration, int originalTris, int currentTris, int targetTris);
+        #endregion
+
+        #region Fields
+        private bool preserveBorders = false;
+        private int maxVertexCount = 0;
+        private bool verbose = false;
+
+        private StatusReportCallback statusReportInvoker = null;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets or sets if borders should be kept.
+        /// Default value: false
+        /// </summary>
+        [Obsolete("Use the 'DecimationAlgorithm.PreserveBorders' property instead.", false)]
+        public bool KeepBorders
+        {
+            get { return preserveBorders; }
+            set { preserveBorders = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets if borders should be preserved.
+        /// Default value: false
+        /// </summary>
+        public bool PreserveBorders
+        {
+            get { return preserveBorders; }
+            set { preserveBorders = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets if linked vertices should be kept.
+        /// Default value: false
+        /// </summary>
+        [Obsolete("This feature has been removed, for more details why please read the readme.", true)]
+        public bool KeepLinkedVertices
+        {
+            get { return false; }
+            set { }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum vertex count. Set to zero for no limitation.
+        /// Default value: 0 (no limitation)
+        /// </summary>
+        public int MaxVertexCount
+        {
+            get { return maxVertexCount; }
+            set { maxVertexCount = Math.MathHelper.Max(value, 0); }
+        }
+
+        /// <summary>
+        /// Gets or sets if verbose information should be printed in the console.
+        /// Default value: false
+        /// </summary>
+        public bool Verbose
+        {
+            get { return verbose; }
+            set { verbose = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the logger used for diagnostics.
+        /// </summary>
+        public ILogger? Logger { get; set; }
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// An event for status reports for this algorithm.
+        /// </summary>
+        public event StatusReportCallback StatusReport
+        {
+            add { statusReportInvoker += value; }
+            remove { statusReportInvoker -= value; }
+        }
+        #endregion
+
+        #region Protected Methods
+        /// <summary>
+        /// Reports the current status of the decimation.
+        /// </summary>
+        /// <param name="iteration">The current iteration, starting at zero.</param>
+        /// <param name="originalTris">The original count of triangles.</param>
+        /// <param name="currentTris">The current count of triangles.</param>
+        /// <param name="targetTris">The target count of triangles.</param>
+        protected void ReportStatus(int iteration, int originalTris, int currentTris, int targetTris)
+        {
+            var statusReportInvoker = this.statusReportInvoker;
+            if (statusReportInvoker != null)
+            {
+                statusReportInvoker.Invoke(iteration, originalTris, currentTris, targetTris);
+            }
+        }
+        #endregion
+
+        #region Public Methods
+        /// <summary>
+        /// Initializes the algorithm with the original mesh.
+        /// </summary>
+        /// <param name="mesh">The mesh.</param>
+        public abstract void Initialize(Mesh mesh);
+
+        /// <summary>
+        /// Decimates the mesh.
+        /// </summary>
+        /// <param name="targetTrisCount">The target triangle count.</param>
+        public abstract void DecimateMesh(int targetTrisCount);
+
+        /// <summary>
+        /// Decimates the mesh without losing any quality.
+        /// </summary>
+        public abstract void DecimateMeshLossless();
+
+        /// <summary>
+        /// Returns the resulting mesh.
+        /// </summary>
+        /// <returns>The resulting mesh.</returns>
+        public abstract Mesh ToMesh();
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Algorithms/FastQuadricMeshSimplification.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Algorithms/FastQuadricMeshSimplification.cs
--- a/LightlessSync/ThirdParty/MeshDecimator/BoneWeight.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/BoneWeight.cs
@@ -0,0 +1,249 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+using MeshDecimator.Math;
+
+namespace MeshDecimator
+{
+    /// <summary>
+    /// A bone weight.
+    /// </summary>
+    public struct BoneWeight : IEquatable<BoneWeight>
+    {
+        #region Fields
+        /// <summary>
+        /// The first bone index.
+        /// </summary>
+        public int boneIndex0;
+        /// <summary>
+        /// The second bone index.
+        /// </summary>
+        public int boneIndex1;
+        /// <summary>
+        /// The third bone index.
+        /// </summary>
+        public int boneIndex2;
+        /// <summary>
+        /// The fourth bone index.
+        /// </summary>
+        public int boneIndex3;
+
+        /// <summary>
+        /// The first bone weight.
+        /// </summary>
+        public float boneWeight0;
+        /// <summary>
+        /// The second bone weight.
+        /// </summary>
+        public float boneWeight1;
+        /// <summary>
+        /// The third bone weight.
+        /// </summary>
+        public float boneWeight2;
+        /// <summary>
+        /// The fourth bone weight.
+        /// </summary>
+        public float boneWeight3;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a new bone weight.
+        /// </summary>
+        /// <param name="boneIndex0">The first bone index.</param>
+        /// <param name="boneIndex1">The second bone index.</param>
+        /// <param name="boneIndex2">The third bone index.</param>
+        /// <param name="boneIndex3">The fourth bone index.</param>
+        /// <param name="boneWeight0">The first bone weight.</param>
+        /// <param name="boneWeight1">The second bone weight.</param>
+        /// <param name="boneWeight2">The third bone weight.</param>
+        /// <param name="boneWeight3">The fourth bone weight.</param>
+        public BoneWeight(int boneIndex0, int boneIndex1, int boneIndex2, int boneIndex3, float boneWeight0, float boneWeight1, float boneWeight2, float boneWeight3)
+        {
+            this.boneIndex0 = boneIndex0;
+            this.boneIndex1 = boneIndex1;
+            this.boneIndex2 = boneIndex2;
+            this.boneIndex3 = boneIndex3;
+
+            this.boneWeight0 = boneWeight0;
+            this.boneWeight1 = boneWeight1;
+            this.boneWeight2 = boneWeight2;
+            this.boneWeight3 = boneWeight3;
+        }
+        #endregion
+
+        #region Operators
+        /// <summary>
+        /// Returns if two bone weights equals eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side bone weight.</param>
+        /// <param name="rhs">The right hand side bone weight.</param>
+        /// <returns>If equals.</returns>
+        public static bool operator ==(BoneWeight lhs, BoneWeight rhs)
+        {
+            return (lhs.boneIndex0 == rhs.boneIndex0 && lhs.boneIndex1 == rhs.boneIndex1 && lhs.boneIndex2 == rhs.boneIndex2 && lhs.boneIndex3 == rhs.boneIndex3 &&
+                new Vector4(lhs.boneWeight0, lhs.boneWeight1, lhs.boneWeight2, lhs.boneWeight3) == new Vector4(rhs.boneWeight0, rhs.boneWeight1, rhs.boneWeight2, rhs.boneWeight3));
+        }
+
+        /// <summary>
+        /// Returns if two bone weights don't equal eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side bone weight.</param>
+        /// <param name="rhs">The right hand side bone weight.</param>
+        /// <returns>If not equals.</returns>
+        public static bool operator !=(BoneWeight lhs, BoneWeight rhs)
+        {
+            return !(lhs == rhs);
+        }
+        #endregion
+
+        #region Private Methods
+        private void MergeBoneWeight(int boneIndex, float weight)
+        {
+            if (boneIndex == boneIndex0)
+            {
+                boneWeight0 = (boneWeight0 + weight) * 0.5f;
+            }
+            else if (boneIndex == boneIndex1)
+            {
+                boneWeight1 = (boneWeight1 + weight) * 0.5f;
+            }
+            else if (boneIndex == boneIndex2)
+            {
+                boneWeight2 = (boneWeight2 + weight) * 0.5f;
+            }
+            else if (boneIndex == boneIndex3)
+            {
+                boneWeight3 = (boneWeight3 + weight) * 0.5f;
+            }
+            else if(boneWeight0 == 0f)
+            {
+                boneIndex0 = boneIndex;
+                boneWeight0 = weight;
+            }
+            else if (boneWeight1 == 0f)
+            {
+                boneIndex1 = boneIndex;
+                boneWeight1 = weight;
+            }
+            else if (boneWeight2 == 0f)
+            {
+                boneIndex2 = boneIndex;
+                boneWeight2 = weight;
+            }
+            else if (boneWeight3 == 0f)
+            {
+                boneIndex3 = boneIndex;
+                boneWeight3 = weight;
+            }
+            Normalize();
+        }
+
+        private void Normalize()
+        {
+            float mag = (float)System.Math.Sqrt(boneWeight0 * boneWeight0 + boneWeight1 * boneWeight1 + boneWeight2 * boneWeight2 + boneWeight3 * boneWeight3);
+            if (mag > float.Epsilon)
+            {
+                boneWeight0 /= mag;
+                boneWeight1 /= mag;
+                boneWeight2 /= mag;
+                boneWeight3 /= mag;
+            }
+            else
+            {
+                boneWeight0 = boneWeight1 = boneWeight2 = boneWeight3 = 0f;
+            }
+        }
+        #endregion
+
+        #region Public Methods
+        #region Object
+        /// <summary>
+        /// Returns a hash code for this vector.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            return boneIndex0.GetHashCode() ^ boneIndex1.GetHashCode() << 2 ^ boneIndex2.GetHashCode() >> 2 ^ boneIndex3.GetHashCode() >>
+                1 ^ boneWeight0.GetHashCode() << 5 ^ boneWeight1.GetHashCode() << 4 ^ boneWeight2.GetHashCode() >> 4 ^ boneWeight3.GetHashCode() >> 3;
+        }
+
+        /// <summary>
+        /// Returns if this bone weight is equal to another object.
+        /// </summary>
+        /// <param name="obj">The other object to compare to.</param>
+        /// <returns>If equals.</returns>
+        public override bool Equals(object obj)
+        {
+            if (!(obj is BoneWeight))
+            {
+                return false;
+            }
+            BoneWeight other = (BoneWeight)obj;
+            return (boneIndex0 == other.boneIndex0 && boneIndex1 == other.boneIndex1 && boneIndex2 == other.boneIndex2 && boneIndex3 == other.boneIndex3 &&
+                boneWeight0 == other.boneWeight0 && boneWeight1 == other.boneWeight1 && boneWeight2 == other.boneWeight2 && boneWeight3 == other.boneWeight3);
+        }
+
+        /// <summary>
+        /// Returns if this bone weight is equal to another one.
+        /// </summary>
+        /// <param name="other">The other bone weight to compare to.</param>
+        /// <returns>If equals.</returns>
+        public bool Equals(BoneWeight other)
+        {
+            return (boneIndex0 == other.boneIndex0 && boneIndex1 == other.boneIndex1 && boneIndex2 == other.boneIndex2 && boneIndex3 == other.boneIndex3 &&
+                boneWeight0 == other.boneWeight0 && boneWeight1 == other.boneWeight1 && boneWeight2 == other.boneWeight2 && boneWeight3 == other.boneWeight3);
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this bone weight.
+        /// </summary>
+        /// <returns>The string.</returns>
+        public override string ToString()
+        {
+            return string.Format("({0}:{4:F1}, {1}:{5:F1}, {2}:{6:F1}, {3}:{7:F1})",
+                boneIndex0, boneIndex1, boneIndex2, boneIndex3, boneWeight0, boneWeight1, boneWeight2, boneWeight3);
+        }
+        #endregion
+
+        #region Static
+        /// <summary>
+        /// Merges two bone weights and stores the merged result in the first parameter.
+        /// </summary>
+        /// <param name="a">The first bone weight, also stores result.</param>
+        /// <param name="b">The second bone weight.</param>
+        public static void Merge(ref BoneWeight a, ref BoneWeight b)
+        {
+            if (b.boneWeight0 > 0f) a.MergeBoneWeight(b.boneIndex0, b.boneWeight0);
+            if (b.boneWeight1 > 0f) a.MergeBoneWeight(b.boneIndex1, b.boneWeight1);
+            if (b.boneWeight2 > 0f) a.MergeBoneWeight(b.boneIndex2, b.boneWeight2);
+            if (b.boneWeight3 > 0f) a.MergeBoneWeight(b.boneIndex3, b.boneWeight3);
+        }
+        #endregion
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Collections/ResizableArray.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Collections/ResizableArray.cs
@@ -0,0 +1,179 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+
+namespace MeshDecimator.Collections
+{
+    /// <summary>
+    /// A resizable array.
+    /// </summary>
+    /// <typeparam name="T">The item type.</typeparam>
+    internal sealed class ResizableArray<T>
+    {
+        #region Fields
+        private T[] items = null;
+        private int length = 0;
+
+        private static T[] emptyArr = new T[0];
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the length of this array.
+        /// </summary>
+        public int Length
+        {
+            get { return length; }
+        }
+
+        /// <summary>
+        /// Gets the internal data buffer for this array.
+        /// </summary>
+        public T[] Data
+        {
+            get { return items; }
+        }
+
+        /// <summary>
+        /// Gets or sets the element value at a specific index.
+        /// </summary>
+        /// <param name="index">The element index.</param>
+        /// <returns>The element value.</returns>
+        public T this[int index]
+        {
+            get { return items[index]; }
+            set { items[index] = value; }
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a new resizable array.
+        /// </summary>
+        /// <param name="capacity">The initial array capacity.</param>
+        public ResizableArray(int capacity)
+            : this(capacity, 0)
+        {
+
+        }
+
+        /// <summary>
+        /// Creates a new resizable array.
+        /// </summary>
+        /// <param name="capacity">The initial array capacity.</param>
+        /// <param name="length">The initial length of the array.</param>
+        public ResizableArray(int capacity, int length)
+        {
+            if (capacity < 0)
+                throw new ArgumentOutOfRangeException("capacity");
+            else if (length < 0 || length > capacity)
+                throw new ArgumentOutOfRangeException("length");
+
+            if (capacity > 0)
+                items = new T[capacity];
+            else
+                items = emptyArr;
+
+            this.length = length;
+        }
+        #endregion
+
+        #region Private Methods
+        private void IncreaseCapacity(int capacity)
+        {
+            T[] newItems = new T[capacity];
+            Array.Copy(items, 0, newItems, 0, System.Math.Min(length, capacity));
+            items = newItems;
+        }
+        #endregion
+
+        #region Public Methods
+        /// <summary>
+        /// Clears this array.
+        /// </summary>
+        public void Clear()
+        {
+            Array.Clear(items, 0, length);
+            length = 0;
+        }
+
+        /// <summary>
+        /// Resizes this array.
+        /// </summary>
+        /// <param name="length">The new length.</param>
+        /// <param name="trimExess">If exess memory should be trimmed.</param>
+        public void Resize(int length, bool trimExess = false)
+        {
+            if (length < 0)
+                throw new ArgumentOutOfRangeException("capacity");
+
+            if (length > items.Length)
+            {
+                IncreaseCapacity(length);
+            }
+            else if (length < this.length)
+            {
+                //Array.Clear(items, capacity, length - capacity);
+            }
+
+            this.length = length;
+
+            if (trimExess)
+            {
+                TrimExcess();
+            }
+        }
+
+        /// <summary>
+        /// Trims any excess memory for this array.
+        /// </summary>
+        public void TrimExcess()
+        {
+            if (items.Length == length) // Nothing to do
+                return;
+
+            T[] newItems = new T[length];
+            Array.Copy(items, 0, newItems, 0, length);
+            items = newItems;
+        }
+
+        /// <summary>
+        /// Adds a new item to the end of this array.
+        /// </summary>
+        /// <param name="item">The new item.</param>
+        public void Add(T item)
+        {
+            if (length >= items.Length)
+            {
+                IncreaseCapacity(items.Length << 1);
+            }
+
+            items[length++] = item;
+        }
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Collections/UVChannels.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Collections/UVChannels.cs
@@ -0,0 +1,79 @@
+using System;
+
+namespace MeshDecimator.Collections
+{
+    /// <summary>
+    /// A collection of UV channels.
+    /// </summary>
+    /// <typeparam name="TVec">The UV vector type.</typeparam>
+    internal sealed class UVChannels<TVec>
+    {
+        #region Fields
+        private ResizableArray<TVec>[] channels = null;
+        private TVec[][] channelsData = null;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the channel collection data.
+        /// </summary>
+        public TVec[][] Data
+        {
+            get
+            {
+                for (int i = 0; i < Mesh.UVChannelCount; i++)
+                {
+                    if (channels[i] != null)
+                    {
+                        channelsData[i] = channels[i].Data;
+                    }
+                    else
+                    {
+                        channelsData[i] = null;
+                    }
+                }
+                return channelsData;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a specific channel by index.
+        /// </summary>
+        /// <param name="index">The channel index.</param>
+        public ResizableArray<TVec> this[int index]
+        {
+            get { return channels[index]; }
+            set { channels[index] = value; }
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a new collection of UV channels.
+        /// </summary>
+        public UVChannels()
+        {
+            channels = new ResizableArray<TVec>[Mesh.UVChannelCount];
+            channelsData = new TVec[Mesh.UVChannelCount][];
+        }
+        #endregion
+
+        #region Public Methods
+        /// <summary>
+        /// Resizes all channels at once.
+        /// </summary>
+        /// <param name="capacity">The new capacity.</param>
+        /// <param name="trimExess">If exess memory should be trimmed.</param>
+        public void Resize(int capacity, bool trimExess = false)
+        {
+            for (int i = 0; i < Mesh.UVChannelCount; i++)
+            {
+                if (channels[i] != null)
+                {
+                    channels[i].Resize(capacity, trimExess);
+                }
+            }
+        }
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/LICENSE.md
+++ b/LightlessSync/ThirdParty/MeshDecimator/LICENSE.md
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/LightlessSync/ThirdParty/MeshDecimator/Math/MathHelper.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Math/MathHelper.cs
@@ -0,0 +1,286 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+
+namespace MeshDecimator.Math
+{
+    /// <summary>
+    /// Math helpers.
+    /// </summary>
+    public static class MathHelper
+    {
+        #region Consts
+        /// <summary>
+        /// The Pi constant.
+        /// </summary>
+        public const float PI = 3.14159274f;
+
+        /// <summary>
+        /// The Pi constant.
+        /// </summary>
+        public const double PId = 3.1415926535897932384626433832795;
+
+        /// <summary>
+        /// Degrees to radian constant.
+        /// </summary>
+        public const float Deg2Rad = PI / 180f;
+
+        /// <summary>
+        /// Degrees to radian constant.
+        /// </summary>
+        public const double Deg2Radd = PId / 180.0;
+
+        /// <summary>
+        /// Radians to degrees constant.
+        /// </summary>
+        public const float Rad2Deg = 180f / PI;
+
+        /// <summary>
+        /// Radians to degrees constant.
+        /// </summary>
+        public const double Rad2Degd = 180.0 / PId;
+        #endregion
+
+        #region Min
+        /// <summary>
+        /// Returns the minimum of two values.
+        /// </summary>
+        /// <param name="val1">The first value.</param>
+        /// <param name="val2">The second value.</param>
+        /// <returns>The minimum value.</returns>
+        public static int Min(int val1, int val2)
+        {
+            return (val1 < val2 ? val1 : val2);
+        }
+
+        /// <summary>
+        /// Returns the minimum of three values.
+        /// </summary>
+        /// <param name="val1">The first value.</param>
+        /// <param name="val2">The second value.</param>
+        /// <param name="val3">The third value.</param>
+        /// <returns>The minimum value.</returns>
+        public static int Min(int val1, int val2, int val3)
+        {
+            return (val1 < val2 ? (val1 < val3 ? val1 : val3) : (val2 < val3 ? val2 : val3));
+        }
+
+        /// <summary>
+        /// Returns the minimum of two values.
+        /// </summary>
+        /// <param name="val1">The first value.</param>
+        /// <param name="val2">The second value.</param>
+        /// <returns>The minimum value.</returns>
+        public static float Min(float val1, float val2)
+        {
+            return (val1 < val2 ? val1 : val2);
+        }
+
+        /// <summary>
+        /// Returns the minimum of three values.
+        /// </summary>
+        /// <param name="val1">The first value.</param>
+        /// <param name="val2">The second value.</param>
+        /// <param name="val3">The third value.</param>
+        /// <returns>The minimum value.</returns>
+        public static float Min(float val1, float val2, float val3)
+        {
+            return (val1 < val2 ? (val1 < val3 ? val1 : val3) : (val2 < val3 ? val2 : val3));
+        }
+
+        /// <summary>
+        /// Returns the minimum of two values.
+        /// </summary>
+        /// <param name="val1">The first value.</param>
+        /// <param name="val2">The second value.</param>
+        /// <returns>The minimum value.</returns>
+        public static double Min(double val1, double val2)
+        {
+            return (val1 < val2 ? val1 : val2);
+        }
+
+        /// <summary>
+        /// Returns the minimum of three values.
+        /// </summary>
+        /// <param name="val1">The first value.</param>
+        /// <param name="val2">The second value.</param>
+        /// <param name="val3">The third value.</param>
+        /// <returns>The minimum value.</returns>
+        public static double Min(double val1, double val2, double val3)
+        {
+            return (val1 < val2 ? (val1 < val3 ? val1 : val3) : (val2 < val3 ? val2 : val3));
+        }
+        #endregion
+
+        #region Max
+        /// <summary>
+        /// Returns the maximum of two values.
+        /// </summary>
+        /// <param name="val1">The first value.</param>
+        /// <param name="val2">The second value.</param>
+        /// <returns>The maximum value.</returns>
+        public static int Max(int val1, int val2)
+        {
+            return (val1 > val2 ? val1 : val2);
+        }
+
+        /// <summary>
+        /// Returns the maximum of three values.
+        /// </summary>
+        /// <param name="val1">The first value.</param>
+        /// <param name="val2">The second value.</param>
+        /// <param name="val3">The third value.</param>
+        /// <returns>The maximum value.</returns>
+        public static int Max(int val1, int val2, int val3)
+        {
+            return (val1 > val2 ? (val1 > val3 ? val1 : val3) : (val2 > val3 ? val2 : val3));
+        }
+
+        /// <summary>
+        /// Returns the maximum of two values.
+        /// </summary>
+        /// <param name="val1">The first value.</param>
+        /// <param name="val2">The second value.</param>
+        /// <returns>The maximum value.</returns>
+        public static float Max(float val1, float val2)
+        {
+            return (val1 > val2 ? val1 : val2);
+        }
+
+        /// <summary>
+        /// Returns the maximum of three values.
+        /// </summary>
+        /// <param name="val1">The first value.</param>
+        /// <param name="val2">The second value.</param>
+        /// <param name="val3">The third value.</param>
+        /// <returns>The maximum value.</returns>
+        public static float Max(float val1, float val2, float val3)
+        {
+            return (val1 > val2 ? (val1 > val3 ? val1 : val3) : (val2 > val3 ? val2 : val3));
+        }
+
+        /// <summary>
+        /// Returns the maximum of two values.
+        /// </summary>
+        /// <param name="val1">The first value.</param>
+        /// <param name="val2">The second value.</param>
+        /// <returns>The maximum value.</returns>
+        public static double Max(double val1, double val2)
+        {
+            return (val1 > val2 ? val1 : val2);
+        }
+
+        /// <summary>
+        /// Returns the maximum of three values.
+        /// </summary>
+        /// <param name="val1">The first value.</param>
+        /// <param name="val2">The second value.</param>
+        /// <param name="val3">The third value.</param>
+        /// <returns>The maximum value.</returns>
+        public static double Max(double val1, double val2, double val3)
+        {
+            return (val1 > val2 ? (val1 > val3 ? val1 : val3) : (val2 > val3 ? val2 : val3));
+        }
+        #endregion
+
+        #region Clamping
+        /// <summary>
+        /// Clamps a value between a minimum and a maximum value.
+        /// </summary>
+        /// <param name="value">The value to clamp.</param>
+        /// <param name="min">The minimum value.</param>
+        /// <param name="max">The maximum value.</param>
+        /// <returns>The clamped value.</returns>
+        public static float Clamp(float value, float min, float max)
+        {
+            return (value >= min ? (value <= max ? value : max) : min);
+        }
+
+        /// <summary>
+        /// Clamps a value between a minimum and a maximum value.
+        /// </summary>
+        /// <param name="value">The value to clamp.</param>
+        /// <param name="min">The minimum value.</param>
+        /// <param name="max">The maximum value.</param>
+        /// <returns>The clamped value.</returns>
+        public static double Clamp(double value, double min, double max)
+        {
+            return (value >= min ? (value <= max ? value : max) : min);
+        }
+
+        /// <summary>
+        /// Clamps the value between 0 and 1.
+        /// </summary>
+        /// <param name="value">The value to clamp.</param>
+        /// <returns>The clamped value.</returns>
+        public static float Clamp01(float value)
+        {
+            return (value > 0f ? (value < 1f ? value : 1f) : 0f);
+        }
+
+        /// <summary>
+        /// Clamps the value between 0 and 1.
+        /// </summary>
+        /// <param name="value">The value to clamp.</param>
+        /// <returns>The clamped value.</returns>
+        public static double Clamp01(double value)
+        {
+            return (value > 0.0 ? (value < 1.0 ? value : 1.0) : 0.0);
+        }
+        #endregion
+
+        #region Triangle Area
+        /// <summary>
+        /// Calculates the area of a triangle.
+        /// </summary>
+        /// <param name="p0">The first point.</param>
+        /// <param name="p1">The second point.</param>
+        /// <param name="p2">The third point.</param>
+        /// <returns>The triangle area.</returns>
+        public static float TriangleArea(ref Vector3 p0, ref Vector3 p1, ref Vector3 p2)
+        {
+            var dx = p1 - p0;
+            var dy = p2 - p0;
+            return dx.Magnitude * ((float)System.Math.Sin(Vector3.Angle(ref dx, ref dy) * Deg2Rad) * dy.Magnitude) * 0.5f;
+        }
+
+        /// <summary>
+        /// Calculates the area of a triangle.
+        /// </summary>
+        /// <param name="p0">The first point.</param>
+        /// <param name="p1">The second point.</param>
+        /// <param name="p2">The third point.</param>
+        /// <returns>The triangle area.</returns>
+        public static double TriangleArea(ref Vector3d p0, ref Vector3d p1, ref Vector3d p2)
+        {
+            var dx = p1 - p0;
+            var dy = p2 - p0;
+            return dx.Magnitude * (System.Math.Sin(Vector3d.Angle(ref dx, ref dy) * Deg2Radd) * dy.Magnitude) * 0.5f;
+        }
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Math/SymmetricMatrix.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Math/SymmetricMatrix.cs
@@ -0,0 +1,303 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+
+namespace MeshDecimator.Math
+{
+    /// <summary>
+    /// A symmetric matrix.
+    /// </summary>
+    public struct SymmetricMatrix
+    {
+        #region Fields
+        /// <summary>
+        /// The m11 component.
+        /// </summary>
+        public double m0;
+        /// <summary>
+        /// The m12 component.
+        /// </summary>
+        public double m1;
+        /// <summary>
+        /// The m13 component.
+        /// </summary>
+        public double m2;
+        /// <summary>
+        /// The m14 component.
+        /// </summary>
+        public double m3;
+        /// <summary>
+        /// The m22 component.
+        /// </summary>
+        public double m4;
+        /// <summary>
+        /// The m23 component.
+        /// </summary>
+        public double m5;
+        /// <summary>
+        /// The m24 component.
+        /// </summary>
+        public double m6;
+        /// <summary>
+        /// The m33 component.
+        /// </summary>
+        public double m7;
+        /// <summary>
+        /// The m34 component.
+        /// </summary>
+        public double m8;
+        /// <summary>
+        /// The m44 component.
+        /// </summary>
+        public double m9;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the component value with a specific index.
+        /// </summary>
+        /// <param name="index">The component index.</param>
+        /// <returns>The value.</returns>
+        public double this[int index]
+        {
+            get
+            {
+                switch (index)
+                {
+                    case 0:
+                        return m0;
+                    case 1:
+                        return m1;
+                    case 2:
+                        return m2;
+                    case 3:
+                        return m3;
+                    case 4:
+                        return m4;
+                    case 5:
+                        return m5;
+                    case 6:
+                        return m6;
+                    case 7:
+                        return m7;
+                    case 8:
+                        return m8;
+                    case 9:
+                        return m9;
+                    default:
+                        throw new IndexOutOfRangeException();
+                }
+            }
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a symmetric matrix with a value in each component.
+        /// </summary>
+        /// <param name="c">The component value.</param>
+        public SymmetricMatrix(double c)
+        {
+            this.m0 = c;
+            this.m1 = c;
+            this.m2 = c;
+            this.m3 = c;
+            this.m4 = c;
+            this.m5 = c;
+            this.m6 = c;
+            this.m7 = c;
+            this.m8 = c;
+            this.m9 = c;
+        }
+
+        /// <summary>
+        /// Creates a symmetric matrix.
+        /// </summary>
+        /// <param name="m0">The m11 component.</param>
+        /// <param name="m1">The m12 component.</param>
+        /// <param name="m2">The m13 component.</param>
+        /// <param name="m3">The m14 component.</param>
+        /// <param name="m4">The m22 component.</param>
+        /// <param name="m5">The m23 component.</param>
+        /// <param name="m6">The m24 component.</param>
+        /// <param name="m7">The m33 component.</param>
+        /// <param name="m8">The m34 component.</param>
+        /// <param name="m9">The m44 component.</param>
+        public SymmetricMatrix(double m0, double m1, double m2, double m3,
+            double m4, double m5, double m6, double m7, double m8, double m9)
+        {
+            this.m0 = m0;
+            this.m1 = m1;
+            this.m2 = m2;
+            this.m3 = m3;
+            this.m4 = m4;
+            this.m5 = m5;
+            this.m6 = m6;
+            this.m7 = m7;
+            this.m8 = m8;
+            this.m9 = m9;
+        }
+
+        /// <summary>
+        /// Creates a symmetric matrix from a plane.
+        /// </summary>
+        /// <param name="a">The plane x-component.</param>
+        /// <param name="b">The plane y-component</param>
+        /// <param name="c">The plane z-component</param>
+        /// <param name="d">The plane w-component</param>
+        public SymmetricMatrix(double a, double b, double c, double d)
+        {
+            this.m0 = a * a;
+            this.m1 = a * b;
+            this.m2 = a * c;
+            this.m3 = a * d;
+
+            this.m4 = b * b;
+            this.m5 = b * c;
+            this.m6 = b * d;
+
+            this.m7 = c * c;
+            this.m8 = c * d;
+
+            this.m9 = d * d;
+        }
+        #endregion
+
+        #region Operators
+        /// <summary>
+        /// Adds two matrixes together.
+        /// </summary>
+        /// <param name="a">The left hand side.</param>
+        /// <param name="b">The right hand side.</param>
+        /// <returns>The resulting matrix.</returns>
+        public static SymmetricMatrix operator +(SymmetricMatrix a, SymmetricMatrix b)
+        {
+            return new SymmetricMatrix(
+                a.m0 + b.m0, a.m1 + b.m1, a.m2 + b.m2, a.m3 + b.m3,
+                a.m4 + b.m4, a.m5 + b.m5, a.m6 + b.m6,
+                a.m7 + b.m7, a.m8 + b.m8,
+                a.m9 + b.m9
+            );
+        }
+        #endregion
+
+        #region Internal Methods
+        /// <summary>
+        /// Determinant(0, 1, 2, 1, 4, 5, 2, 5, 7)
+        /// </summary>
+        /// <returns></returns>
+        internal double Determinant1()
+        {
+            double det =
+                m0 * m4 * m7 +
+                m2 * m1 * m5 +
+                m1 * m5 * m2 -
+                m2 * m4 * m2 -
+                m0 * m5 * m5 -
+                m1 * m1 * m7;
+            return det;
+        }
+
+        /// <summary>
+        /// Determinant(1, 2, 3, 4, 5, 6, 5, 7, 8)
+        /// </summary>
+        /// <returns></returns>
+        internal double Determinant2()
+        {
+            double det =
+                m1 * m5 * m8 +
+                m3 * m4 * m7 +
+                m2 * m6 * m5 -
+                m3 * m5 * m5 -
+                m1 * m6 * m7 -
+                m2 * m4 * m8;
+            return det;
+        }
+
+        /// <summary>
+        /// Determinant(0, 2, 3, 1, 5, 6, 2, 7, 8)
+        /// </summary>
+        /// <returns></returns>
+        internal double Determinant3()
+        {
+            double det =
+                m0 * m5 * m8 +
+                m3 * m1 * m7 +
+                m2 * m6 * m2 -
+                m3 * m5 * m2 -
+                m0 * m6 * m7 -
+                m2 * m1 * m8;
+            return det;
+        }
+
+        /// <summary>
+        /// Determinant(0, 1, 3, 1, 4, 6, 2, 5, 8)
+        /// </summary>
+        /// <returns></returns>
+        internal double Determinant4()
+        {
+            double det =
+                m0 * m4 * m8 +
+                m3 * m1 * m5 +
+                m1 * m6 * m2 -
+                m3 * m4 * m2 -
+                m0 * m6 * m5 -
+                m1 * m1 * m8;
+            return det;
+        }
+        #endregion
+
+        #region Public Methods
+        /// <summary>
+        /// Computes the determinant of this matrix.
+        /// </summary>
+        /// <param name="a11">The a11 index.</param>
+        /// <param name="a12">The a12 index.</param>
+        /// <param name="a13">The a13 index.</param>
+        /// <param name="a21">The a21 index.</param>
+        /// <param name="a22">The a22 index.</param>
+        /// <param name="a23">The a23 index.</param>
+        /// <param name="a31">The a31 index.</param>
+        /// <param name="a32">The a32 index.</param>
+        /// <param name="a33">The a33 index.</param>
+        /// <returns>The determinant value.</returns>
+        public double Determinant(int a11, int a12, int a13,
+            int a21, int a22, int a23,
+            int a31, int a32, int a33)
+        {
+            double det =
+                this[a11] * this[a22] * this[a33] +
+                this[a13] * this[a21] * this[a32] +
+                this[a12] * this[a23] * this[a31] -
+                this[a13] * this[a22] * this[a31] -
+                this[a11] * this[a23] * this[a32] -
+                this[a12] * this[a21] * this[a33];
+            return det;
+        }
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Math/Vector2.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Math/Vector2.cs
@@ -0,0 +1,425 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+using System.Globalization;
+
+namespace MeshDecimator.Math
+{
+    /// <summary>
+    /// A single precision 2D vector.
+    /// </summary>
+    public struct Vector2 : IEquatable<Vector2>
+    {
+        #region Static Read-Only
+        /// <summary>
+        /// The zero vector.
+        /// </summary>
+        public static readonly Vector2 zero = new Vector2(0, 0);
+        #endregion
+
+        #region Consts
+        /// <summary>
+        /// The vector epsilon.
+        /// </summary>
+        public const float Epsilon = 9.99999944E-11f;
+        #endregion
+
+        #region Fields
+        /// <summary>
+        /// The x component.
+        /// </summary>
+        public float x;
+        /// <summary>
+        /// The y component.
+        /// </summary>
+        public float y;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the magnitude of this vector.
+        /// </summary>
+        public float Magnitude
+        {
+            get { return (float)System.Math.Sqrt(x * x + y * y); }
+        }
+
+        /// <summary>
+        /// Gets the squared magnitude of this vector.
+        /// </summary>
+        public float MagnitudeSqr
+        {
+            get { return (x * x + y * y); }
+        }
+
+        /// <summary>
+        /// Gets a normalized vector from this vector.
+        /// </summary>
+        public Vector2 Normalized
+        {
+            get
+            {
+                Vector2 result;
+                Normalize(ref this, out result);
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a specific component by index in this vector.
+        /// </summary>
+        /// <param name="index">The component index.</param>
+        public float this[int index]
+        {
+            get
+            {
+                switch (index)
+                {
+                    case 0:
+                        return x;
+                    case 1:
+                        return y;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector2 index!");
+                }
+            }
+            set
+            {
+                switch (index)
+                {
+                    case 0:
+                        x = value;
+                        break;
+                    case 1:
+                        y = value;
+                        break;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector2 index!");
+                }
+            }
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a new vector with one value for all components.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public Vector2(float value)
+        {
+            this.x = value;
+            this.y = value;
+        }
+
+        /// <summary>
+        /// Creates a new vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        public Vector2(float x, float y)
+        {
+            this.x = x;
+            this.y = y;
+        }
+        #endregion
+
+        #region Operators
+        /// <summary>
+        /// Adds two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2 operator +(Vector2 a, Vector2 b)
+        {
+            return new Vector2(a.x + b.x, a.y + b.y);
+        }
+
+        /// <summary>
+        /// Subtracts two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2 operator -(Vector2 a, Vector2 b)
+        {
+            return new Vector2(a.x - b.x, a.y - b.y);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The scaling value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2 operator *(Vector2 a, float d)
+        {
+            return new Vector2(a.x * d, a.y * d);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="d">The scaling value.</param>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2 operator *(float d, Vector2 a)
+        {
+            return new Vector2(a.x * d, a.y * d);
+        }
+
+        /// <summary>
+        /// Divides the vector with a float.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The dividing float value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2 operator /(Vector2 a, float d)
+        {
+            return new Vector2(a.x / d, a.y / d);
+        }
+
+        /// <summary>
+        /// Subtracts the vector from a zero vector.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2 operator -(Vector2 a)
+        {
+            return new Vector2(-a.x, -a.y);
+        }
+
+        /// <summary>
+        /// Returns if two vectors equals eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If equals.</returns>
+        public static bool operator ==(Vector2 lhs, Vector2 rhs)
+        {
+            return (lhs - rhs).MagnitudeSqr < Epsilon;
+        }
+
+        /// <summary>
+        /// Returns if two vectors don't equal eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If not equals.</returns>
+        public static bool operator !=(Vector2 lhs, Vector2 rhs)
+        {
+            return (lhs - rhs).MagnitudeSqr >= Epsilon;
+        }
+
+        /// <summary>
+        /// Explicitly converts from a double-precision vector into a single-precision vector.
+        /// </summary>
+        /// <param name="v">The double-precision vector.</param>
+        public static explicit operator Vector2(Vector2d v)
+        {
+            return new Vector2((float)v.x, (float)v.y);
+        }
+
+        /// <summary>
+        /// Implicitly converts from an integer vector into a single-precision vector.
+        /// </summary>
+        /// <param name="v">The integer vector.</param>
+        public static implicit operator Vector2(Vector2i v)
+        {
+            return new Vector2(v.x, v.y);
+        }
+        #endregion
+
+        #region Public Methods
+        #region Instance
+        /// <summary>
+        /// Set x and y components of an existing vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        public void Set(float x, float y)
+        {
+            this.x = x;
+            this.y = y;
+        }
+
+        /// <summary>
+        /// Multiplies with another vector component-wise.
+        /// </summary>
+        /// <param name="scale">The vector to multiply with.</param>
+        public void Scale(ref Vector2 scale)
+        {
+            x *= scale.x;
+            y *= scale.y;
+        }
+
+        /// <summary>
+        /// Normalizes this vector.
+        /// </summary>
+        public void Normalize()
+        {
+            float mag = this.Magnitude;
+            if (mag > Epsilon)
+            {
+                x /= mag;
+                y /= mag;
+            }
+            else
+            {
+                x = y = 0;
+            }
+        }
+
+        /// <summary>
+        /// Clamps this vector between a specific range.
+        /// </summary>
+        /// <param name="min">The minimum component value.</param>
+        /// <param name="max">The maximum component value.</param>
+        public void Clamp(float min, float max)
+        {
+            if (x < min) x = min;
+            else if (x > max) x = max;
+
+            if (y < min) y = min;
+            else if (y > max) y = max;
+        }
+        #endregion
+
+        #region Object
+        /// <summary>
+        /// Returns a hash code for this vector.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            return x.GetHashCode() ^ y.GetHashCode() << 2;
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public override bool Equals(object other)
+        {
+            if (!(other is Vector2))
+            {
+                return false;
+            }
+            Vector2 vector = (Vector2)other;
+            return (x == vector.x && y == vector.y);
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public bool Equals(Vector2 other)
+        {
+            return (x == other.x && y == other.y);
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <returns>The string.</returns>
+        public override string ToString()
+        {
+            return string.Format("({0}, {1})",
+                x.ToString("F1", CultureInfo.InvariantCulture),
+                y.ToString("F1", CultureInfo.InvariantCulture));
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <param name="format">The float format.</param>
+        /// <returns>The string.</returns>
+        public string ToString(string format)
+        {
+            return string.Format("({0}, {1})",
+                x.ToString(format, CultureInfo.InvariantCulture),
+                y.ToString(format, CultureInfo.InvariantCulture));
+        }
+        #endregion
+
+        #region Static
+        /// <summary>
+        /// Dot Product of two vectors.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        public static float Dot(ref Vector2 lhs, ref Vector2 rhs)
+        {
+            return lhs.x * rhs.x + lhs.y * rhs.y;
+        }
+        
+        /// <summary>
+        /// Performs a linear interpolation between two vectors.
+        /// </summary>
+        /// <param name="a">The vector to interpolate from.</param>
+        /// <param name="b">The vector to interpolate to.</param>
+        /// <param name="t">The time fraction.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Lerp(ref Vector2 a, ref Vector2 b, float t, out Vector2 result)
+        {
+            result = new Vector2(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t);
+        }
+
+        /// <summary>
+        /// Multiplies two vectors component-wise.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Scale(ref Vector2 a, ref Vector2 b, out Vector2 result)
+        {
+            result = new Vector2(a.x * b.x, a.y * b.y);
+        }
+
+        /// <summary>
+        /// Normalizes a vector.
+        /// </summary>
+        /// <param name="value">The vector to normalize.</param>
+        /// <param name="result">The resulting normalized vector.</param>
+        public static void Normalize(ref Vector2 value, out Vector2 result)
+        {
+            float mag = value.Magnitude;
+            if (mag > Epsilon)
+            {
+                result = new Vector2(value.x / mag, value.y / mag);
+            }
+            else
+            {
+                result = Vector2.zero;
+            }
+        }
+        #endregion
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Math/Vector2d.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Math/Vector2d.cs
@@ -0,0 +1,425 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+using System.Globalization;
+
+namespace MeshDecimator.Math
+{
+    /// <summary>
+    /// A double precision 2D vector.
+    /// </summary>
+    public struct Vector2d : IEquatable<Vector2d>
+    {
+        #region Static Read-Only
+        /// <summary>
+        /// The zero vector.
+        /// </summary>
+        public static readonly Vector2d zero = new Vector2d(0, 0);
+        #endregion
+
+        #region Consts
+        /// <summary>
+        /// The vector epsilon.
+        /// </summary>
+        public const double Epsilon = double.Epsilon;
+        #endregion
+
+        #region Fields
+        /// <summary>
+        /// The x component.
+        /// </summary>
+        public double x;
+        /// <summary>
+        /// The y component.
+        /// </summary>
+        public double y;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the magnitude of this vector.
+        /// </summary>
+        public double Magnitude
+        {
+            get { return System.Math.Sqrt(x * x + y * y); }
+        }
+
+        /// <summary>
+        /// Gets the squared magnitude of this vector.
+        /// </summary>
+        public double MagnitudeSqr
+        {
+            get { return (x * x + y * y); }
+        }
+
+        /// <summary>
+        /// Gets a normalized vector from this vector.
+        /// </summary>
+        public Vector2d Normalized
+        {
+            get
+            {
+                Vector2d result;
+                Normalize(ref this, out result);
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a specific component by index in this vector.
+        /// </summary>
+        /// <param name="index">The component index.</param>
+        public double this[int index]
+        {
+            get
+            {
+                switch (index)
+                {
+                    case 0:
+                        return x;
+                    case 1:
+                        return y;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector2d index!");
+                }
+            }
+            set
+            {
+                switch (index)
+                {
+                    case 0:
+                        x = value;
+                        break;
+                    case 1:
+                        y = value;
+                        break;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector2d index!");
+                }
+            }
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a new vector with one value for all components.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public Vector2d(double value)
+        {
+            this.x = value;
+            this.y = value;
+        }
+
+        /// <summary>
+        /// Creates a new vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        public Vector2d(double x, double y)
+        {
+            this.x = x;
+            this.y = y;
+        }
+        #endregion
+
+        #region Operators
+        /// <summary>
+        /// Adds two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2d operator +(Vector2d a, Vector2d b)
+        {
+            return new Vector2d(a.x + b.x, a.y + b.y);
+        }
+
+        /// <summary>
+        /// Subtracts two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2d operator -(Vector2d a, Vector2d b)
+        {
+            return new Vector2d(a.x - b.x, a.y - b.y);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The scaling value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2d operator *(Vector2d a, double d)
+        {
+            return new Vector2d(a.x * d, a.y * d);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="d">The scaling value.</param>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2d operator *(double d, Vector2d a)
+        {
+            return new Vector2d(a.x * d, a.y * d);
+        }
+
+        /// <summary>
+        /// Divides the vector with a float.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The dividing float value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2d operator /(Vector2d a, double d)
+        {
+            return new Vector2d(a.x / d, a.y / d);
+        }
+
+        /// <summary>
+        /// Subtracts the vector from a zero vector.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2d operator -(Vector2d a)
+        {
+            return new Vector2d(-a.x, -a.y);
+        }
+
+        /// <summary>
+        /// Returns if two vectors equals eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If equals.</returns>
+        public static bool operator ==(Vector2d lhs, Vector2d rhs)
+        {
+            return (lhs - rhs).MagnitudeSqr < Epsilon;
+        }
+
+        /// <summary>
+        /// Returns if two vectors don't equal eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If not equals.</returns>
+        public static bool operator !=(Vector2d lhs, Vector2d rhs)
+        {
+            return (lhs - rhs).MagnitudeSqr >= Epsilon;
+        }
+
+        /// <summary>
+        /// Implicitly converts from a single-precision vector into a double-precision vector.
+        /// </summary>
+        /// <param name="v">The single-precision vector.</param>
+        public static implicit operator Vector2d(Vector2 v)
+        {
+            return new Vector2d(v.x, v.y);
+        }
+
+        /// <summary>
+        /// Implicitly converts from an integer vector into a double-precision vector.
+        /// </summary>
+        /// <param name="v">The integer vector.</param>
+        public static implicit operator Vector2d(Vector2i v)
+        {
+            return new Vector2d(v.x, v.y);
+        }
+        #endregion
+
+        #region Public Methods
+        #region Instance
+        /// <summary>
+        /// Set x and y components of an existing vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        public void Set(double x, double y)
+        {
+            this.x = x;
+            this.y = y;
+        }
+
+        /// <summary>
+        /// Multiplies with another vector component-wise.
+        /// </summary>
+        /// <param name="scale">The vector to multiply with.</param>
+        public void Scale(ref Vector2d scale)
+        {
+            x *= scale.x;
+            y *= scale.y;
+        }
+
+        /// <summary>
+        /// Normalizes this vector.
+        /// </summary>
+        public void Normalize()
+        {
+            double mag = this.Magnitude;
+            if (mag > Epsilon)
+            {
+                x /= mag;
+                y /= mag;
+            }
+            else
+            {
+                x = y = 0;
+            }
+        }
+
+        /// <summary>
+        /// Clamps this vector between a specific range.
+        /// </summary>
+        /// <param name="min">The minimum component value.</param>
+        /// <param name="max">The maximum component value.</param>
+        public void Clamp(double min, double max)
+        {
+            if (x < min) x = min;
+            else if (x > max) x = max;
+
+            if (y < min) y = min;
+            else if (y > max) y = max;
+        }
+        #endregion
+
+        #region Object
+        /// <summary>
+        /// Returns a hash code for this vector.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            return x.GetHashCode() ^ y.GetHashCode() << 2;
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public override bool Equals(object other)
+        {
+            if (!(other is Vector2d))
+            {
+                return false;
+            }
+            Vector2d vector = (Vector2d)other;
+            return (x == vector.x && y == vector.y);
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public bool Equals(Vector2d other)
+        {
+            return (x == other.x && y == other.y);
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <returns>The string.</returns>
+        public override string ToString()
+        {
+            return string.Format("({0}, {1})",
+                x.ToString("F1", CultureInfo.InvariantCulture),
+                y.ToString("F1", CultureInfo.InvariantCulture));
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <param name="format">The float format.</param>
+        /// <returns>The string.</returns>
+        public string ToString(string format)
+        {
+            return string.Format("({0}, {1})",
+                x.ToString(format, CultureInfo.InvariantCulture),
+                y.ToString(format, CultureInfo.InvariantCulture));
+        }
+        #endregion
+
+        #region Static
+        /// <summary>
+        /// Dot Product of two vectors.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        public static double Dot(ref Vector2d lhs, ref Vector2d rhs)
+        {
+            return lhs.x * rhs.x + lhs.y * rhs.y;
+        }
+
+        /// <summary>
+        /// Performs a linear interpolation between two vectors.
+        /// </summary>
+        /// <param name="a">The vector to interpolate from.</param>
+        /// <param name="b">The vector to interpolate to.</param>
+        /// <param name="t">The time fraction.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Lerp(ref Vector2d a, ref Vector2d b, double t, out Vector2d result)
+        {
+            result = new Vector2d(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t);
+        }
+
+        /// <summary>
+        /// Multiplies two vectors component-wise.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Scale(ref Vector2d a, ref Vector2d b, out Vector2d result)
+        {
+            result = new Vector2d(a.x * b.x, a.y * b.y);
+        }
+
+        /// <summary>
+        /// Normalizes a vector.
+        /// </summary>
+        /// <param name="value">The vector to normalize.</param>
+        /// <param name="result">The resulting normalized vector.</param>
+        public static void Normalize(ref Vector2d value, out Vector2d result)
+        {
+            double mag = value.Magnitude;
+            if (mag > Epsilon)
+            {
+                result = new Vector2d(value.x / mag, value.y / mag);
+            }
+            else
+            {
+                result = Vector2d.zero;
+            }
+        }
+        #endregion
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Math/Vector2i.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Math/Vector2i.cs
@@ -0,0 +1,348 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+using System.Globalization;
+
+namespace MeshDecimator.Math
+{
+    /// <summary>
+    /// A 2D integer vector.
+    /// </summary>
+    public struct Vector2i : IEquatable<Vector2i>
+    {
+        #region Static Read-Only
+        /// <summary>
+        /// The zero vector.
+        /// </summary>
+        public static readonly Vector2i zero = new Vector2i(0, 0);
+        #endregion
+
+        #region Fields
+        /// <summary>
+        /// The x component.
+        /// </summary>
+        public int x;
+        /// <summary>
+        /// The y component.
+        /// </summary>
+        public int y;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the magnitude of this vector.
+        /// </summary>
+        public int Magnitude
+        {
+            get { return (int)System.Math.Sqrt(x * x + y * y); }
+        }
+
+        /// <summary>
+        /// Gets the squared magnitude of this vector.
+        /// </summary>
+        public int MagnitudeSqr
+        {
+            get { return (x * x + y * y); }
+        }
+
+        /// <summary>
+        /// Gets or sets a specific component by index in this vector.
+        /// </summary>
+        /// <param name="index">The component index.</param>
+        public int this[int index]
+        {
+            get
+            {
+                switch (index)
+                {
+                    case 0:
+                        return x;
+                    case 1:
+                        return y;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector2i index!");
+                }
+            }
+            set
+            {
+                switch (index)
+                {
+                    case 0:
+                        x = value;
+                        break;
+                    case 1:
+                        y = value;
+                        break;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector2i index!");
+                }
+            }
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a new vector with one value for all components.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public Vector2i(int value)
+        {
+            this.x = value;
+            this.y = value;
+        }
+
+        /// <summary>
+        /// Creates a new vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        public Vector2i(int x, int y)
+        {
+            this.x = x;
+            this.y = y;
+        }
+        #endregion
+
+        #region Operators
+        /// <summary>
+        /// Adds two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2i operator +(Vector2i a, Vector2i b)
+        {
+            return new Vector2i(a.x + b.x, a.y + b.y);
+        }
+
+        /// <summary>
+        /// Subtracts two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2i operator -(Vector2i a, Vector2i b)
+        {
+            return new Vector2i(a.x - b.x, a.y - b.y);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The scaling value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2i operator *(Vector2i a, int d)
+        {
+            return new Vector2i(a.x * d, a.y * d);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="d">The scaling value.</param>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2i operator *(int d, Vector2i a)
+        {
+            return new Vector2i(a.x * d, a.y * d);
+        }
+
+        /// <summary>
+        /// Divides the vector with a float.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The dividing float value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2i operator /(Vector2i a, int d)
+        {
+            return new Vector2i(a.x / d, a.y / d);
+        }
+
+        /// <summary>
+        /// Subtracts the vector from a zero vector.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector2i operator -(Vector2i a)
+        {
+            return new Vector2i(-a.x, -a.y);
+        }
+
+        /// <summary>
+        /// Returns if two vectors equals eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If equals.</returns>
+        public static bool operator ==(Vector2i lhs, Vector2i rhs)
+        {
+            return (lhs.x == rhs.x && lhs.y == rhs.y);
+        }
+
+        /// <summary>
+        /// Returns if two vectors don't equal eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If not equals.</returns>
+        public static bool operator !=(Vector2i lhs, Vector2i rhs)
+        {
+            return (lhs.x != rhs.x || lhs.y != rhs.y);
+        }
+
+        /// <summary>
+        /// Explicitly converts from a single-precision vector into an integer vector.
+        /// </summary>
+        /// <param name="v">The single-precision vector.</param>
+        public static explicit operator Vector2i(Vector2 v)
+        {
+            return new Vector2i((int)v.x, (int)v.y);
+        }
+
+        /// <summary>
+        /// Explicitly converts from a double-precision vector into an integer vector.
+        /// </summary>
+        /// <param name="v">The double-precision vector.</param>
+        public static explicit operator Vector2i(Vector2d v)
+        {
+            return new Vector2i((int)v.x, (int)v.y);
+        }
+        #endregion
+
+        #region Public Methods
+        #region Instance
+        /// <summary>
+        /// Set x and y components of an existing vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        public void Set(int x, int y)
+        {
+            this.x = x;
+            this.y = y;
+        }
+
+        /// <summary>
+        /// Multiplies with another vector component-wise.
+        /// </summary>
+        /// <param name="scale">The vector to multiply with.</param>
+        public void Scale(ref Vector2i scale)
+        {
+            x *= scale.x;
+            y *= scale.y;
+        }
+
+        /// <summary>
+        /// Clamps this vector between a specific range.
+        /// </summary>
+        /// <param name="min">The minimum component value.</param>
+        /// <param name="max">The maximum component value.</param>
+        public void Clamp(int min, int max)
+        {
+            if (x < min) x = min;
+            else if (x > max) x = max;
+
+            if (y < min) y = min;
+            else if (y > max) y = max;
+        }
+        #endregion
+
+        #region Object
+        /// <summary>
+        /// Returns a hash code for this vector.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            return x.GetHashCode() ^ y.GetHashCode() << 2;
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public override bool Equals(object other)
+        {
+            if (!(other is Vector2i))
+            {
+                return false;
+            }
+            Vector2i vector = (Vector2i)other;
+            return (x == vector.x && y == vector.y);
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public bool Equals(Vector2i other)
+        {
+            return (x == other.x && y == other.y);
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <returns>The string.</returns>
+        public override string ToString()
+        {
+            return string.Format("({0}, {1})",
+                x.ToString(CultureInfo.InvariantCulture),
+                y.ToString(CultureInfo.InvariantCulture));
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <param name="format">The integer format.</param>
+        /// <returns>The string.</returns>
+        public string ToString(string format)
+        {
+            return string.Format("({0}, {1})",
+                x.ToString(format, CultureInfo.InvariantCulture),
+                y.ToString(format, CultureInfo.InvariantCulture));
+        }
+        #endregion
+
+        #region Static
+        /// <summary>
+        /// Multiplies two vectors component-wise.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Scale(ref Vector2i a, ref Vector2i b, out Vector2i result)
+        {
+            result = new Vector2i(a.x * b.x, a.y * b.y);
+        }
+        #endregion
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Math/Vector3.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Math/Vector3.cs
@@ -0,0 +1,494 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+using System.Globalization;
+
+namespace MeshDecimator.Math
+{
+    /// <summary>
+    /// A single precision 3D vector.
+    /// </summary>
+    public struct Vector3 : IEquatable<Vector3>
+    {
+        #region Static Read-Only
+        /// <summary>
+        /// The zero vector.
+        /// </summary>
+        public static readonly Vector3 zero = new Vector3(0, 0, 0);
+        #endregion
+
+        #region Consts
+        /// <summary>
+        /// The vector epsilon.
+        /// </summary>
+        public const float Epsilon = 9.99999944E-11f;
+        #endregion
+
+        #region Fields
+        /// <summary>
+        /// The x component.
+        /// </summary>
+        public float x;
+        /// <summary>
+        /// The y component.
+        /// </summary>
+        public float y;
+        /// <summary>
+        /// The z component.
+        /// </summary>
+        public float z;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the magnitude of this vector.
+        /// </summary>
+        public float Magnitude
+        {
+            get { return (float)System.Math.Sqrt(x * x + y * y + z * z); }
+        }
+
+        /// <summary>
+        /// Gets the squared magnitude of this vector.
+        /// </summary>
+        public float MagnitudeSqr
+        {
+            get { return (x * x + y * y + z * z); }
+        }
+
+        /// <summary>
+        /// Gets a normalized vector from this vector.
+        /// </summary>
+        public Vector3 Normalized
+        {
+            get
+            {
+                Vector3 result;
+                Normalize(ref this, out result);
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a specific component by index in this vector.
+        /// </summary>
+        /// <param name="index">The component index.</param>
+        public float this[int index]
+        {
+            get
+            {
+                switch (index)
+                {
+                    case 0:
+                        return x;
+                    case 1:
+                        return y;
+                    case 2:
+                        return z;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector3 index!");
+                }
+            }
+            set
+            {
+                switch (index)
+                {
+                    case 0:
+                        x = value;
+                        break;
+                    case 1:
+                        y = value;
+                        break;
+                    case 2:
+                        z = value;
+                        break;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector3 index!");
+                }
+            }
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a new vector with one value for all components.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public Vector3(float value)
+        {
+            this.x = value;
+            this.y = value;
+            this.z = value;
+        }
+
+        /// <summary>
+        /// Creates a new vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        /// <param name="z">The z value.</param>
+        public Vector3(float x, float y, float z)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+        }
+
+        /// <summary>
+        /// Creates a new vector from a double precision vector.
+        /// </summary>
+        /// <param name="vector">The double precision vector.</param>
+        public Vector3(Vector3d vector)
+        {
+            this.x = (float)vector.x;
+            this.y = (float)vector.y;
+            this.z = (float)vector.z;
+        }
+        #endregion
+
+        #region Operators
+        /// <summary>
+        /// Adds two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3 operator +(Vector3 a, Vector3 b)
+        {
+            return new Vector3(a.x + b.x, a.y + b.y, a.z + b.z);
+        }
+
+        /// <summary>
+        /// Subtracts two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3 operator -(Vector3 a, Vector3 b)
+        {
+            return new Vector3(a.x - b.x, a.y - b.y, a.z - b.z);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The scaling value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3 operator *(Vector3 a, float d)
+        {
+            return new Vector3(a.x * d, a.y * d, a.z * d);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="d">The scaling value.</param>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3 operator *(float d, Vector3 a)
+        {
+            return new Vector3(a.x * d, a.y * d, a.z * d);
+        }
+
+        /// <summary>
+        /// Divides the vector with a float.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The dividing float value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3 operator /(Vector3 a, float d)
+        {
+            return new Vector3(a.x / d, a.y / d, a.z / d);
+        }
+
+        /// <summary>
+        /// Subtracts the vector from a zero vector.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3 operator -(Vector3 a)
+        {
+            return new Vector3(-a.x, -a.y, -a.z);
+        }
+
+        /// <summary>
+        /// Returns if two vectors equals eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If equals.</returns>
+        public static bool operator ==(Vector3 lhs, Vector3 rhs)
+        {
+            return (lhs - rhs).MagnitudeSqr < Epsilon;
+        }
+
+        /// <summary>
+        /// Returns if two vectors don't equal eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If not equals.</returns>
+        public static bool operator !=(Vector3 lhs, Vector3 rhs)
+        {
+            return (lhs - rhs).MagnitudeSqr >= Epsilon;
+        }
+
+        /// <summary>
+        /// Explicitly converts from a double-precision vector into a single-precision vector.
+        /// </summary>
+        /// <param name="v">The double-precision vector.</param>
+        public static explicit operator Vector3(Vector3d v)
+        {
+            return new Vector3((float)v.x, (float)v.y, (float)v.z);
+        }
+
+        /// <summary>
+        /// Implicitly converts from an integer vector into a single-precision vector.
+        /// </summary>
+        /// <param name="v">The integer vector.</param>
+        public static implicit operator Vector3(Vector3i v)
+        {
+            return new Vector3(v.x, v.y, v.z);
+        }
+        #endregion
+
+        #region Public Methods
+        #region Instance
+        /// <summary>
+        /// Set x, y and z components of an existing vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        /// <param name="z">The z value.</param>
+        public void Set(float x, float y, float z)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+        }
+
+        /// <summary>
+        /// Multiplies with another vector component-wise.
+        /// </summary>
+        /// <param name="scale">The vector to multiply with.</param>
+        public void Scale(ref Vector3 scale)
+        {
+            x *= scale.x;
+            y *= scale.y;
+            z *= scale.z;
+        }
+
+        /// <summary>
+        /// Normalizes this vector.
+        /// </summary>
+        public void Normalize()
+        {
+            float mag = this.Magnitude;
+            if (mag > Epsilon)
+            {
+                x /= mag;
+                y /= mag;
+                z /= mag;
+            }
+            else
+            {
+                x = y = z = 0;
+            }
+        }
+
+        /// <summary>
+        /// Clamps this vector between a specific range.
+        /// </summary>
+        /// <param name="min">The minimum component value.</param>
+        /// <param name="max">The maximum component value.</param>
+        public void Clamp(float min, float max)
+        {
+            if (x < min) x = min;
+            else if (x > max) x = max;
+
+            if (y < min) y = min;
+            else if (y > max) y = max;
+
+            if (z < min) z = min;
+            else if (z > max) z = max;
+        }
+        #endregion
+
+        #region Object
+        /// <summary>
+        /// Returns a hash code for this vector.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            return x.GetHashCode() ^ y.GetHashCode() << 2 ^ z.GetHashCode() >> 2;
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public override bool Equals(object other)
+        {
+            if (!(other is Vector3))
+            {
+                return false;
+            }
+            Vector3 vector = (Vector3)other;
+            return (x == vector.x && y == vector.y && z == vector.z);
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public bool Equals(Vector3 other)
+        {
+            return (x == other.x && y == other.y && z == other.z);
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <returns>The string.</returns>
+        public override string ToString()
+        {
+            return string.Format("({0}, {1}, {2})",
+                x.ToString("F1", CultureInfo.InvariantCulture),
+                y.ToString("F1", CultureInfo.InvariantCulture),
+                z.ToString("F1", CultureInfo.InvariantCulture));
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <param name="format">The float format.</param>
+        /// <returns>The string.</returns>
+        public string ToString(string format)
+        {
+            return string.Format("({0}, {1}, {2})",
+                x.ToString(format, CultureInfo.InvariantCulture),
+                y.ToString(format, CultureInfo.InvariantCulture),
+                z.ToString(format, CultureInfo.InvariantCulture));
+        }
+        #endregion
+
+        #region Static
+        /// <summary>
+        /// Dot Product of two vectors.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        public static float Dot(ref Vector3 lhs, ref Vector3 rhs)
+        {
+            return lhs.x * rhs.x + lhs.y * rhs.y + lhs.z * rhs.z;
+        }
+
+        /// <summary>
+        /// Cross Product of two vectors.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Cross(ref Vector3 lhs, ref Vector3 rhs, out Vector3 result)
+        {
+            result = new Vector3(lhs.y * rhs.z - lhs.z * rhs.y, lhs.z * rhs.x - lhs.x * rhs.z, lhs.x * rhs.y - lhs.y * rhs.x);
+        }
+
+        /// <summary>
+        /// Calculates the angle between two vectors.
+        /// </summary>
+        /// <param name="from">The from vector.</param>
+        /// <param name="to">The to vector.</param>
+        /// <returns>The angle.</returns>
+        public static float Angle(ref Vector3 from, ref Vector3 to)
+        {
+            Vector3 fromNormalized = from.Normalized;
+            Vector3 toNormalized = to.Normalized;
+            return (float)System.Math.Acos(MathHelper.Clamp(Vector3.Dot(ref fromNormalized, ref toNormalized), -1f, 1f)) * MathHelper.Rad2Deg;
+        }
+
+        /// <summary>
+        /// Performs a linear interpolation between two vectors.
+        /// </summary>
+        /// <param name="a">The vector to interpolate from.</param>
+        /// <param name="b">The vector to interpolate to.</param>
+        /// <param name="t">The time fraction.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Lerp(ref Vector3 a, ref Vector3 b, float t, out Vector3 result)
+        {
+            result = new Vector3(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t, a.z + (b.z - a.z) * t);
+        }
+
+        /// <summary>
+        /// Multiplies two vectors component-wise.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Scale(ref Vector3 a, ref Vector3 b, out Vector3 result)
+        {
+            result = new Vector3(a.x * b.x, a.y * b.y, a.z * b.z);
+        }
+
+        /// <summary>
+        /// Normalizes a vector.
+        /// </summary>
+        /// <param name="value">The vector to normalize.</param>
+        /// <param name="result">The resulting normalized vector.</param>
+        public static void Normalize(ref Vector3 value, out Vector3 result)
+        {
+            float mag = value.Magnitude;
+            if (mag > Epsilon)
+            {
+                result = new Vector3(value.x / mag, value.y / mag, value.z / mag);
+            }
+            else
+            {
+                result = Vector3.zero;
+            }
+        }
+
+        /// <summary>
+        /// Normalizes both vectors and makes them orthogonal to each other.
+        /// </summary>
+        /// <param name="normal">The normal vector.</param>
+        /// <param name="tangent">The tangent.</param>
+        public static void OrthoNormalize(ref Vector3 normal, ref Vector3 tangent)
+        {
+            normal.Normalize();
+            Vector3 proj = normal * Vector3.Dot(ref tangent, ref normal);
+            tangent -= proj;
+            tangent.Normalize();
+        }
+        #endregion
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Math/Vector3d.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Math/Vector3d.cs
@@ -0,0 +1,481 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+using System.Globalization;
+
+namespace MeshDecimator.Math
+{
+    /// <summary>
+    /// A double precision 3D vector.
+    /// </summary>
+    public struct Vector3d : IEquatable<Vector3d>
+    {
+        #region Static Read-Only
+        /// <summary>
+        /// The zero vector.
+        /// </summary>
+        public static readonly Vector3d zero = new Vector3d(0, 0, 0);
+        #endregion
+
+        #region Consts
+        /// <summary>
+        /// The vector epsilon.
+        /// </summary>
+        public const double Epsilon = double.Epsilon;
+        #endregion
+
+        #region Fields
+        /// <summary>
+        /// The x component.
+        /// </summary>
+        public double x;
+        /// <summary>
+        /// The y component.
+        /// </summary>
+        public double y;
+        /// <summary>
+        /// The z component.
+        /// </summary>
+        public double z;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the magnitude of this vector.
+        /// </summary>
+        public double Magnitude
+        {
+            get { return System.Math.Sqrt(x * x + y * y + z * z); }
+        }
+
+        /// <summary>
+        /// Gets the squared magnitude of this vector.
+        /// </summary>
+        public double MagnitudeSqr
+        {
+            get { return (x * x + y * y + z * z); }
+        }
+
+        /// <summary>
+        /// Gets a normalized vector from this vector.
+        /// </summary>
+        public Vector3d Normalized
+        {
+            get
+            {
+                Vector3d result;
+                Normalize(ref this, out result);
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a specific component by index in this vector.
+        /// </summary>
+        /// <param name="index">The component index.</param>
+        public double this[int index]
+        {
+            get
+            {
+                switch (index)
+                {
+                    case 0:
+                        return x;
+                    case 1:
+                        return y;
+                    case 2:
+                        return z;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector3d index!");
+                }
+            }
+            set
+            {
+                switch (index)
+                {
+                    case 0:
+                        x = value;
+                        break;
+                    case 1:
+                        y = value;
+                        break;
+                    case 2:
+                        z = value;
+                        break;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector3d index!");
+                }
+            }
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a new vector with one value for all components.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public Vector3d(double value)
+        {
+            this.x = value;
+            this.y = value;
+            this.z = value;
+        }
+
+        /// <summary>
+        /// Creates a new vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        /// <param name="z">The z value.</param>
+        public Vector3d(double x, double y, double z)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+        }
+
+        /// <summary>
+        /// Creates a new vector from a single precision vector.
+        /// </summary>
+        /// <param name="vector">The single precision vector.</param>
+        public Vector3d(Vector3 vector)
+        {
+            this.x = vector.x;
+            this.y = vector.y;
+            this.z = vector.z;
+        }
+        #endregion
+
+        #region Operators
+        /// <summary>
+        /// Adds two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3d operator +(Vector3d a, Vector3d b)
+        {
+            return new Vector3d(a.x + b.x, a.y + b.y, a.z + b.z);
+        }
+
+        /// <summary>
+        /// Subtracts two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3d operator -(Vector3d a, Vector3d b)
+        {
+            return new Vector3d(a.x - b.x, a.y - b.y, a.z - b.z);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The scaling value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3d operator *(Vector3d a, double d)
+        {
+            return new Vector3d(a.x * d, a.y * d, a.z * d);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="d">The scaling value.</param>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3d operator *(double d, Vector3d a)
+        {
+            return new Vector3d(a.x * d, a.y * d, a.z * d);
+        }
+
+        /// <summary>
+        /// Divides the vector with a float.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The dividing float value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3d operator /(Vector3d a, double d)
+        {
+            return new Vector3d(a.x / d, a.y / d, a.z / d);
+        }
+
+        /// <summary>
+        /// Subtracts the vector from a zero vector.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3d operator -(Vector3d a)
+        {
+            return new Vector3d(-a.x, -a.y, -a.z);
+        }
+
+        /// <summary>
+        /// Returns if two vectors equals eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If equals.</returns>
+        public static bool operator ==(Vector3d lhs, Vector3d rhs)
+        {
+            return (lhs - rhs).MagnitudeSqr < Epsilon;
+        }
+
+        /// <summary>
+        /// Returns if two vectors don't equal eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If not equals.</returns>
+        public static bool operator !=(Vector3d lhs, Vector3d rhs)
+        {
+            return (lhs - rhs).MagnitudeSqr >= Epsilon;
+        }
+
+        /// <summary>
+        /// Implicitly converts from a single-precision vector into a double-precision vector.
+        /// </summary>
+        /// <param name="v">The single-precision vector.</param>
+        public static implicit operator Vector3d(Vector3 v)
+        {
+            return new Vector3d(v.x, v.y, v.z);
+        }
+
+        /// <summary>
+        /// Implicitly converts from an integer vector into a double-precision vector.
+        /// </summary>
+        /// <param name="v">The integer vector.</param>
+        public static implicit operator Vector3d(Vector3i v)
+        {
+            return new Vector3d(v.x, v.y, v.z);
+        }
+        #endregion
+
+        #region Public Methods
+        #region Instance
+        /// <summary>
+        /// Set x, y and z components of an existing vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        /// <param name="z">The z value.</param>
+        public void Set(double x, double y, double z)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+        }
+
+        /// <summary>
+        /// Multiplies with another vector component-wise.
+        /// </summary>
+        /// <param name="scale">The vector to multiply with.</param>
+        public void Scale(ref Vector3d scale)
+        {
+            x *= scale.x;
+            y *= scale.y;
+            z *= scale.z;
+        }
+
+        /// <summary>
+        /// Normalizes this vector.
+        /// </summary>
+        public void Normalize()
+        {
+            double mag = this.Magnitude;
+            if (mag > Epsilon)
+            {
+                x /= mag;
+                y /= mag;
+                z /= mag;
+            }
+            else
+            {
+                x = y = z = 0;
+            }
+        }
+
+        /// <summary>
+        /// Clamps this vector between a specific range.
+        /// </summary>
+        /// <param name="min">The minimum component value.</param>
+        /// <param name="max">The maximum component value.</param>
+        public void Clamp(double min, double max)
+        {
+            if (x < min) x = min;
+            else if (x > max) x = max;
+
+            if (y < min) y = min;
+            else if (y > max) y = max;
+
+            if (z < min) z = min;
+            else if (z > max) z = max;
+        }
+        #endregion
+
+        #region Object
+        /// <summary>
+        /// Returns a hash code for this vector.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            return x.GetHashCode() ^ y.GetHashCode() << 2 ^ z.GetHashCode() >> 2;
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public override bool Equals(object other)
+        {
+            if (!(other is Vector3d))
+            {
+                return false;
+            }
+            Vector3d vector = (Vector3d)other;
+            return (x == vector.x && y == vector.y && z == vector.z);
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public bool Equals(Vector3d other)
+        {
+            return (x == other.x && y == other.y && z == other.z);
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <returns>The string.</returns>
+        public override string ToString()
+        {
+            return string.Format("({0}, {1}, {2})",
+                x.ToString("F1", CultureInfo.InvariantCulture),
+                y.ToString("F1", CultureInfo.InvariantCulture),
+                z.ToString("F1", CultureInfo.InvariantCulture));
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <param name="format">The float format.</param>
+        /// <returns>The string.</returns>
+        public string ToString(string format)
+        {
+            return string.Format("({0}, {1}, {2})",
+                x.ToString(format, CultureInfo.InvariantCulture),
+                y.ToString(format, CultureInfo.InvariantCulture),
+                z.ToString(format, CultureInfo.InvariantCulture));
+        }
+        #endregion
+
+        #region Static
+        /// <summary>
+        /// Dot Product of two vectors.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        public static double Dot(ref Vector3d lhs, ref Vector3d rhs)
+        {
+            return lhs.x * rhs.x + lhs.y * rhs.y + lhs.z * rhs.z;
+        }
+
+        /// <summary>
+        /// Cross Product of two vectors.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Cross(ref Vector3d lhs, ref Vector3d rhs, out Vector3d result)
+        {
+            result = new Vector3d(lhs.y * rhs.z - lhs.z * rhs.y, lhs.z * rhs.x - lhs.x * rhs.z, lhs.x * rhs.y - lhs.y * rhs.x);
+        }
+
+        /// <summary>
+        /// Calculates the angle between two vectors.
+        /// </summary>
+        /// <param name="from">The from vector.</param>
+        /// <param name="to">The to vector.</param>
+        /// <returns>The angle.</returns>
+        public static double Angle(ref Vector3d from, ref Vector3d to)
+        {
+            Vector3d fromNormalized = from.Normalized;
+            Vector3d toNormalized = to.Normalized;
+            return System.Math.Acos(MathHelper.Clamp(Vector3d.Dot(ref fromNormalized, ref toNormalized), -1.0, 1.0)) * MathHelper.Rad2Degd;
+        }
+
+        /// <summary>
+        /// Performs a linear interpolation between two vectors.
+        /// </summary>
+        /// <param name="a">The vector to interpolate from.</param>
+        /// <param name="b">The vector to interpolate to.</param>
+        /// <param name="t">The time fraction.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Lerp(ref Vector3d a, ref Vector3d b, double t, out Vector3d result)
+        {
+            result = new Vector3d(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t, a.z + (b.z - a.z) * t);
+        }
+
+        /// <summary>
+        /// Multiplies two vectors component-wise.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Scale(ref Vector3d a, ref Vector3d b, out Vector3d result)
+        {
+            result = new Vector3d(a.x * b.x, a.y * b.y, a.z * b.z);
+        }
+
+        /// <summary>
+        /// Normalizes a vector.
+        /// </summary>
+        /// <param name="value">The vector to normalize.</param>
+        /// <param name="result">The resulting normalized vector.</param>
+        public static void Normalize(ref Vector3d value, out Vector3d result)
+        {
+            double mag = value.Magnitude;
+            if (mag > Epsilon)
+            {
+                result = new Vector3d(value.x / mag, value.y / mag, value.z / mag);
+            }
+            else
+            {
+                result = Vector3d.zero;
+            }
+        }
+        #endregion
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Math/Vector3i.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Math/Vector3i.cs
@@ -0,0 +1,368 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+using System.Globalization;
+
+namespace MeshDecimator.Math
+{
+    /// <summary>
+    /// A 3D integer vector.
+    /// </summary>
+    public struct Vector3i : IEquatable<Vector3i>
+    {
+        #region Static Read-Only
+        /// <summary>
+        /// The zero vector.
+        /// </summary>
+        public static readonly Vector3i zero = new Vector3i(0, 0, 0);
+        #endregion
+
+        #region Fields
+        /// <summary>
+        /// The x component.
+        /// </summary>
+        public int x;
+        /// <summary>
+        /// The y component.
+        /// </summary>
+        public int y;
+        /// <summary>
+        /// The z component.
+        /// </summary>
+        public int z;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the magnitude of this vector.
+        /// </summary>
+        public int Magnitude
+        {
+            get { return (int)System.Math.Sqrt(x * x + y * y + z * z); }
+        }
+
+        /// <summary>
+        /// Gets the squared magnitude of this vector.
+        /// </summary>
+        public int MagnitudeSqr
+        {
+            get { return (x * x + y * y + z * z); }
+        }
+
+        /// <summary>
+        /// Gets or sets a specific component by index in this vector.
+        /// </summary>
+        /// <param name="index">The component index.</param>
+        public int this[int index]
+        {
+            get
+            {
+                switch (index)
+                {
+                    case 0:
+                        return x;
+                    case 1:
+                        return y;
+                    case 2:
+                        return z;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector3i index!");
+                }
+            }
+            set
+            {
+                switch (index)
+                {
+                    case 0:
+                        x = value;
+                        break;
+                    case 1:
+                        y = value;
+                        break;
+                    case 2:
+                        z = value;
+                        break;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector3i index!");
+                }
+            }
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a new vector with one value for all components.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public Vector3i(int value)
+        {
+            this.x = value;
+            this.y = value;
+            this.z = value;
+        }
+
+        /// <summary>
+        /// Creates a new vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        /// <param name="z">The z value.</param>
+        public Vector3i(int x, int y, int z)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+        }
+        #endregion
+
+        #region Operators
+        /// <summary>
+        /// Adds two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3i operator +(Vector3i a, Vector3i b)
+        {
+            return new Vector3i(a.x + b.x, a.y + b.y, a.z + b.z);
+        }
+
+        /// <summary>
+        /// Subtracts two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3i operator -(Vector3i a, Vector3i b)
+        {
+            return new Vector3i(a.x - b.x, a.y - b.y, a.z - b.z);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The scaling value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3i operator *(Vector3i a, int d)
+        {
+            return new Vector3i(a.x * d, a.y * d, a.z * d);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="d">The scaling value.</param>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3i operator *(int d, Vector3i a)
+        {
+            return new Vector3i(a.x * d, a.y * d, a.z * d);
+        }
+
+        /// <summary>
+        /// Divides the vector with a float.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The dividing float value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3i operator /(Vector3i a, int d)
+        {
+            return new Vector3i(a.x / d, a.y / d, a.z / d);
+        }
+
+        /// <summary>
+        /// Subtracts the vector from a zero vector.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector3i operator -(Vector3i a)
+        {
+            return new Vector3i(-a.x, -a.y, -a.z);
+        }
+
+        /// <summary>
+        /// Returns if two vectors equals eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If equals.</returns>
+        public static bool operator ==(Vector3i lhs, Vector3i rhs)
+        {
+            return (lhs.x == rhs.x && lhs.y == rhs.y && lhs.z == rhs.z);
+        }
+
+        /// <summary>
+        /// Returns if two vectors don't equal eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If not equals.</returns>
+        public static bool operator !=(Vector3i lhs, Vector3i rhs)
+        {
+            return (lhs.x != rhs.x || lhs.y != rhs.y || lhs.z != rhs.z);
+        }
+
+        /// <summary>
+        /// Explicitly converts from a single-precision vector into an integer vector.
+        /// </summary>
+        /// <param name="v">The single-precision vector.</param>
+        public static implicit operator Vector3i(Vector3 v)
+        {
+            return new Vector3i((int)v.x, (int)v.y, (int)v.z);
+        }
+
+        /// <summary>
+        /// Explicitly converts from a double-precision vector into an integer vector.
+        /// </summary>
+        /// <param name="v">The double-precision vector.</param>
+        public static explicit operator Vector3i(Vector3d v)
+        {
+            return new Vector3i((int)v.x, (int)v.y, (int)v.z);
+        }
+        #endregion
+
+        #region Public Methods
+        #region Instance
+        /// <summary>
+        /// Set x, y and z components of an existing vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        /// <param name="z">The z value.</param>
+        public void Set(int x, int y, int z)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+        }
+
+        /// <summary>
+        /// Multiplies with another vector component-wise.
+        /// </summary>
+        /// <param name="scale">The vector to multiply with.</param>
+        public void Scale(ref Vector3i scale)
+        {
+            x *= scale.x;
+            y *= scale.y;
+            z *= scale.z;
+        }
+
+        /// <summary>
+        /// Clamps this vector between a specific range.
+        /// </summary>
+        /// <param name="min">The minimum component value.</param>
+        /// <param name="max">The maximum component value.</param>
+        public void Clamp(int min, int max)
+        {
+            if (x < min) x = min;
+            else if (x > max) x = max;
+
+            if (y < min) y = min;
+            else if (y > max) y = max;
+
+            if (z < min) z = min;
+            else if (z > max) z = max;
+        }
+        #endregion
+
+        #region Object
+        /// <summary>
+        /// Returns a hash code for this vector.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            return x.GetHashCode() ^ y.GetHashCode() << 2 ^ z.GetHashCode() >> 2;
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public override bool Equals(object other)
+        {
+            if (!(other is Vector3i))
+            {
+                return false;
+            }
+            Vector3i vector = (Vector3i)other;
+            return (x == vector.x && y == vector.y && z == vector.z);
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public bool Equals(Vector3i other)
+        {
+            return (x == other.x && y == other.y && z == other.z);
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <returns>The string.</returns>
+        public override string ToString()
+        {
+            return string.Format("({0}, {1}, {2})",
+                x.ToString(CultureInfo.InvariantCulture),
+                y.ToString(CultureInfo.InvariantCulture),
+                z.ToString(CultureInfo.InvariantCulture));
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <param name="format">The integer format.</param>
+        /// <returns>The string.</returns>
+        public string ToString(string format)
+        {
+            return string.Format("({0}, {1}, {2})",
+                x.ToString(format, CultureInfo.InvariantCulture),
+                y.ToString(format, CultureInfo.InvariantCulture),
+                z.ToString(format, CultureInfo.InvariantCulture));
+        }
+        #endregion
+
+        #region Static
+        /// <summary>
+        /// Multiplies two vectors component-wise.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Scale(ref Vector3i a, ref Vector3i b, out Vector3i result)
+        {
+            result = new Vector3i(a.x * b.x, a.y * b.y, a.z * b.z);
+        }
+        #endregion
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Math/Vector4.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Math/Vector4.cs
@@ -0,0 +1,467 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+using System.Globalization;
+
+namespace MeshDecimator.Math
+{
+    /// <summary>
+    /// A single precision 4D vector.
+    /// </summary>
+    public struct Vector4 : IEquatable<Vector4>
+    {
+        #region Static Read-Only
+        /// <summary>
+        /// The zero vector.
+        /// </summary>
+        public static readonly Vector4 zero = new Vector4(0, 0, 0, 0);
+        #endregion
+
+        #region Consts
+        /// <summary>
+        /// The vector epsilon.
+        /// </summary>
+        public const float Epsilon = 9.99999944E-11f;
+        #endregion
+
+        #region Fields
+        /// <summary>
+        /// The x component.
+        /// </summary>
+        public float x;
+        /// <summary>
+        /// The y component.
+        /// </summary>
+        public float y;
+        /// <summary>
+        /// The z component.
+        /// </summary>
+        public float z;
+        /// <summary>
+        /// The w component.
+        /// </summary>
+        public float w;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the magnitude of this vector.
+        /// </summary>
+        public float Magnitude
+        {
+            get { return (float)System.Math.Sqrt(x * x + y * y + z * z + w * w); }
+        }
+
+        /// <summary>
+        /// Gets the squared magnitude of this vector.
+        /// </summary>
+        public float MagnitudeSqr
+        {
+            get { return (x * x + y * y + z * z + w * w); }
+        }
+
+        /// <summary>
+        /// Gets a normalized vector from this vector.
+        /// </summary>
+        public Vector4 Normalized
+        {
+            get
+            {
+                Vector4 result;
+                Normalize(ref this, out result);
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a specific component by index in this vector.
+        /// </summary>
+        /// <param name="index">The component index.</param>
+        public float this[int index]
+        {
+            get
+            {
+                switch (index)
+                {
+                    case 0:
+                        return x;
+                    case 1:
+                        return y;
+                    case 2:
+                        return z;
+                    case 3:
+                        return w;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector4 index!");
+                }
+            }
+            set
+            {
+                switch (index)
+                {
+                    case 0:
+                        x = value;
+                        break;
+                    case 1:
+                        y = value;
+                        break;
+                    case 2:
+                        z = value;
+                        break;
+                    case 3:
+                        w = value;
+                        break;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector4 index!");
+                }
+            }
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a new vector with one value for all components.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public Vector4(float value)
+        {
+            this.x = value;
+            this.y = value;
+            this.z = value;
+            this.w = value;
+        }
+
+        /// <summary>
+        /// Creates a new vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        /// <param name="z">The z value.</param>
+        /// <param name="w">The w value.</param>
+        public Vector4(float x, float y, float z, float w)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+            this.w = w;
+        }
+        #endregion
+
+        #region Operators
+        /// <summary>
+        /// Adds two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4 operator +(Vector4 a, Vector4 b)
+        {
+            return new Vector4(a.x + b.x, a.y + b.y, a.z + b.z, a.w + b.w);
+        }
+
+        /// <summary>
+        /// Subtracts two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4 operator -(Vector4 a, Vector4 b)
+        {
+            return new Vector4(a.x - b.x, a.y - b.y, a.z - b.z, a.w - b.w);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The scaling value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4 operator *(Vector4 a, float d)
+        {
+            return new Vector4(a.x * d, a.y * d, a.z * d, a.w * d);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="d">The scaling value.</param>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4 operator *(float d, Vector4 a)
+        {
+            return new Vector4(a.x * d, a.y * d, a.z * d, a.w * d);
+        }
+
+        /// <summary>
+        /// Divides the vector with a float.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The dividing float value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4 operator /(Vector4 a, float d)
+        {
+            return new Vector4(a.x / d, a.y / d, a.z / d, a.w / d);
+        }
+
+        /// <summary>
+        /// Subtracts the vector from a zero vector.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4 operator -(Vector4 a)
+        {
+            return new Vector4(-a.x, -a.y, -a.z, -a.w);
+        }
+
+        /// <summary>
+        /// Returns if two vectors equals eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If equals.</returns>
+        public static bool operator ==(Vector4 lhs, Vector4 rhs)
+        {
+            return (lhs - rhs).MagnitudeSqr < Epsilon;
+        }
+
+        /// <summary>
+        /// Returns if two vectors don't equal eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If not equals.</returns>
+        public static bool operator !=(Vector4 lhs, Vector4 rhs)
+        {
+            return (lhs - rhs).MagnitudeSqr >= Epsilon;
+        }
+
+        /// <summary>
+        /// Explicitly converts from a double-precision vector into a single-precision vector.
+        /// </summary>
+        /// <param name="v">The double-precision vector.</param>
+        public static explicit operator Vector4(Vector4d v)
+        {
+            return new Vector4((float)v.x, (float)v.y, (float)v.z, (float)v.w);
+        }
+
+        /// <summary>
+        /// Implicitly converts from an integer vector into a single-precision vector.
+        /// </summary>
+        /// <param name="v">The integer vector.</param>
+        public static implicit operator Vector4(Vector4i v)
+        {
+            return new Vector4(v.x, v.y, v.z, v.w);
+        }
+        #endregion
+
+        #region Public Methods
+        #region Instance
+        /// <summary>
+        /// Set x, y and z components of an existing vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        /// <param name="z">The z value.</param>
+        /// <param name="w">The w value.</param>
+        public void Set(float x, float y, float z, float w)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+            this.w = w;
+        }
+
+        /// <summary>
+        /// Multiplies with another vector component-wise.
+        /// </summary>
+        /// <param name="scale">The vector to multiply with.</param>
+        public void Scale(ref Vector4 scale)
+        {
+            x *= scale.x;
+            y *= scale.y;
+            z *= scale.z;
+            w *= scale.w;
+        }
+
+        /// <summary>
+        /// Normalizes this vector.
+        /// </summary>
+        public void Normalize()
+        {
+            float mag = this.Magnitude;
+            if (mag > Epsilon)
+            {
+                x /= mag;
+                y /= mag;
+                z /= mag;
+                w /= mag;
+            }
+            else
+            {
+                x = y = z = w = 0;
+            }
+        }
+
+        /// <summary>
+        /// Clamps this vector between a specific range.
+        /// </summary>
+        /// <param name="min">The minimum component value.</param>
+        /// <param name="max">The maximum component value.</param>
+        public void Clamp(float min, float max)
+        {
+            if (x < min) x = min;
+            else if (x > max) x = max;
+
+            if (y < min) y = min;
+            else if (y > max) y = max;
+
+            if (z < min) z = min;
+            else if (z > max) z = max;
+
+            if (w < min) w = min;
+            else if (w > max) w = max;
+        }
+        #endregion
+
+        #region Object
+        /// <summary>
+        /// Returns a hash code for this vector.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            return x.GetHashCode() ^ y.GetHashCode() << 2 ^ z.GetHashCode() >> 2 ^ w.GetHashCode() >> 1;
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public override bool Equals(object other)
+        {
+            if (!(other is Vector4))
+            {
+                return false;
+            }
+            Vector4 vector = (Vector4)other;
+            return (x == vector.x && y == vector.y && z == vector.z && w == vector.w);
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public bool Equals(Vector4 other)
+        {
+            return (x == other.x && y == other.y && z == other.z && w == other.w);
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <returns>The string.</returns>
+        public override string ToString()
+        {
+            return string.Format("({0}, {1}, {2}, {3})",
+                x.ToString("F1", CultureInfo.InvariantCulture),
+                y.ToString("F1", CultureInfo.InvariantCulture),
+                z.ToString("F1", CultureInfo.InvariantCulture),
+                w.ToString("F1", CultureInfo.InvariantCulture));
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <param name="format">The float format.</param>
+        /// <returns>The string.</returns>
+        public string ToString(string format)
+        {
+            return string.Format("({0}, {1}, {2}, {3})",
+                x.ToString(format, CultureInfo.InvariantCulture),
+                y.ToString(format, CultureInfo.InvariantCulture),
+                z.ToString(format, CultureInfo.InvariantCulture),
+                w.ToString(format, CultureInfo.InvariantCulture));
+        }
+        #endregion
+
+        #region Static
+        /// <summary>
+        /// Dot Product of two vectors.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        public static float Dot(ref Vector4 lhs, ref Vector4 rhs)
+        {
+            return lhs.x * rhs.x + lhs.y * rhs.y + lhs.z * rhs.z + lhs.w * rhs.w;
+        }
+
+        /// <summary>
+        /// Performs a linear interpolation between two vectors.
+        /// </summary>
+        /// <param name="a">The vector to interpolate from.</param>
+        /// <param name="b">The vector to interpolate to.</param>
+        /// <param name="t">The time fraction.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Lerp(ref Vector4 a, ref Vector4 b, float t, out Vector4 result)
+        {
+            result = new Vector4(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t, a.z + (b.z - a.z) * t, a.w + (b.w - a.w) * t);
+        }
+
+        /// <summary>
+        /// Multiplies two vectors component-wise.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Scale(ref Vector4 a, ref Vector4 b, out Vector4 result)
+        {
+            result = new Vector4(a.x * b.x, a.y * b.y, a.z * b.z, a.w * b.w);
+        }
+
+        /// <summary>
+        /// Normalizes a vector.
+        /// </summary>
+        /// <param name="value">The vector to normalize.</param>
+        /// <param name="result">The resulting normalized vector.</param>
+        public static void Normalize(ref Vector4 value, out Vector4 result)
+        {
+            float mag = value.Magnitude;
+            if (mag > Epsilon)
+            {
+                result = new Vector4(value.x / mag, value.y / mag, value.z / mag, value.w / mag);
+            }
+            else
+            {
+                result = Vector4.zero;
+            }
+        }
+        #endregion
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Math/Vector4d.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Math/Vector4d.cs
@@ -0,0 +1,467 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+using System.Globalization;
+
+namespace MeshDecimator.Math
+{
+    /// <summary>
+    /// A double precision 4D vector.
+    /// </summary>
+    public struct Vector4d : IEquatable<Vector4d>
+    {
+        #region Static Read-Only
+        /// <summary>
+        /// The zero vector.
+        /// </summary>
+        public static readonly Vector4d zero = new Vector4d(0, 0, 0, 0);
+        #endregion
+
+        #region Consts
+        /// <summary>
+        /// The vector epsilon.
+        /// </summary>
+        public const double Epsilon = double.Epsilon;
+        #endregion
+
+        #region Fields
+        /// <summary>
+        /// The x component.
+        /// </summary>
+        public double x;
+        /// <summary>
+        /// The y component.
+        /// </summary>
+        public double y;
+        /// <summary>
+        /// The z component.
+        /// </summary>
+        public double z;
+        /// <summary>
+        /// The w component.
+        /// </summary>
+        public double w;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the magnitude of this vector.
+        /// </summary>
+        public double Magnitude
+        {
+            get { return System.Math.Sqrt(x * x + y * y + z * z + w * w); }
+        }
+
+        /// <summary>
+        /// Gets the squared magnitude of this vector.
+        /// </summary>
+        public double MagnitudeSqr
+        {
+            get { return (x * x + y * y + z * z + w * w); }
+        }
+
+        /// <summary>
+        /// Gets a normalized vector from this vector.
+        /// </summary>
+        public Vector4d Normalized
+        {
+            get
+            {
+                Vector4d result;
+                Normalize(ref this, out result);
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a specific component by index in this vector.
+        /// </summary>
+        /// <param name="index">The component index.</param>
+        public double this[int index]
+        {
+            get
+            {
+                switch (index)
+                {
+                    case 0:
+                        return x;
+                    case 1:
+                        return y;
+                    case 2:
+                        return z;
+                    case 3:
+                        return w;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector4d index!");
+                }
+            }
+            set
+            {
+                switch (index)
+                {
+                    case 0:
+                        x = value;
+                        break;
+                    case 1:
+                        y = value;
+                        break;
+                    case 2:
+                        z = value;
+                        break;
+                    case 3:
+                        w = value;
+                        break;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector4d index!");
+                }
+            }
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a new vector with one value for all components.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public Vector4d(double value)
+        {
+            this.x = value;
+            this.y = value;
+            this.z = value;
+            this.w = value;
+        }
+
+        /// <summary>
+        /// Creates a new vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        /// <param name="z">The z value.</param>
+        /// <param name="w">The w value.</param>
+        public Vector4d(double x, double y, double z, double w)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+            this.w = w;
+        }
+        #endregion
+
+        #region Operators
+        /// <summary>
+        /// Adds two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4d operator +(Vector4d a, Vector4d b)
+        {
+            return new Vector4d(a.x + b.x, a.y + b.y, a.z + b.z, a.w + b.w);
+        }
+
+        /// <summary>
+        /// Subtracts two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4d operator -(Vector4d a, Vector4d b)
+        {
+            return new Vector4d(a.x - b.x, a.y - b.y, a.z - b.z, a.w - b.w);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The scaling value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4d operator *(Vector4d a, double d)
+        {
+            return new Vector4d(a.x * d, a.y * d, a.z * d, a.w * d);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="d">The scaling value.</param>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4d operator *(double d, Vector4d a)
+        {
+            return new Vector4d(a.x * d, a.y * d, a.z * d, a.w * d);
+        }
+
+        /// <summary>
+        /// Divides the vector with a float.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The dividing float value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4d operator /(Vector4d a, double d)
+        {
+            return new Vector4d(a.x / d, a.y / d, a.z / d, a.w / d);
+        }
+
+        /// <summary>
+        /// Subtracts the vector from a zero vector.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4d operator -(Vector4d a)
+        {
+            return new Vector4d(-a.x, -a.y, -a.z, -a.w);
+        }
+
+        /// <summary>
+        /// Returns if two vectors equals eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If equals.</returns>
+        public static bool operator ==(Vector4d lhs, Vector4d rhs)
+        {
+            return (lhs - rhs).MagnitudeSqr < Epsilon;
+        }
+
+        /// <summary>
+        /// Returns if two vectors don't equal eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If not equals.</returns>
+        public static bool operator !=(Vector4d lhs, Vector4d rhs)
+        {
+            return (lhs - rhs).MagnitudeSqr >= Epsilon;
+        }
+
+        /// <summary>
+        /// Implicitly converts from a single-precision vector into a double-precision vector.
+        /// </summary>
+        /// <param name="v">The single-precision vector.</param>
+        public static implicit operator Vector4d(Vector4 v)
+        {
+            return new Vector4d(v.x, v.y, v.z, v.w);
+        }
+
+        /// <summary>
+        /// Implicitly converts from an integer vector into a double-precision vector.
+        /// </summary>
+        /// <param name="v">The integer vector.</param>
+        public static implicit operator Vector4d(Vector4i v)
+        {
+            return new Vector4d(v.x, v.y, v.z, v.w);
+        }
+        #endregion
+
+        #region Public Methods
+        #region Instance
+        /// <summary>
+        /// Set x, y and z components of an existing vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        /// <param name="z">The z value.</param>
+        /// <param name="w">The w value.</param>
+        public void Set(double x, double y, double z, double w)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+            this.w = w;
+        }
+
+        /// <summary>
+        /// Multiplies with another vector component-wise.
+        /// </summary>
+        /// <param name="scale">The vector to multiply with.</param>
+        public void Scale(ref Vector4d scale)
+        {
+            x *= scale.x;
+            y *= scale.y;
+            z *= scale.z;
+            w *= scale.w;
+        }
+
+        /// <summary>
+        /// Normalizes this vector.
+        /// </summary>
+        public void Normalize()
+        {
+            double mag = this.Magnitude;
+            if (mag > Epsilon)
+            {
+                x /= mag;
+                y /= mag;
+                z /= mag;
+                w /= mag;
+            }
+            else
+            {
+                x = y = z = w = 0;
+            }
+        }
+
+        /// <summary>
+        /// Clamps this vector between a specific range.
+        /// </summary>
+        /// <param name="min">The minimum component value.</param>
+        /// <param name="max">The maximum component value.</param>
+        public void Clamp(double min, double max)
+        {
+            if (x < min) x = min;
+            else if (x > max) x = max;
+
+            if (y < min) y = min;
+            else if (y > max) y = max;
+
+            if (z < min) z = min;
+            else if (z > max) z = max;
+
+            if (w < min) w = min;
+            else if (w > max) w = max;
+        }
+        #endregion
+
+        #region Object
+        /// <summary>
+        /// Returns a hash code for this vector.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            return x.GetHashCode() ^ y.GetHashCode() << 2 ^ z.GetHashCode() >> 2 ^ w.GetHashCode() >> 1;
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public override bool Equals(object other)
+        {
+            if (!(other is Vector4d))
+            {
+                return false;
+            }
+            Vector4d vector = (Vector4d)other;
+            return (x == vector.x && y == vector.y && z == vector.z && w == vector.w);
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public bool Equals(Vector4d other)
+        {
+            return (x == other.x && y == other.y && z == other.z && w == other.w);
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <returns>The string.</returns>
+        public override string ToString()
+        {
+            return string.Format("({0}, {1}, {2}, {3})",
+                x.ToString("F1", CultureInfo.InvariantCulture),
+                y.ToString("F1", CultureInfo.InvariantCulture),
+                z.ToString("F1", CultureInfo.InvariantCulture),
+                w.ToString("F1", CultureInfo.InvariantCulture));
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <param name="format">The float format.</param>
+        /// <returns>The string.</returns>
+        public string ToString(string format)
+        {
+            return string.Format("({0}, {1}, {2}, {3})",
+                x.ToString(format, CultureInfo.InvariantCulture),
+                y.ToString(format, CultureInfo.InvariantCulture),
+                z.ToString(format, CultureInfo.InvariantCulture),
+                w.ToString(format, CultureInfo.InvariantCulture));
+        }
+        #endregion
+
+        #region Static
+        /// <summary>
+        /// Dot Product of two vectors.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        public static double Dot(ref Vector4d lhs, ref Vector4d rhs)
+        {
+            return lhs.x * rhs.x + lhs.y * rhs.y + lhs.z * rhs.z + lhs.w * rhs.w;
+        }
+
+        /// <summary>
+        /// Performs a linear interpolation between two vectors.
+        /// </summary>
+        /// <param name="a">The vector to interpolate from.</param>
+        /// <param name="b">The vector to interpolate to.</param>
+        /// <param name="t">The time fraction.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Lerp(ref Vector4d a, ref Vector4d b, double t, out Vector4d result)
+        {
+            result = new Vector4d(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t, a.z + (b.z - a.z) * t, a.w + (b.w - a.w) * t);
+        }
+
+        /// <summary>
+        /// Multiplies two vectors component-wise.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Scale(ref Vector4d a, ref Vector4d b, out Vector4d result)
+        {
+            result = new Vector4d(a.x * b.x, a.y * b.y, a.z * b.z, a.w * b.w);
+        }
+
+        /// <summary>
+        /// Normalizes a vector.
+        /// </summary>
+        /// <param name="value">The vector to normalize.</param>
+        /// <param name="result">The resulting normalized vector.</param>
+        public static void Normalize(ref Vector4d value, out Vector4d result)
+        {
+            double mag = value.Magnitude;
+            if (mag > Epsilon)
+            {
+                result = new Vector4d(value.x / mag, value.y / mag, value.z / mag, value.w / mag);
+            }
+            else
+            {
+                result = Vector4d.zero;
+            }
+        }
+        #endregion
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Math/Vector4i.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Math/Vector4i.cs
@@ -0,0 +1,388 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+using System.Globalization;
+
+namespace MeshDecimator.Math
+{
+    /// <summary>
+    /// A 4D integer vector.
+    /// </summary>
+    public struct Vector4i : IEquatable<Vector4i>
+    {
+        #region Static Read-Only
+        /// <summary>
+        /// The zero vector.
+        /// </summary>
+        public static readonly Vector4i zero = new Vector4i(0, 0, 0, 0);
+        #endregion
+
+        #region Fields
+        /// <summary>
+        /// The x component.
+        /// </summary>
+        public int x;
+        /// <summary>
+        /// The y component.
+        /// </summary>
+        public int y;
+        /// <summary>
+        /// The z component.
+        /// </summary>
+        public int z;
+        /// <summary>
+        /// The w component.
+        /// </summary>
+        public int w;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the magnitude of this vector.
+        /// </summary>
+        public int Magnitude
+        {
+            get { return (int)System.Math.Sqrt(x * x + y * y + z * z + w * w); }
+        }
+
+        /// <summary>
+        /// Gets the squared magnitude of this vector.
+        /// </summary>
+        public int MagnitudeSqr
+        {
+            get { return (x * x + y * y + z * z + w * w); }
+        }
+
+        /// <summary>
+        /// Gets or sets a specific component by index in this vector.
+        /// </summary>
+        /// <param name="index">The component index.</param>
+        public int this[int index]
+        {
+            get
+            {
+                switch (index)
+                {
+                    case 0:
+                        return x;
+                    case 1:
+                        return y;
+                    case 2:
+                        return z;
+                    case 3:
+                        return w;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector4i index!");
+                }
+            }
+            set
+            {
+                switch (index)
+                {
+                    case 0:
+                        x = value;
+                        break;
+                    case 1:
+                        y = value;
+                        break;
+                    case 2:
+                        z = value;
+                        break;
+                    case 3:
+                        w = value;
+                        break;
+                    default:
+                        throw new IndexOutOfRangeException("Invalid Vector4i index!");
+                }
+            }
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a new vector with one value for all components.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public Vector4i(int value)
+        {
+            this.x = value;
+            this.y = value;
+            this.z = value;
+            this.w = value;
+        }
+
+        /// <summary>
+        /// Creates a new vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        /// <param name="z">The z value.</param>
+        /// <param name="w">The w value.</param>
+        public Vector4i(int x, int y, int z, int w)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+            this.w = w;
+        }
+        #endregion
+
+        #region Operators
+        /// <summary>
+        /// Adds two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4i operator +(Vector4i a, Vector4i b)
+        {
+            return new Vector4i(a.x + b.x, a.y + b.y, a.z + b.z, a.w + b.w);
+        }
+
+        /// <summary>
+        /// Subtracts two vectors.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4i operator -(Vector4i a, Vector4i b)
+        {
+            return new Vector4i(a.x - b.x, a.y - b.y, a.z - b.z, a.w - b.w);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The scaling value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4i operator *(Vector4i a, int d)
+        {
+            return new Vector4i(a.x * d, a.y * d, a.z * d, a.w * d);
+        }
+
+        /// <summary>
+        /// Scales the vector uniformly.
+        /// </summary>
+        /// <param name="d">The scaling value.</param>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4i operator *(int d, Vector4i a)
+        {
+            return new Vector4i(a.x * d, a.y * d, a.z * d, a.w * d);
+        }
+
+        /// <summary>
+        /// Divides the vector with a float.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <param name="d">The dividing float value.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4i operator /(Vector4i a, int d)
+        {
+            return new Vector4i(a.x / d, a.y / d, a.z / d, a.w / d);
+        }
+
+        /// <summary>
+        /// Subtracts the vector from a zero vector.
+        /// </summary>
+        /// <param name="a">The vector.</param>
+        /// <returns>The resulting vector.</returns>
+        public static Vector4i operator -(Vector4i a)
+        {
+            return new Vector4i(-a.x, -a.y, -a.z, -a.w);
+        }
+
+        /// <summary>
+        /// Returns if two vectors equals eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If equals.</returns>
+        public static bool operator ==(Vector4i lhs, Vector4i rhs)
+        {
+            return (lhs.x == rhs.x && lhs.y == rhs.y && lhs.z == rhs.z && lhs.w == rhs.w);
+        }
+
+        /// <summary>
+        /// Returns if two vectors don't equal eachother.
+        /// </summary>
+        /// <param name="lhs">The left hand side vector.</param>
+        /// <param name="rhs">The right hand side vector.</param>
+        /// <returns>If not equals.</returns>
+        public static bool operator !=(Vector4i lhs, Vector4i rhs)
+        {
+            return (lhs.x != rhs.x || lhs.y != rhs.y || lhs.z != rhs.z || lhs.w != rhs.w);
+        }
+
+        /// <summary>
+        /// Explicitly converts from a single-precision vector into an integer vector.
+        /// </summary>
+        /// <param name="v">The single-precision vector.</param>
+        public static explicit operator Vector4i(Vector4 v)
+        {
+            return new Vector4i((int)v.x, (int)v.y, (int)v.z, (int)v.w);
+        }
+
+        /// <summary>
+        /// Explicitly converts from a double-precision vector into an integer vector.
+        /// </summary>
+        /// <param name="v">The double-precision vector.</param>
+        public static explicit operator Vector4i(Vector4d v)
+        {
+            return new Vector4i((int)v.x, (int)v.y, (int)v.z, (int)v.w);
+        }
+        #endregion
+
+        #region Public Methods
+        #region Instance
+        /// <summary>
+        /// Set x, y and z components of an existing vector.
+        /// </summary>
+        /// <param name="x">The x value.</param>
+        /// <param name="y">The y value.</param>
+        /// <param name="z">The z value.</param>
+        /// <param name="w">The w value.</param>
+        public void Set(int x, int y, int z, int w)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+            this.w = w;
+        }
+
+        /// <summary>
+        /// Multiplies with another vector component-wise.
+        /// </summary>
+        /// <param name="scale">The vector to multiply with.</param>
+        public void Scale(ref Vector4i scale)
+        {
+            x *= scale.x;
+            y *= scale.y;
+            z *= scale.z;
+            w *= scale.w;
+        }
+
+        /// <summary>
+        /// Clamps this vector between a specific range.
+        /// </summary>
+        /// <param name="min">The minimum component value.</param>
+        /// <param name="max">The maximum component value.</param>
+        public void Clamp(int min, int max)
+        {
+            if (x < min) x = min;
+            else if (x > max) x = max;
+
+            if (y < min) y = min;
+            else if (y > max) y = max;
+
+            if (z < min) z = min;
+            else if (z > max) z = max;
+
+            if (w < min) w = min;
+            else if (w > max) w = max;
+        }
+        #endregion
+
+        #region Object
+        /// <summary>
+        /// Returns a hash code for this vector.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            return x.GetHashCode() ^ y.GetHashCode() << 2 ^ z.GetHashCode() >> 2 ^ w.GetHashCode() >> 1;
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public override bool Equals(object other)
+        {
+            if (!(other is Vector4i))
+            {
+                return false;
+            }
+            Vector4i vector = (Vector4i)other;
+            return (x == vector.x && y == vector.y && z == vector.z && w == vector.w);
+        }
+
+        /// <summary>
+        /// Returns if this vector is equal to another one.
+        /// </summary>
+        /// <param name="other">The other vector to compare to.</param>
+        /// <returns>If equals.</returns>
+        public bool Equals(Vector4i other)
+        {
+            return (x == other.x && y == other.y && z == other.z && w == other.w);
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <returns>The string.</returns>
+        public override string ToString()
+        {
+            return string.Format("({0}, {1}, {2}, {3})",
+                x.ToString(CultureInfo.InvariantCulture),
+                y.ToString(CultureInfo.InvariantCulture),
+                z.ToString(CultureInfo.InvariantCulture),
+                w.ToString(CultureInfo.InvariantCulture));
+        }
+
+        /// <summary>
+        /// Returns a nicely formatted string for this vector.
+        /// </summary>
+        /// <param name="format">The integer format.</param>
+        /// <returns>The string.</returns>
+        public string ToString(string format)
+        {
+            return string.Format("({0}, {1}, {2}, {3})",
+                x.ToString(format, CultureInfo.InvariantCulture),
+                y.ToString(format, CultureInfo.InvariantCulture),
+                z.ToString(format, CultureInfo.InvariantCulture),
+                w.ToString(format, CultureInfo.InvariantCulture));
+        }
+        #endregion
+
+        #region Static
+        /// <summary>
+        /// Multiplies two vectors component-wise.
+        /// </summary>
+        /// <param name="a">The first vector.</param>
+        /// <param name="b">The second vector.</param>
+        /// <param name="result">The resulting vector.</param>
+        public static void Scale(ref Vector4i a, ref Vector4i b, out Vector4i result)
+        {
+            result = new Vector4i(a.x * b.x, a.y * b.y, a.z * b.z, a.w * b.w);
+        }
+        #endregion
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/Mesh.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/Mesh.cs
@@ -0,0 +1,955 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+using System.Collections.Generic;
+using MeshDecimator.Math;
+
+namespace MeshDecimator
+{
+    /// <summary>
+    /// A mesh.
+    /// </summary>
+    public sealed class Mesh
+    {
+        #region Consts
+        /// <summary>
+        /// The count of supported UV channels.
+        /// </summary>
+        public const int UVChannelCount = 4;
+        #endregion
+
+        #region Fields
+        private Vector3d[] vertices = null;
+        private int[][] indices = null;
+        private Vector3[] normals = null;
+        private Vector4[] tangents = null;
+        private Vector2[][] uvs2D = null;
+        private Vector3[][] uvs3D = null;
+        private Vector4[][] uvs4D = null;
+        private Vector4[] colors = null;
+        private BoneWeight[] boneWeights = null;
+
+        private static readonly int[] emptyIndices = new int[0];
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the count of vertices of this mesh.
+        /// </summary>
+        public int VertexCount
+        {
+            get { return vertices.Length; }
+        }
+
+        /// <summary>
+        /// Gets or sets the count of submeshes in this mesh.
+        /// </summary>
+        public int SubMeshCount
+        {
+            get { return indices.Length; }
+            set
+            {
+                if (value <= 0)
+                    throw new ArgumentOutOfRangeException("value");
+
+                int[][] newIndices = new int[value][];
+                Array.Copy(indices, 0, newIndices, 0, MathHelper.Min(indices.Length, newIndices.Length));
+                indices = newIndices;
+            }
+        }
+
+        /// <summary>
+        /// Gets the total count of triangles in this mesh.
+        /// </summary>
+        public int TriangleCount
+        {
+            get
+            {
+                int triangleCount = 0;
+                for (int i = 0; i < indices.Length; i++)
+                {
+                    if (indices[i] != null)
+                    {
+                        triangleCount += indices[i].Length / 3;
+                    }
+                }
+                return triangleCount;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the vertices for this mesh. Note that this resets all other vertex attributes.
+        /// </summary>
+        public Vector3d[] Vertices
+        {
+            get { return vertices; }
+            set
+            {
+                if (value == null)
+                    throw new ArgumentNullException("value");
+
+                vertices = value;
+                ClearVertexAttributes();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the combined indices for this mesh. Once set, the sub-mesh count gets set to 1.
+        /// </summary>
+        public int[] Indices
+        {
+            get
+            {
+                if (indices.Length == 1)
+                {
+                    return indices[0] ?? emptyIndices;
+                }
+                else
+                {
+                    List<int> indexList = new List<int>(TriangleCount * 3);
+                    for (int i = 0; i < indices.Length; i++)
+                    {
+                        if (indices[i] != null)
+                        {
+                            indexList.AddRange(indices[i]);
+                        }
+                    }
+                    return indexList.ToArray();
+                }
+            }
+            set
+            {
+                if (value == null)
+                    throw new ArgumentNullException("value");
+                else if ((value.Length % 3) != 0)
+                    throw new ArgumentException("The index count must be multiple by 3.", "value");
+
+                SubMeshCount = 1;
+                SetIndices(0, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the normals for this mesh.
+        /// </summary>
+        public Vector3[] Normals
+        {
+            get { return normals; }
+            set
+            {
+                if (value != null && value.Length != vertices.Length)
+                    throw new ArgumentException(string.Format("The vertex normals must be as many as the vertices. Assigned: {0}  Require: {1}", value.Length, vertices.Length));
+
+                normals = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tangents for this mesh.
+        /// </summary>
+        public Vector4[] Tangents
+        {
+            get { return tangents; }
+            set
+            {
+                if (value != null && value.Length != vertices.Length)
+                    throw new ArgumentException(string.Format("The vertex tangents must be as many as the vertices. Assigned: {0}  Require: {1}", value.Length, vertices.Length));
+
+                tangents = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the first UV set for this mesh.
+        /// </summary>
+        public Vector2[] UV1
+        {
+            get { return GetUVs2D(0); }
+            set { SetUVs(0, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the second UV set for this mesh.
+        /// </summary>
+        public Vector2[] UV2
+        {
+            get { return GetUVs2D(1); }
+            set { SetUVs(1, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the third UV set for this mesh.
+        /// </summary>
+        public Vector2[] UV3
+        {
+            get { return GetUVs2D(2); }
+            set { SetUVs(2, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the fourth UV set for this mesh.
+        /// </summary>
+        public Vector2[] UV4
+        {
+            get { return GetUVs2D(3); }
+            set { SetUVs(3, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the vertex colors for this mesh.
+        /// </summary>
+        public Vector4[] Colors
+        {
+            get { return colors; }
+            set
+            {
+                if (value != null && value.Length != vertices.Length)
+                    throw new ArgumentException(string.Format("The vertex colors must be as many as the vertices. Assigned: {0}  Require: {1}", value.Length, vertices.Length));
+
+                colors = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the vertex bone weights for this mesh.
+        /// </summary>
+        public BoneWeight[] BoneWeights
+        {
+            get { return boneWeights; }
+            set
+            {
+                if (value != null && value.Length != vertices.Length)
+                    throw new ArgumentException(string.Format("The vertex bone weights must be as many as the vertices. Assigned: {0}  Require: {1}", value.Length, vertices.Length));
+
+                boneWeights = value;
+            }
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates a new mesh.
+        /// </summary>
+        /// <param name="vertices">The mesh vertices.</param>
+        /// <param name="indices">The mesh indices.</param>
+        public Mesh(Vector3d[] vertices, int[] indices)
+        {
+            if (vertices == null)
+                throw new ArgumentNullException("vertices");
+            else if (indices == null)
+                throw new ArgumentNullException("indices");
+            else if ((indices.Length % 3) != 0)
+                throw new ArgumentException("The index count must be multiple by 3.", "indices");
+
+            this.vertices = vertices;
+            this.indices = new int[1][];
+            this.indices[0] = indices;
+        }
+
+        /// <summary>
+        /// Creates a new mesh.
+        /// </summary>
+        /// <param name="vertices">The mesh vertices.</param>
+        /// <param name="indices">The mesh indices.</param>
+        public Mesh(Vector3d[] vertices, int[][] indices)
+        {
+            if (vertices == null)
+                throw new ArgumentNullException("vertices");
+            else if (indices == null)
+                throw new ArgumentNullException("indices");
+
+            for (int i = 0; i < indices.Length; i++)
+            {
+                if (indices[i] != null && (indices[i].Length % 3) != 0)
+                    throw new ArgumentException(string.Format("The index count must be multiple by 3 at sub-mesh index {0}.", i), "indices");
+            }
+
+            this.vertices = vertices;
+            this.indices = indices;
+        }
+        #endregion
+
+        #region Private Methods
+        private void ClearVertexAttributes()
+        {
+            normals = null;
+            tangents = null;
+            uvs2D = null;
+            uvs3D = null;
+            uvs4D = null;
+            colors = null;
+            boneWeights = null;
+        }
+        #endregion
+
+        #region Public Methods
+        #region Recalculate Normals
+        /// <summary>
+        /// Recalculates the normals for this mesh smoothly.
+        /// </summary>
+        public void RecalculateNormals()
+        {
+            int vertexCount = vertices.Length;
+            Vector3[] normals = new Vector3[vertexCount];
+
+            int subMeshCount = this.indices.Length;
+            for (int subMeshIndex = 0; subMeshIndex < subMeshCount; subMeshIndex++)
+            {
+                int[] indices = this.indices[subMeshIndex];
+                if (indices == null)
+                    continue;
+
+                int indexCount = indices.Length;
+                for (int i = 0; i < indexCount; i += 3)
+                {
+                    int i0 = indices[i];
+                    int i1 = indices[i + 1];
+                    int i2 = indices[i + 2];
+
+                    var v0 = (Vector3)vertices[i0];
+                    var v1 = (Vector3)vertices[i1];
+                    var v2 = (Vector3)vertices[i2];
+
+                    var nx = v1 - v0;
+                    var ny = v2 - v0;
+                    Vector3 normal;
+                    Vector3.Cross(ref nx, ref ny, out normal);
+                    normal.Normalize();
+
+                    normals[i0] += normal;
+                    normals[i1] += normal;
+                    normals[i2] += normal;
+                }
+            }
+
+            for (int i = 0; i < vertexCount; i++)
+            {
+                normals[i].Normalize();
+            }
+
+            this.normals = normals;
+        }
+        #endregion
+
+        #region Recalculate Tangents
+        /// <summary>
+        /// Recalculates the tangents for this mesh.
+        /// </summary>
+        public void RecalculateTangents()
+        {
+            // Make sure we have the normals first
+            if (normals == null)
+                return;
+
+            // Also make sure that we have the first UV set
+            bool uvIs2D = (uvs2D != null && uvs2D[0] != null);
+            bool uvIs3D = (uvs3D != null && uvs3D[0] != null);
+            bool uvIs4D = (uvs4D != null && uvs4D[0] != null);
+            if (!uvIs2D && !uvIs3D && !uvIs4D)
+                return;
+
+            int vertexCount = vertices.Length;
+            
+            var tangents = new Vector4[vertexCount];
+            var tan1 = new Vector3[vertexCount];
+            var tan2 = new Vector3[vertexCount];
+
+            Vector2[] uv2D = (uvIs2D ? uvs2D[0] : null);
+            Vector3[] uv3D = (uvIs3D ? uvs3D[0] : null);
+            Vector4[] uv4D = (uvIs4D ? uvs4D[0] : null);
+
+            int subMeshCount = this.indices.Length;
+            for (int subMeshIndex = 0; subMeshIndex < subMeshCount; subMeshIndex++)
+            {
+                int[] indices = this.indices[subMeshIndex];
+                if (indices == null)
+                    continue;
+
+                int indexCount = indices.Length;
+                for (int i = 0; i < indexCount; i += 3)
+                {
+                    int i0 = indices[i];
+                    int i1 = indices[i + 1];
+                    int i2 = indices[i + 2];
+
+                    var v0 = vertices[i0];
+                    var v1 = vertices[i1];
+                    var v2 = vertices[i2];
+
+                    float s1, s2, t1, t2;
+                    if (uvIs2D)
+                    {
+                        var w0 = uv2D[i0];
+                        var w1 = uv2D[i1];
+                        var w2 = uv2D[i2];
+                        s1 = w1.x - w0.x;
+                        s2 = w2.x - w0.x;
+                        t1 = w1.y - w0.y;
+                        t2 = w2.y - w0.y;
+                    }
+                    else if (uvIs3D)
+                    {
+                        var w0 = uv3D[i0];
+                        var w1 = uv3D[i1];
+                        var w2 = uv3D[i2];
+                        s1 = w1.x - w0.x;
+                        s2 = w2.x - w0.x;
+                        t1 = w1.y - w0.y;
+                        t2 = w2.y - w0.y;
+                    }
+                    else
+                    {
+                        var w0 = uv4D[i0];
+                        var w1 = uv4D[i1];
+                        var w2 = uv4D[i2];
+                        s1 = w1.x - w0.x;
+                        s2 = w2.x - w0.x;
+                        t1 = w1.y - w0.y;
+                        t2 = w2.y - w0.y;
+                    }
+                    
+
+                    float x1 = (float)(v1.x - v0.x);
+                    float x2 = (float)(v2.x - v0.x);
+                    float y1 = (float)(v1.y - v0.y);
+                    float y2 = (float)(v2.y - v0.y);
+                    float z1 = (float)(v1.z - v0.z);
+                    float z2 = (float)(v2.z - v0.z);
+                    float r = 1f / (s1 * t2 - s2 * t1);
+
+                    var sdir = new Vector3((t2 * x1 - t1 * x2) * r, (t2 * y1 - t1 * y2) * r, (t2 * z1 - t1 * z2) * r);
+                    var tdir = new Vector3((s1 * x2 - s2 * x1) * r, (s1 * y2 - s2 * y1) * r, (s1 * z2 - s2 * z1) * r);
+
+                    tan1[i0] += sdir;
+                    tan1[i1] += sdir;
+                    tan1[i2] += sdir;
+                    tan2[i0] += tdir;
+                    tan2[i1] += tdir;
+                    tan2[i2] += tdir;
+                }
+            }
+
+            for (int i = 0; i < vertexCount; i++)
+            {
+                var n = normals[i];
+                var t = tan1[i];
+
+                var tmp = (t - n * Vector3.Dot(ref n, ref t));
+                tmp.Normalize();
+
+                Vector3 c;
+                Vector3.Cross(ref n, ref t, out c);
+                float dot = Vector3.Dot(ref c, ref tan2[i]);
+                float w = (dot < 0f ? -1f : 1f);
+                tangents[i] = new Vector4(tmp.x, tmp.y, tmp.z, w);
+            }
+
+            this.tangents = tangents;
+        }
+        #endregion
+
+        #region Triangles
+        /// <summary>
+        /// Returns the count of triangles for a specific sub-mesh in this mesh.
+        /// </summary>
+        /// <param name="subMeshIndex">The sub-mesh index.</param>
+        /// <returns>The triangle count.</returns>
+        public int GetTriangleCount(int subMeshIndex)
+        {
+            if (subMeshIndex < 0 || subMeshIndex >= indices.Length)
+                throw new IndexOutOfRangeException();
+
+            return indices[subMeshIndex].Length / 3;
+        }
+
+        /// <summary>
+        /// Returns the triangle indices of a specific sub-mesh in this mesh.
+        /// </summary>
+        /// <param name="subMeshIndex">The sub-mesh index.</param>
+        /// <returns>The triangle indices.</returns>
+        public int[] GetIndices(int subMeshIndex)
+        {
+            if (subMeshIndex < 0 || subMeshIndex >= indices.Length)
+                throw new IndexOutOfRangeException();
+
+            return indices[subMeshIndex] ?? emptyIndices;
+        }
+
+        /// <summary>
+        /// Returns the triangle indices for all sub-meshes in this mesh.
+        /// </summary>
+        /// <returns>The sub-mesh triangle indices.</returns>
+        public int[][] GetSubMeshIndices()
+        {
+            var subMeshIndices = new int[indices.Length][];
+            for (int subMeshIndex = 0; subMeshIndex < indices.Length; subMeshIndex++)
+            {
+                subMeshIndices[subMeshIndex] = indices[subMeshIndex] ?? emptyIndices;
+            }
+            return subMeshIndices;
+        }
+
+        /// <summary>
+        /// Sets the triangle indices of a specific sub-mesh in this mesh.
+        /// </summary>
+        /// <param name="subMeshIndex">The sub-mesh index.</param>
+        /// <param name="indices">The triangle indices.</param>
+        public void SetIndices(int subMeshIndex, int[] indices)
+        {
+            if (subMeshIndex < 0 || subMeshIndex >= this.indices.Length)
+                throw new IndexOutOfRangeException();
+            else if (indices == null)
+                throw new ArgumentNullException("indices");
+            else if ((indices.Length % 3) != 0)
+                throw new ArgumentException("The index count must be multiple by 3.", "indices");
+
+            this.indices[subMeshIndex] = indices;
+        }
+        #endregion
+
+        #region UV Sets
+        #region Getting
+        /// <summary>
+        /// Returns the UV dimension for a specific channel.
+        /// </summary>
+        /// <param name="channel"></param>
+        /// <returns>The UV dimension count.</returns>
+        public int GetUVDimension(int channel)
+        {
+            if (channel < 0 || channel >= UVChannelCount)
+                throw new ArgumentOutOfRangeException("channel");
+
+            if (uvs2D != null && uvs2D[channel] != null)
+            {
+                return 2;
+            }
+            else if (uvs3D != null && uvs3D[channel] != null)
+            {
+                return 3;
+            }
+            else if (uvs4D != null && uvs4D[channel] != null)
+            {
+                return 4;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// Returns the UVs (2D) from a specific channel.
+        /// </summary>
+        /// <param name="channel">The channel index.</param>
+        /// <returns>The UVs.</returns>
+        public Vector2[] GetUVs2D(int channel)
+        {
+            if (channel < 0 || channel >= UVChannelCount)
+                throw new ArgumentOutOfRangeException("channel");
+
+            if (uvs2D != null && uvs2D[channel] != null)
+            {
+                return uvs2D[channel];
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns the UVs (3D) from a specific channel.
+        /// </summary>
+        /// <param name="channel">The channel index.</param>
+        /// <returns>The UVs.</returns>
+        public Vector3[] GetUVs3D(int channel)
+        {
+            if (channel < 0 || channel >= UVChannelCount)
+                throw new ArgumentOutOfRangeException("channel");
+
+            if (uvs3D != null && uvs3D[channel] != null)
+            {
+                return uvs3D[channel];
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns the UVs (4D) from a specific channel.
+        /// </summary>
+        /// <param name="channel">The channel index.</param>
+        /// <returns>The UVs.</returns>
+        public Vector4[] GetUVs4D(int channel)
+        {
+            if (channel < 0 || channel >= UVChannelCount)
+                throw new ArgumentOutOfRangeException("channel");
+
+            if (uvs4D != null && uvs4D[channel] != null)
+            {
+                return uvs4D[channel];
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns the UVs (2D) from a specific channel.
+        /// </summary>
+        /// <param name="channel">The channel index.</param>
+        /// <param name="uvs">The UVs.</param>
+        public void GetUVs(int channel, List<Vector2> uvs)
+        {
+            if (channel < 0 || channel >= UVChannelCount)
+                throw new ArgumentOutOfRangeException("channel");
+            else if (uvs == null)
+                throw new ArgumentNullException("uvs");
+
+            uvs.Clear();
+            if (uvs2D != null && uvs2D[channel] != null)
+            {
+                var uvData = uvs2D[channel];
+                if (uvData != null)
+                {
+                    uvs.AddRange(uvData);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the UVs (3D) from a specific channel.
+        /// </summary>
+        /// <param name="channel">The channel index.</param>
+        /// <param name="uvs">The UVs.</param>
+        public void GetUVs(int channel, List<Vector3> uvs)
+        {
+            if (channel < 0 || channel >= UVChannelCount)
+                throw new ArgumentOutOfRangeException("channel");
+            else if (uvs == null)
+                throw new ArgumentNullException("uvs");
+
+            uvs.Clear();
+            if (uvs3D != null && uvs3D[channel] != null)
+            {
+                var uvData = uvs3D[channel];
+                if (uvData != null)
+                {
+                    uvs.AddRange(uvData);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the UVs (4D) from a specific channel.
+        /// </summary>
+        /// <param name="channel">The channel index.</param>
+        /// <param name="uvs">The UVs.</param>
+        public void GetUVs(int channel, List<Vector4> uvs)
+        {
+            if (channel < 0 || channel >= UVChannelCount)
+                throw new ArgumentOutOfRangeException("channel");
+            else if (uvs == null)
+                throw new ArgumentNullException("uvs");
+
+            uvs.Clear();
+            if (uvs4D != null && uvs4D[channel] != null)
+            {
+                var uvData = uvs4D[channel];
+                if (uvData != null)
+                {
+                    uvs.AddRange(uvData);
+                }
+            }
+        }
+        #endregion
+
+        #region Setting
+        /// <summary>
+        /// Sets the UVs (2D) for a specific channel.
+        /// </summary>
+        /// <param name="channel">The channel index.</param>
+        /// <param name="uvs">The UVs.</param>
+        public void SetUVs(int channel, Vector2[] uvs)
+        {
+            if (channel < 0 || channel >= UVChannelCount)
+                throw new ArgumentOutOfRangeException("channel");
+
+            if (uvs != null && uvs.Length > 0)
+            {
+                if (uvs.Length != vertices.Length)
+                    throw new ArgumentException(string.Format("The vertex UVs must be as many as the vertices. Assigned: {0}  Require: {1}", uvs.Length, vertices.Length));
+
+                if (uvs2D == null)
+                    uvs2D = new Vector2[UVChannelCount][];
+
+                int uvCount = uvs.Length;
+                var uvSet = new Vector2[uvCount];
+                uvs2D[channel] = uvSet;
+                uvs.CopyTo(uvSet, 0);
+            }
+            else
+            {
+                if (uvs2D != null)
+                {
+                    uvs2D[channel] = null;
+                }
+            }
+
+            if (uvs3D != null)
+            {
+                uvs3D[channel] = null;
+            }
+            if (uvs4D != null)
+            {
+                uvs4D[channel] = null;
+            }
+        }
+
+        /// <summary>
+        /// Sets the UVs (3D) for a specific channel.
+        /// </summary>
+        /// <param name="channel">The channel index.</param>
+        /// <param name="uvs">The UVs.</param>
+        public void SetUVs(int channel, Vector3[] uvs)
+        {
+            if (channel < 0 || channel >= UVChannelCount)
+                throw new ArgumentOutOfRangeException("channel");
+
+            if (uvs != null && uvs.Length > 0)
+            {
+                int uvCount = uvs.Length;
+                if (uvCount != vertices.Length)
+                    throw new ArgumentException(string.Format("The vertex UVs must be as many as the vertices. Assigned: {0}  Require: {1}", uvCount, vertices.Length), "uvs");
+
+                if (uvs3D == null)
+                    uvs3D = new Vector3[UVChannelCount][];
+
+                var uvSet = new Vector3[uvCount];
+                uvs3D[channel] = uvSet;
+                uvs.CopyTo(uvSet, 0);
+            }
+            else
+            {
+                if (uvs3D != null)
+                {
+                    uvs3D[channel] = null;
+                }
+            }
+
+            if (uvs2D != null)
+            {
+                uvs2D[channel] = null;
+            }
+            if (uvs4D != null)
+            {
+                uvs4D[channel] = null;
+            }
+        }
+
+        /// <summary>
+        /// Sets the UVs (4D) for a specific channel.
+        /// </summary>
+        /// <param name="channel">The channel index.</param>
+        /// <param name="uvs">The UVs.</param>
+        public void SetUVs(int channel, Vector4[] uvs)
+        {
+            if (channel < 0 || channel >= UVChannelCount)
+                throw new ArgumentOutOfRangeException("channel");
+
+            if (uvs != null && uvs.Length > 0)
+            {
+                int uvCount = uvs.Length;
+                if (uvCount != vertices.Length)
+                    throw new ArgumentException(string.Format("The vertex UVs must be as many as the vertices. Assigned: {0}  Require: {1}", uvCount, vertices.Length), "uvs");
+
+                if (uvs4D == null)
+                    uvs4D = new Vector4[UVChannelCount][];
+
+                var uvSet = new Vector4[uvCount];
+                uvs4D[channel] = uvSet;
+                uvs.CopyTo(uvSet, 0);
+            }
+            else
+            {
+                if (uvs4D != null)
+                {
+                    uvs4D[channel] = null;
+                }
+            }
+
+            if (uvs2D != null)
+            {
+                uvs2D[channel] = null;
+            }
+            if (uvs3D != null)
+            {
+                uvs3D[channel] = null;
+            }
+        }
+
+        /// <summary>
+        /// Sets the UVs (2D) for a specific channel.
+        /// </summary>
+        /// <param name="channel">The channel index.</param>
+        /// <param name="uvs">The UVs.</param>
+        public void SetUVs(int channel, List<Vector2> uvs)
+        {
+            if (channel < 0 || channel >= UVChannelCount)
+                throw new ArgumentOutOfRangeException("channel");
+
+            if (uvs != null && uvs.Count > 0)
+            {
+                int uvCount = uvs.Count;
+                if (uvCount != vertices.Length)
+                    throw new ArgumentException(string.Format("The vertex UVs must be as many as the vertices. Assigned: {0}  Require: {1}", uvCount, vertices.Length), "uvs");
+
+                if (uvs2D == null)
+                    uvs2D = new Vector2[UVChannelCount][];
+
+                var uvSet = new Vector2[uvCount];
+                uvs2D[channel] = uvSet;
+                uvs.CopyTo(uvSet, 0);
+            }
+            else
+            {
+                if (uvs2D != null)
+                {
+                    uvs2D[channel] = null;
+                }
+            }
+
+            if (uvs3D != null)
+            {
+                uvs3D[channel] = null;
+            }
+            if (uvs4D != null)
+            {
+                uvs4D[channel] = null;
+            }
+        }
+
+        /// <summary>
+        /// Sets the UVs (3D) for a specific channel.
+        /// </summary>
+        /// <param name="channel">The channel index.</param>
+        /// <param name="uvs">The UVs.</param>
+        public void SetUVs(int channel, List<Vector3> uvs)
+        {
+            if (channel < 0 || channel >= UVChannelCount)
+                throw new ArgumentOutOfRangeException("channel");
+
+            if (uvs != null && uvs.Count > 0)
+            {
+                int uvCount = uvs.Count;
+                if (uvCount != vertices.Length)
+                    throw new ArgumentException(string.Format("The vertex UVs must be as many as the vertices. Assigned: {0}  Require: {1}", uvCount, vertices.Length), "uvs");
+
+                if (uvs3D == null)
+                    uvs3D = new Vector3[UVChannelCount][];
+
+                var uvSet = new Vector3[uvCount];
+                uvs3D[channel] = uvSet;
+                uvs.CopyTo(uvSet, 0);
+            }
+            else
+            {
+                if (uvs3D != null)
+                {
+                    uvs3D[channel] = null;
+                }
+            }
+
+            if (uvs2D != null)
+            {
+                uvs2D[channel] = null;
+            }
+            if (uvs4D != null)
+            {
+                uvs4D[channel] = null;
+            }
+        }
+
+        /// <summary>
+        /// Sets the UVs (4D) for a specific channel.
+        /// </summary>
+        /// <param name="channel">The channel index.</param>
+        /// <param name="uvs">The UVs.</param>
+        public void SetUVs(int channel, List<Vector4> uvs)
+        {
+            if (channel < 0 || channel >= UVChannelCount)
+                throw new ArgumentOutOfRangeException("channel");
+
+            if (uvs != null && uvs.Count > 0)
+            {
+                int uvCount = uvs.Count;
+                if (uvCount != vertices.Length)
+                    throw new ArgumentException(string.Format("The vertex UVs must be as many as the vertices. Assigned: {0}  Require: {1}", uvCount, vertices.Length), "uvs");
+
+                if (uvs4D == null)
+                    uvs4D = new Vector4[UVChannelCount][];
+
+                var uvSet = new Vector4[uvCount];
+                uvs4D[channel] = uvSet;
+                uvs.CopyTo(uvSet, 0);
+            }
+            else
+            {
+                if (uvs4D != null)
+                {
+                    uvs4D[channel] = null;
+                }
+            }
+
+            if (uvs2D != null)
+            {
+                uvs2D[channel] = null;
+            }
+            if (uvs3D != null)
+            {
+                uvs3D[channel] = null;
+            }
+        }
+        #endregion
+        #endregion
+
+        #region To String
+        /// <summary>
+        /// Returns the text-representation of this mesh.
+        /// </summary>
+        /// <returns>The text-representation.</returns>
+        public override string ToString()
+        {
+            return string.Format("Vertices: {0}", vertices.Length);
+        }
+        #endregion
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/MeshDecimator/MeshDecimation.cs
+++ b/LightlessSync/ThirdParty/MeshDecimator/MeshDecimation.cs
@@ -0,0 +1,180 @@
+#region License
+/*
+MIT License
+
+Copyright(c) 2017-2018 Mattias Edlund
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#endregion
+
+using System;
+using MeshDecimator.Algorithms;
+
+namespace MeshDecimator
+{
+    #region Algorithm
+    /// <summary>
+    /// The decimation algorithms.
+    /// </summary>
+    public enum Algorithm
+    {
+        /// <summary>
+        /// The default algorithm.
+        /// </summary>
+        Default,
+        /// <summary>
+        /// The fast quadric mesh simplification algorithm.
+        /// </summary>
+        FastQuadricMesh
+    }
+    #endregion
+
+    /// <summary>
+    /// The mesh decimation API.
+    /// </summary>
+    public static class MeshDecimation
+    {
+        #region Public Methods
+        #region Create Algorithm
+        /// <summary>
+        /// Creates a specific decimation algorithm.
+        /// </summary>
+        /// <param name="algorithm">The desired algorithm.</param>
+        /// <returns>The decimation algorithm.</returns>
+        public static DecimationAlgorithm CreateAlgorithm(Algorithm algorithm)
+        {
+            DecimationAlgorithm alg = null;
+
+            switch (algorithm)
+            {
+                case Algorithm.Default:
+                case Algorithm.FastQuadricMesh:
+                    alg = new FastQuadricMeshSimplification();
+                    break;
+                default:
+                    throw new ArgumentException("The specified algorithm is not supported.", "algorithm");
+            }
+
+            return alg;
+        }
+        #endregion
+
+        #region Decimate Mesh
+        /// <summary>
+        /// Decimates a mesh.
+        /// </summary>
+        /// <param name="mesh">The mesh to decimate.</param>
+        /// <param name="targetTriangleCount">The target triangle count.</param>
+        /// <returns>The decimated mesh.</returns>
+        public static Mesh DecimateMesh(Mesh mesh, int targetTriangleCount)
+        {
+            return DecimateMesh(Algorithm.Default, mesh, targetTriangleCount);
+        }
+
+        /// <summary>
+        /// Decimates a mesh.
+        /// </summary>
+        /// <param name="algorithm">The desired algorithm.</param>
+        /// <param name="mesh">The mesh to decimate.</param>
+        /// <param name="targetTriangleCount">The target triangle count.</param>
+        /// <returns>The decimated mesh.</returns>
+        public static Mesh DecimateMesh(Algorithm algorithm, Mesh mesh, int targetTriangleCount)
+        {
+            if (mesh == null)
+                throw new ArgumentNullException("mesh");
+
+            var decimationAlgorithm = CreateAlgorithm(algorithm);
+            return DecimateMesh(decimationAlgorithm, mesh, targetTriangleCount);
+        }
+
+        /// <summary>
+        /// Decimates a mesh.
+        /// </summary>
+        /// <param name="algorithm">The decimation algorithm.</param>
+        /// <param name="mesh">The mesh to decimate.</param>
+        /// <param name="targetTriangleCount">The target triangle count.</param>
+        /// <returns>The decimated mesh.</returns>
+        public static Mesh DecimateMesh(DecimationAlgorithm algorithm, Mesh mesh, int targetTriangleCount)
+        {
+            if (algorithm == null)
+                throw new ArgumentNullException("algorithm");
+            else if (mesh == null)
+                throw new ArgumentNullException("mesh");
+
+            int currentTriangleCount = mesh.TriangleCount;
+            if (targetTriangleCount > currentTriangleCount)
+                targetTriangleCount = currentTriangleCount;
+            else if (targetTriangleCount < 0)
+                targetTriangleCount = 0;
+
+            algorithm.Initialize(mesh);
+            algorithm.DecimateMesh(targetTriangleCount);
+            return algorithm.ToMesh();
+        }
+        #endregion
+
+        #region Decimate Mesh Lossless
+        /// <summary>
+        /// Decimates a mesh without losing any quality.
+        /// </summary>
+        /// <param name="mesh">The mesh to decimate.</param>
+        /// <returns>The decimated mesh.</returns>
+        public static Mesh DecimateMeshLossless(Mesh mesh)
+        {
+            return DecimateMeshLossless(Algorithm.Default, mesh);
+        }
+
+        /// <summary>
+        /// Decimates a mesh without losing any quality.
+        /// </summary>
+        /// <param name="algorithm">The desired algorithm.</param>
+        /// <param name="mesh">The mesh to decimate.</param>
+        /// <returns>The decimated mesh.</returns>
+        public static Mesh DecimateMeshLossless(Algorithm algorithm, Mesh mesh)
+        {
+            if (mesh == null)
+                throw new ArgumentNullException("mesh");
+
+            var decimationAlgorithm = CreateAlgorithm(algorithm);
+            return DecimateMeshLossless(decimationAlgorithm, mesh);
+        }
+
+        /// <summary>
+        /// Decimates a mesh without losing any quality.
+        /// </summary>
+        /// <param name="algorithm">The decimation algorithm.</param>
+        /// <param name="mesh">The mesh to decimate.</param>
+        /// <returns>The decimated mesh.</returns>
+        public static Mesh DecimateMeshLossless(DecimationAlgorithm algorithm, Mesh mesh)
+        {
+            if (algorithm == null)
+                throw new ArgumentNullException("algorithm");
+            else if (mesh == null)
+                throw new ArgumentNullException("mesh");
+
+            int currentTriangleCount = mesh.TriangleCount;
+            algorithm.Initialize(mesh);
+            algorithm.DecimateMeshLossless();
+            return algorithm.ToMesh();
+        }
+        #endregion
+        #endregion
+    }
+}
--- a/LightlessSync/ThirdParty/Nanomesh/Algo/Decimation/Decimate.cs
+++ b/LightlessSync/ThirdParty/Nanomesh/Algo/Decimation/Decimate.cs
--- a/LightlessSync/ThirdParty/Nanomesh/Algo/Decimation/EdgeCollapse.cs
+++ b/LightlessSync/ThirdParty/Nanomesh/Algo/Decimation/EdgeCollapse.cs
@@ -1,88 +0,0 @@
-using System;
-
-namespace Nanomesh
-{
-    public partial class DecimateModifier
-    {
-        public class EdgeCollapse : IComparable<EdgeCollapse>, IEquatable<EdgeCollapse>
-        {
-            public int posA;
-            public int posB;
-            public Vector3 result;
-            public double error;
-
-            private double _weight = -1;
-
-            public ref double Weight => ref _weight;
-
-            public void SetWeight(double weight)
-            {
-                _weight = weight;
-            }
-
-            public EdgeCollapse(int posA, int posB)
-            {
-                this.posA = posA;
-                this.posB = posB;
-            }
-
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    return posA + posB;
-                }
-            }
-
-            public override bool Equals(object obj)
-            {
-                return Equals((EdgeCollapse)obj);
-            }
-
-            public bool Equals(EdgeCollapse pc)
-            {
-                if (ReferenceEquals(pc, null))
-                    return false;
-
-                if (ReferenceEquals(this, pc))
-                {
-                    return true;
-                }
-                else
-                {
-                    return (posA == pc.posA && posB == pc.posB) || (posA == pc.posB && posB == pc.posA);
-                }
-            }
-
-            public int CompareTo(EdgeCollapse other)
-            {
-                return error > other.error ? 1 : error < other.error ? -1 : 0;
-            }
-
-            public static bool operator >(EdgeCollapse x, EdgeCollapse y)
-            {
-                return x.error > y.error;
-            }
-
-            public static bool operator >=(EdgeCollapse x, EdgeCollapse y)
-            {
-                return x.error >= y.error;
-            }
-
-            public static bool operator <(EdgeCollapse x, EdgeCollapse y)
-            {
-                return x.error < y.error;
-            }
-
-            public static bool operator <=(EdgeCollapse x, EdgeCollapse y)
-            {
-                return x.error <= y.error;
-            }
-
-            public override string ToString()
-            {
-                return $"<A:{posA} B:{posB} error:{error} topology:{_weight}>";
-            }
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
azyges	17dd8a307b	fix access violation	2026-01-06 00:42:44 +09:00
azyges	24d0c38f59	animated emotes and fix clipper in chat window	2026-01-05 22:43:50 +09:00
azyges	4da2548e03	just misc	2026-01-05 07:48:14 +09:00
azyges	b6b9c81a57	tighten the check	2026-01-03 13:53:55 +09:00
azyges	a824d94ffe	slight adjustments and fixes	2026-01-03 10:20:07 +09:00
azyges	4b13dfe8d4	skip decimation for direct pairs and make it a toggle in settings	2026-01-03 03:19:10 +09:00
azyges	979443d9bb	atomize download status!	2026-01-02 11:30:36 +09:00
azyges	92cb861710	readjust cache clean up and add keep originals setting for models	2026-01-02 11:04:15 +09:00
azyges	aeed8503c2	highly experimental runtime model decimation + file cache adjustment to clean up processed file copies	2026-01-02 09:54:34 +09:00
azyges	44bb53023e	improvements to data analysis ui	2026-01-01 13:04:52 +09:00
azyges	05b91ed243	Merge remote-tracking branch 'origin/2.0.3' into just-experimenting	2026-01-01 10:04:38 +09:00
azyges	cfc5c1e0f3	"improving" pair handler clean up and some other stuff	2026-01-01 00:33:24 +09:00
				`@@ -1 +0,0 @@`
				`global using AddressBookEntryTuple = (string Name, int World, int City, int Ward, int PropertyType, int Plot, int Apartment, bool ApartmentSubdivision, bool AliasEnabled, string Alias);`