testing a different version extracter

Reviewed-on: #49
Reviewed-by: defnotken <defnotken@noreply.git.lightless-sync.org>

.gitea/workflows/lightless-tag-and-release.yml

@@ -0,0 +1,285 @@
+name: Tag and Release Lightless
+
+on:
+  push:
+    branches: [ master, dev ]
+
+env:
+  PLUGIN_NAME: LightlessSync
+  DOTNET_VERSION: 9.x
+
+jobs:
+  tag-and-release:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: write
+
+    steps:
+    - name: Checkout Lightless
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: true
+
+    - name: Setup .NET 9 SDK
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 9.x
+
+    - name: Download Dalamud
+      run: |
+        cd /
+        mkdir -p root/.xlcore/dalamud/Hooks/dev
+        curl -O https://goatcorp.github.io/dalamud-distrib/stg/latest.zip
+        unzip latest.zip -d /root/.xlcore/dalamud/Hooks/dev
+
+    - name: Lets Build Lightless!
+      run: | 
+          dotnet restore
+          dotnet build --configuration Release --no-restore
+          dotnet publish --configuration Release --no-build
+
+    - name: Get version
+      id: package_version
+      run: |
+        version=$(grep -oPm1 "(?<=<Version>)[^<]+" LightlessSync/LightlessSync.csproj)
+        echo "version=$version" >> $GITHUB_OUTPUT
+
+    - name: Display version
+      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: |
+        tag="${{ steps.package_version.outputs.version }}"
+        git fetch --tags
+        if ! git tag -l "$tag" | grep -q "$tag"; then
+          echo "Tag $tag does not exist. Creating and pushing..."
+          git config user.name "GitHub Action"
+          git config user.email "action@github.com"
+          git tag "$tag"
+          git push origin "$tag"
+        else
+          echo "Tag $tag already exists. Skipping tag creation."
+        fi
+
+    - name: Create Git tag if not exists (dev)
+      if: github.ref == 'refs/heads/dev'
+      run: |
+        tag="${{ steps.package_version.outputs.version }}-Dev"
+        git fetch --tags
+        if ! git tag -l "$tag" | grep -q "$tag"; then
+          echo "Tag $tag does not exist. Creating and pushing..."
+          git config user.name "GitHub Action"
+          git config user.email "action@github.com"
+          git tag "$tag"
+          git push origin "$tag"
+        else
+          echo "Tag $tag already exists. Skipping tag creation."
+        fi
+
+    - name: Create Release (master)
+      if: github.ref == 'refs/heads/master'
+      id: create_release
+      run: |
+          echo "=== Searching for existing release ${{ steps.package_version.outputs.version }}==="
+
+          release_id=$(curl -s -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            "https://git.lightless-sync.org/api/v1/repos/${GITHUB_REPOSITORY}/releases/tags/${{ steps.package_version.outputs.version }}" | jq -r .id)
+
+          if [ "$release_id" != "null" ]; then
+            echo "=== Deleting existing release ${{ steps.package_version.outputs.version }}==="
+            curl -X DELETE -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+              "https://git.lightless-sync.org/api/v1/repos/${GITHUB_REPOSITORY}/releases/$release_id"
+          fi
+
+          echo "=== Creating new release ${{ steps.package_version.outputs.version }}==="
+          response=$(
+            curl --fail-with-body -X POST \
+            -H "Content-Type: application/json" \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -d '{
+              "tag_name": "${{ steps.package_version.outputs.version }}",
+              "name": "${{ steps.package_version.outputs.version }}",
+              "draft": false,
+              "prerelease": false
+            }' \
+           "https://git.lightless-sync.org/api/v1/repos/${GITHUB_REPOSITORY}/releases"
+            )
+
+          echo "API response: $response"
+          release_id=$(echo "$response" | jq -r .id)
+          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: Create Release (dev)
+      if: github.ref == 'refs/heads/dev'
+      id: create_release
+      run: |
+        version="${{ steps.package_version.outputs.version }}-Dev"
+        echo "=== Searching for existing release $version==="
+        release_id=$(curl -s -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+          "https://git.lightless-sync.org/api/v1/repos/${GITHUB_REPOSITORY}/releases/tags/$version" | jq -r .id)
+        if [ "$release_id" != "null" ]; then
+          echo "=== Deleting existing release $version==="
+          curl -X DELETE -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            "https://git.lightless-sync.org/api/v1/repos/${GITHUB_REPOSITORY}/releases/$release_id"
+        fi
+        echo "=== Creating new release $version==="
+        response=$(
+          curl --fail-with-body -X POST \
+          -H "Content-Type: application/json" \
+          -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+          -d '{
+            "tag_name": "'"$version"'",
+            "name": "'"$version"'",
+            "draft": false,
+            "prerelease": false
+          }' \
+         "https://git.lightless-sync.org/api/v1/repos/${GITHUB_REPOSITORY}/releases"
+        )
+        echo "API response: $response"
+        release_id=$(echo "$response" | jq -r .id)
+        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 }}
+      run: |
+          echo "Uploading to release ID: $RELEASE_ID"
+          curl --fail-with-body -s -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@output/LightlessClient.zip" \
+           "https://git.lightless-sync.org/api/v1/repos/${GITHUB_REPOSITORY}/releases/$RELEASE_ID/assets"
+
+    - name: Clone plugin hosting repo
+      run: |
+          mkdir LightlessSyncRepo
+          cd LightlessSyncRepo
+          git clone https://git.lightless-sync.org/${{ gitea.repository_owner }}/LightlessSync.git
+      env:
+        GIT_TERMINAL_PROMPT: 0
+
+    - name: Update plogonmaster.json with version (master)
+      if: github.ref == 'refs/heads/master'
+      env:
+          VERSION: ${{ steps.package_version.outputs.version }}
+      run: |
+            set -e
+
+            pluginJsonPath="${PLUGIN_NAME}/bin/x64/Release/${PLUGIN_NAME}.json"
+            repoJsonPath="LightlessSyncRepo/LightlessSync/plogonmaster.json"
+            version="${VERSION}"
+            downloadUrl="https://git.lightless-sync.org/${{ gitea.repository_owner }}/LightlessClient/releases/download/$version/LightlessClient.zip"
+
+            # Read plugin JSON
+            pluginJson=$(cat "$pluginJsonPath")
+            internalName=$(jq -r '.InternalName' <<< "$pluginJson")
+            dalamudApiLevel=$(jq -r '.DalamudApiLevel' <<< "$pluginJson")
+
+            # Read repo JSON (force array if not already)
+            repoJsonRaw=$(cat "$repoJsonPath")
+            if echo "$repoJsonRaw" | jq 'type' | grep -q '"array"'; then
+              repoJson="$repoJsonRaw"
+            else
+              repoJson="[$repoJsonRaw]"
+            fi
+
+            # Update matching plugin entry
+            updatedRepoJson=$(jq \
+              --arg internalName "$internalName" \
+              --arg dalamudApiLevel "$dalamudApiLevel" \
+              --arg version "$version" \
+              --arg downloadUrl "$downloadUrl" \
+              '
+              map(
+                if .InternalName == $internalName
+                then
+                  .DalamudApiLevel = $dalamudApiLevel
+                  | .AssemblyVersion = $version
+                  | .DownloadLinkInstall = $downloadUrl
+                  | .DownloadLinkUpdate = $downloadUrl
+                else
+                  .
+                end
+              )
+              ' <<< "$repoJson")
+
+            # Write back to file
+            echo "$updatedRepoJson" > "$repoJsonPath"
+            # Output the content of the file
+            cat "$repoJsonPath"
+
+    - name: Update plogonmaster.json with version (dev)
+      if: github.ref == 'refs/heads/dev'
+      env:
+        VERSION: ${{ steps.package_version.outputs.version }}
+      run: |
+        set -e
+        pluginJsonPath="${PLUGIN_NAME}/bin/x64/Release/${PLUGIN_NAME}.json"
+        repoJsonPath="LightlessSyncRepo/LightlessSync/plogonmaster.json"
+        assemblyVersion="${VERSION}"
+        version="${VERSION}-Dev"
+        downloadUrl="https://git.lightless-sync.org/${{ gitea.repository_owner }}/LightlessClient/releases/download/$version/LightlessClient.zip"
+        pluginJson=$(cat "$pluginJsonPath")
+        internalName=$(jq -r '.InternalName' <<< "$pluginJson")
+        dalamudApiLevel=$(jq -r '.DalamudApiLevel' <<< "$pluginJson")
+        repoJsonRaw=$(cat "$repoJsonPath")
+        if echo "$repoJsonRaw" | jq 'type' | grep -q '"array"'; then
+          repoJson="$repoJsonRaw"
+        else
+          repoJson="[$repoJsonRaw]"
+        fi
+        updatedRepoJson=$(jq \
+          --arg internalName "$internalName" \
+          --arg dalamudApiLevel "$dalamudApiLevel" \
+          --arg assemblyVersion "$assemblyVersion" \
+          --arg version "$version" \
+          --arg downloadUrl "$downloadUrl" \
+          '
+          map(
+            if .InternalName == $internalName
+            then
+              .DalamudApiLevel = $dalamudApiLevel
+              | .TestingAssemblyVersion = $assemblyVersion
+              | .DownloadLinkTesting = $downloadUrl
+            else
+              .
+            end
+          )
+          ' <<< "$repoJson")
+        echo "$updatedRepoJson" > "$repoJsonPath"
+        cat "$repoJsonPath"
+
+    - name: Commit and push to LightlessSync
+      run: |
+          cd LightlessSyncRepo/LightlessSync
+          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

.github/workflows/lightless-tag-and-release.yml

@@ -1,140 +0,0 @@
-name: Tag and Release Lightless
-
-on:
-  push:
-    branches: [ master ]
-
-env:
-  PLUGIN_NAME: LightlessSync
-  DOTNET_VERSION: 9.x
-
-jobs:
-  tag-and-release:
-    runs-on: windows-2022
-    permissions:
-      contents: write
-
-    steps:
-    - name: Checkout Lightless
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        submodules: true
-
-    - name: Setup .NET 9 SDK
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 9.x
-
-    - name: Download Dalamud
-      run: |
-        Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile latest.zip
-        Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev"
-
-    - name: Lets Build Lightless!
-      run: | 
-          dotnet restore
-          dotnet build --configuration Release --no-restore
-          dotnet publish --configuration Release --no-build
-
-    - name: Get version
-      id: package_version
-      uses: KageKirin/get-csproj-version@v0
-      with:
-        file: LightlessSync/LightlessSync.csproj
-
-    - name: Display version
-      run: | 
-          echo "Version: ${{ steps.package_version.outputs.version }}"
-
-    - name: Prepare Lightless Client
-      run: |
-        $publishPath = "${{ env.PLUGIN_NAME }}/bin/x64/Release/publish"
-        if (Test-Path $publishPath) {
-          Remove-Item -Recurse -Force $publishPath
-          Write-Host "Removed $publishPath"
-        } else {
-          Write-Host "$publishPath does not exist, nothing to remove."
-        }
-        mkdir output
-        Compress-Archive -Path ${{ env.PLUGIN_NAME }}/bin/x64/Release/* -DestinationPath output/LightlessClient.zip
-
-    - name: Create Git tag if not exists
-      shell: pwsh
-      run: |
-        $tag = "${{ steps.package_version.outputs.version }}"
-        git fetch --tags
-        if (-not (git tag -l $tag)) {
-          Write-Host "Tag $tag does not exist. Creating and pushing..."
-          git config user.name "GitHub Action"
-          git config user.email "action@github.com"
-          git tag $tag
-          git push origin $tag
-        } else {
-          Write-Host "Tag $tag already exists. Skipping tag creation."
-        }
-
-    - name: Create GitHub Release
-      uses: softprops/action-gh-release@v2
-      with:
-        tag_name: ${{ steps.package_version.outputs.version }}
-        name: ${{ steps.package_version.outputs.version }}
-        draft: false
-        prerelease: false
-        files: output/LightlessClient.zip
-
-    - name: Clone plugin hosting repo
-      run: |
-          mkdir LightlessSyncRepo
-          cd LightlessSyncRepo
-          git clone https://github.com/${{ github.repository_owner }}/LightlessSync.git
-      env:
-        GIT_TERMINAL_PROMPT: 0
-
-    - name: Update plogonmaster.json with version
-      shell: pwsh
-      env:
-          VERSION: ${{ steps.package_version.outputs.version }}
-      run: |
-          $pluginJsonPath = "${{ env.PLUGIN_NAME }}/bin/x64/Release/${{ env.PLUGIN_NAME }}.json"
-          $pluginJson = Get-Content $pluginJsonPath | ConvertFrom-Json
-          $repoJsonPath = "LightlessSyncRepo/LightlessSync/plogonmaster.json"
-          $repoJsonRaw = Get-Content $repoJsonPath -Raw
-          $repoJson = $repoJsonRaw | ConvertFrom-Json
-          $version = $env:VERSION
-          $downloadUrl = "https://github.com/${{ github.repository_owner }}/LightlessClient/releases/download/$version/LightlessClient.zip"
-          
-          if (-not ($repoJson -is [System.Collections.IEnumerable])) {
-            $repoJson = @($repoJson)
-          }
-          
-          foreach ($plugin in $repoJson) {
-            if ($plugin.InternalName -eq $pluginJson.InternalName) {
-              $plugin.DalamudApiLevel = $pluginJson.DalamudApiLevel
-              $plugin.AssemblyVersion = $version
-              $plugin.DownloadLinkInstall = $downloadUrl
-              $plugin.DownloadLinkTesting = $downloadUrl
-              $plugin.DownloadLinkUpdate = $downloadUrl
-            }
-          }
-          
-          $repoJson | ConvertTo-Json -Depth 100 | Set-Content $repoJsonPath
-
-          # Convert to JSON and force array brackets if necessary
-          $repoJsonString = $repoJson | ConvertTo-Json -Depth 100
-        
-          # If the output is not an array, wrap it manually
-          if ($repoJsonString.Trim().StartsWith('{')) {
-              $repoJsonString = "[$repoJsonString]"
-          }
-        
-          $repoJsonString | Set-Content $repoJsonPath
-
-    - name: Commit and push to LightlessSync
-      run: |
-          cd LightlessSyncRepo/LightlessSync
-          git config user.name "github-actions"
-          git config user.email "github-actions@github.com"
-          git add .
-          git commit -m "Update ${{ env.PLUGIN_NAME }} to ${{ steps.package_version.outputs.version }}"
-          git push https://x-access-token:${{ secrets.LIGHTLESS_TOKEN }}@github.com/${{ github.repository_owner }}/LightlessSync.git HEAD:main

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "LightlessAPI"]
 	path = LightlessAPI
-	url = https://github.com/Light-Public-Syncshells/LightlessAPI
+	url = https://git.lightless-sync.org/Lightless-Sync/LightlessAPI.git
 [submodule "PenumbraAPI"]
 	path = PenumbraAPI
 	url = https://github.com/Ottermandias/Penumbra.Api.git

LightlessSync/FileCache/CacheMonitor.cs

@@ -20,7 +20,7 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
     private long _currentFileProgress = 0;
     private CancellationTokenSource _scanCancellationTokenSource = new();
     private readonly CancellationTokenSource _periodicCalculationTokenSource = new();
-    public static readonly IImmutableList<string> AllowedFileExtensions = [".mdl", ".tex", ".mtrl", ".tmb", ".pap", ".avfx", ".atex", ".sklb", ".eid", ".phyb", ".pbd", ".scd", ".skp", ".shpk"];
+    public static readonly IImmutableList<string> AllowedFileExtensions = [".mdl", ".tex", ".mtrl", ".tmb", ".pap", ".avfx", ".atex", ".sklb", ".eid", ".phyb", ".pbd", ".scd", ".skp", ".shpk", ".kdb"];
 
     public CacheMonitor(ILogger<CacheMonitor> logger, IpcManager ipcManager, LightlessConfigService configService,
         FileCacheManager fileDbManager, LightlessMediator mediator, PerformanceCollectorService performanceCollector, DalamudUtilService dalamudUtil,
@@ -383,7 +383,7 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
             scanThread.Start();
             while (scanThread.IsAlive)
             {
-                await Task.Delay(250).ConfigureAwait(false);
+                await Task.Delay(250, token).ConfigureAwait(false);
             }
             TotalFiles = 0;
             _currentFileProgress = 0;
@@ -583,7 +583,14 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
                     }
                     catch (Exception ex)
                     {
-                        Logger.LogWarning(ex, "Failed validating {path}", workload.ResolvedFilepath);
+                        if (workload != null)
+                        {
+                            Logger.LogWarning(ex, "Failed validating {path}", workload.ResolvedFilepath);
+                        }
+                        else
+                        {
+                            Logger.LogWarning(ex, "Failed validating unknown workload");
+                        }
                     }
                     Interlocked.Increment(ref _currentFileProgress);
                 }
@@ -612,7 +619,7 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
             return;
         }
 
-        if (entitiesToUpdate.Any() || entitiesToRemove.Any())
+        if (entitiesToUpdate.Count != 0 || entitiesToRemove.Count != 0)
         {
             foreach (var entity in entitiesToUpdate)
             {
@@ -647,6 +654,12 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
                     CancellationToken = ct
                 }, (cachePath) =>
                 {
+                    if (_fileDbManager == null || _ipcManager?.Penumbra == null || cachePath == null)
+                    {
+                        Logger.LogTrace("Potential null in db: {isDbNull} penumbra: {isPenumbraNull} cachepath: {isPathNull}", _fileDbManager == null, _ipcManager?.Penumbra == null, cachePath == null);
+                        return;
+                    }
+
                     if (ct.IsCancellationRequested) return;
 
                     if (!_ipcManager.Penumbra.APIAvailable)

LightlessSync/FileCache/FileCacheManager.cs

@@ -1,4 +1,4 @@
-using K4os.Compression.LZ4.Legacy;
+using K4os.Compression.LZ4.Legacy;
 using LightlessSync.Interop.Ipc;
 using LightlessSync.LightlessConfiguration;
 using LightlessSync.Services.Mediator;
@@ -19,9 +19,10 @@ public sealed class FileCacheManager : IHostedService
     private readonly LightlessConfigService _configService;
     private readonly LightlessMediator _lightlessMediator;
     private readonly string _csvPath;
-    private readonly ConcurrentDictionary<string, List<FileCacheEntity>> _fileCaches = new(StringComparer.Ordinal);
+    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 object _fileWriteLock = new();
+    private readonly Lock _fileWriteLock = new();
     private readonly IpcManager _ipcManager;
     private readonly ILogger<FileCacheManager> _logger;
     public string CacheFolder => _configService.Current.CacheFolder;
@@ -37,15 +38,63 @@ public sealed class FileCacheManager : IHostedService
 
     private string CsvBakPath => _csvPath + ".bak";
 
+    private static string NormalizeSeparators(string path)
+    {
+        return path.Replace("/", "\\", StringComparison.Ordinal)
+            .Replace("\\\\", "\\", StringComparison.Ordinal);
+    }
+
+    private static string NormalizePrefixedPathKey(string prefixedPath)
+    {
+        if (string.IsNullOrEmpty(prefixedPath))
+        {
+            return string.Empty;
+        }
+
+        return NormalizeSeparators(prefixedPath).ToLowerInvariant();
+    }
+
+    private string NormalizeToPrefixedPath(string path)
+    {
+        if (string.IsNullOrEmpty(path)) return string.Empty;
+
+        var normalized = NormalizeSeparators(path);
+
+        if (normalized.StartsWith(CachePrefix, StringComparison.OrdinalIgnoreCase) ||
+            normalized.StartsWith(PenumbraPrefix, StringComparison.OrdinalIgnoreCase))
+        {
+            return NormalizePrefixedPathKey(normalized);
+        }
+
+        var penumbraDir = _ipcManager.Penumbra.ModDirectory;
+        if (!string.IsNullOrEmpty(penumbraDir))
+        {
+            var normalizedPenumbra = NormalizeSeparators(penumbraDir);
+            var replacement = normalizedPenumbra.EndsWith("\\", StringComparison.Ordinal)
+                ? PenumbraPrefix + "\\"
+                : PenumbraPrefix;
+            normalized = normalized.Replace(normalizedPenumbra, replacement, StringComparison.OrdinalIgnoreCase);
+        }
+
+        var cacheFolder = _configService.Current.CacheFolder;
+        if (!string.IsNullOrEmpty(cacheFolder))
+        {
+            var normalizedCache = NormalizeSeparators(cacheFolder);
+            var replacement = normalizedCache.EndsWith("\\", StringComparison.Ordinal)
+                ? CachePrefix + "\\"
+                : CachePrefix;
+            normalized = normalized.Replace(normalizedCache, replacement, StringComparison.OrdinalIgnoreCase);
+        }
+
+        return NormalizePrefixedPathKey(normalized);
+    }
+
     public FileCacheEntity? CreateCacheEntry(string path)
     {
         FileInfo fi = new(path);
         if (!fi.Exists) return null;
         _logger.LogTrace("Creating cache entry for {path}", path);
-        var fullName = fi.FullName.ToLowerInvariant();
+        return CreateFileEntity(_configService.Current.CacheFolder.ToLowerInvariant(), CachePrefix, fi);
-        if (!fullName.Contains(_configService.Current.CacheFolder.ToLowerInvariant(), StringComparison.Ordinal)) return null;
-        string prefixedPath = fullName.Replace(_configService.Current.CacheFolder.ToLowerInvariant(), CachePrefix + "\\", StringComparison.Ordinal).Replace("\\\\", "\\", StringComparison.Ordinal);
-        return CreateFileCacheEntity(fi, prefixedPath);
     }
 
     public FileCacheEntity? CreateFileEntry(string path)
@@ -53,26 +102,37 @@ public sealed class FileCacheManager : IHostedService
         FileInfo fi = new(path);
         if (!fi.Exists) return null;
         _logger.LogTrace("Creating file entry for {path}", path);
+        return CreateFileEntity(_ipcManager.Penumbra.ModDirectory!.ToLowerInvariant(), PenumbraPrefix, fi);
+    }
+
+    private FileCacheEntity? CreateFileEntity(string directory, string prefix, FileInfo fi)
+    {
         var fullName = fi.FullName.ToLowerInvariant();
-        if (!fullName.Contains(_ipcManager.Penumbra.ModDirectory!.ToLowerInvariant(), StringComparison.Ordinal)) return null;
+        if (!fullName.Contains(directory, StringComparison.Ordinal)) return null;
-        string prefixedPath = fullName.Replace(_ipcManager.Penumbra.ModDirectory!.ToLowerInvariant(), PenumbraPrefix + "\\", StringComparison.Ordinal).Replace("\\\\", "\\", StringComparison.Ordinal);
+        string prefixedPath = fullName.Replace(directory, prefix + "\\", StringComparison.Ordinal).Replace("\\\\", "\\", StringComparison.Ordinal);
         return CreateFileCacheEntity(fi, prefixedPath);
     }
 
-    public List<FileCacheEntity> GetAllFileCaches() => _fileCaches.Values.SelectMany(v => v).ToList();
+    public List<FileCacheEntity> GetAllFileCaches() => _fileCaches.Values.SelectMany(v => v.Values.Where(e => e != null)).ToList();
 
     public List<FileCacheEntity> GetAllFileCachesByHash(string hash, bool ignoreCacheEntries = false, bool validate = true)
     {
         List<FileCacheEntity> output = [];
         if (_fileCaches.TryGetValue(hash, out var fileCacheEntities))
         {
-            foreach (var fileCache in fileCacheEntities.Where(c => ignoreCacheEntries ? !c.IsCacheEntry : true).ToList())
+            foreach (var fileCache in fileCacheEntities.Values.Where(c => !ignoreCacheEntries || !c.IsCacheEntry).ToList())
             {
-                if (!validate) output.Add(fileCache);
+                if (!validate)
+                {
+                    output.Add(fileCache);
+                }
                 else
                 {
                     var validated = GetValidatedFileCache(fileCache);
-                    if (validated != null) output.Add(validated);
+                    if (validated != null)
+                    {
+                        output.Add(validated);
+                    }
                 }
             }
         }
@@ -84,7 +144,7 @@ public sealed class FileCacheManager : IHostedService
     {
         _lightlessMediator.Publish(new HaltScanMessage(nameof(ValidateLocalIntegrity)));
         _logger.LogInformation("Validating local storage");
-        var cacheEntries = _fileCaches.SelectMany(v => v.Value).Where(v => v.IsCacheEntry).ToList();
+        var cacheEntries = _fileCaches.Values.SelectMany(v => v.Values.Where(e => e != null)).Where(v => v.IsCacheEntry).ToList();
         List<FileCacheEntity> brokenEntities = [];
         int i = 0;
         foreach (var fileCache in cacheEntries)
@@ -106,7 +166,7 @@ public sealed class FileCacheManager : IHostedService
                 var computedHash = Crypto.GetFileHash(fileCache.ResolvedFilepath);
                 if (!string.Equals(computedHash, fileCache.Hash, StringComparison.Ordinal))
                 {
-                    _logger.LogInformation("Failed to validate {file}, got hash {hash}, expected hash {hash}", fileCache.ResolvedFilepath, computedHash, fileCache.Hash);
+                    _logger.LogInformation("Failed to validate {file}, got hash {computedHash}, expected hash {hash}", fileCache.ResolvedFilepath, computedHash, fileCache.Hash);
                     brokenEntities.Add(fileCache);
                 }
             }
@@ -149,29 +209,40 @@ public sealed class FileCacheManager : IHostedService
 
     public FileCacheEntity? GetFileCacheByHash(string hash)
     {
-        if (_fileCaches.TryGetValue(hash, out var hashes))
+        if (_fileCaches.TryGetValue(hash, out var entries))
         {
-            var item = hashes.OrderBy(p => p.PrefixedFilePath.Contains(PenumbraPrefix) ? 0 : 1).FirstOrDefault();
+            var item = entries.Values
-            if (item != null) return GetValidatedFileCache(item);
+                .OrderBy(p => p.PrefixedFilePath.Contains(PenumbraPrefix, StringComparison.Ordinal) ? 0 : 1)
+                .FirstOrDefault();
+            if (item != null)
+            {
+                return GetValidatedFileCache(item);
+            }
         }
         return null;
     }
 
     private FileCacheEntity? GetFileCacheByPath(string path)
     {
-        var cleanedPath = path.Replace("/", "\\", StringComparison.OrdinalIgnoreCase).ToLowerInvariant()
+        var normalizedPrefixedPath = NormalizeToPrefixedPath(path);
-            .Replace(_ipcManager.Penumbra.ModDirectory!.ToLowerInvariant(), "", StringComparison.OrdinalIgnoreCase);
+        if (string.IsNullOrEmpty(normalizedPrefixedPath))
-        var entry = _fileCaches.SelectMany(v => v.Value).FirstOrDefault(f => f.ResolvedFilepath.EndsWith(cleanedPath, StringComparison.OrdinalIgnoreCase));
-
-        if (entry == null)
         {
-            _logger.LogDebug("Found no entries for {path}", cleanedPath);
+            return null;
-            return CreateFileEntry(path);
         }
 
-        var validatedCacheEntry = GetValidatedFileCache(entry);
+        if (_fileCachesByPrefixedPath.TryGetValue(normalizedPrefixedPath, out var entry))
+        {
+            return GetValidatedFileCache(entry);
+        }
 
-        return validatedCacheEntry;
+        _logger.LogDebug("Found no entries for {path}", normalizedPrefixedPath);
+
+        if (normalizedPrefixedPath.Contains(CachePrefix, StringComparison.Ordinal))
+        {
+            return CreateCacheEntry(path);
+        }
+
+        return CreateFileEntry(path) ?? CreateCacheEntry(path);
     }
 
     public Dictionary<string, FileCacheEntity?> GetFileCachesByPaths(string[] paths)
@@ -180,34 +251,52 @@ public sealed class FileCacheManager : IHostedService
 
         try
         {
-            var cleanedPaths = paths.Distinct(StringComparer.OrdinalIgnoreCase).ToDictionary(p => p,
+            var result = new Dictionary<string, FileCacheEntity?>(StringComparer.OrdinalIgnoreCase);
-                p => p.Replace("/", "\\", StringComparison.OrdinalIgnoreCase)
+            var seenNormalized = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-                    .Replace(_ipcManager.Penumbra.ModDirectory!, _ipcManager.Penumbra.ModDirectory!.EndsWith('\\') ? PenumbraPrefix + '\\' : PenumbraPrefix, StringComparison.OrdinalIgnoreCase)
-                    .Replace(_configService.Current.CacheFolder, _configService.Current.CacheFolder.EndsWith('\\') ? CachePrefix + '\\' : CachePrefix, StringComparison.OrdinalIgnoreCase)
-                    .Replace("\\\\", "\\", StringComparison.Ordinal),
-                StringComparer.OrdinalIgnoreCase);
 
-            Dictionary<string, FileCacheEntity?> result = new(StringComparer.OrdinalIgnoreCase);
+            foreach (var originalPath in paths)
-
-            var dict = _fileCaches.SelectMany(f => f.Value)
-                .ToDictionary(d => d.PrefixedFilePath, d => d, StringComparer.OrdinalIgnoreCase);
-
-            foreach (var entry in cleanedPaths)
             {
-                //_logger.LogDebug("Checking {path}", entry.Value);
+                if (string.IsNullOrEmpty(originalPath))
-
-                if (dict.TryGetValue(entry.Value, out var entity))
                 {
-                    var validatedCache = GetValidatedFileCache(entity);
+                    result[originalPath] = null;
-                    result.Add(entry.Key, validatedCache);
+                    continue;
+                }
+
+                var normalized = NormalizeToPrefixedPath(originalPath);
+                if (seenNormalized.Add(normalized))
+                {
+                    if (!string.IsNullOrEmpty(normalized))
+                    {
+                        _logger.LogDebug("Normalized path {cleaned}", normalized);
+                    }
+                }
+                else if (!string.IsNullOrEmpty(normalized))
+                {
+                    _logger.LogWarning("Duplicate normalized path detected: {cleaned}", normalized);
+                }
+
+                if (_fileCachesByPrefixedPath.TryGetValue(normalized, out var entity))
+                {
+                    result[originalPath] = GetValidatedFileCache(entity);
+                    continue;
+                }
+
+                FileCacheEntity? created = null;
+
+                if (normalized.Contains(CachePrefix, StringComparison.Ordinal))
+                {
+                    created = CreateCacheEntry(originalPath);
+                }
+                else if (normalized.Contains(PenumbraPrefix, StringComparison.Ordinal))
+                {
+                    created = CreateFileEntry(originalPath);
                 }
                 else
                 {
-                    if (!entry.Value.Contains(CachePrefix, StringComparison.Ordinal))
+                    created = CreateFileEntry(originalPath) ?? CreateCacheEntry(originalPath);
-                        result.Add(entry.Key, CreateFileEntry(entry.Key));
-                    else
-                        result.Add(entry.Key, CreateCacheEntry(entry.Key));
                 }
+
+                result[originalPath] = created;
             }
 
             return result;
@@ -220,16 +309,24 @@ public sealed class FileCacheManager : IHostedService
 
     public void RemoveHashedFile(string hash, string prefixedFilePath)
     {
+        var normalizedPath = NormalizePrefixedPathKey(prefixedFilePath);
+
         if (_fileCaches.TryGetValue(hash, out var caches))
         {
-            var removedCount = caches?.RemoveAll(c => string.Equals(c.PrefixedFilePath, prefixedFilePath, StringComparison.Ordinal));
+            _logger.LogTrace("Removing from DB: {hash} => {path}", hash, prefixedFilePath);
-            _logger.LogTrace("Removed from DB: {count} file(s) with hash {hash} and file cache {path}", removedCount, hash, prefixedFilePath);
 
-            if (caches?.Count == 0)
+            if (caches.TryRemove(normalizedPath, out var removedEntity))
             {
-                _fileCaches.Remove(hash, out var entity);
+                _logger.LogTrace("Removed from DB: {hash} => {path}", hash, removedEntity.PrefixedFilePath);
+            }
+
+            if (caches.IsEmpty)
+            {
+                _fileCaches.TryRemove(hash, out _);
             }
         }
+
+        _fileCachesByPrefixedPath.TryRemove(normalizedPath, out _);
     }
 
     public void UpdateHashedFile(FileCacheEntity fileCache, bool computeProperties = true)
@@ -270,7 +367,7 @@ public sealed class FileCacheManager : IHostedService
         lock (_fileWriteLock)
         {
             StringBuilder sb = new();
-            foreach (var entry in _fileCaches.SelectMany(k => k.Value).OrderBy(f => f.PrefixedFilePath, StringComparer.OrdinalIgnoreCase))
+            foreach (var entry in _fileCaches.Values.SelectMany(k => k.Values).OrderBy(f => f.PrefixedFilePath, StringComparer.OrdinalIgnoreCase))
             {
                 sb.AppendLine(entry.CsvEntry);
             }
@@ -315,16 +412,11 @@ public sealed class FileCacheManager : IHostedService
 
     private void AddHashedFile(FileCacheEntity fileCache)
     {
-        if (!_fileCaches.TryGetValue(fileCache.Hash, out var entries) || entries is null)
+        var normalizedPath = NormalizePrefixedPathKey(fileCache.PrefixedFilePath);
-        {
+        var entries = _fileCaches.GetOrAdd(fileCache.Hash, _ => new ConcurrentDictionary<string, FileCacheEntity>(StringComparer.OrdinalIgnoreCase));
-            _fileCaches[fileCache.Hash] = entries = [];
-        }
 
-        if (!entries.Exists(u => string.Equals(u.PrefixedFilePath, fileCache.PrefixedFilePath, StringComparison.OrdinalIgnoreCase)))
+        entries[normalizedPath] = fileCache;
-        {
+        _fileCachesByPrefixedPath[normalizedPath] = fileCache;
-            //_logger.LogTrace("Adding to DB: {hash} => {path}", fileCache.Hash, fileCache.PrefixedFilePath);
-            entries.Add(fileCache);
-        }
     }
 
     private FileCacheEntity? CreateFileCacheEntity(FileInfo fileInfo, string prefixedPath, string? hash = null)
@@ -366,6 +458,12 @@ public sealed class FileCacheManager : IHostedService
 
     private FileCacheEntity? Validate(FileCacheEntity fileCache)
     {
+        if (string.IsNullOrWhiteSpace(fileCache.ResolvedFilepath))
+        {
+            _logger.LogWarning("FileCacheEntity has empty ResolvedFilepath for hash {hash}, prefixed path {prefixed}", fileCache.Hash, fileCache.PrefixedFilePath);
+            RemoveHashedFile(fileCache.Hash, fileCache.PrefixedFilePath);
+            return null;
+        }
         var file = new FileInfo(fileCache.ResolvedFilepath);
         if (!file.Exists)
         {
@@ -439,7 +537,7 @@ public sealed class FileCacheManager : IHostedService
                 {
                     attempts++;
                     _logger.LogWarning(ex, "Could not open {file}, trying again", _csvPath);
-                    Thread.Sleep(100);
+                    Task.Delay(100, cancellationToken);
                 }
             }
 

LightlessSync/FileCache/TransientResourceManager.cs

@@ -17,7 +17,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
     private readonly HashSet<string> _cachedHandledPaths = new(StringComparer.Ordinal);
     private readonly TransientConfigService _configurationService;
     private readonly DalamudUtilService _dalamudUtil;
-    private readonly string[] _handledFileTypes = ["tmb", "pap", "avfx", "atex", "sklb", "eid", "phyb", "scd", "skp", "shpk"];
+    private readonly string[] _handledFileTypes = ["tmb", "pap", "avfx", "atex", "sklb", "eid", "phyb", "scd", "skp", "shpk", "kdb"];
     private readonly string[] _handledRecordingFileTypes = ["tex", "mdl", "mtrl"];
     private readonly HashSet<GameObjectHandler> _playerRelatedPointers = [];
     private ConcurrentDictionary<IntPtr, ObjectKind> _cachedFrameAddresses = [];

LightlessSync/Interop/Ipc/IpcCallerMoodles.cs

@@ -27,9 +27,9 @@ public sealed class IpcCallerMoodles : IIpcCaller
 
         _moodlesApiVersion = pi.GetIpcSubscriber<int>("Moodles.Version");
         _moodlesOnChange = pi.GetIpcSubscriber<IPlayerCharacter, object>("Moodles.StatusManagerModified");
-        _moodlesGetStatus = pi.GetIpcSubscriber<nint, string>("Moodles.GetStatusManagerByPtr");
+        _moodlesGetStatus = pi.GetIpcSubscriber<nint, string>("Moodles.GetStatusManagerByPtrV2");
-        _moodlesSetStatus = pi.GetIpcSubscriber<nint, string, object>("Moodles.SetStatusManagerByPtr");
+        _moodlesSetStatus = pi.GetIpcSubscriber<nint, string, object>("Moodles.SetStatusManagerByPtrV2");
-        _moodlesRevertStatus = pi.GetIpcSubscriber<nint, object>("Moodles.ClearStatusManagerByPtr");
+        _moodlesRevertStatus = pi.GetIpcSubscriber<nint, object>("Moodles.ClearStatusManagerByPtrV2");
 
         _moodlesOnChange.Subscribe(OnMoodlesChange);
 
@@ -47,7 +47,7 @@ public sealed class IpcCallerMoodles : IIpcCaller
     {
         try
         {
-            APIAvailable = _moodlesApiVersion.InvokeFunc() == 1;
+            APIAvailable = _moodlesApiVersion.InvokeFunc() == 3;
         }
         catch
         {

LightlessSync/Interop/Ipc/IpcCallerPetNames.cs

@@ -30,12 +30,12 @@ public sealed class IpcCallerPetNames : IIpcCaller
         _dalamudUtil = dalamudUtil;
         _lightlessMediator = lightlessMediator;
 
-        _petnamesReady = pi.GetIpcSubscriber<object>("PetRenamer.Ready");
+        _petnamesReady = pi.GetIpcSubscriber<object>("PetRenamer.OnReady");
-        _petnamesDisposing = pi.GetIpcSubscriber<object>("PetRenamer.Disposing");
+        _petnamesDisposing = pi.GetIpcSubscriber<object>("PetRenamer.OnDisposing");
         _apiVersion = pi.GetIpcSubscriber<(uint, uint)>("PetRenamer.ApiVersion");
-        _enabled = pi.GetIpcSubscriber<bool>("PetRenamer.Enabled");
+        _enabled = pi.GetIpcSubscriber<bool>("PetRenamer.IsEnabled");
 
-        _playerDataChanged = pi.GetIpcSubscriber<string, object>("PetRenamer.PlayerDataChanged");
+        _playerDataChanged = pi.GetIpcSubscriber<string, object>("PetRenamer.OnPlayerDataChanged");
         _getPlayerData = pi.GetIpcSubscriber<string>("PetRenamer.GetPlayerData");
         _setPlayerData = pi.GetIpcSubscriber<string, object>("PetRenamer.SetPlayerData");
         _clearPlayerData = pi.GetIpcSubscriber<ushort, object>("PetRenamer.ClearPlayerData");
@@ -56,7 +56,7 @@ public sealed class IpcCallerPetNames : IIpcCaller
             APIAvailable = _enabled?.InvokeFunc() ?? false;
             if (APIAvailable)
             {
-                APIAvailable = _apiVersion?.InvokeFunc() is { Item1: 3, Item2: >= 1 };
+                APIAvailable = _apiVersion?.InvokeFunc() is { Item1: 4, Item2: >= 0 };
             }
         }
         catch

LightlessSync/LightlessConfiguration/Configurations/LightlessConfig.cs

@@ -1,4 +1,6 @@
-using LightlessSync.LightlessConfiguration.Models;
+using Dalamud.Game.Text;
+using LightlessSync.UtilsEnum.Enum;
+using LightlessSync.LightlessConfiguration.Models;
 using LightlessSync.UI;
 using Microsoft.Extensions.Logging;
 
@@ -15,10 +17,12 @@ public class LightlessConfig : ILightlessConfiguration
     public bool PreferNoteInDtrTooltip { get; set; } = false;
     public bool IsNameplateColorsEnabled { get; set; } = false;
     public DtrEntry.Colors NameplateColors { get; set; } = new(Foreground: 0xE69138u, Glow: 0xFFBA47u);
+    public Dictionary<string, string> CustomUIColors { get; set; } = new(StringComparer.OrdinalIgnoreCase);
     public bool UseColorsInDtr { get; set; } = true;
     public DtrEntry.Colors DtrColorsDefault { get; set; } = default;
     public DtrEntry.Colors DtrColorsNotConnected { get; set; } = new(Glow: 0x0428FFu);
     public DtrEntry.Colors DtrColorsPairsInRange { get; set; } = new(Glow: 0xFFBA47u);
+    public bool UseLightlessRedesign { get; set; } = true;
     public bool EnableRightClickMenus { get; set; } = true;
     public NotificationLocation ErrorNotification { get; set; } = NotificationLocation.Both;
     public string ExportFolder { get; set; } = string.Empty;
@@ -31,6 +35,9 @@ public class LightlessConfig : ILightlessConfiguration
     public bool OpenGposeImportOnGposeStart { get; set; } = false;
     public bool OpenPopupOnAdd { get; set; } = true;
     public int ParallelDownloads { get; set; } = 10;
+    public int ParallelUploads { get; set; } = 8;
+    public bool EnablePairProcessingLimiter { get; set; } = true;
+    public int MaxConcurrentPairApplications { get; set; } = 3;
     public int DownloadSpeedLimitInBytes { get; set; } = 0;
     public DownloadSpeeds DownloadSpeedType { get; set; } = DownloadSpeeds.MBps;
     public bool PreferNotesOverNamesForVisible { get; set; } = false;
@@ -42,6 +49,7 @@ public class LightlessConfig : ILightlessConfiguration
     public bool ShowCharacterNameInsteadOfNotesForVisible { get; set; } = false;
     public bool ShowOfflineUsersSeparately { get; set; } = true;
     public bool ShowSyncshellOfflineUsersSeparately { get; set; } = true;
+    public bool ShowGroupedSyncshellsInAll { get; set; } = true;
     public bool GroupUpSyncshells { get; set; } = true;
     public bool ShowOnlineNotifications { get; set; } = false;
     public bool ShowOnlineNotificationsOnlyForIndividualPairs { get; set; } = true;
@@ -64,4 +72,19 @@ public class LightlessConfig : ILightlessConfiguration
     public bool UseFocusTarget { get; set; } = false;
     public bool overrideFriendColor { get; set; } = false;
     public bool overridePartyColor { get; set; } = false;
-}
+    public bool overrideFcTagColor { get; set; } = false;
+    public bool useColoredUIDs { get; set; } = true;
+    public bool BroadcastEnabled { get; set; } = false;
+    public short LightfinderLabelOffsetX { get; set; } = 0;
+    public short LightfinderLabelOffsetY { get; set; } = 0;
+    public bool LightfinderLabelUseIcon { get; set; } = false;
+    public bool LightfinderLabelShowOwn { get; set; } = true;
+    public bool LightfinderLabelShowPaired { get; set; } = true;
+    public string LightfinderLabelIconGlyph { get; set; } = SeIconCharExtensions.ToIconString(SeIconChar.Hyadelyn);
+    public float LightfinderLabelScale { get; set; } = 1.0f;
+    public bool LightfinderAutoAlign { get; set; } = true;
+    public LabelAlignment LabelAlignment { get; set; } = LabelAlignment.Left;
+    public DateTime BroadcastTtl { get; set; } = DateTime.MinValue;
+    public bool SyncshellFinderEnabled { get; set; } = false;
+    public string? SelectedFinderSyncshell { get; set; } = null;
+}

LightlessSync/LightlessConfiguration/Configurations/PairTagStorage.cs

@@ -0,0 +1,7 @@
+namespace LightlessSync.LightlessConfiguration.Configurations;
+
+public class PairTagStorage : ILightlessConfiguration
+{
+    public Dictionary<string, Models.PairTagStorage> ServerTagStorage { get; set; } = new(StringComparer.OrdinalIgnoreCase);
+    public int Version { get; set; } = 0;
+}

LightlessSync/LightlessConfiguration/Configurations/PlayerPerformanceConfig.cs

@@ -13,4 +13,7 @@ public class PlayerPerformanceConfig : ILightlessConfiguration
     public int VRAMSizeAutoPauseThresholdMiB { get; set; } = 550;
     public int TrisAutoPauseThresholdThousands { get; set; } = 250;
     public List<string> UIDsToIgnore { get; set; } = new();
+    public bool PauseInInstanceDuty { get; set; } = false;
+    public bool PauseWhilePerforming { get; set; } = true;
+    public bool PauseInCombat { get; set; } = true;
 }

LightlessSync/LightlessConfiguration/Configurations/SyncshellTagStorage.cs

@@ -0,0 +1,7 @@
+namespace LightlessSync.LightlessConfiguration.Configurations;
+
+public class SyncshellTagStorage : ILightlessConfiguration
+{
+    public Dictionary<string, Models.SyncshellTagStorage> ServerTagStorage { get; set; } = new(StringComparer.OrdinalIgnoreCase);
+    public int Version { get; set; } = 0;
+}

LightlessSync/LightlessConfiguration/Models/PairTagStorage.cs

@@ -0,0 +1,9 @@
+namespace LightlessSync.LightlessConfiguration.Models;
+
+[Serializable]
+public class PairTagStorage
+{
+    public HashSet<string> OpenPairTags { get; set; } = new(StringComparer.Ordinal);
+    public HashSet<string> ServerAvailablePairTags { get; set; } = new(StringComparer.Ordinal);
+    public Dictionary<string, List<string>> UidServerPairedUserTags { get; set; } = new(StringComparer.Ordinal);
+}

LightlessSync/LightlessConfiguration/Models/SyncshellTagStorage.cs

@@ -0,0 +1,8 @@
+namespace LightlessSync.LightlessConfiguration.Models;
+
+[Serializable]
+public class SyncshellTagStorage
+{
+    public HashSet<string> ServerAvailableSyncshellTags { get; set; } = new(StringComparer.Ordinal);
+    public Dictionary<string, List<string>> SyncshellPairedTags { get; set; } = new(StringComparer.Ordinal);
+}

LightlessSync/LightlessConfiguration/PairTagConfigService.cs

@@ -0,0 +1,14 @@
+using LightlessSync.LightlessConfiguration.Configurations;
+
+namespace LightlessSync.LightlessConfiguration;
+
+public class PairTagConfigService : ConfigurationServiceBase<PairTagStorage>
+{
+    public const string ConfigName = "servertags.json";
+
+    public PairTagConfigService(string configDir) : base(configDir)
+    {
+    }
+
+    public override string ConfigurationName => ConfigName;
+}

LightlessSync/LightlessConfiguration/SyncshellTagConfigService.cs

@@ -0,0 +1,14 @@
+using LightlessSync.LightlessConfiguration.Configurations;
+
+namespace LightlessSync.LightlessConfiguration;
+
+public class SyncshellTagConfigService : ConfigurationServiceBase<SyncshellTagStorage>
+{
+    public const string ConfigName = "syncshelltags.json";
+
+    public SyncshellTagConfigService(string configDir) : base(configDir)
+    {
+    }
+
+    public override string ConfigurationName => ConfigName;
+}

LightlessSync/LightlessPlugin.cs

@@ -1,10 +1,11 @@
-using LightlessSync.FileCache;
+using LightlessSync.FileCache;
 using LightlessSync.LightlessConfiguration;
 using LightlessSync.PlayerData.Pairs;
 using LightlessSync.PlayerData.Services;
 using LightlessSync.Services;
 using LightlessSync.Services.Mediator;
 using LightlessSync.Services.ServerConfiguration;
+using LightlessSync.UI;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -98,6 +99,7 @@ public class LightlessPlugin : MediatorSubscriberBase, IHostedService
         Mediator.Subscribe<DalamudLoginMessage>(this, (_) => DalamudUtilOnLogIn());
         Mediator.Subscribe<DalamudLogoutMessage>(this, (_) => DalamudUtilOnLogOut());
 
+        UIColors.Initialize(_lightlessConfigService);
         Mediator.StartQueueProcessing();
 
         return Task.CompletedTask;

LightlessSync/LightlessSync.csproj

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Dalamud.NET.Sdk/13.0.0">
+<Project Sdk="Dalamud.NET.Sdk/13.1.0">
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>1.11.3</Version>
+    <Version>1.12.1-beta.1</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Light-Public-Syncshells/LightlessClient</PackageProjectUrl>

LightlessSync/PlayerData/Factories/PairHandlerFactory.cs

@@ -1,4 +1,4 @@
-using LightlessSync.FileCache;
+using LightlessSync.FileCache;
 using LightlessSync.Interop.Ipc;
 using LightlessSync.PlayerData.Handlers;
 using LightlessSync.PlayerData.Pairs;
@@ -21,6 +21,7 @@ public class PairHandlerFactory
     private readonly ILoggerFactory _loggerFactory;
     private readonly LightlessMediator _lightlessMediator;
     private readonly PlayerPerformanceService _playerPerformanceService;
+    private readonly PairProcessingLimiter _pairProcessingLimiter;
     private readonly ServerConfigurationManager _serverConfigManager;
     private readonly PluginWarningNotificationService _pluginWarningNotificationManager;
 
@@ -28,6 +29,7 @@ public class PairHandlerFactory
         FileDownloadManagerFactory fileDownloadManagerFactory, DalamudUtilService dalamudUtilService,
         PluginWarningNotificationService pluginWarningNotificationManager, IHostApplicationLifetime hostApplicationLifetime,
         FileCacheManager fileCacheManager, LightlessMediator lightlessMediator, PlayerPerformanceService playerPerformanceService,
+        PairProcessingLimiter pairProcessingLimiter,
         ServerConfigurationManager serverConfigManager)
     {
         _loggerFactory = loggerFactory;
@@ -40,6 +42,7 @@ public class PairHandlerFactory
         _fileCacheManager = fileCacheManager;
         _lightlessMediator = lightlessMediator;
         _playerPerformanceService = playerPerformanceService;
+        _pairProcessingLimiter = pairProcessingLimiter;
         _serverConfigManager = serverConfigManager;
     }
 
@@ -47,6 +50,6 @@ public class PairHandlerFactory
     {
         return new PairHandler(_loggerFactory.CreateLogger<PairHandler>(), pair, _gameObjectHandlerFactory,
             _ipcManager, _fileDownloadManagerFactory.Create(), _pluginWarningNotificationManager, _dalamudUtilService, _hostApplicationLifetime,
-            _fileCacheManager, _lightlessMediator, _playerPerformanceService, _serverConfigManager);
+            _fileCacheManager, _lightlessMediator, _playerPerformanceService, _pairProcessingLimiter, _serverConfigManager);
     }
 }

LightlessSync/PlayerData/Handlers/PairHandler.cs

@@ -1,4 +1,4 @@
-using LightlessSync.API.Data;
+using LightlessSync.API.Data;
 using LightlessSync.FileCache;
 using LightlessSync.Interop.Ipc;
 using LightlessSync.PlayerData.Factories;
@@ -28,6 +28,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
     private readonly IpcManager _ipcManager;
     private readonly IHostApplicationLifetime _lifetime;
     private readonly PlayerPerformanceService _playerPerformanceService;
+    private readonly PairProcessingLimiter _pairProcessingLimiter;
     private readonly ServerConfigurationManager _serverConfigManager;
     private readonly PluginWarningNotificationService _pluginWarningNotificationManager;
     private CancellationTokenSource? _applicationCancellationTokenSource = new();
@@ -50,6 +51,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
         DalamudUtilService dalamudUtil, IHostApplicationLifetime lifetime,
         FileCacheManager fileDbManager, LightlessMediator mediator,
         PlayerPerformanceService playerPerformanceService,
+        PairProcessingLimiter pairProcessingLimiter,
         ServerConfigurationManager serverConfigManager) : base(logger, mediator)
     {
         Pair = pair;
@@ -61,6 +63,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
         _lifetime = lifetime;
         _fileDbManager = fileDbManager;
         _playerPerformanceService = playerPerformanceService;
+        _pairProcessingLimiter = pairProcessingLimiter;
         _serverConfigManager = serverConfigManager;
         _penumbraCollection = _ipcManager.Penumbra.CreateTemporaryCollectionAsync(logger, Pair.UserData.UID).ConfigureAwait(false).GetAwaiter().GetResult();
 
@@ -88,20 +91,30 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
                 _redrawOnNextApplication = true;
             }
         });
-        Mediator.Subscribe<CombatOrPerformanceEndMessage>(this, (msg) =>
+        Mediator.Subscribe<CombatEndMessage>(this, (msg) =>
         {
-            if (IsVisible && _dataReceivedInDowntime != null)
+            EnableSync();
-            {
-                ApplyCharacterData(_dataReceivedInDowntime.ApplicationId,
-                    _dataReceivedInDowntime.CharacterData, _dataReceivedInDowntime.Forced);
-                _dataReceivedInDowntime = null;
-            }
         });
-        Mediator.Subscribe<CombatOrPerformanceStartMessage>(this, _ =>
+        Mediator.Subscribe<CombatStartMessage>(this, _ =>
         {
-            _dataReceivedInDowntime = null;
+            DisableSync();
-            _downloadCancellationTokenSource = _downloadCancellationTokenSource?.CancelRecreate();
+        });
-            _applicationCancellationTokenSource = _applicationCancellationTokenSource?.CancelRecreate();
+        Mediator.Subscribe<PerformanceEndMessage>(this, (msg) =>
+        {
+            EnableSync();
+        });
+        Mediator.Subscribe<PerformanceStartMessage>(this, _ =>
+        {
+            DisableSync();
+        });
+        Mediator.Subscribe<InstanceOrDutyStartMessage>(this, _ =>
+        {
+           DisableSync();
+        });
+        Mediator.Subscribe<InstanceOrDutyEndMessage>(this, (msg) =>
+        {
+           EnableSync();
+
         });
 
         LastAppliedDataBytes = -1;
@@ -135,11 +148,31 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
 
     public void ApplyCharacterData(Guid applicationBase, CharacterData characterData, bool forceApplyCustomization = false)
     {
-        if (_dalamudUtil.IsInCombatOrPerforming)
+        if (_dalamudUtil.IsInCombat)
         {
             Mediator.Publish(new EventMessage(new Event(PlayerName, Pair.UserData, nameof(PairHandler), EventSeverity.Warning,
-                "Cannot apply character data: you are in combat or performing music, deferring application")));
+                "Cannot apply character data: you are in combat, deferring application")));
-            Logger.LogDebug("[BASE-{appBase}] Received data but player is in combat or performing", applicationBase);
+            Logger.LogDebug("[BASE-{appBase}] Received data but player is in combat", applicationBase);
+            _dataReceivedInDowntime = new(applicationBase, characterData, forceApplyCustomization);
+            SetUploading(isUploading: false);
+            return;
+        }
+
+        if (_dalamudUtil.IsPerforming)
+        {
+            Mediator.Publish(new EventMessage(new Event(PlayerName, Pair.UserData, nameof(PairHandler), EventSeverity.Warning,
+                "Cannot apply character data: you are performing music, deferring application")));
+            Logger.LogDebug("[BASE-{appBase}] Received data but player is performing", applicationBase);
+            _dataReceivedInDowntime = new(applicationBase, characterData, forceApplyCustomization);
+            SetUploading(isUploading: false);
+            return;
+        }
+
+        if (_dalamudUtil.IsInInstance)
+        {
+            Mediator.Publish(new EventMessage(new Event(PlayerName, Pair.UserData, nameof(PairHandler), EventSeverity.Warning,
+                "Cannot apply character data: you are in an instance, deferring application")));
+            Logger.LogDebug("[BASE-{appBase}] Received data but player is in instance", applicationBase);
             _dataReceivedInDowntime = new(applicationBase, characterData, forceApplyCustomization);
             SetUploading(isUploading: false);
             return;
@@ -390,6 +423,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
     private async Task DownloadAndApplyCharacterAsync(Guid applicationBase, CharacterData charaData, Dictionary<ObjectKind, HashSet<PlayerChanges>> updatedData,
         bool updateModdedPaths, bool updateManip, CancellationToken downloadToken)
     {
+        await using var concurrencyLease = await _pairProcessingLimiter.AcquireAsync(downloadToken).ConfigureAwait(false);
         Dictionary<(string GamePath, string? Hash), string> moddedPaths = [];
 
         if (updateModdedPaths)
@@ -707,6 +741,11 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
                 }
             }
         }
+        catch (OperationCanceledException)
+        {
+            Logger.LogTrace("[BASE-{appBase}] Modded path calculation cancelled", applicationBase);
+            throw;
+        }
         catch (Exception ex)
         {
             Logger.LogError(ex, "[BASE-{appBase}] Something went wrong during calculation replacements", applicationBase);
@@ -716,4 +755,21 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
         Logger.LogDebug("[BASE-{appBase}] ModdedPaths calculated in {time}ms, missing files: {count}, total files: {total}", applicationBase, st.ElapsedMilliseconds, missingFiles.Count, moddedDictionary.Keys.Count);
         return [.. missingFiles];
     }
-}
+
+    private void DisableSync()
+    {
+        _dataReceivedInDowntime = null;
+        _downloadCancellationTokenSource = _downloadCancellationTokenSource?.CancelRecreate();
+        _applicationCancellationTokenSource = _applicationCancellationTokenSource?.CancelRecreate();
+    }
+
+    private void EnableSync()
+    {
+        if (IsVisible && _dataReceivedInDowntime != null)
+        {
+            ApplyCharacterData(_dataReceivedInDowntime.ApplicationId,
+                _dataReceivedInDowntime.CharacterData, _dataReceivedInDowntime.Forced);
+            _dataReceivedInDowntime = null;
+        }
+    }
+}

LightlessSync/PlayerData/Pairs/Pair.cs

@@ -72,8 +72,8 @@ public class Pair
             Name = openProfileSeString,
             OnClicked = (a) => _mediator.Publish(new ProfileOpenStandaloneMessage(this)),
             UseDefaultPrefix = false,
-            PrefixChar = 'M',
+            PrefixChar = 'L',
-            PrefixColor = 526
+            PrefixColor = 708
         });
 
         args.AddMenuItem(new MenuItem()
@@ -81,8 +81,8 @@ public class Pair
             Name = reapplyDataSeString,
             OnClicked = (a) => ApplyLastReceivedData(forced: true),
             UseDefaultPrefix = false,
-            PrefixChar = 'M',
+            PrefixChar = 'L',
-            PrefixColor = 526
+            PrefixColor = 708
         });
 
         args.AddMenuItem(new MenuItem()
@@ -90,8 +90,8 @@ public class Pair
             Name = changePermissions,
             OnClicked = (a) => _mediator.Publish(new OpenPermissionWindow(this)),
             UseDefaultPrefix = false,
-            PrefixChar = 'M',
+            PrefixChar = 'L',
-            PrefixColor = 526
+            PrefixColor = 708
         });
 
         args.AddMenuItem(new MenuItem()
@@ -99,8 +99,8 @@ public class Pair
             Name = cyclePauseState,
             OnClicked = (a) => _mediator.Publish(new CyclePauseMessage(UserData)),
             UseDefaultPrefix = false,
-            PrefixChar = 'M',
+            PrefixChar = 'L',
-            PrefixColor = 526
+            PrefixColor = 708
         });
     }
 

LightlessSync/PlayerData/Pairs/PairManager.cs

@@ -1,4 +1,4 @@
-using Dalamud.Plugin.Services;
+using Dalamud.Plugin.Services;
 using LightlessSync.API.Data;
 using LightlessSync.API.Data.Comparer;
 using LightlessSync.API.Data.Extensions;
@@ -7,10 +7,14 @@ using LightlessSync.API.Dto.User;
 using LightlessSync.LightlessConfiguration;
 using LightlessSync.LightlessConfiguration.Models;
 using LightlessSync.PlayerData.Factories;
+using LightlessSync.Services;
+
 using LightlessSync.Services.Events;
 using LightlessSync.Services.Mediator;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace LightlessSync.PlayerData.Pairs;
 
@@ -24,14 +28,19 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
     private Lazy<List<Pair>> _directPairsInternal;
     private Lazy<Dictionary<GroupFullInfoDto, List<Pair>>> _groupPairsInternal;
     private Lazy<Dictionary<Pair, List<GroupFullInfoDto>>> _pairsWithGroupsInternal;
+    private readonly PairProcessingLimiter _pairProcessingLimiter;
+    private readonly ConcurrentQueue<(Pair Pair, OnlineUserIdentDto? Ident)> _pairCreationQueue = new();
+    private CancellationTokenSource _pairCreationCts = new();
+    private int _pairCreationProcessorRunning;
 
     public PairManager(ILogger<PairManager> logger, PairFactory pairFactory,
                 LightlessConfigService configurationService, LightlessMediator mediator,
-                IContextMenu dalamudContextMenu) : base(logger, mediator)
+                IContextMenu dalamudContextMenu, PairProcessingLimiter pairProcessingLimiter) : base(logger, mediator)
     {
         _pairFactory = pairFactory;
         _configurationService = configurationService;
         _dalamudContextMenu = dalamudContextMenu;
+        _pairProcessingLimiter = pairProcessingLimiter;
         Mediator.Subscribe<DisconnectedMessage>(this, (_) => ClearPairs());
         Mediator.Subscribe<CutsceneEndMessage>(this, (_) => ReapplyPairData());
         _directPairsInternal = DirectPairsLazy();
@@ -112,6 +121,7 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
     public void ClearPairs()
     {
         Logger.LogDebug("Clearing all Pairs");
+        ResetPairCreationQueue();
         DisposePairs();
         _allClientPairs.Clear();
         _allGroups.Clear();
@@ -161,7 +171,7 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
             Mediator.Publish(new NotificationMessage("User online", msg, NotificationType.Info, TimeSpan.FromSeconds(5)));
         }
 
-        pair.CreateCachedPlayer(dto);
+        QueuePairCreation(pair, dto);
 
         RecreateLazy();
     }
@@ -332,6 +342,7 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
     {
         base.Dispose(disposing);
 
+        ResetPairCreationQueue();
         _dalamudContextMenu.OnMenuOpened -= DalamudContextMenuOnOnOpenGameObjectContextMenu;
 
         DisposePairs();
@@ -390,6 +401,84 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
         });
     }
 
+    private void QueuePairCreation(Pair pair, OnlineUserIdentDto? dto)
+    {
+        if (pair.HasCachedPlayer)
+        {
+            RecreateLazy();
+            return;
+        }
+
+        _pairCreationQueue.Enqueue((pair, dto));
+        StartPairCreationProcessor();
+    }
+
+    private void StartPairCreationProcessor()
+    {
+        if (_pairCreationCts.IsCancellationRequested)
+        {
+            return;
+        }
+
+        if (Interlocked.CompareExchange(ref _pairCreationProcessorRunning, 1, 0) == 0)
+        {
+            _ = Task.Run(ProcessPairCreationQueueAsync);
+        }
+    }
+
+    private async Task ProcessPairCreationQueueAsync()
+    {
+        try
+        {
+            while (!_pairCreationCts.IsCancellationRequested)
+            {
+                if (!_pairCreationQueue.TryDequeue(out var work))
+                {
+                    break;
+                }
+
+                try
+                {
+                    await using var lease = await _pairProcessingLimiter.AcquireAsync(_pairCreationCts.Token).ConfigureAwait(false);
+                    if (!work.Pair.HasCachedPlayer)
+                    {
+                        work.Pair.CreateCachedPlayer(work.Ident);
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                    break;
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogError(ex, "Error creating cached player for {uid}", work.Pair.UserData.UID);
+                }
+
+                RecreateLazy();
+                await Task.Yield();
+            }
+        }
+        finally
+        {
+            Interlocked.Exchange(ref _pairCreationProcessorRunning, 0);
+            if (!_pairCreationQueue.IsEmpty && !_pairCreationCts.IsCancellationRequested)
+            {
+                StartPairCreationProcessor();
+            }
+        }
+    }
+
+    private void ResetPairCreationQueue()
+    {
+        _pairCreationCts.Cancel();
+        while (_pairCreationQueue.TryDequeue(out _))
+        {
+        }
+        _pairCreationCts.Dispose();
+        _pairCreationCts = new CancellationTokenSource();
+        Interlocked.Exchange(ref _pairCreationProcessorRunning, 0);
+    }
+
     private void ReapplyPairData()
     {
         foreach (var pair in _allClientPairs.Select(k => k.Value))

LightlessSync/PlayerData/Pairs/VisibleUserDataDistributor.cs

@@ -1,4 +1,4 @@
-using LightlessSync.API.Data;
+using LightlessSync.API.Data;
 using LightlessSync.Services;
 using LightlessSync.Services.Mediator;
 using LightlessSync.Utils;
@@ -101,6 +101,8 @@ public class VisibleUserDataDistributor : DisposableMediatorSubscriberBase
 
         _ = Task.Run(async () =>
         {
+            try
+            {
             forced |= _uploadingCharacterData?.DataHash != _lastCreatedData.DataHash;
 
             if (_fileUploadTask == null || (_fileUploadTask?.IsCompleted ?? false) || forced)
@@ -127,6 +129,15 @@ public class VisibleUserDataDistributor : DisposableMediatorSubscriberBase
                     _pushDataSemaphore.Release();
                 }
             }
+        }
+        catch (OperationCanceledException) when (_runtimeCts.IsCancellationRequested)
+        {
+            Logger.LogDebug("PushCharacterData cancelled");
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Failed to push character data");
+        }
         });
     }
 }

LightlessSync/Plugin.cs

@@ -1,4 +1,4 @@
-using Dalamud.Game;
+using Dalamud.Game;
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Interface.ImGuiFileDialog;
 using Dalamud.Interface.Windowing;
@@ -41,7 +41,7 @@ public sealed class Plugin : IDalamudPlugin
         IFramework framework, IObjectTable objectTable, IClientState clientState, ICondition condition, IChatGui chatGui,
         IGameGui gameGui, IDtrBar dtrBar, IPluginLog pluginLog, ITargetManager targetManager, INotificationManager notificationManager,
         ITextureProvider textureProvider, IContextMenu contextMenu, IGameInteropProvider gameInteropProvider, IGameConfig gameConfig,
-        ISigScanner sigScanner, INamePlateGui namePlateGui)
+        ISigScanner sigScanner, INamePlateGui namePlateGui, IAddonLifecycle addonLifecycle)
     {
         if (!Directory.Exists(pluginInterface.ConfigDirectory.FullName))
             Directory.CreateDirectory(pluginInterface.ConfigDirectory.FullName);
@@ -90,6 +90,7 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddSingleton(new WindowSystem("LightlessSync"));
             collection.AddSingleton<FileDialogManager>();
             collection.AddSingleton(new Dalamud.Localization("LightlessSync.Localization.", "", useEmbedded: true));
+            collection.AddSingleton(gameGui);
 
             // add lightless related singletons
             collection.AddSingleton<LightlessMediator>();
@@ -105,6 +106,7 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddSingleton<GameObjectHandlerFactory>();
             collection.AddSingleton<FileDownloadManagerFactory>();
             collection.AddSingleton<PairHandlerFactory>();
+            collection.AddSingleton<PairProcessingLimiter>();
             collection.AddSingleton<PairFactory>();
             collection.AddSingleton<XivDataAnalyzer>();
             collection.AddSingleton<CharacterAnalyzer>();
@@ -112,6 +114,7 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddSingleton<PluginWarningNotificationService>();
             collection.AddSingleton<FileCompactor>();
             collection.AddSingleton<TagHandler>();
+            collection.AddSingleton<PairRequestService>();
             collection.AddSingleton<IdDisplayHandler>();
             collection.AddSingleton<PlayerPerformanceService>();
             collection.AddSingleton<TransientResourceManager>();
@@ -130,17 +133,25 @@ public sealed class Plugin : IDalamudPlugin
                 s.GetRequiredService<CharaDataManager>(),
                 s.GetRequiredService<LightlessMediator>()));
             collection.AddSingleton<SelectPairForTagUi>();
+            collection.AddSingleton<RenamePairTagUi>();
+            collection.AddSingleton<SelectSyncshellForTagUi>();
+            collection.AddSingleton<RenameSyncshellTagUi>();
             collection.AddSingleton((s) => new EventAggregator(pluginInterface.ConfigDirectory.FullName,
                 s.GetRequiredService<ILogger<EventAggregator>>(), s.GetRequiredService<LightlessMediator>()));
             collection.AddSingleton((s) => new DalamudUtilService(s.GetRequiredService<ILogger<DalamudUtilService>>(),
                 clientState, objectTable, framework, gameGui, condition, gameData, targetManager, gameConfig,
                 s.GetRequiredService<BlockedCharacterHandler>(), s.GetRequiredService<LightlessMediator>(), s.GetRequiredService<PerformanceCollectorService>(),
-                s.GetRequiredService<LightlessConfigService>()));
+                s.GetRequiredService<LightlessConfigService>(), s.GetRequiredService<PlayerPerformanceConfigService>()));
             collection.AddSingleton((s) => new DtrEntry(s.GetRequiredService<ILogger<DtrEntry>>(), dtrBar, s.GetRequiredService<LightlessConfigService>(),
-                s.GetRequiredService<LightlessMediator>(), s.GetRequiredService<PairManager>(), s.GetRequiredService<ApiController>()));
+                s.GetRequiredService<LightlessMediator>(), s.GetRequiredService<PairManager>(), s.GetRequiredService<ApiController>(), s.GetRequiredService<ServerConfigurationManager>()));
             collection.AddSingleton(s => new PairManager(s.GetRequiredService<ILogger<PairManager>>(), s.GetRequiredService<PairFactory>(),
-                s.GetRequiredService<LightlessConfigService>(), s.GetRequiredService<LightlessMediator>(), contextMenu));
+                s.GetRequiredService<LightlessConfigService>(), s.GetRequiredService<LightlessMediator>(), contextMenu, s.GetRequiredService<PairProcessingLimiter>()));
             collection.AddSingleton<RedrawManager>();
+            collection.AddSingleton<BroadcastService>();
+            collection.AddSingleton(addonLifecycle);
+            collection.AddSingleton(p => new ContextMenuService(contextMenu, pluginInterface, gameData, 
+                p.GetRequiredService<ILogger<ContextMenuService>>(), p.GetRequiredService<DalamudUtilService>(), p.GetRequiredService<ApiController>(), objectTable, 
+                p.GetRequiredService<LightlessConfigService>(), p.GetRequiredService<PairRequestService>(), p.GetRequiredService<PairManager>(), clientState));
             collection.AddSingleton((s) => new IpcCallerPenumbra(s.GetRequiredService<ILogger<IpcCallerPenumbra>>(), pluginInterface,
                 s.GetRequiredService<DalamudUtilService>(), s.GetRequiredService<LightlessMediator>(), s.GetRequiredService<RedrawManager>()));
             collection.AddSingleton((s) => new IpcCallerGlamourer(s.GetRequiredService<ILogger<IpcCallerGlamourer>>(), pluginInterface,
@@ -171,10 +182,16 @@ public sealed class Plugin : IDalamudPlugin
                 httpClient.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("LightlessSync", ver!.Major + "." + ver!.Minor + "." + ver!.Build));
                 return httpClient;
             });
-            collection.AddSingleton((s) => new LightlessConfigService(pluginInterface.ConfigDirectory.FullName));
+            collection.AddSingleton((s) =>
+            {
+                var cfg = new LightlessConfigService(pluginInterface.ConfigDirectory.FullName);
+                LightlessSync.UI.Style.MainStyle.Init(cfg);
+                return cfg;
+            });
             collection.AddSingleton((s) => new ServerConfigService(pluginInterface.ConfigDirectory.FullName));
             collection.AddSingleton((s) => new NotesConfigService(pluginInterface.ConfigDirectory.FullName));
-            collection.AddSingleton((s) => new ServerTagConfigService(pluginInterface.ConfigDirectory.FullName));
+            collection.AddSingleton((s) => new PairTagConfigService(pluginInterface.ConfigDirectory.FullName));
+            collection.AddSingleton((s) => new SyncshellTagConfigService(pluginInterface.ConfigDirectory.FullName));
             collection.AddSingleton((s) => new TransientConfigService(pluginInterface.ConfigDirectory.FullName));
             collection.AddSingleton((s) => new XivDataStorageService(pluginInterface.ConfigDirectory.FullName));
             collection.AddSingleton((s) => new PlayerPerformanceConfigService(pluginInterface.ConfigDirectory.FullName));
@@ -182,21 +199,24 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<LightlessConfigService>());
             collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<ServerConfigService>());
             collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<NotesConfigService>());
-            collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<ServerTagConfigService>());
+            collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<PairTagConfigService>());
+            collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<SyncshellTagConfigService>());
             collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<TransientConfigService>());
             collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<XivDataStorageService>());
             collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<PlayerPerformanceConfigService>());
             collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<CharaDataConfigService>());
             collection.AddSingleton<ConfigurationMigrator>();
             collection.AddSingleton<ConfigurationSaveService>();
-
             collection.AddSingleton<HubFactory>();
+            collection.AddSingleton(s => new BroadcastScannerService( s.GetRequiredService<ILogger<BroadcastScannerService>>(), clientState, objectTable, framework, s.GetRequiredService<BroadcastService>(), s.GetRequiredService<LightlessMediator>(), s.GetRequiredService<NameplateHandler>(), s.GetRequiredService<DalamudUtilService>(), s.GetRequiredService<LightlessConfigService>()));
+
 
             // add scoped services
             collection.AddScoped<DrawEntityFactory>();
             collection.AddScoped<CacheMonitor>();
             collection.AddScoped<UiFactory>();
             collection.AddScoped<SelectTagForPairUi>();
+            collection.AddScoped<SelectTagForSyncshellUi>();
             collection.AddScoped<WindowMediatorSubscriberBase, SettingsUi>();
             collection.AddScoped<WindowMediatorSubscriberBase, CompactUi>();
             collection.AddScoped<WindowMediatorSubscriberBase, IntroUi>();
@@ -212,6 +232,8 @@ public sealed class Plugin : IDalamudPlugin
                 s.GetRequiredService<LightlessMediator>(), s.GetRequiredService<ApiController>(), s.GetRequiredService<UiSharedService>(), s.GetRequiredService<FileDialogManager>(),
                 s.GetRequiredService<LightlessProfileManager>(), s.GetRequiredService<PerformanceCollectorService>()));
             collection.AddScoped<WindowMediatorSubscriberBase, PopupHandler>();
+            collection.AddScoped<WindowMediatorSubscriberBase, BroadcastUI>((s) => new BroadcastUI(s.GetRequiredService<ILogger<BroadcastUI>>(), s.GetRequiredService<LightlessMediator>(), s.GetRequiredService<PerformanceCollectorService>(), s.GetRequiredService<BroadcastService>(), s.GetRequiredService<LightlessConfigService>(), s.GetRequiredService<UiSharedService>(), s.GetRequiredService<ApiController>(), s.GetRequiredService<BroadcastScannerService>()));
+            collection.AddScoped<WindowMediatorSubscriberBase, SyncshellFinderUI>((s) => new SyncshellFinderUI(s.GetRequiredService<ILogger<SyncshellFinderUI>>(), s.GetRequiredService<LightlessMediator>(), s.GetRequiredService<PerformanceCollectorService>(), s.GetRequiredService<BroadcastService>(), s.GetRequiredService<UiSharedService>(), s.GetRequiredService<ApiController>(), s.GetRequiredService<BroadcastScannerService>(), s.GetRequiredService<PairManager>(), s.GetRequiredService<DalamudUtilService>()));
             collection.AddScoped<IPopupHandler, BanUserPopupHandler>();
             collection.AddScoped<IPopupHandler, CensusPopupHandler>();
             collection.AddScoped<CacheCreationService>();
@@ -230,6 +252,8 @@ public sealed class Plugin : IDalamudPlugin
                 s.GetRequiredService<LightlessMediator>()));
             collection.AddScoped((s) => new NameplateService(s.GetRequiredService<ILogger<NameplateService>>(), s.GetRequiredService<LightlessConfigService>(), namePlateGui, clientState,
                 s.GetRequiredService<PairManager>(), s.GetRequiredService<LightlessMediator>()));
+            collection.AddScoped((s) => new NameplateHandler(s.GetRequiredService<ILogger<NameplateHandler>>(), addonLifecycle, gameGui, s.GetRequiredService<DalamudUtilService>(),
+                s.GetRequiredService<LightlessConfigService>(), s.GetRequiredService<LightlessMediator>(), clientState, s.GetRequiredService<PairManager>()));
 
             collection.AddHostedService(p => p.GetRequiredService<ConfigurationSaveService>());
             collection.AddHostedService(p => p.GetRequiredService<LightlessMediator>());
@@ -242,6 +266,8 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddHostedService(p => p.GetRequiredService<EventAggregator>());
             collection.AddHostedService(p => p.GetRequiredService<IpcProvider>());
             collection.AddHostedService(p => p.GetRequiredService<LightlessPlugin>());
+            collection.AddHostedService(p => p.GetRequiredService<ContextMenuService>());
+            collection.AddHostedService(p => p.GetRequiredService<BroadcastService>());
         })
         .Build();
 

LightlessSync/Services/BroadcastScanningService.cs

@@ -0,0 +1,222 @@
+using Dalamud.Game.ClientState.Objects.SubKinds;
+using Dalamud.Plugin.Services;
+using LightlessSync.API.Dto.User;
+using LightlessSync.LightlessConfiguration;
+using LightlessSync.Services.Mediator;
+using Microsoft.Extensions.Logging;
+using System.Collections.Concurrent;
+
+namespace LightlessSync.Services;
+
+public class BroadcastScannerService : DisposableMediatorSubscriberBase, IDisposable
+{
+    private readonly ILogger<BroadcastScannerService> _logger;
+    private readonly IObjectTable _objectTable;
+    private readonly IFramework _framework;
+
+    private readonly BroadcastService _broadcastService;
+    private readonly NameplateHandler _nameplateHandler;
+
+    private readonly ConcurrentDictionary<string, BroadcastEntry> _broadcastCache = new();
+    private readonly Queue<string> _lookupQueue = new();
+    private readonly HashSet<string> _lookupQueuedCids = new();
+    private readonly HashSet<string> _syncshellCids = new();
+
+    private static readonly TimeSpan MaxAllowedTtl = TimeSpan.FromMinutes(4);
+    private static readonly TimeSpan RetryDelay = TimeSpan.FromMinutes(1);
+
+    private readonly CancellationTokenSource _cleanupCts = new();
+    private Task? _cleanupTask;
+
+    private int _checkEveryFrames = 20;
+    private int _frameCounter = 0;
+    private int _lookupsThisFrame = 0;
+    private const int MaxLookupsPerFrame = 30;
+    private const int MaxQueueSize = 100;
+
+    private volatile bool _batchRunning = false;
+
+    public IReadOnlyDictionary<string, BroadcastEntry> BroadcastCache => _broadcastCache;
+    public readonly record struct BroadcastEntry(bool IsBroadcasting, DateTime ExpiryTime, string? GID);
+
+    public BroadcastScannerService(ILogger<BroadcastScannerService> logger,
+        IClientState clientState,
+        IObjectTable objectTable,
+        IFramework framework,
+        BroadcastService broadcastService,
+        LightlessMediator mediator,
+        NameplateHandler nameplateHandler,
+        DalamudUtilService dalamudUtil,
+        LightlessConfigService configService) : base(logger, mediator)
+    {
+        _logger = logger;
+        _objectTable = objectTable;
+        _broadcastService = broadcastService;
+        _nameplateHandler = nameplateHandler;
+
+        _logger = logger;
+        _framework = framework;
+        _framework.Update += OnFrameworkUpdate;
+
+        Mediator.Subscribe<BroadcastStatusChangedMessage>(this, OnBroadcastStatusChanged);
+        _cleanupTask = Task.Run(ExpiredBroadcastCleanupLoop);
+
+        _nameplateHandler.Init();
+    }
+
+    private void OnFrameworkUpdate(IFramework framework) => Update();
+
+    public void Update()
+    {
+        _frameCounter++;
+        _lookupsThisFrame = 0;
+
+        if (!_broadcastService.IsBroadcasting)
+            return;
+
+        var now = DateTime.UtcNow;
+
+        foreach (var obj in _objectTable)
+        {
+            if (obj is not IPlayerCharacter player || player.Address == IntPtr.Zero)
+                continue;
+
+            var cid = DalamudUtilService.GetHashedCIDFromPlayerPointer(player.Address);
+            var isStale = !_broadcastCache.TryGetValue(cid, out var entry) || entry.ExpiryTime <= now;
+
+            if (isStale && _lookupQueuedCids.Add(cid) && _lookupQueue.Count < MaxQueueSize)
+                _lookupQueue.Enqueue(cid);
+        }
+
+        if (_frameCounter % _checkEveryFrames == 0 && _lookupQueue.Count > 0)
+        {
+            var cidsToLookup = new List<string>();
+            while (_lookupQueue.Count > 0 && _lookupsThisFrame < MaxLookupsPerFrame)
+            {
+                var cid = _lookupQueue.Dequeue();
+                _lookupQueuedCids.Remove(cid);
+                cidsToLookup.Add(cid);
+                _lookupsThisFrame++;
+            }
+
+            if (cidsToLookup.Count > 0 && !_batchRunning)
+            {
+                _batchRunning = true;
+                _ = BatchUpdateBroadcastCacheAsync(cidsToLookup).ContinueWith(_ => _batchRunning = false);
+            }
+        }
+    }
+
+    private async Task BatchUpdateBroadcastCacheAsync(List<string> cids)
+    {
+        var results = await _broadcastService.AreUsersBroadcastingAsync(cids).ConfigureAwait(false);
+        var now = DateTime.UtcNow;
+
+        foreach (var (cid, info) in results)
+        {
+            if (string.IsNullOrWhiteSpace(cid) || info == null)
+                continue;
+
+            var ttl = info.IsBroadcasting && info.TTL.HasValue
+                ? TimeSpan.FromTicks(Math.Min(info.TTL.Value.Ticks, MaxAllowedTtl.Ticks))
+                : RetryDelay;
+
+            var expiry = now + ttl;
+
+            _broadcastCache.AddOrUpdate(cid,
+                new BroadcastEntry(info.IsBroadcasting, expiry, info.GID),
+                (_, old) => new BroadcastEntry(info.IsBroadcasting, expiry, info.GID));
+        }
+
+        var activeCids = _broadcastCache
+            .Where(e => e.Value.IsBroadcasting && e.Value.ExpiryTime > now)
+            .Select(e => e.Key)
+            .ToList();
+
+        _nameplateHandler.UpdateBroadcastingCids(activeCids);
+        UpdateSyncshellBroadcasts();
+    }
+
+    private void OnBroadcastStatusChanged(BroadcastStatusChangedMessage msg)
+    {
+        if (!msg.Enabled)
+        {
+            _broadcastCache.Clear();
+            _lookupQueue.Clear();
+            _lookupQueuedCids.Clear();
+            _syncshellCids.Clear();
+
+            _nameplateHandler.UpdateBroadcastingCids(Enumerable.Empty<string>());
+        }
+    }
+
+    private void UpdateSyncshellBroadcasts()
+    {
+        var now = DateTime.UtcNow;
+        var newSet = _broadcastCache
+            .Where(e => e.Value.IsBroadcasting && e.Value.ExpiryTime > now && !string.IsNullOrEmpty(e.Value.GID))
+            .Select(e => e.Key)
+            .ToHashSet();
+
+        if (!_syncshellCids.SetEquals(newSet))
+        {
+            _syncshellCids.Clear();
+            foreach (var cid in newSet)
+                _syncshellCids.Add(cid);
+
+            Mediator.Publish(new SyncshellBroadcastsUpdatedMessage());
+        }
+    }
+
+    public List<BroadcastStatusInfoDto> GetActiveSyncshellBroadcasts()
+    {
+        var now = DateTime.UtcNow;
+
+        return _broadcastCache
+            .Where(e => e.Value.IsBroadcasting && e.Value.ExpiryTime > now && !string.IsNullOrEmpty(e.Value.GID))
+            .Select(e => new BroadcastStatusInfoDto
+            {
+                HashedCID = e.Key,
+                IsBroadcasting = true,
+                TTL = e.Value.ExpiryTime - now,
+                GID = e.Value.GID
+            })
+            .ToList();
+    }
+
+    private async Task ExpiredBroadcastCleanupLoop()
+    {
+        var token = _cleanupCts.Token;
+
+        try
+        {
+            while (!token.IsCancellationRequested)
+            {
+                await Task.Delay(TimeSpan.FromSeconds(10), token);
+
+                var now = DateTime.UtcNow;
+                foreach (var (cid, entry) in _broadcastCache.ToArray())
+                {
+                    if (entry.ExpiryTime <= now)
+                        _broadcastCache.TryRemove(cid, out _);
+                }
+            }
+        }
+        catch (OperationCanceledException) { }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Broadcast cleanup loop crashed");
+        }
+
+        UpdateSyncshellBroadcasts();
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        _framework.Update -= OnFrameworkUpdate;
+        _cleanupCts.Cancel();
+        _cleanupTask?.Wait(100);
+        _nameplateHandler.Uninit();
+    }
+}

LightlessSync/Services/BroadcastService.cs

@@ -0,0 +1,377 @@
+using LightlessSync.API.Dto.Group;
+using LightlessSync.API.Dto.User;
+using LightlessSync.LightlessConfiguration;
+using LightlessSync.Services.Mediator;
+using LightlessSync.Utils;
+using LightlessSync.WebAPI;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace LightlessSync.Services;
+public class BroadcastService : IHostedService, IMediatorSubscriber
+{
+    private readonly ILogger<BroadcastService> _logger;
+    private readonly ApiController _apiController;
+    private readonly LightlessMediator _mediator;
+    private readonly LightlessConfigService _config;
+    private readonly DalamudUtilService _dalamudUtil;
+    public LightlessMediator Mediator => _mediator;
+
+    public bool IsLightFinderAvailable { get; private set; } = true;
+
+    public bool IsBroadcasting => _config.Current.BroadcastEnabled;
+    private bool _syncedOnStartup = false;
+    private bool _waitingForTtlFetch = false;
+    private TimeSpan? _remainingTtl = null;
+    private DateTime _lastTtlCheck = DateTime.MinValue;
+    private DateTime _lastForcedDisableTime = DateTime.MinValue;
+    private static readonly TimeSpan _disableCooldown = TimeSpan.FromSeconds(5);
+    public TimeSpan? RemainingTtl => _remainingTtl;
+    public TimeSpan? RemainingCooldown
+    {
+        get
+        {
+            var elapsed = DateTime.UtcNow - _lastForcedDisableTime;
+            if (elapsed >= _disableCooldown) return null;
+            return _disableCooldown - elapsed;
+        }
+    }
+
+    public BroadcastService(ILogger<BroadcastService> logger, LightlessMediator mediator, LightlessConfigService config, DalamudUtilService dalamudUtil, ApiController apiController)
+    {
+        _logger = logger;
+        _mediator = mediator;
+        _config = config;
+        _dalamudUtil = dalamudUtil;
+        _apiController = apiController;
+    }
+
+    private async Task RequireConnectionAsync(string context, Func<Task> action)
+    {
+        if (!_apiController.IsConnected)
+        {
+            _logger.LogDebug(context + " skipped, not connected");
+            return;
+        }
+        await action().ConfigureAwait(false);
+    }
+
+    public async Task StartAsync(CancellationToken cancellationToken)
+    {
+        _mediator.Subscribe<EnableBroadcastMessage>(this, OnEnableBroadcast);
+        _mediator.Subscribe<BroadcastStatusChangedMessage>(this, OnBroadcastStatusChanged);
+        _mediator.Subscribe<PriorityFrameworkUpdateMessage>(this, OnTick);
+
+        _apiController.OnConnected += () => _ = CheckLightfinderSupportAsync(cancellationToken);
+        //_ = CheckLightfinderSupportAsync(cancellationToken);
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken)
+    {
+        _mediator.UnsubscribeAll(this);
+        _apiController.OnConnected -= () => _ = CheckLightfinderSupportAsync(cancellationToken);
+        return Task.CompletedTask;
+    }
+
+    // need to rework this, this is cooked
+    private async Task CheckLightfinderSupportAsync(CancellationToken cancellationToken)
+    {
+        try
+        {
+            while (!_apiController.IsConnected && !cancellationToken.IsCancellationRequested)
+                await Task.Delay(250, cancellationToken).ConfigureAwait(false);
+
+            if (cancellationToken.IsCancellationRequested)
+                return;
+
+            var dummy = "0".PadLeft(64, '0');
+
+            await _apiController.IsUserBroadcasting(dummy).ConfigureAwait(false);
+            await _apiController.SetBroadcastStatus(dummy, true, null).ConfigureAwait(false);
+            await _apiController.GetBroadcastTtl(dummy).ConfigureAwait(false);
+            await _apiController.AreUsersBroadcasting([dummy]).ConfigureAwait(false);
+
+            IsLightFinderAvailable = true;
+            _logger.LogInformation("Lightfinder is available.");
+        }
+        catch (HubException ex) when (ex.Message.Contains("Method does not exist"))
+        {
+            _logger.LogWarning("Lightfinder unavailable: required method missing.");
+            IsLightFinderAvailable = false;
+
+            _config.Current.BroadcastEnabled = false;
+            _config.Current.BroadcastTtl = DateTime.MinValue;
+            _config.Save();
+            _mediator.Publish(new BroadcastStatusChangedMessage(false, null));
+        }
+        catch (OperationCanceledException)
+        {
+            _logger.LogInformation("Lightfinder check was canceled.");
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Lightfinder check failed.");
+            IsLightFinderAvailable = false;
+
+            _config.Current.BroadcastEnabled = false;
+            _config.Current.BroadcastTtl = DateTime.MinValue;
+            _config.Save();
+
+            _mediator.Publish(new BroadcastStatusChangedMessage(false, null));
+        }
+    }
+
+    private void OnEnableBroadcast(EnableBroadcastMessage msg)
+    {
+        _ = RequireConnectionAsync(nameof(OnEnableBroadcast), async () =>
+        {
+            try
+            {
+                GroupBroadcastRequestDto? groupDto = null;
+                if (_config.Current.SyncshellFinderEnabled && _config.Current.SelectedFinderSyncshell != null)
+                {
+                    groupDto = new GroupBroadcastRequestDto
+                    {
+                        HashedCID = msg.HashedCid,
+                        GID = _config.Current.SelectedFinderSyncshell,
+                        Enabled = msg.Enabled,
+                    };
+                }
+
+                await _apiController.SetBroadcastStatus(msg.HashedCid, msg.Enabled, groupDto).ConfigureAwait(false);
+
+                _logger.LogDebug("Broadcast {Status} for {Cid}", msg.Enabled ? "enabled" : "disabled", msg.HashedCid);
+
+                if (!msg.Enabled)
+                {
+                    _config.Current.BroadcastEnabled = false;
+                    _config.Current.BroadcastTtl = DateTime.MinValue;
+                    _config.Save();
+
+                    _mediator.Publish(new BroadcastStatusChangedMessage(false, null));
+                    Mediator.Publish(new EventMessage(new Services.Events.Event(nameof(BroadcastService), Services.Events.EventSeverity.Informational, $"Disabled Lightfinder for Player: {msg.HashedCid}")));
+                    return;
+                }
+
+                _waitingForTtlFetch = true;
+
+                TimeSpan? ttl = await GetBroadcastTtlAsync(msg.HashedCid).ConfigureAwait(false);
+
+                if (ttl is { } remaining && remaining > TimeSpan.Zero)
+                {
+                    _config.Current.BroadcastTtl = DateTime.UtcNow + remaining;
+                    _config.Current.BroadcastEnabled = true;
+                    _config.Save();
+
+                    _logger.LogDebug("Fetched TTL from server: {TTL}", remaining);
+                    _mediator.Publish(new BroadcastStatusChangedMessage(true, remaining));
+                    Mediator.Publish(new EventMessage(new Services.Events.Event(nameof(BroadcastService), Services.Events.EventSeverity.Informational, $"Enabled Lightfinder for Player: {msg.HashedCid}")));
+                }
+                else
+                {
+                    _logger.LogWarning("No valid TTL returned after enabling broadcast. Disabling.");
+                    _config.Current.BroadcastEnabled = false;
+                    _config.Current.BroadcastTtl = DateTime.MinValue;
+                    _config.Save();
+
+                    _mediator.Publish(new BroadcastStatusChangedMessage(false, null));
+                }
+
+                _waitingForTtlFetch = false;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Failed to toggle broadcast for {Cid}", msg.HashedCid);
+                _waitingForTtlFetch = false;
+            }
+        });
+    }
+
+    private void OnBroadcastStatusChanged(BroadcastStatusChangedMessage msg)
+    {
+        _config.Current.BroadcastEnabled = msg.Enabled;
+        _config.Save();
+    }
+
+    public async Task<bool> CheckIfBroadcastingAsync(string targetCid)
+    {
+        bool result = false;
+        await RequireConnectionAsync(nameof(CheckIfBroadcastingAsync), async () =>
+        {
+            try
+            {
+                _logger.LogDebug("[BroadcastCheck] Checking CID: {cid}", targetCid);
+
+                var info = await _apiController.IsUserBroadcasting(targetCid).ConfigureAwait(false);
+                result = info?.TTL > TimeSpan.Zero;
+
+
+                _logger.LogDebug("[BroadcastCheck] Result for {cid}: {result} (TTL: {ttl}, GID: {gid})", targetCid, result, info?.TTL, info?.GID);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning(ex, "Failed to check broadcast status for {cid}", targetCid);
+            }
+        }).ConfigureAwait(false);
+
+
+        return result;
+    }
+
+    public async Task<TimeSpan?> GetBroadcastTtlAsync(string cid)
+    {
+        TimeSpan? ttl = null;
+        await RequireConnectionAsync(nameof(GetBroadcastTtlAsync), async () => {
+            try
+            {
+                ttl = await _apiController.GetBroadcastTtl(cid).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning(ex, "Failed to fetch broadcast TTL for {cid}", cid);
+            }
+        }).ConfigureAwait(false);
+        return ttl;
+    }
+
+    public async Task<Dictionary<string, BroadcastStatusInfoDto?>> AreUsersBroadcastingAsync(List<string> hashedCids)
+    {
+        Dictionary<string, BroadcastStatusInfoDto?> result = new();
+
+        await RequireConnectionAsync(nameof(AreUsersBroadcastingAsync), async () =>
+        {
+            try
+            {
+                var batch = await _apiController.AreUsersBroadcasting(hashedCids).ConfigureAwait(false);
+
+                if (batch?.Results != null)
+                {
+                    foreach (var kv in batch.Results)
+                        result[kv.Key] = kv.Value;
+                }
+
+                _logger.LogTrace("Batch broadcast status check complete for {Count} CIDs", hashedCids.Count);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning(ex, "Failed to batch check broadcast status");
+            }
+        }).ConfigureAwait(false);
+
+        return result;
+    }
+
+
+
+    public async void ToggleBroadcast()
+    {
+        if (!IsLightFinderAvailable)
+        {
+            _logger.LogWarning("ToggleBroadcast - Lightfinder is not available.");
+            return;
+        }
+
+        await RequireConnectionAsync(nameof(ToggleBroadcast), async () =>
+        {
+            var cooldown = RemainingCooldown;
+            if (!_config.Current.BroadcastEnabled && cooldown is { } cd && cd > TimeSpan.Zero)
+            {
+                _logger.LogWarning("Cooldown active. Must wait {Remaining}s before re-enabling.", cd.TotalSeconds);
+                return;
+            }
+
+            var hashedCid = (await _dalamudUtil.GetCIDAsync().ConfigureAwait(false)).ToString().GetHash256();
+
+            try
+            {
+                var isCurrentlyBroadcasting = await CheckIfBroadcastingAsync(hashedCid).ConfigureAwait(false);
+                var newStatus = !isCurrentlyBroadcasting;
+
+                if (!newStatus)
+                {
+                    _lastForcedDisableTime = DateTime.UtcNow;
+                    _logger.LogDebug("Manual disable: cooldown timer started.");
+                }
+
+                _logger.LogDebug("Toggling broadcast. Server currently broadcasting: {ServerStatus}, setting to: {NewStatus}", isCurrentlyBroadcasting, newStatus);
+
+                _mediator.Publish(new EnableBroadcastMessage(hashedCid, newStatus));
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Failed to determine current broadcast status for toggle");
+            }
+        }).ConfigureAwait(false);
+    }
+
+    private async void OnTick(PriorityFrameworkUpdateMessage _)
+    {
+        if (!IsLightFinderAvailable)
+            return;
+
+        if (_config?.Current == null)
+            return;
+
+        if ((DateTime.UtcNow - _lastTtlCheck).TotalSeconds < 1)
+            return;
+
+        _lastTtlCheck = DateTime.UtcNow;
+
+        await RequireConnectionAsync(nameof(OnTick), async () => {
+            if (!_syncedOnStartup && _config.Current.BroadcastEnabled)
+            {
+                _syncedOnStartup = true;
+                try
+                {
+                    string hashedCid = (await _dalamudUtil.GetCIDAsync().ConfigureAwait(false)).ToString().GetHash256();
+                    TimeSpan? ttl = await GetBroadcastTtlAsync(hashedCid).ConfigureAwait(false);
+                    if (ttl is { }
+                      remaining && remaining > TimeSpan.Zero)
+                    {
+                        _config.Current.BroadcastTtl = DateTime.UtcNow + remaining;
+                        _config.Current.BroadcastEnabled = true;
+                        _config.Save();
+                        _logger.LogDebug("Refreshed broadcast TTL from server on first OnTick: {TTL}", remaining);
+                    }
+                    else
+                    {
+                        _logger.LogWarning("No valid TTL found on OnTick. Disabling broadcast state.");
+                        _config.Current.BroadcastEnabled = false;
+                        _config.Current.BroadcastTtl = DateTime.MinValue;
+                        _config.Save();
+                        _mediator.Publish(new BroadcastStatusChangedMessage(false, null));
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Failed to refresh TTL in OnTick");
+                }
+            }
+            if (_config.Current.BroadcastEnabled)
+            {
+                if (_waitingForTtlFetch)
+                {
+                    _logger.LogDebug("OnTick skipped: waiting for TTL fetch");
+                    return;
+                }
+
+                DateTime expiry = _config.Current.BroadcastTtl;
+                TimeSpan remaining = expiry - DateTime.UtcNow;
+                _remainingTtl = remaining > TimeSpan.Zero ? remaining : null;
+                if (_remainingTtl == null)
+                {
+                    _logger.LogDebug("Broadcast TTL expired. Disabling broadcast locally.");
+                    _config.Current.BroadcastEnabled = false;
+                    _config.Current.BroadcastTtl = DateTime.MinValue;
+                    _config.Save();
+                    _mediator.Publish(new BroadcastStatusChangedMessage(false, null));
+                }
+            }
+            else
+            {
+                _remainingTtl = null;
+            }
+        }).ConfigureAwait(false);
+    }
+}

LightlessSync/Services/CharaData/CharaDataManager.cs

@@ -944,9 +944,7 @@ public sealed partial class CharaDataManager : DisposableMediatorSubscriberBase
 
         Logger.LogTrace("[{appId}] Computing local missing files", applicationId);
 
-        Dictionary<string, string> modPaths;
+        _fileHandler.ComputeMissingFiles(charaDataDownloadDto, out Dictionary<string, string> modPaths, out List<FileReplacementData> missingFiles);
-        List<FileReplacementData> missingFiles;
-        _fileHandler.ComputeMissingFiles(charaDataDownloadDto, out modPaths, out missingFiles);
 
         Logger.LogTrace("[{appId}] Computing local missing files", applicationId);
 
@@ -990,7 +988,7 @@ public sealed partial class CharaDataManager : DisposableMediatorSubscriberBase
         {
             _uploadCts = _uploadCts.CancelRecreate();
             var missingFiles = await _fileHandler.UploadFiles([.. missingFileList.Select(k => k.HashOrFileSwap)], UploadProgress, _uploadCts.Token).ConfigureAwait(false);
-            if (missingFiles.Any())
+            if (missingFiles.Count != 0)
             {
                 Logger.LogInformation("Failed to upload {files}", string.Join(", ", missingFiles));
                 return ($"Upload failed: {missingFiles.Count} missing or forbidden to upload local files.", false);

LightlessSync/Services/CharaData/CharaDataNearbyManager.cs

@@ -236,7 +236,7 @@ public sealed class CharaDataNearbyManager : DisposableMediatorSubscriberBase
             }
         }
 
-        if (_charaDataConfigService.Current.NearbyDrawWisps && !_dalamudUtilService.IsInGpose && !_dalamudUtilService.IsInCombatOrPerforming)
+        if (_charaDataConfigService.Current.NearbyDrawWisps && !_dalamudUtilService.IsInGpose && !_dalamudUtilService.IsInCombat && !_dalamudUtilService.IsPerforming && !_dalamudUtilService.IsInInstance)
             await _dalamudUtilService.RunOnFrameworkThread(() => ManageWispsNearby(previousPoses)).ConfigureAwait(false);
     }
 
@@ -253,7 +253,7 @@ public sealed class CharaDataNearbyManager : DisposableMediatorSubscriberBase
             return;
         }
 
-        if (!_charaDataConfigService.Current.NearbyDrawWisps || _dalamudUtilService.IsInGpose || _dalamudUtilService.IsInCombatOrPerforming)
+        if (!_charaDataConfigService.Current.NearbyDrawWisps || _dalamudUtilService.IsInGpose || _dalamudUtilService.IsInCombat || _dalamudUtilService.IsPerforming || _dalamudUtilService.IsInInstance)
             ClearAllVfx();
 
         var camera = CameraManager.Instance()->CurrentCamera;

LightlessSync/Services/CommandManagerService.cs

@@ -42,7 +42,8 @@ public sealed class CommandManagerService : IDisposable
                 "\t /light toggle on|off - Connects or disconnects to Lightless respectively" + Environment.NewLine +
                 "\t /light gpose - Opens the Lightless Character Data Hub window" + Environment.NewLine +
                 "\t /light analyze - Opens the Lightless Character Data Analysis window" + Environment.NewLine +
-                "\t /light settings - Opens the Lightless Settings window"
+                "\t /light settings - Opens the Lightless Settings window" + Environment.NewLine +
+                "\t /light lightfinder - Opens the Lightfinder window"
         });
     }
 
@@ -122,5 +123,9 @@ public sealed class CommandManagerService : IDisposable
         {
             _mediator.Publish(new UiToggleMessage(typeof(SettingsUi)));
         }
+        else if (string.Equals(splitArgs[0], "lightfinder", StringComparison.OrdinalIgnoreCase))
+        {
+            _mediator.Publish(new UiToggleMessage(typeof(BroadcastUI)));
+        }
     }
 }

LightlessSync/Services/ContextMenuService.cs

@@ -0,0 +1,210 @@
+using Dalamud.Game.ClientState.Objects.SubKinds;
+using Dalamud.Game.Gui.ContextMenu;
+using Dalamud.Plugin;
+using Dalamud.Plugin.Services;
+using LightlessSync.LightlessConfiguration;
+using LightlessSync.PlayerData.Pairs;
+using LightlessSync.Utils;
+using LightlessSync.WebAPI;
+using Lumina.Excel.Sheets;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace LightlessSync.Services;
+
+internal class ContextMenuService : IHostedService
+{
+    private readonly IContextMenu _contextMenu;
+    private readonly IDalamudPluginInterface _pluginInterface;
+    private readonly IDataManager _gameData;
+    private readonly ILogger<ContextMenuService> _logger;
+    private readonly DalamudUtilService _dalamudUtil;
+    private readonly IClientState _clientState;
+    private readonly PairManager _pairManager;
+    private readonly PairRequestService _pairRequestService;
+    private readonly ApiController _apiController;
+    private readonly IObjectTable _objectTable;
+    private readonly LightlessConfigService _configService;
+
+    public ContextMenuService(
+        IContextMenu contextMenu,
+        IDalamudPluginInterface pluginInterface,
+        IDataManager gameData,
+        ILogger<ContextMenuService> logger,
+        DalamudUtilService dalamudUtil,
+        ApiController apiController,
+        IObjectTable objectTable,
+        LightlessConfigService configService,
+        PairRequestService pairRequestService,
+        PairManager pairManager,
+        IClientState clientState)
+    {
+        _contextMenu = contextMenu;
+        _pluginInterface = pluginInterface;
+        _gameData = gameData;
+        _logger = logger;
+        _dalamudUtil = dalamudUtil;
+        _apiController = apiController;
+        _objectTable = objectTable;
+        _configService = configService;
+        _pairManager = pairManager;
+        _pairRequestService = pairRequestService;
+        _clientState = clientState;
+    }
+
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        _contextMenu.OnMenuOpened += OnMenuOpened;
+        return Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken)
+    {
+        _contextMenu.OnMenuOpened -= OnMenuOpened;
+        return Task.CompletedTask;
+    }
+
+    public void Enable()
+    {
+        _contextMenu.OnMenuOpened += OnMenuOpened;
+        _logger.LogDebug("Context menu enabled.");
+    }
+
+    public void Disable()
+    {
+        _contextMenu.OnMenuOpened -= OnMenuOpened;
+        _logger.LogDebug("Context menu disabled.");
+    }
+
+    private void OnMenuOpened(IMenuOpenedArgs args)
+    {
+
+        if (!_pluginInterface.UiBuilder.ShouldModifyUi)
+            return;
+
+        if (args.AddonName != null)
+            return;
+        
+        //Check if target is not menutargetdefault.
+        if (args.Target is not MenuTargetDefault target)
+            return;
+
+        //Check if name or target id isnt null/zero
+        if (string.IsNullOrEmpty(target.TargetName) || target.TargetObjectId == 0 || target.TargetHomeWorld.RowId == 0)
+            return;
+
+        //Check if it is a real target.
+        IPlayerCharacter? targetData = GetPlayerFromObjectTable(target);
+        if (targetData == null || targetData.Address == nint.Zero)
+            return;
+
+        //Check if user is paired or is own.
+        if (VisibleUserIds.Any(u => u == target.TargetObjectId) || _clientState.LocalPlayer.GameObjectId == target.TargetObjectId)
+            return;
+
+        //Check if in PVP or GPose
+        if (_clientState.IsPvPExcludingDen || _clientState.IsGPosing)
+            return;
+
+        //Check for valid world.
+        var world = GetWorld(target.TargetHomeWorld.RowId);
+        if (!IsWorldValid(world))
+            return;
+
+        if (!_configService.Current.EnableRightClickMenus)
+            return;
+        
+        args.AddMenuItem(new MenuItem
+        {
+            Name = "Send Pair Request",
+            PrefixChar = 'L',
+            UseDefaultPrefix = false,
+            PrefixColor = 708,
+            OnClicked = async _ => await HandleSelection(args).ConfigureAwait(false)
+        });
+    }
+
+    private async Task HandleSelection(IMenuArgs args)
+    {
+        if (args.Target is not MenuTargetDefault target)
+            return;
+
+        var world = GetWorld(target.TargetHomeWorld.RowId);
+        if (!IsWorldValid(world))
+            return;
+
+        try
+        {
+            IPlayerCharacter? targetData = GetPlayerFromObjectTable(target);
+
+            if (targetData == null || targetData.Address == nint.Zero)
+            {
+                _logger.LogWarning("Target player {TargetName}@{World} not found in object table.", target.TargetName, world.Name);
+                return;
+            }
+
+            var senderCid = (await _dalamudUtil.GetCIDAsync().ConfigureAwait(false)).ToString().GetHash256();
+            var receiverCid = DalamudUtilService.GetHashedCIDFromPlayerPointer(targetData.Address);
+
+            _logger.LogInformation("Sending pair request: sender {SenderCid}, receiver {ReceiverCid}", senderCid, receiverCid);
+            await _apiController.TryPairWithContentId(receiverCid, senderCid).ConfigureAwait(false);
+            if (!string.IsNullOrWhiteSpace(receiverCid))
+            {
+                _pairRequestService.RemoveRequest(receiverCid);
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error sending pair request.");
+        }
+    }
+
+    private HashSet<ulong> VisibleUserIds => [.. _pairManager.GetOnlineUserPairs()
+            .Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue)
+            .Select(u => (ulong)u.PlayerCharacterId)];
+
+    private IPlayerCharacter? GetPlayerFromObjectTable(MenuTargetDefault target)
+    {
+        return _objectTable
+            .OfType<IPlayerCharacter>()
+            .FirstOrDefault(p =>
+                string.Equals(p.Name.TextValue, target.TargetName, StringComparison.OrdinalIgnoreCase) &&
+                p.HomeWorld.RowId == target.TargetHomeWorld.RowId);
+    }
+
+    private World GetWorld(uint worldId)
+    {
+        var sheet = _gameData.GetExcelSheet<World>()!;
+        var luminaWorlds = sheet.Where(x =>
+        {
+            var dc = x.DataCenter.ValueNullable;
+            var name = x.Name.ExtractText();
+            var internalName = x.InternalName.ExtractText();
+
+            if (dc == null || dc.Value.Region == 0 || string.IsNullOrWhiteSpace(dc.Value.Name.ExtractText()))
+                return false;
+
+            if (string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(internalName))
+                return false;
+
+            if (name.Contains('-', StringComparison.Ordinal) || name.Contains('_', StringComparison.Ordinal))
+                return false;
+
+            return x.DataCenter.Value.Region != 5 || x.RowId > 3001 && x.RowId != 1200 && IsChineseJapaneseKoreanString(name);
+        });
+
+        return luminaWorlds.FirstOrDefault(x => x.RowId == worldId);
+    }
+
+    private static bool IsChineseJapaneseKoreanString(string text) => text.All(IsChineseJapaneseKoreanCharacter);
+
+    private static bool IsChineseJapaneseKoreanCharacter(char c) => c >= 0x4E00 && c <= 0x9FFF;
+
+    public bool IsWorldValid(uint worldId) => IsWorldValid(GetWorld(worldId));
+
+    public static bool IsWorldValid(World world)
+    {
+        var name = world.Name.ToString();
+        return !string.IsNullOrWhiteSpace(name) && char.IsUpper(name[0]);
+    }
+}

LightlessSync/Services/DalamudUtilService.cs

@@ -1,4 +1,4 @@
-using Dalamud.Game.ClientState.Conditions;
+using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 using Dalamud.Game.ClientState.Objects.Types;
@@ -39,6 +39,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     private readonly IObjectTable _objectTable;
     private readonly PerformanceCollectorService _performanceCollector;
     private readonly LightlessConfigService _configService;
+    private readonly PlayerPerformanceConfigService _playerPerformanceConfigService;
     private uint? _classJobId = 0;
     private DateTime _delayedFrameworkUpdateCheck = DateTime.UtcNow;
     private string _lastGlobalBlockPlayer = string.Empty;
@@ -52,7 +53,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public DalamudUtilService(ILogger<DalamudUtilService> logger, IClientState clientState, IObjectTable objectTable, IFramework framework,
         IGameGui gameGui, ICondition condition, IDataManager gameData, ITargetManager targetManager, IGameConfig gameConfig,
         BlockedCharacterHandler blockedCharacterHandler, LightlessMediator mediator, PerformanceCollectorService performanceCollector,
-        LightlessConfigService configService)
+        LightlessConfigService configService, PlayerPerformanceConfigService playerPerformanceConfigService)
     {
         _logger = logger;
         _clientState = clientState;
@@ -66,6 +67,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         Mediator = mediator;
         _performanceCollector = performanceCollector;
         _configService = configService;
+        _playerPerformanceConfigService = playerPerformanceConfigService;
         WorldData = new(() =>
         {
             return gameData.GetExcelSheet<Lumina.Excel.Sheets.World>(Dalamud.Game.ClientLanguage.English)!
@@ -160,7 +162,9 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public bool IsLoggedIn { get; private set; }
     public bool IsOnFrameworkThread => _framework.IsInFrameworkUpdateThread;
     public bool IsZoning => _condition[ConditionFlag.BetweenAreas] || _condition[ConditionFlag.BetweenAreas51];
-    public bool IsInCombatOrPerforming { get; private set; } = false;
+    public bool IsInCombat { get; private set; } = false;
+    public bool IsPerforming { get; private set; } = false;
+    public bool IsInInstance { get; private set; } = false;
     public bool HasModifiedGameFiles => _gameData.HasModifiedGameDataFiles;
     public uint ClassJobId => _classJobId!.Value;
     public Lazy<Dictionary<uint, string>> JobData { get; private set; }
@@ -309,7 +313,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         return await RunOnFrameworkThread(() => _cid.Value.ToString().GetHash256()).ConfigureAwait(false);
     }
 
-    private unsafe static string GetHashedCIDFromPlayerPointer(nint ptr)
+    public unsafe static string GetHashedCIDFromPlayerPointer(nint ptr)
     {
         return ((BattleChara*)ptr)->Character.ContentId.ToString().GetHash256();
     }
@@ -417,6 +421,16 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         return await RunOnFrameworkThread(() => IsObjectPresent(obj)).ConfigureAwait(false);
     }
 
+    public IPlayerCharacter? GetPlayerByNameAndWorld(string name, ushort homeWorldId)
+    {
+        EnsureIsOnFramework();
+        return _objectTable
+            .OfType<IPlayerCharacter>()
+            .FirstOrDefault(p =>
+                string.Equals(p.Name.TextValue, name, StringComparison.Ordinal) &&
+                p.HomeWorld.RowId == homeWorldId);
+    }
+
     public async Task RunOnFrameworkThread(System.Action act, [CallerMemberName] string callerMember = "", [CallerFilePath] string callerFilePath = "", [CallerLineNumber] int callerLineNumber = 0)
     {
         var fileName = Path.GetFileNameWithoutExtension(callerFilePath);
@@ -527,7 +541,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
             curWaitTime += tick;
             Thread.Sleep(tick);
         }
-
         Thread.Sleep(tick * 2);
     }
 
@@ -543,6 +556,18 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         return result;
     }
 
+    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;
+    }
+
     private unsafe void CheckCharacterForDrawing(nint address, string characterName)
     {
         var gameObj = (GameObject*)address;
@@ -667,19 +692,47 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 Mediator.Publish(new GposeEndMessage());
             }
 
-            if ((_condition[ConditionFlag.Performing] || _condition[ConditionFlag.InCombat]) && !IsInCombatOrPerforming)
+            if ((_condition[ConditionFlag.InCombat]) && !IsInCombat && !IsInInstance && _playerPerformanceConfigService.Current.PauseInCombat)
-            {
+            { 
-                _logger.LogDebug("Combat/Performance start");
+                _logger.LogDebug("Combat start");
-                IsInCombatOrPerforming = true;
+                IsInCombat = true;
-                Mediator.Publish(new CombatOrPerformanceStartMessage());
+                Mediator.Publish(new CombatStartMessage());
-                Mediator.Publish(new HaltScanMessage(nameof(IsInCombatOrPerforming)));
+                Mediator.Publish(new HaltScanMessage(nameof(IsInCombat)));
             }
-            else if ((!_condition[ConditionFlag.Performing] && !_condition[ConditionFlag.InCombat]) && IsInCombatOrPerforming)
+            else if ((!_condition[ConditionFlag.InCombat]) && IsInCombat && !IsInInstance && _playerPerformanceConfigService.Current.PauseInCombat)
             {
-                _logger.LogDebug("Combat/Performance end");
+                _logger.LogDebug("Combat end");
-                IsInCombatOrPerforming = false;
+                IsInCombat = false;
-                Mediator.Publish(new CombatOrPerformanceEndMessage());
+                Mediator.Publish(new CombatEndMessage());
-                Mediator.Publish(new ResumeScanMessage(nameof(IsInCombatOrPerforming)));
+                Mediator.Publish(new ResumeScanMessage(nameof(IsInCombat)));
+            }
+            if (_condition[ConditionFlag.Performing] && !IsPerforming && _playerPerformanceConfigService.Current.PauseWhilePerforming)
+            {
+                _logger.LogDebug("Performance start");
+                IsInCombat = true;
+                Mediator.Publish(new PerformanceStartMessage());
+                Mediator.Publish(new HaltScanMessage(nameof(IsPerforming)));
+            }
+            else if (!_condition[ConditionFlag.Performing] && IsPerforming && _playerPerformanceConfigService.Current.PauseWhilePerforming)
+            {
+                _logger.LogDebug("Performance end");
+                IsInCombat = false;
+                Mediator.Publish(new PerformanceEndMessage());
+                Mediator.Publish(new ResumeScanMessage(nameof(IsPerforming)));
+            }
+            if ((_condition[ConditionFlag.BoundByDuty]) && !IsInInstance && _playerPerformanceConfigService.Current.PauseInInstanceDuty)
+            {
+                _logger.LogDebug("Instance start");
+                IsInInstance = true;
+                Mediator.Publish(new InstanceOrDutyStartMessage());
+                Mediator.Publish(new HaltScanMessage(nameof(IsInInstance)));
+            }
+            else if (((!_condition[ConditionFlag.BoundByDuty]) && IsInInstance && _playerPerformanceConfigService.Current.PauseInInstanceDuty) || ((_condition[ConditionFlag.BoundByDuty]) && IsInInstance && !_playerPerformanceConfigService.Current.PauseInInstanceDuty))
+            {
+                _logger.LogDebug("Instance end");
+                IsInInstance = false;
+                Mediator.Publish(new InstanceOrDutyEndMessage());
+                Mediator.Publish(new ResumeScanMessage(nameof(IsInInstance)));
             }
 
             if (_condition[ConditionFlag.WatchingCutscene] && !IsInCutscene)
@@ -735,7 +788,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 _classJobId = localPlayer.ClassJob.RowId;
             }
 
-            if (!IsInCombatOrPerforming)
+            if (!IsInCombat || !IsPerforming || !IsInInstance)
                 Mediator.Publish(new FrameworkUpdateMessage());
 
             Mediator.Publish(new PriorityFrameworkUpdateMessage());
@@ -764,7 +817,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 IsLodEnabled = lodEnabled;
             }
 
-            if (IsInCombatOrPerforming)
+            if (IsInCombat || IsPerforming || IsInInstance)
                 Mediator.Publish(new FrameworkUpdateMessage());
 
             Mediator.Publish(new DelayedFrameworkUpdateMessage());

LightlessSync/Services/Mediator/Messages.cs

@@ -1,4 +1,4 @@
-using Dalamud.Game.ClientState.Objects.Types;
+using Dalamud.Game.ClientState.Objects.Types;
 using LightlessSync.API.Data;
 using LightlessSync.API.Dto;
 using LightlessSync.API.Dto.CharaData;
@@ -77,10 +77,15 @@ public record OpenCensusPopupMessage() : MessageBase;
 public record OpenSyncshellAdminPanel(GroupFullInfoDto GroupInfo) : MessageBase;
 public record OpenPermissionWindow(Pair Pair) : MessageBase;
 public record DownloadLimitChangedMessage() : SameThreadMessage;
+public record PairProcessingLimitChangedMessage : SameThreadMessage;
 public record CensusUpdateMessage(byte Gender, byte RaceId, byte TribeId) : MessageBase;
 public record TargetPairMessage(Pair Pair) : MessageBase;
-public record CombatOrPerformanceStartMessage : MessageBase;
+public record CombatStartMessage : MessageBase;
-public record CombatOrPerformanceEndMessage : MessageBase;
+public record CombatEndMessage : MessageBase;
+public record PerformanceStartMessage : MessageBase;
+public record PerformanceEndMessage : MessageBase;
+public record InstanceOrDutyStartMessage : MessageBase;
+public record InstanceOrDutyEndMessage : MessageBase;
 public record EventMessage(Event Event) : MessageBase;
 public record PenumbraDirectoryChangedMessage(string? ModDirectory) : MessageBase;
 public record PenumbraRedrawCharacterMessage(ICharacter Character) : SameThreadMessage;
@@ -93,7 +98,10 @@ public record GPoseLobbyReceiveCharaData(CharaDataDownloadDto CharaDataDownloadD
 public record GPoseLobbyReceivePoseData(UserData UserData, PoseData PoseData) : MessageBase;
 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) : MessageBase;
+public record SyncshellBroadcastsUpdatedMessage : MessageBase;
+public record PairRequestsUpdatedMessage : MessageBase;
 public record VisibilityChange : MessageBase;
 #pragma warning restore S2094
 #pragma warning restore MA0048 // File name must match type name

LightlessSync/Services/Mediator/WindowMediatorSubscriberBase.cs

@@ -1,4 +1,5 @@
 using Dalamud.Interface.Windowing;
+using LightlessSync.UI.Style;
 using Microsoft.Extensions.Logging;
 
 namespace LightlessSync.Services.Mediator;
@@ -33,6 +34,18 @@ public abstract class WindowMediatorSubscriberBase : Window, IMediatorSubscriber
         GC.SuppressFinalize(this);
     }
 
+    public override void PreDraw()
+    {
+        base.PreDraw();
+        MainStyle.PushStyle(); // internally checks ShouldUseTheme
+    }
+
+    public override void PostDraw()
+    {
+        MainStyle.PopStyle(); // always attempts to pop if pushed
+        base.PostDraw();
+    }
+
     public override void Draw()
     {
         _performanceCollectorService.LogPerformance(this, $"Draw", DrawInternal);

LightlessSync/Services/NameplateHandler.cs

@@ -0,0 +1,597 @@
+using Dalamud.Game.Addon.Lifecycle;
+using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
+using Dalamud.Game.Text;
+using Dalamud.Plugin.Services;
+using FFXIVClientStructs.FFXIV.Client.System.Framework;
+using FFXIVClientStructs.FFXIV.Client.UI;
+using FFXIVClientStructs.FFXIV.Component.GUI;
+using LightlessSync.LightlessConfiguration;
+using LightlessSync.PlayerData.Pairs;
+using LightlessSync.Services.Mediator;
+using LightlessSync.UI;
+using LightlessSync.Utils;
+using LightlessSync.UtilsEnum.Enum;
+
+// Created using https://github.com/PunishedPineapple/Distance as a reference, thank you!
+
+using Microsoft.Extensions.Logging;
+using System.Globalization;
+using System.Text;
+
+namespace LightlessSync.Services;
+
+public unsafe class NameplateHandler : IMediatorSubscriber
+{
+    private readonly ILogger<NameplateHandler> _logger;
+    private readonly IAddonLifecycle _addonLifecycle;
+    private readonly IGameGui _gameGui;
+    private readonly IClientState _clientState;
+    private readonly DalamudUtilService _dalamudUtil;
+    private readonly LightlessConfigService _configService;
+    private readonly PairManager _pairManager;
+    private readonly LightlessMediator _mediator;
+    public LightlessMediator Mediator => _mediator;
+
+    private bool mEnabled = false;
+    private bool _needsLabelRefresh = false;
+    private AddonNamePlate* mpNameplateAddon = null;
+    private readonly AtkTextNode*[] mTextNodes = new AtkTextNode*[AddonNamePlate.NumNamePlateObjects];
+    private readonly int[] _cachedNameplateTextWidths = new int[AddonNamePlate.NumNamePlateObjects];
+    private readonly int[] _cachedNameplateTextHeights = new int[AddonNamePlate.NumNamePlateObjects];
+    private readonly int[] _cachedNameplateContainerHeights = new int[AddonNamePlate.NumNamePlateObjects];
+    private readonly int[] _cachedNameplateTextOffsets = new int[AddonNamePlate.NumNamePlateObjects];
+
+    internal const uint mNameplateNodeIDBase = 0x7D99D500;
+    private const string DefaultLabelText = "LightFinder";
+    private const SeIconChar DefaultIcon = SeIconChar.Hyadelyn;
+    private const int ContainerOffsetX = 50;
+    private static readonly string DefaultIconGlyph = SeIconCharExtensions.ToIconString(DefaultIcon);
+
+    private volatile HashSet<string> _activeBroadcastingCids = [];
+
+    public NameplateHandler(ILogger<NameplateHandler> logger, IAddonLifecycle addonLifecycle, IGameGui gameGui, DalamudUtilService dalamudUtil, LightlessConfigService configService, LightlessMediator mediator, IClientState clientState, PairManager pairManager)
+    {
+        _logger = logger;
+        _addonLifecycle = addonLifecycle;
+        _gameGui = gameGui;
+        _dalamudUtil = dalamudUtil;
+        _configService = configService;
+        _mediator = mediator;
+        _clientState = clientState;
+        _pairManager = pairManager;
+
+        System.Array.Fill(_cachedNameplateTextOffsets, int.MinValue);
+    }
+
+    internal void Init()
+    {
+        EnableNameplate();
+        _mediator.Subscribe<PriorityFrameworkUpdateMessage>(this, OnTick);
+    }
+
+    internal void Uninit()
+    {
+        DisableNameplate();
+        DestroyNameplateNodes();
+        _mediator.Unsubscribe<PriorityFrameworkUpdateMessage>(this);
+        mpNameplateAddon = null;
+    }
+
+    internal void EnableNameplate()
+    {
+        if (!mEnabled)
+        {
+            try
+            {
+                _addonLifecycle.RegisterListener(AddonEvent.PostDraw, "NamePlate", NameplateDrawDetour);
+                mEnabled = true;
+            }
+            catch (Exception e)
+            {
+                _logger.LogError($"Unknown error while trying to enable nameplate distances:\n{e}");
+                DisableNameplate();
+            }
+        }
+    }
+
+    internal void DisableNameplate()
+    {
+        if (mEnabled)
+        {
+            try
+            {
+                _addonLifecycle.UnregisterListener(NameplateDrawDetour);
+            }
+            catch (Exception e)
+            {
+                _logger.LogError($"Unknown error while unregistering nameplate listener:\n{e}");
+            }
+
+            mEnabled = false;
+            HideAllNameplateNodes();
+        }
+    }
+
+    private void NameplateDrawDetour(AddonEvent type, AddonArgs args)
+    {
+        var pNameplateAddon = (AddonNamePlate*)args.Addon.Address;
+
+        if (mpNameplateAddon != pNameplateAddon)
+        {
+            for (int i = 0; i < mTextNodes.Length; ++i) mTextNodes[i] = null;
+            System.Array.Clear(_cachedNameplateTextWidths, 0, _cachedNameplateTextWidths.Length);
+            System.Array.Clear(_cachedNameplateTextHeights, 0, _cachedNameplateTextHeights.Length);
+            System.Array.Clear(_cachedNameplateContainerHeights, 0, _cachedNameplateContainerHeights.Length);
+            System.Array.Fill(_cachedNameplateTextOffsets, int.MinValue);
+            mpNameplateAddon = pNameplateAddon;
+            if (mpNameplateAddon != null) CreateNameplateNodes();
+        }
+
+        UpdateNameplateNodes();
+    }
+
+    private void CreateNameplateNodes()
+    {
+        for (int i = 0; i < AddonNamePlate.NumNamePlateObjects; ++i)
+        {
+            var nameplateObject = GetNameplateObject(i);
+            if (nameplateObject == null)
+                continue;
+
+            var pNameplateResNode = nameplateObject.Value.NameContainer;
+            var pNewNode = AtkNodeHelpers.CreateOrphanTextNode(mNameplateNodeIDBase + (uint)i, TextFlags.Edge | TextFlags.Glare);
+
+            if (pNewNode != null)
+            {
+                var pLastChild = pNameplateResNode->ChildNode;
+                while (pLastChild->PrevSiblingNode != null) pLastChild = pLastChild->PrevSiblingNode;
+                pNewNode->AtkResNode.NextSiblingNode = pLastChild;
+                pNewNode->AtkResNode.ParentNode = pNameplateResNode;
+                pLastChild->PrevSiblingNode = (AtkResNode*)pNewNode;
+                nameplateObject.Value.RootComponentNode->Component->UldManager.UpdateDrawNodeList();
+                pNewNode->AtkResNode.SetUseDepthBasedPriority(true);
+                mTextNodes[i] = pNewNode;
+            }
+        }
+    }
+
+    private void DestroyNameplateNodes()
+    {
+        var pCurrentNameplateAddon = (AddonNamePlate*)_gameGui.GetAddonByName("NamePlate", 1).Address;
+        if (mpNameplateAddon == null || mpNameplateAddon != pCurrentNameplateAddon)
+            return;
+
+        for (int i = 0; i < AddonNamePlate.NumNamePlateObjects; ++i)
+        {
+            var pTextNode = mTextNodes[i];
+            var pNameplateNode = GetNameplateComponentNode(i);
+            if (pTextNode != null && pNameplateNode != null)
+            {
+                try
+                {
+                    if (pTextNode->AtkResNode.PrevSiblingNode != null)
+                        pTextNode->AtkResNode.PrevSiblingNode->NextSiblingNode = pTextNode->AtkResNode.NextSiblingNode;
+                    if (pTextNode->AtkResNode.NextSiblingNode != null)
+                        pTextNode->AtkResNode.NextSiblingNode->PrevSiblingNode = pTextNode->AtkResNode.PrevSiblingNode;
+                    pNameplateNode->Component->UldManager.UpdateDrawNodeList();
+                    pTextNode->AtkResNode.Destroy(true);
+                    mTextNodes[i] = null;
+                }
+                catch (Exception e)
+                {
+                    _logger.LogError($"Unknown error while removing text node 0x{(IntPtr)pTextNode:X} for nameplate {i} on component node 0x{(IntPtr)pNameplateNode:X}:\n{e}");
+                }
+            }
+        }
+
+        System.Array.Clear(_cachedNameplateTextWidths, 0, _cachedNameplateTextWidths.Length);
+        System.Array.Clear(_cachedNameplateTextHeights, 0, _cachedNameplateTextHeights.Length);
+        System.Array.Clear(_cachedNameplateContainerHeights, 0, _cachedNameplateContainerHeights.Length);
+        System.Array.Fill(_cachedNameplateTextOffsets, int.MinValue);
+    }
+
+    private void HideAllNameplateNodes()
+    {
+        for (int i = 0; i < mTextNodes.Length; ++i)
+        {
+            HideNameplateTextNode(i);
+        }
+    }
+
+    private void UpdateNameplateNodes()
+    {
+        var framework = Framework.Instance();
+        var ui3DModule = framework->GetUIModule()->GetUI3DModule();
+
+        if (ui3DModule == null)
+            return;
+
+        for (int i = 0; i < ui3DModule->NamePlateObjectInfoCount; ++i)
+        {
+            var objectInfo = ui3DModule->NamePlateObjectInfoPointers[i].Value;
+
+            if (objectInfo == null || objectInfo->GameObject == null)
+                continue;
+
+            var nameplateIndex = objectInfo->NamePlateIndex;
+            if (nameplateIndex < 0 || nameplateIndex >= AddonNamePlate.NumNamePlateObjects)
+                continue;
+
+            var pNode = mTextNodes[nameplateIndex];
+            if (pNode == null)
+                continue;
+
+            var cid = DalamudUtilService.GetHashedCIDFromPlayerPointer((nint)objectInfo->GameObject);
+
+            if (cid == null || !_activeBroadcastingCids.Contains(cid))
+            {
+                pNode->AtkResNode.ToggleVisibility(false);
+                continue;
+            }
+
+            if (!_configService.Current.LightfinderLabelShowOwn && (objectInfo->GameObject->GetGameObjectId() == _clientState.LocalPlayer.GameObjectId))
+            {
+                pNode->AtkResNode.ToggleVisibility(false);
+                continue;
+            }
+
+            if (!_configService.Current.LightfinderLabelShowPaired && VisibleUserIds.Any(u => u == objectInfo->GameObject->GetGameObjectId()))
+            {
+                pNode->AtkResNode.ToggleVisibility(false);
+                continue;
+            }
+
+            var nameplateObject = mpNameplateAddon->NamePlateObjectArray[nameplateIndex];
+            nameplateObject.RootComponentNode->Component->UldManager.UpdateDrawNodeList();
+
+            var pNameplateIconNode = nameplateObject.MarkerIcon;
+            var pNameplateResNode = nameplateObject.NameContainer;
+            var pNameplateTextNode = nameplateObject.NameText;
+            bool IsVisible = pNameplateIconNode->AtkResNode.IsVisible() || (pNameplateResNode->IsVisible() && pNameplateTextNode->AtkResNode.IsVisible());
+            pNode->AtkResNode.ToggleVisibility(IsVisible);
+
+            var nameContainer = nameplateObject.NameContainer;
+            var nameText = nameplateObject.NameText;
+
+            if (nameContainer == null || nameText == null)
+            {
+                pNode->AtkResNode.ToggleVisibility(false);
+                continue;
+            }
+
+            var labelColor = UIColors.Get("LightlessPurple");
+            var edgeColor = UIColors.Get("FullBlack");
+            var config = _configService.Current;
+
+            var scaleMultiplier = System.Math.Clamp(config.LightfinderLabelScale, 0.5f, 2.0f);
+            var baseScale = config.LightfinderLabelUseIcon ? 1.0f : 0.5f;
+            var effectiveScale = baseScale * scaleMultiplier;
+            var labelContent = config.LightfinderLabelUseIcon
+                ? NormalizeIconGlyph(config.LightfinderLabelIconGlyph)
+                : DefaultLabelText;
+
+            pNode->FontType = config.LightfinderLabelUseIcon ? FontType.Axis : FontType.MiedingerMed;
+            pNode->AtkResNode.SetScale(effectiveScale, effectiveScale);
+            var nodeWidth = (int)pNode->AtkResNode.GetWidth();
+            if (nodeWidth <= 0)
+                nodeWidth = (int)System.Math.Round(AtkNodeHelpers.DefaultTextNodeWidth * effectiveScale);
+            var nodeHeight = (int)System.Math.Round(AtkNodeHelpers.DefaultTextNodeHeight * effectiveScale);
+            var baseFontSize = config.LightfinderLabelUseIcon ? 36f : 24f;
+            var computedFontSize = (int)System.Math.Round(baseFontSize * scaleMultiplier);
+            pNode->FontSize = (byte)System.Math.Clamp(computedFontSize, 1, 255);
+            AlignmentType alignment;
+
+            var textScaleY = nameText->AtkResNode.ScaleY;
+            if (textScaleY <= 0f)
+                textScaleY = 1f;
+
+            var blockHeight = System.Math.Abs((int)nameplateObject.TextH);
+            if (blockHeight > 0)
+            {
+                _cachedNameplateTextHeights[nameplateIndex] = blockHeight;
+            }
+            else
+            {
+                blockHeight = _cachedNameplateTextHeights[nameplateIndex];
+            }
+
+            if (blockHeight <= 0)
+            {
+                blockHeight = GetScaledTextHeight(nameText);
+                if (blockHeight <= 0)
+                    blockHeight = nodeHeight;
+
+                _cachedNameplateTextHeights[nameplateIndex] = blockHeight;
+            }
+
+            var containerHeight = (int)nameContainer->Height;
+            if (containerHeight > 0)
+            {
+                _cachedNameplateContainerHeights[nameplateIndex] = containerHeight;
+            }
+            else
+            {
+                containerHeight = _cachedNameplateContainerHeights[nameplateIndex];
+            }
+
+            if (containerHeight <= 0)
+            {
+                containerHeight = blockHeight + (int)System.Math.Round(8 * textScaleY);
+                if (containerHeight <= blockHeight)
+                    containerHeight = blockHeight + 1;
+
+                _cachedNameplateContainerHeights[nameplateIndex] = containerHeight;
+            }
+
+            var blockTop = containerHeight - blockHeight;
+            if (blockTop < 0)
+                blockTop = 0;
+            var verticalPadding = (int)System.Math.Round(4 * effectiveScale);
+
+            var positionY = blockTop - verticalPadding - nodeHeight;
+
+            var textWidth = System.Math.Abs((int)nameplateObject.TextW);
+            if (textWidth <= 0)
+            {
+                textWidth = GetScaledTextWidth(nameText);
+                if (textWidth <= 0)
+                    textWidth = nodeWidth;
+            }
+
+            if (textWidth > 0)
+            {
+                _cachedNameplateTextWidths[nameplateIndex] = textWidth;
+            }
+
+            var textOffset = (int)System.Math.Round(nameText->AtkResNode.X);
+            var hasValidOffset = true;
+
+            if (System.Math.Abs((int)nameplateObject.TextW) > 0 || textOffset != 0)
+            {
+                _cachedNameplateTextOffsets[nameplateIndex] = textOffset;
+            }
+            else if (_cachedNameplateTextOffsets[nameplateIndex] != int.MinValue)
+            {
+                textOffset = _cachedNameplateTextOffsets[nameplateIndex];
+            }
+            else
+            {
+                hasValidOffset = false;
+            }
+            int positionX;
+
+            if (config.LightfinderAutoAlign && nameContainer != null && hasValidOffset)
+            {
+                var nameplateWidth = (int)nameContainer->Width;
+
+                if (!config.LightfinderLabelUseIcon)
+                {
+                    pNode->TextFlags &= ~TextFlags.AutoAdjustNodeSize;
+                    pNode->AtkResNode.Width = 0;
+                    pNode->SetText(labelContent);
+
+                    nodeWidth = (int)pNode->AtkResNode.GetWidth();
+                    if (nodeWidth <= 0)
+                        nodeWidth = (int)System.Math.Round(AtkNodeHelpers.DefaultTextNodeWidth * effectiveScale);
+
+                    if (nodeWidth > nameplateWidth)
+                        nodeWidth = nameplateWidth;
+
+                    pNode->AtkResNode.Width = (ushort)nodeWidth;
+                }
+                else
+                {
+                    pNode->TextFlags |= TextFlags.AutoAdjustNodeSize;
+                    pNode->AtkResNode.Width = 0;
+                    pNode->SetText(labelContent);
+                    nodeWidth = (int)pNode->AtkResNode.GetWidth();
+                }
+
+                int leftPos = nameplateWidth / 8;
+                int rightPos = nameplateWidth - nodeWidth - (nameplateWidth / 8);
+                int centrePos = (nameplateWidth - nodeWidth) / 2;
+                int staticMargin = 24;
+                int calcMargin = (int)(nameplateWidth * 0.08f);
+               
+                switch (config.LabelAlignment)
+                {
+                    case LabelAlignment.Left:
+                        positionX = config.LightfinderLabelUseIcon ? leftPos + staticMargin : leftPos;
+                        alignment = AlignmentType.BottomLeft;
+                        break;
+                    case LabelAlignment.Right:
+                        positionX = config.LightfinderLabelUseIcon ? rightPos - staticMargin : nameplateWidth - nodeWidth + calcMargin;
+                        alignment = AlignmentType.BottomRight;
+                        break;
+                    default:
+                        positionX = config.LightfinderLabelUseIcon ? centrePos : centrePos + calcMargin;
+                        alignment = AlignmentType.Bottom;
+                        break;
+                }
+            }
+            else
+            {
+                positionX = 58 + config.LightfinderLabelOffsetX;
+                alignment = AlignmentType.Bottom;
+            }
+
+            positionY += config.LightfinderLabelOffsetY;
+
+            alignment = (AlignmentType)System.Math.Clamp((int)alignment, 0, 8);
+            pNode->AtkResNode.SetUseDepthBasedPriority(true);
+
+            pNode->AtkResNode.Color.A = 255;
+
+            pNode->TextColor.R = (byte)(labelColor.X * 255);
+            pNode->TextColor.G = (byte)(labelColor.Y * 255);
+            pNode->TextColor.B = (byte)(labelColor.Z * 255);
+            pNode->TextColor.A = (byte)(labelColor.W * 255);
+
+            pNode->EdgeColor.R = (byte)(edgeColor.X * 255);
+            pNode->EdgeColor.G = (byte)(edgeColor.Y * 255);
+            pNode->EdgeColor.B = (byte)(edgeColor.Z * 255);
+            pNode->EdgeColor.A = (byte)(edgeColor.W * 255);
+
+            
+            if(!config.LightfinderLabelUseIcon)
+            {
+                pNode->AlignmentType = AlignmentType.Bottom;
+            }
+            else
+            {
+                pNode->AlignmentType = alignment;
+            }
+            pNode->AtkResNode.SetPositionShort(
+                (short)System.Math.Clamp(positionX, short.MinValue, short.MaxValue),
+                (short)System.Math.Clamp(positionY, short.MinValue, short.MaxValue)
+            );
+            var computedLineSpacing = (int)System.Math.Round(24 * scaleMultiplier);
+            pNode->LineSpacing = (byte)System.Math.Clamp(computedLineSpacing, 0, byte.MaxValue);
+            pNode->CharSpacing = 1;
+            pNode->TextFlags = config.LightfinderLabelUseIcon
+                ? TextFlags.Edge | TextFlags.Glare | TextFlags.AutoAdjustNodeSize
+                : TextFlags.Edge | TextFlags.Glare; 
+        }
+    }
+
+    private static unsafe int GetScaledTextHeight(AtkTextNode* node)
+    {
+        if (node == null)
+            return 0;
+
+        var resNode = &node->AtkResNode;
+        var rawHeight = (int)resNode->GetHeight();
+        if (rawHeight <= 0 && node->LineSpacing > 0)
+            rawHeight = node->LineSpacing;
+        if (rawHeight <= 0)
+            rawHeight = AtkNodeHelpers.DefaultTextNodeHeight;
+
+        var scale = resNode->ScaleY;
+        if (scale <= 0f)
+            scale = 1f;
+
+        var computed = (int)System.Math.Round(rawHeight * scale);
+        return System.Math.Max(1, computed);
+    }
+
+    private static unsafe int GetScaledTextWidth(AtkTextNode* node)
+    {
+        if (node == null)
+            return 0;
+
+        var resNode = &node->AtkResNode;
+        var rawWidth = (int)resNode->GetWidth();
+        if (rawWidth <= 0)
+            rawWidth = AtkNodeHelpers.DefaultTextNodeWidth;
+
+        var scale = resNode->ScaleX;
+        if (scale <= 0f)
+            scale = 1f;
+
+        var computed = (int)System.Math.Round(rawWidth * scale);
+        return System.Math.Max(1, computed);
+    }
+
+    internal static string NormalizeIconGlyph(string? rawInput)
+    {
+        if (string.IsNullOrWhiteSpace(rawInput))
+            return DefaultIconGlyph;
+
+        var trimmed = rawInput.Trim();
+
+        if (Enum.TryParse<SeIconChar>(trimmed, true, out var iconEnum))
+            return SeIconCharExtensions.ToIconString(iconEnum);
+
+        var hexCandidate = trimmed.StartsWith("0x", StringComparison.OrdinalIgnoreCase)
+            ? trimmed[2..]
+            : trimmed;
+
+        if (ushort.TryParse(hexCandidate, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var hexValue))
+            return char.ConvertFromUtf32(hexValue);
+
+        var enumerator = trimmed.EnumerateRunes();
+        if (enumerator.MoveNext())
+            return enumerator.Current.ToString();
+
+        return DefaultIconGlyph;
+    }
+
+    internal static string ToIconEditorString(string? rawInput)
+    {
+        var normalized = NormalizeIconGlyph(rawInput);
+        var runeEnumerator = normalized.EnumerateRunes();
+        return runeEnumerator.MoveNext()
+            ? runeEnumerator.Current.Value.ToString("X4", CultureInfo.InvariantCulture)
+            : DefaultIconGlyph;
+    }
+    private void HideNameplateTextNode(int i)
+    {
+        var pNode = mTextNodes[i];
+        if (pNode != null)
+        {
+            pNode->AtkResNode.ToggleVisibility(false);
+        }
+    }
+
+    private AddonNamePlate.NamePlateObject? GetNameplateObject(int i)
+    {
+        if (i < AddonNamePlate.NumNamePlateObjects &&
+            mpNameplateAddon != null &&
+            mpNameplateAddon->NamePlateObjectArray[i].RootComponentNode != null)
+        {
+            return mpNameplateAddon->NamePlateObjectArray[i];
+        }
+        else
+        {
+            return null;
+        }
+    }
+
+    private AtkComponentNode* GetNameplateComponentNode(int i)
+    {
+        var nameplateObject = GetNameplateObject(i);
+        return nameplateObject != null ? nameplateObject.Value.RootComponentNode : null;
+    }
+    private HashSet<ulong> VisibleUserIds => [.. _pairManager.GetOnlineUserPairs()
+            .Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue)
+            .Select(u => (ulong)u.PlayerCharacterId)];
+
+    public void FlagRefresh()
+    {
+        _needsLabelRefresh = true;
+    }
+
+    public void OnTick(PriorityFrameworkUpdateMessage _)
+    {
+        if (_needsLabelRefresh)
+        {
+            UpdateNameplateNodes();
+            _needsLabelRefresh = false;
+        }
+    }
+
+    public void UpdateBroadcastingCids(IEnumerable<string> cids)
+    {
+        var newSet = cids.ToHashSet();
+
+        var changed = !_activeBroadcastingCids.SetEquals(newSet);
+        if (!changed)
+            return;
+
+        _activeBroadcastingCids.Clear();
+        foreach (var cid in newSet)
+            _activeBroadcastingCids.Add(cid);
+
+        _logger.LogInformation("Active broadcast CIDs: {Cids}", string.Join(",", _activeBroadcastingCids));
+
+        FlagRefresh();
+    }
+
+    public void ClearNameplateCaches()
+    {
+        System.Array.Clear(_cachedNameplateTextWidths, 0, _cachedNameplateTextWidths.Length);
+        System.Array.Clear(_cachedNameplateTextHeights, 0, _cachedNameplateTextHeights.Length);
+        System.Array.Clear(_cachedNameplateContainerHeights, 0, _cachedNameplateContainerHeights.Length);
+        System.Array.Fill(_cachedNameplateTextOffsets, int.MinValue);
+    }
+}

LightlessSync/Services/NameplateService.cs

@@ -1,4 +1,4 @@
-using Dalamud.Game.ClientState.Objects.Enums;
+using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.Gui.NamePlate;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Plugin.Services;
@@ -8,10 +8,12 @@ using LightlessSync.PlayerData.Pairs;
 using LightlessSync.Services.Mediator;
 using LightlessSync.UI;
 using Microsoft.Extensions.Logging;
+
 namespace LightlessSync.Services;
 
 public class NameplateService : DisposableMediatorSubscriberBase
 {
+    private readonly ILogger<NameplateService> _logger;
     private readonly LightlessConfigService _configService;
     private readonly IClientState _clientState;
     private readonly INamePlateGui _namePlateGui;
@@ -24,27 +26,36 @@ public class NameplateService : DisposableMediatorSubscriberBase
         PairManager pairManager,
         LightlessMediator lightlessMediator) : base(logger, lightlessMediator)
     {
+        _logger = logger;
         _configService = configService;
         _namePlateGui = namePlateGui;
         _clientState = clientState;
         _pairManager = pairManager;
+
         _namePlateGui.OnNamePlateUpdate += OnNamePlateUpdate;
         _namePlateGui.RequestRedraw();
         Mediator.Subscribe<VisibilityChange>(this, (_) => _namePlateGui.RequestRedraw());
-
     }
 
     private void OnNamePlateUpdate(INamePlateUpdateContext context, IReadOnlyList<INamePlateUpdateHandler> handlers)
     {
+        if (!_configService.Current.IsNameplateColorsEnabled || (_configService.Current.IsNameplateColorsEnabled && _clientState.IsPvPExcludingDen))
+            return;
 
-        if (!_configService.Current.IsNameplateColorsEnabled && !_clientState.IsPvPExcludingDen) return;
+        var visibleUsersIds = _pairManager.GetOnlineUserPairs()
-        var visibleUsersIds = _pairManager.GetOnlineUserPairs().Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue).Select(u => (ulong)u.PlayerCharacterId).ToHashSet();
+            .Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue)
+            .Select(u => (ulong)u.PlayerCharacterId)
+            .ToHashSet();
+
+        var now = DateTime.UtcNow;
         var colors = _configService.Current.NameplateColors;
 
         foreach (var handler in handlers)
         {
             var playerCharacter = handler.PlayerCharacter;
-            if (playerCharacter == null) { continue; }
+            if (playerCharacter == null)
+                continue;
+
             var isInParty = playerCharacter.StatusFlags.HasFlag(StatusFlags.PartyMember);
             var isFriend = playerCharacter.StatusFlags.HasFlag(StatusFlags.Friend);
             bool partyColorAllowed = (_configService.Current.overridePartyColor && isInParty);
@@ -57,6 +68,19 @@ public class NameplateService : DisposableMediatorSubscriberBase
                     ))
             {
                 handler.NameParts.TextWrap = CreateTextWrap(colors);
+
+                if (_configService.Current.overrideFcTagColor)
+                {
+                    bool hasActualFcTag = playerCharacter.CompanyTag.TextValue.Length > 0;
+                    bool isFromDifferentRealm = playerCharacter.HomeWorld.RowId != playerCharacter.CurrentWorld.RowId;
+                    bool shouldColorFcArea = hasActualFcTag || (!hasActualFcTag && isFromDifferentRealm);
+                    
+                    if (shouldColorFcArea)
+                    {
+                        handler.FreeCompanyTagParts.OuterWrap = CreateTextWrap(colors);
+                        handler.FreeCompanyTagParts.TextWrap = CreateTextWrap(colors);
+                    }
+                }
             }
         }
     }
@@ -80,12 +104,11 @@ public class NameplateService : DisposableMediatorSubscriberBase
         return (left.ToReadOnlySeString().ToDalamudString(), right.ToReadOnlySeString().ToDalamudString());
     }
 
-
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
+
         _namePlateGui.OnNamePlateUpdate -= OnNamePlateUpdate;
         _namePlateGui.RequestRedraw();
     }
-}
+}
-

LightlessSync/Services/PairProcessingLimiter.cs

@@ -0,0 +1,220 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using LightlessSync.LightlessConfiguration;
+using LightlessSync.Services.Mediator;
+using Microsoft.Extensions.Logging;
+
+namespace LightlessSync.Services;
+
+public sealed class PairProcessingLimiter : DisposableMediatorSubscriberBase
+{
+    private const int HardLimit = 32;
+    private readonly LightlessConfigService _configService;
+    private readonly object _limitLock = new();
+    private readonly SemaphoreSlim _semaphore;
+    private int _currentLimit;
+    private int _pendingReductions;
+    private int _waiting;
+    private int _inFlight;
+
+    public PairProcessingLimiter(ILogger<PairProcessingLimiter> logger, LightlessMediator mediator, LightlessConfigService configService)
+        : base(logger, mediator)
+    {
+        _configService = configService;
+        _currentLimit = CalculateLimit();
+        var initialCount = _configService.Current.EnablePairProcessingLimiter ? _currentLimit : HardLimit;
+        _semaphore = new SemaphoreSlim(initialCount, HardLimit);
+
+        Mediator.Subscribe<PairProcessingLimitChangedMessage>(this, _ => UpdateSemaphoreLimit());
+    }
+
+    public ValueTask<IAsyncDisposable> AcquireAsync(CancellationToken cancellationToken)
+    {
+        return WaitInternalAsync(cancellationToken);
+    }
+
+    public PairProcessingLimiterSnapshot GetSnapshot()
+    {
+        lock (_limitLock)
+        {
+            var enabled = IsEnabled;
+            var limit = enabled ? _currentLimit : CalculateLimit();
+            var waiting = Math.Max(0, Volatile.Read(ref _waiting));
+            var inFlight = Math.Max(0, Volatile.Read(ref _inFlight));
+            return new PairProcessingLimiterSnapshot(enabled, limit, inFlight, waiting);
+        }
+    }
+
+    private bool IsEnabled => _configService.Current.EnablePairProcessingLimiter;
+
+    private async ValueTask<IAsyncDisposable> WaitInternalAsync(CancellationToken token)
+    {
+        if (!IsEnabled)
+        {
+            return NoopReleaser.Instance;
+        }
+
+        Interlocked.Increment(ref _waiting);
+        try
+        {
+            await _semaphore.WaitAsync(token).ConfigureAwait(false);
+        }
+        catch
+        {
+            Interlocked.Decrement(ref _waiting);
+            throw;
+        }
+
+        Interlocked.Decrement(ref _waiting);
+
+        if (!IsEnabled)
+        {
+            _semaphore.Release();
+            return NoopReleaser.Instance;
+        }
+
+        Interlocked.Increment(ref _inFlight);
+        return new Releaser(this);
+    }
+
+    private void UpdateSemaphoreLimit()
+    {
+        lock (_limitLock)
+        {
+            var enabled = IsEnabled;
+            var desiredLimit = CalculateLimit();
+
+            if (!enabled)
+            {
+                var releaseAmount = HardLimit - _semaphore.CurrentCount;
+                if (releaseAmount > 0)
+                {
+                    try
+                    {
+                        _semaphore.Release(releaseAmount);
+                    }
+                    catch (SemaphoreFullException)
+                    {
+                        // ignore, already at max
+                    }
+                }
+
+                _currentLimit = desiredLimit;
+                _pendingReductions = 0;
+                return;
+            }
+
+            if (desiredLimit == _currentLimit)
+            {
+                return;
+            }
+
+            if (desiredLimit > _currentLimit)
+            {
+                var increment = desiredLimit - _currentLimit;
+                var allowed = Math.Min(increment, HardLimit - _semaphore.CurrentCount);
+                if (allowed > 0)
+                {
+                    _semaphore.Release(allowed);
+                }
+            }
+            else
+            {
+                var decrement = _currentLimit - desiredLimit;
+                var removed = 0;
+                while (removed < decrement && _semaphore.Wait(0))
+                {
+                    removed++;
+                }
+
+                var remaining = decrement - removed;
+                if (remaining > 0)
+                {
+                    _pendingReductions += remaining;
+                }
+            }
+
+            _currentLimit = desiredLimit;
+            Logger.LogDebug("Pair processing concurrency updated to {limit} (pending reductions: {pending})", _currentLimit, _pendingReductions);
+        }
+    }
+
+    private int CalculateLimit()
+    {
+        var configured = _configService.Current.MaxConcurrentPairApplications;
+        return Math.Clamp(configured, 1, HardLimit);
+    }
+
+    private void ReleaseOne()
+    {
+        var inFlight = Interlocked.Decrement(ref _inFlight);
+        if (inFlight < 0)
+        {
+            Interlocked.Exchange(ref _inFlight, 0);
+        }
+
+        if (!IsEnabled)
+        {
+            return;
+        }
+
+        lock (_limitLock)
+        {
+            if (_pendingReductions > 0)
+            {
+                _pendingReductions--;
+                return;
+            }
+        }
+
+        _semaphore.Release();
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing)
+        {
+            return;
+        }
+
+        _semaphore.Dispose();
+    }
+
+    private sealed class Releaser : IAsyncDisposable
+    {
+        private PairProcessingLimiter? _owner;
+
+        public Releaser(PairProcessingLimiter owner)
+        {
+            _owner = owner;
+        }
+
+        public ValueTask DisposeAsync()
+        {
+            var owner = Interlocked.Exchange(ref _owner, null);
+            owner?.ReleaseOne();
+            return ValueTask.CompletedTask;
+        }
+    }
+
+    private sealed class NoopReleaser : IAsyncDisposable
+    {
+        public static readonly NoopReleaser Instance = new();
+
+        private NoopReleaser()
+        {
+        }
+
+        public ValueTask DisposeAsync()
+        {
+            return ValueTask.CompletedTask;
+        }
+    }
+}
+
+public readonly record struct PairProcessingLimiterSnapshot(bool IsEnabled, int Limit, int InFlight, int Waiting)
+{
+    public int Remaining => Math.Max(0, Limit - InFlight);
+}

LightlessSync/Services/PairRequestService.cs

@@ -0,0 +1,189 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using LightlessSync.PlayerData.Pairs;
+using LightlessSync.Services.Mediator;
+using Microsoft.Extensions.Logging;
+
+namespace LightlessSync.Services;
+
+public sealed class PairRequestService : DisposableMediatorSubscriberBase
+{
+    private readonly DalamudUtilService _dalamudUtil;
+    private readonly PairManager _pairManager;
+    private readonly object _syncRoot = new();
+    private readonly List<PairRequestEntry> _requests = [];
+
+    private static readonly TimeSpan Expiration = TimeSpan.FromMinutes(5);
+
+    public PairRequestService(ILogger<PairRequestService> logger, LightlessMediator mediator, DalamudUtilService dalamudUtil, PairManager pairManager)
+        : base(logger, mediator)
+    {
+        _dalamudUtil = dalamudUtil;
+        _pairManager = pairManager;
+
+        Mediator.Subscribe<PriorityFrameworkUpdateMessage>(this, _ =>
+        {
+            bool removed;
+            lock (_syncRoot)
+            {
+                removed = CleanupExpiredUnsafe();
+            }
+
+            if (removed)
+            {
+                Mediator.Publish(new PairRequestsUpdatedMessage());
+            }
+        });
+    }
+
+    public PairRequestDisplay RegisterIncomingRequest(string hashedCid, string messageTemplate)
+    {
+        if (string.IsNullOrWhiteSpace(hashedCid))
+        {
+            hashedCid = string.Empty;
+        }
+
+        messageTemplate ??= string.Empty;
+
+        PairRequestEntry entry = new(hashedCid, messageTemplate, DateTime.UtcNow);
+        lock (_syncRoot)
+        {
+            CleanupExpiredUnsafe();
+            var index = _requests.FindIndex(r => string.Equals(r.HashedCid, hashedCid, StringComparison.Ordinal));
+            if (index >= 0)
+            {
+                _requests[index] = entry;
+            }
+            else
+            {
+                _requests.Add(entry);
+            }
+        }
+
+        var display = _dalamudUtil.IsOnFrameworkThread
+            ? ToDisplay(entry)
+            : _dalamudUtil.RunOnFrameworkThread(() => ToDisplay(entry)).GetAwaiter().GetResult();
+
+        Mediator.Publish(new PairRequestsUpdatedMessage());
+        return display;
+    }
+
+    public IReadOnlyList<PairRequestDisplay> GetActiveRequests()
+    {
+        List<PairRequestEntry> entries;
+        lock (_syncRoot)
+        {
+            CleanupExpiredUnsafe();
+            entries = _requests
+                .OrderByDescending(r => r.ReceivedAt)
+                .ToList();
+        }
+
+        return _dalamudUtil.IsOnFrameworkThread
+            ? entries.Select(ToDisplay).ToList()
+            : _dalamudUtil.RunOnFrameworkThread(() => entries.Select(ToDisplay).ToList()).GetAwaiter().GetResult();
+    }
+
+    public bool RemoveRequest(string hashedCid)
+    {
+        bool removed;
+        lock (_syncRoot)
+        {
+            removed = _requests.RemoveAll(r => string.Equals(r.HashedCid, hashedCid, StringComparison.Ordinal)) > 0;
+        }
+
+        if (removed)
+        {
+            Mediator.Publish(new PairRequestsUpdatedMessage());
+        }
+
+        return removed;
+    }
+
+    public bool HasPendingRequests()
+    {
+        lock (_syncRoot)
+        {
+            CleanupExpiredUnsafe();
+            return _requests.Count > 0;
+        }
+    }
+
+    private PairRequestDisplay ToDisplay(PairRequestEntry entry)
+    {
+        var displayName = ResolveDisplayName(entry.HashedCid);
+        var message = FormatMessage(entry.MessageTemplate, displayName);
+        return new PairRequestDisplay(entry.HashedCid, displayName, message, entry.ReceivedAt);
+    }
+
+    private string ResolveDisplayName(string hashedCid)
+    {
+        if (string.IsNullOrWhiteSpace(hashedCid))
+        {
+            return string.Empty;
+        }
+
+        var (name, address) = _dalamudUtil.FindPlayerByNameHash(hashedCid);
+        if (!string.IsNullOrWhiteSpace(name))
+        {
+            var worldName = _dalamudUtil.GetWorldNameFromPlayerAddress(address);
+            return !string.IsNullOrWhiteSpace(worldName)
+                ? $"{name} @ {worldName}"
+                : name;
+        }
+
+        var pair = _pairManager
+            .GetOnlineUserPairs()
+            .FirstOrDefault(p => string.Equals(p.Ident, hashedCid, StringComparison.Ordinal));
+
+        if (pair != null)
+        {
+            if (!string.IsNullOrWhiteSpace(pair.PlayerName))
+            {
+                return pair.PlayerName;
+            }
+
+            if (!string.IsNullOrWhiteSpace(pair.UserData.AliasOrUID))
+            {
+                return pair.UserData.AliasOrUID;
+            }
+        }
+
+        return string.Empty;
+    }
+
+    private static string FormatMessage(string template, string displayName)
+    {
+        var safeName = string.IsNullOrWhiteSpace(displayName) ? "Someone" : displayName;
+        template ??= string.Empty;
+        const string placeholder = "{DisplayName}";
+
+        if (!string.IsNullOrEmpty(template) && template.Contains(placeholder, StringComparison.Ordinal))
+        {
+            return template.Replace(placeholder, safeName, StringComparison.Ordinal);
+        }
+
+        if (!string.IsNullOrWhiteSpace(template))
+        {
+            return $"{safeName}: {template}";
+        }
+
+        return $"{safeName} sent you a pair request.";
+    }
+
+    private bool CleanupExpiredUnsafe()
+    {
+        if (_requests.Count == 0)
+        {
+            return false;
+        }
+
+        var now = DateTime.UtcNow;
+        return _requests.RemoveAll(r => now - r.ReceivedAt > Expiration) > 0;
+    }
+
+    private record struct PairRequestEntry(string HashedCid, string MessageTemplate, DateTime ReceivedAt);
+
+    public readonly record struct PairRequestDisplay(string HashedCid, string DisplayName, string Message, DateTime ReceivedAt);
+}

LightlessSync/Services/ServerConfiguration/ServerConfigurationManager.cs

@@ -23,15 +23,18 @@ public class ServerConfigurationManager
     private readonly ILogger<ServerConfigurationManager> _logger;
     private readonly LightlessMediator _lightlessMediator;
     private readonly NotesConfigService _notesConfig;
-    private readonly ServerTagConfigService _serverTagConfig;
+    private readonly PairTagConfigService _pairTagConfig;
+    private readonly SyncshellTagConfigService _syncshellTagConfig;
+    private readonly int _maxCharactersFolder = 20;
 
     public ServerConfigurationManager(ILogger<ServerConfigurationManager> logger, ServerConfigService configService,
-        ServerTagConfigService serverTagConfig, NotesConfigService notesConfig, DalamudUtilService dalamudUtil,
+        PairTagConfigService pairTagConfig, SyncshellTagConfigService syncshellTagConfig, NotesConfigService notesConfig, DalamudUtilService dalamudUtil,
         LightlessConfigService lightlessConfigService, HttpClient httpClient, LightlessMediator lightlessMediator)
     {
         _logger = logger;
         _configService = configService;
-        _serverTagConfig = serverTagConfig;
+        _pairTagConfig = pairTagConfig;
+        _syncshellTagConfig = syncshellTagConfig;
         _notesConfig = notesConfig;
         _dalamudUtil = dalamudUtil;
         _lightlessConfigService = lightlessConfigService;
@@ -258,7 +261,7 @@ public class ServerConfigurationManager
     {
         if (serverSelectionIndex == -1) serverSelectionIndex = CurrentServerIndex;
         var server = GetServerByIndex(serverSelectionIndex);
-        if (server.Authentications.Any(c => string.Equals(c.CharacterName, _dalamudUtil.GetPlayerNameAsync().GetAwaiter().GetResult(), StringComparison.Ordinal)
+        if (server.Authentications.Exists(c => string.Equals(c.CharacterName, _dalamudUtil.GetPlayerNameAsync().GetAwaiter().GetResult(), StringComparison.Ordinal)
                 && c.WorldId == _dalamudUtil.GetHomeWorldIdAsync().GetAwaiter().GetResult()))
             return;
 
@@ -277,15 +280,15 @@ public class ServerConfigurationManager
         var server = GetServerByIndex(serverSelectionIndex);
         server.Authentications.Add(new Authentication()
         {
-            SecretKeyIdx = server.SecretKeys.Any() ? server.SecretKeys.First().Key : -1,
+            SecretKeyIdx = server.SecretKeys.Count != 0 ? server.SecretKeys.First().Key : -1,
         });
         Save();
     }
 
     internal void AddOpenPairTag(string tag)
     {
-        CurrentServerTagStorage().OpenPairTags.Add(tag);
+        CurrentPairTagStorage().OpenPairTags.Add(tag);
-        _serverTagConfig.Save();
+        _pairTagConfig.Save();
     }
 
     internal void AddServer(ServerStorage serverStorage)
@@ -294,36 +297,79 @@ public class ServerConfigurationManager
         Save();
     }
 
-    internal void AddTag(string tag)
+    internal void AddPairTag(string tag)
     {
-        CurrentServerTagStorage().ServerAvailablePairTags.Add(tag);
+        if (tag.Length <= _maxCharactersFolder)
-        _serverTagConfig.Save();
+        {
-        _lightlessMediator.Publish(new RefreshUiMessage());
+            CurrentPairTagStorage().ServerAvailablePairTags.Add(tag);
+            _pairTagConfig.Save();
+            _lightlessMediator.Publish(new RefreshUiMessage());
+        }
+        else
+        {
+            _logger.LogInformation("Couldn't save/add {tag}. Name too long to be saved", tag);
+        }
+    }
+
+    internal void AddSyncshellTag(string tag)
+    {
+        if (tag.Length <= _maxCharactersFolder)
+        {
+            CurrentSyncshellTagStorage().ServerAvailableSyncshellTags.Add(tag);
+            _syncshellTagConfig.Save();
+            _lightlessMediator.Publish(new RefreshUiMessage());
+        }
+        else
+        {
+            _logger.LogInformation("Couldn't save/add {tag}. Name too long to be saved", tag);
+        }
     }
 
     internal void AddTagForUid(string uid, string tagName)
     {
-        if (CurrentServerTagStorage().UidServerPairedUserTags.TryGetValue(uid, out var tags))
+        if (CurrentPairTagStorage().UidServerPairedUserTags.TryGetValue(uid, out var tags))
         {
             tags.Add(tagName);
             _lightlessMediator.Publish(new RefreshUiMessage());
         }
         else
         {
-            CurrentServerTagStorage().UidServerPairedUserTags[uid] = [tagName];
+            CurrentPairTagStorage().UidServerPairedUserTags[uid] = [tagName];
         }
 
-        _serverTagConfig.Save();
+        _pairTagConfig.Save();
     }
 
-    internal bool ContainsOpenPairTag(string tag)
+    internal void AddTagForSyncshell(string syncshellName, string tagName)
     {
-        return CurrentServerTagStorage().OpenPairTags.Contains(tag);
+        if (CurrentSyncshellTagStorage().SyncshellPairedTags.TryGetValue(syncshellName, out var tags))
+        {
+            tags.Add(tagName);
+            _lightlessMediator.Publish(new RefreshUiMessage());
+        }
+        else
+        {
+            CurrentSyncshellTagStorage().SyncshellPairedTags[syncshellName] = [tagName];
+        }
+
+        _syncshellTagConfig.Save();
     }
 
-    internal bool ContainsTag(string uid, string tag)
+    internal bool ContainsOpenPairTag(string tag) => CurrentPairTagStorage().OpenPairTags.Contains(tag);
+
+    internal bool ContainsPairTag(string uid, string tag)
     {
-        if (CurrentServerTagStorage().UidServerPairedUserTags.TryGetValue(uid, out var tags))
+        if (CurrentPairTagStorage().UidServerPairedUserTags.TryGetValue(uid, out var tags))
+        {
+            return tags.Contains(tag, StringComparer.Ordinal);
+        }
+
+        return false;
+    }
+
+    internal bool ContainsSyncshellTag(string name, string tag)
+    {
+        if (CurrentSyncshellTagStorage().SyncshellPairedTags.TryGetValue(name, out var tags))
         {
             return tags.Contains(tag, StringComparer.Ordinal);
         }
@@ -364,30 +410,19 @@ public class ServerConfigurationManager
         return null;
     }
 
-    internal HashSet<string> GetServerAvailablePairTags()
+    internal HashSet<string> GetServerAvailablePairTags() => CurrentPairTagStorage().ServerAvailablePairTags;
-    {
-        return CurrentServerTagStorage().ServerAvailablePairTags;
-    }
 
-    internal Dictionary<string, List<string>> GetUidServerPairedUserTags()
+    internal HashSet<string> GetServerAvailableSyncshellTags() => CurrentSyncshellTagStorage().ServerAvailableSyncshellTags;
-    {
-        return CurrentServerTagStorage().UidServerPairedUserTags;
-    }
 
-    internal HashSet<string> GetUidsForTag(string tag)
+    internal Dictionary<string, List<string>> GetUidServerPairedUserTags() => CurrentPairTagStorage().UidServerPairedUserTags;
-    {
-        return CurrentServerTagStorage().UidServerPairedUserTags.Where(p => p.Value.Contains(tag, StringComparer.Ordinal)).Select(p => p.Key).ToHashSet(StringComparer.Ordinal);
-    }
 
-    internal bool HasTags(string uid)
+    internal HashSet<string> GetUidsForPairTag(string tag) => CurrentPairTagStorage().UidServerPairedUserTags.Where(p => p.Value.Contains(tag, StringComparer.Ordinal)).Select(p => p.Key).ToHashSet(StringComparer.Ordinal);
-    {
-        if (CurrentServerTagStorage().UidServerPairedUserTags.TryGetValue(uid, out var tags))
-        {
-            return tags.Any();
-        }
 
-        return false;
+    internal HashSet<string> GetNamesForSyncshellTag(string tag) => CurrentSyncshellTagStorage().SyncshellPairedTags.Where(p => p.Value.Contains(tag, StringComparer.Ordinal)).Select(p => p.Key).ToHashSet(StringComparer.Ordinal);
-    }
+
+    internal bool HasPairTags(string uid) => CurrentPairTagStorage().UidServerPairedUserTags.TryGetValue(uid, out var tags) && tags.Count != 0;
+
+    internal bool HasSyncshellTags(string name) => CurrentSyncshellTagStorage().SyncshellPairedTags.TryGetValue(name, out var tags) && tags.Count != 0;
 
     internal void RemoveCharacterFromServer(int serverSelectionIndex, Authentication item)
     {
@@ -398,51 +433,96 @@ public class ServerConfigurationManager
 
     internal void RemoveOpenPairTag(string tag)
     {
-        CurrentServerTagStorage().OpenPairTags.Remove(tag);
+        CurrentPairTagStorage().OpenPairTags.Remove(tag);
-        _serverTagConfig.Save();
+        _pairTagConfig.Save();
     }
 
-    internal void RemoveTag(string tag)
+    internal void RemovePairTag(string tag)
     {
-        CurrentServerTagStorage().ServerAvailablePairTags.Remove(tag);
+        RemoveTag(CurrentPairTagStorage().ServerAvailablePairTags, tag);
-        foreach (var uid in GetUidsForTag(tag))
+        _pairTagConfig.Save();
-        {
-            RemoveTagForUid(uid, tag, save: false);
-        }
-        _serverTagConfig.Save();
         _lightlessMediator.Publish(new RefreshUiMessage());
     }
 
+    internal void RemoveSyncshellTag(string tag)
+    {
+        RemoveTag(CurrentSyncshellTagStorage().ServerAvailableSyncshellTags, tag, true);
+        _syncshellTagConfig.Save();
+        _lightlessMediator.Publish(new RefreshUiMessage());
+    }
+
+    internal void RemoveTag(HashSet<string> storage, string tag, bool syncshell = false)
+    {
+        storage.Remove(tag);
+        if (syncshell)
+        {
+            foreach (var uid in GetNamesForSyncshellTag(tag))
+            {
+                RemoveTagForSyncshell(uid, tag, save: false);
+            }
+        }
+        else
+        {
+            foreach (var uid in GetUidsForPairTag(tag))
+            {
+                RemoveTagForUid(uid, tag, save: false);
+            }
+        }
+    }
+
     internal void RemoveTagForUid(string uid, string tagName, bool save = true)
     {
-        if (CurrentServerTagStorage().UidServerPairedUserTags.TryGetValue(uid, out var tags))
+        if (CurrentPairTagStorage().UidServerPairedUserTags.TryGetValue(uid, out var tags))
         {
             tags.Remove(tagName);
 
             if (save)
             {
-                _serverTagConfig.Save();
+                _pairTagConfig.Save();
                 _lightlessMediator.Publish(new RefreshUiMessage());
             }
         }
     }
 
-    internal void RenameTag(string oldName, string newName)
+    internal void RemoveTagForSyncshell(string name, string tagName, bool save = true)
     {
-        CurrentServerTagStorage().ServerAvailablePairTags.Remove(oldName);
+        if (CurrentSyncshellTagStorage().SyncshellPairedTags.TryGetValue(name, out var tags))
-        CurrentServerTagStorage().ServerAvailablePairTags.Add(newName);
-        foreach (var existingTags in CurrentServerTagStorage().UidServerPairedUserTags.Select(k => k.Value))
         {
-            if (existingTags.Remove(oldName))
+            tags.Remove(tagName);
-                existingTags.Add(newName);
+
+            if (save)
+            {
+                _syncshellTagConfig.Save();
+                _lightlessMediator.Publish(new RefreshUiMessage());
+            }
         }
     }
 
-    internal void SaveNotes()
+    internal void RenamePairTag(string oldName, string newName) => RenameTag(CurrentPairTagStorage().UidServerPairedUserTags, CurrentPairTagStorage().ServerAvailablePairTags, oldName, newName);
+
+    internal void RenameSyncshellTag(string oldName, string newName) => RenameTag(CurrentSyncshellTagStorage().SyncshellPairedTags, CurrentSyncshellTagStorage().ServerAvailableSyncshellTags, oldName, newName);
+
+    internal void RenameTag(Dictionary<string, List<string>> tags, HashSet<string> storage, string oldName, string newName)
     {
-        _notesConfig.Save();
+        if (newName.Length > _maxCharactersFolder)
+        {
+            storage.Remove(oldName);
+            storage.Add(newName);
+            foreach (var existingTags in tags.Select(k => k.Value))
+            {
+                if (existingTags.Remove(oldName))
+                    existingTags.Add(newName);
+            }
+            _lightlessMediator.Publish(new RefreshUiMessage());
+        }
+        else
+        {
+            _logger.LogInformation("Couldn't save/add {tag}. Name too long to be saved", newName);
+        }
     }
 
+    internal void SaveNotes() => _notesConfig.Save();
+
     internal void SetNoteForGid(string gid, string note, bool save = true)
     {
         if (string.IsNullOrEmpty(gid)) return;
@@ -476,10 +556,16 @@ public class ServerConfigurationManager
         return _notesConfig.Current.ServerNotes[CurrentApiUrl];
     }
 
-    private ServerTagStorage CurrentServerTagStorage()
+    private PairTagStorage CurrentPairTagStorage()
     {
-        TryCreateCurrentServerTagStorage();
+        TryCreateCurrentPairTagStorage();
-        return _serverTagConfig.Current.ServerTagStorage[CurrentApiUrl];
+        return _pairTagConfig.Current.ServerTagStorage[CurrentApiUrl];
+    }
+
+    private SyncshellTagStorage CurrentSyncshellTagStorage()
+    {
+        TryCreateCurrentSyncshellTagStorage();
+        return _syncshellTagConfig.Current.ServerTagStorage[CurrentApiUrl];
     }
 
     private void EnsureMainExists()
@@ -499,11 +585,19 @@ public class ServerConfigurationManager
         }
     }
 
-    private void TryCreateCurrentServerTagStorage()
+    private void TryCreateCurrentPairTagStorage()
     {
-        if (!_serverTagConfig.Current.ServerTagStorage.ContainsKey(CurrentApiUrl))
+        if (!_pairTagConfig.Current.ServerTagStorage.ContainsKey(CurrentApiUrl))
         {
-            _serverTagConfig.Current.ServerTagStorage[CurrentApiUrl] = new();
+            _pairTagConfig.Current.ServerTagStorage[CurrentApiUrl] = new();
+        }
+    }
+
+    private void TryCreateCurrentSyncshellTagStorage()
+    {
+        if (!_syncshellTagConfig.Current.ServerTagStorage.ContainsKey(CurrentApiUrl))
+        {
+            _syncshellTagConfig.Current.ServerTagStorage[CurrentApiUrl] = new();
         }
     }
 

LightlessSync/Services/UiFactory.cs

@@ -3,7 +3,6 @@ using LightlessSync.PlayerData.Pairs;
 using LightlessSync.Services.Mediator;
 using LightlessSync.Services.ServerConfiguration;
 using LightlessSync.UI;
-using LightlessSync.UI.Components.Popup;
 using LightlessSync.WebAPI;
 using Microsoft.Extensions.Logging;
 

LightlessSync/Services/UiService.cs

@@ -4,7 +4,6 @@ using Dalamud.Interface.Windowing;
 using LightlessSync.LightlessConfiguration;
 using LightlessSync.Services.Mediator;
 using LightlessSync.UI;
-using LightlessSync.UI.Components.Popup;
 using Microsoft.Extensions.Logging;
 
 namespace LightlessSync.Services;

LightlessSync/UI/BroadcastUI.cs

@@ -0,0 +1,421 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface.Colors;
+using Dalamud.Interface.Utility;
+using Dalamud.Utility;
+using LightlessSync.API.Dto.Group;
+using LightlessSync.LightlessConfiguration;
+using LightlessSync.Services;
+using LightlessSync.Services.Mediator;
+using LightlessSync.Utils;
+using LightlessSync.WebAPI;
+using Microsoft.Extensions.Logging;
+using System.Numerics;
+
+namespace LightlessSync.UI
+{
+    public class BroadcastUI : WindowMediatorSubscriberBase
+    {
+        private readonly ApiController _apiController;
+        private readonly LightlessConfigService _configService;
+        private readonly BroadcastService _broadcastService;
+        private readonly UiSharedService _uiSharedService;
+        private readonly BroadcastScannerService _broadcastScannerService;
+
+        private IReadOnlyList<GroupFullInfoDto> _allSyncshells;
+        private string _userUid = string.Empty;
+
+        private readonly List<(string Label, string? GID, bool IsAvailable)> _syncshellOptions = new();
+
+        public BroadcastUI(
+            ILogger<BroadcastUI> logger,
+            LightlessMediator mediator,
+            PerformanceCollectorService performanceCollectorService,
+            BroadcastService broadcastService,
+            LightlessConfigService configService,
+            UiSharedService uiShared,
+            ApiController apiController,
+            BroadcastScannerService broadcastScannerService
+            ) : base(logger, mediator, "Lightfinder###LightlessLightfinderUI", performanceCollectorService)
+        {
+            _broadcastService = broadcastService;
+            _uiSharedService = uiShared;
+            _configService = configService;
+            _apiController = apiController;
+            _broadcastScannerService = broadcastScannerService;
+
+            IsOpen = false;
+            this.SizeConstraints = new()
+            {
+                MinimumSize = new(600, 465),
+                MaximumSize = new(750, 525)
+            };
+        }
+
+        private void RebuildSyncshellDropdownOptions()
+        {
+            var selectedGid = _configService.Current.SelectedFinderSyncshell;
+            var allSyncshells = _allSyncshells ?? Array.Empty<GroupFullInfoDto>();
+            var ownedSyncshells = allSyncshells
+                .Where(g => string.Equals(g.OwnerUID, _userUid, StringComparison.Ordinal))
+                .ToList();
+
+            _syncshellOptions.Clear();
+            _syncshellOptions.Add(("None", null, true));
+
+            var addedGids = new HashSet<string>(StringComparer.Ordinal);
+
+            foreach (var shell in ownedSyncshells)
+            {
+                var label = shell.GroupAliasOrGID ?? shell.GID;
+                _syncshellOptions.Add((label, shell.GID, true));
+                addedGids.Add(shell.GID);
+            }
+
+            if (!string.IsNullOrEmpty(selectedGid) && !addedGids.Contains(selectedGid))
+            {
+                var matching = allSyncshells.FirstOrDefault(g => string.Equals(g.GID, selectedGid, StringComparison.Ordinal));
+                if (matching != null)
+                {
+                    var label = matching.GroupAliasOrGID ?? matching.GID;
+                    _syncshellOptions.Add((label, matching.GID, true));
+                    addedGids.Add(matching.GID);
+                }
+            }
+
+            if (!string.IsNullOrEmpty(selectedGid) && !addedGids.Contains(selectedGid))
+            {
+                _syncshellOptions.Add(($"[Unavailable] {selectedGid}", selectedGid, false));
+            }
+        }
+
+        public Task RefreshSyncshells()
+        {
+            return RefreshSyncshellsInternal();
+        }
+
+        private async Task RefreshSyncshellsInternal()
+        {
+            if (!_apiController.IsConnected)
+            {
+                _allSyncshells = [];
+                RebuildSyncshellDropdownOptions();
+                return;
+            }
+
+            try
+            {
+                _allSyncshells = await _apiController.GroupsGetAll().ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Failed to fetch Syncshells.");
+                _allSyncshells = [];
+            }
+
+            RebuildSyncshellDropdownOptions();
+        }
+
+
+        public override void OnOpen()
+        {
+            _userUid = _apiController.UID;
+            _ = RefreshSyncshells();
+        }
+
+        protected override void DrawInternal()
+        {
+            if (!_broadcastService.IsLightFinderAvailable)
+            {
+                _uiSharedService.MediumText("This server doesn't support Lightfinder.", UIColors.Get("LightlessYellow"));
+
+                ImGuiHelpers.ScaledDummy(0.25f);
+            }
+
+            if (ImGui.BeginTabBar("##BroadcastTabs"))
+            {
+                if (ImGui.BeginTabItem("Lightfinder"))
+                {
+                    _uiSharedService.MediumText("Lightfinder", UIColors.Get("PairBlue"));
+
+                    ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(1, -2));
+
+                    _uiSharedService.DrawNoteLine("# ", UIColors.Get("LightlessPurple"),"This lets other Lightless users know you use Lightless. While enabled, you and others using Lightfinder can see each other identified as Lightless users.");
+
+                    ImGui.Indent(15f);
+                        ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudGrey);
+                        ImGui.Text("- This is done using a 'Lightless' label above player nameplates.");
+                        ImGui.PopStyleColor();
+                    ImGui.Unindent(15f);
+
+                    ImGuiHelpers.ScaledDummy(3f);
+
+                    _uiSharedService.MediumText("Pairing", UIColors.Get("PairBlue"));
+                    _uiSharedService.DrawNoteLine("# ", UIColors.Get("LightlessPurple"), "Pairing may be initiated via the right-click context menu on another player." +
+                        " The process requires mutual confirmation: the sender initiates the request, and the recipient completes it by responding with a request in return.");
+
+                    _uiSharedService.DrawNoteLine(
+                        "! ",
+                        UIColors.Get("LightlessYellow"),
+                        new SeStringUtils.RichTextEntry("If Lightfinder is "),
+                        new SeStringUtils.RichTextEntry("ENABLED", UIColors.Get("LightlessGreen"), true),
+                        new SeStringUtils.RichTextEntry(" when a pair request is made, the receiving user will get notified about it."));
+
+                    _uiSharedService.DrawNoteLine(
+                        "! ",
+                        UIColors.Get("LightlessYellow"),
+                        new SeStringUtils.RichTextEntry("If Lightfinder is "),
+                        new SeStringUtils.RichTextEntry("DISABLED", UIColors.Get("DimRed"), true),
+                        new SeStringUtils.RichTextEntry(" when a pair request is made, the receiving user will "),
+                        new SeStringUtils.RichTextEntry("NOT", UIColors.Get("DimRed"), true),
+                        new SeStringUtils.RichTextEntry(" get a notification, and the request will not be visible to them in any way."));
+
+                    ImGuiHelpers.ScaledDummy(3f);
+
+                    _uiSharedService.MediumText("Privacy", UIColors.Get("PairBlue"));
+
+                    _uiSharedService.DrawNoteLine(
+                    "! ",
+                    UIColors.Get("DimRed"),
+                    new SeStringUtils.RichTextEntry("Lightfinder is entirely "),
+                    new SeStringUtils.RichTextEntry("opt-in", UIColors.Get("LightlessYellow"), true),
+                    new SeStringUtils.RichTextEntry(" and does not share any data with other users. All identifying information remains private to the server."));
+
+                    _uiSharedService.DrawNoteLine("! ", UIColors.Get("DimRed"), "Pairing is intended as a mutual agreement between both parties. A pair request will not be visible to the recipient unless Lightfinder is enabled.");
+
+                    ImGuiHelpers.ScaledDummy(5f);
+
+                    ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("DimRed"));
+                    ImGui.TextWrapped("Use Lightfinder when you're okay with being visible to other users and understand that you are responsible for your own experience.");
+                    ImGui.PopStyleColor();
+
+                    ImGui.PopStyleVar();
+
+                    ImGuiHelpers.ScaledDummy(3f);
+                    _uiSharedService.ColoredSeparator(UIColors.Get("LightlessPurple"), 2f);
+
+                    if (_configService.Current.BroadcastEnabled)
+                    {
+                        ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("LightlessGreen"));
+                        ImGui.Text("The Lightfinder calls, and somewhere, a soul may answer."); // cringe..
+                        ImGui.PopStyleColor();
+
+                        var ttl = _broadcastService.RemainingTtl;
+                        if (ttl is { } remaining && remaining > TimeSpan.Zero)
+                        {
+                            ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("LightlessYellow"));
+                            ImGui.Text($"Still shining, for {remaining:hh\\:mm\\:ss}");
+                            ImGui.PopStyleColor();
+                        }
+                        else
+                        {
+                            ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("DimRed"));
+                            ImGui.Text("The Lightfinder<65>s light wanes, but not in vain."); // cringe..
+                            ImGui.PopStyleColor();
+                        }
+                    }
+                    else
+                    {
+                        ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("DimRed"));
+                        ImGui.Text("The Lightfinder rests, waiting to shine again."); // cringe..
+                        ImGui.PopStyleColor();
+                    }
+
+                    var cooldown = _broadcastService.RemainingCooldown;
+                    if (cooldown is { } cd)
+                    {
+                        ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("DimRed"));
+                        ImGui.Text($"The Lightfinder gathers its strength... ({Math.Ceiling(cd.TotalSeconds)}s)");
+                        ImGui.PopStyleColor();
+                    }
+
+                    ImGuiHelpers.ScaledDummy(0.5f);
+
+                    bool isBroadcasting = _broadcastService.IsBroadcasting;
+                    bool isOnCooldown = cooldown.HasValue && cooldown.Value.TotalSeconds > 0;
+
+                    ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 10.0f);
+
+                    if (isOnCooldown)
+                        ImGui.PushStyleColor(ImGuiCol.Button, UIColors.Get("DimRed"));
+                    else if (isBroadcasting)
+                        ImGui.PushStyleColor(ImGuiCol.Button, UIColors.Get("LightlessGreen"));
+                    else
+                        ImGui.PushStyleColor(ImGuiCol.Button, UIColors.Get("PairBlue"));
+
+                    if (isOnCooldown || !_broadcastService.IsLightFinderAvailable)
+                        ImGui.BeginDisabled();
+
+                    string buttonText = isBroadcasting ? "Disable Lightfinder" : "Enable Lightfinder";
+
+                    if (ImGui.Button(buttonText, new Vector2(200 * ImGuiHelpers.GlobalScale, 0)))
+                    {
+                        _broadcastService.ToggleBroadcast();
+                    }
+
+                    if (isOnCooldown || !_broadcastService.IsLightFinderAvailable)
+                        ImGui.EndDisabled();
+
+                    ImGui.PopStyleColor();
+                    ImGui.PopStyleVar();
+
+                    ImGui.EndTabItem();
+                }
+
+                if (ImGui.BeginTabItem("Syncshell Finder"))
+                {
+                    if (_allSyncshells == null)
+                    {
+                        ImGui.Text("Loading Syncshells...");
+                        _ = RefreshSyncshells();
+                        return;
+                    }
+
+                    _uiSharedService.MediumText("Syncshell Finder", UIColors.Get("PairBlue"));
+
+                    _uiSharedService.ColoredSeparator(UIColors.Get("LightlessPurple"), 2f);
+
+                    ImGui.PushTextWrapPos();
+                    ImGui.Text("Allow your owned Syncshell to be indexed by the Nearby Syncshell Finder.");
+                    ImGui.Text("To enable this, select one of your owned Syncshells from the dropdown menu below and ensure that \"Toggle Syncshell Finder\" is enabled. Your Syncshell will be visible in the Nearby Syncshell Finder as long as Lightfinder is active.");
+                    ImGui.PopTextWrapPos();
+
+                    ImGuiHelpers.ScaledDummy(0.2f);
+                    _uiSharedService.ColoredSeparator(UIColors.Get("LightlessPurple"), 2f);
+
+                    bool ShellFinderEnabled = _configService.Current.SyncshellFinderEnabled;
+                    bool isBroadcasting = _broadcastService.IsBroadcasting;
+
+                    if (isBroadcasting)
+                        ImGui.BeginDisabled();
+
+                    if (ImGui.Checkbox("Toggle Syncshell Finder", ref ShellFinderEnabled))
+                    {
+                        _configService.Current.SyncshellFinderEnabled = ShellFinderEnabled;
+                        _configService.Save();
+                    }
+
+                    if (ImGui.IsItemHovered())
+                    {
+                        ImGui.BeginTooltip();
+                        ImGui.Text("Toggle to broadcast specified Syncshell.");
+                        ImGui.EndTooltip();
+                    }
+
+                    var selectedGid = _configService.Current.SelectedFinderSyncshell;
+                    var currentOption = _syncshellOptions.FirstOrDefault(o => string.Equals(o.GID, selectedGid, StringComparison.Ordinal));
+                    var preview = currentOption.Label ?? "Select a Syncshell...";
+
+                    if (ImGui.BeginCombo("##SyncshellDropdown", preview))
+                    {
+                        foreach (var (label, gid, available) in _syncshellOptions)
+                        {
+                            bool isSelected = string.Equals(gid, selectedGid, StringComparison.Ordinal);
+
+                            if (!available)
+                                ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("DimRed"));
+
+                            if (ImGui.Selectable(label, isSelected))
+                            {
+                                _configService.Current.SelectedFinderSyncshell = gid;
+                                _configService.Save();
+                                _ = RefreshSyncshells();
+                            }
+
+                            if (!available && ImGui.IsItemHovered())
+                            {
+                                ImGui.BeginTooltip();
+                                ImGui.Text("This Syncshell is not available on the current service.");
+                                ImGui.EndTooltip();
+                            }
+
+                            if (!available)
+                                ImGui.PopStyleColor();
+
+                            if (isSelected)
+                                ImGui.SetItemDefaultFocus();
+                        }
+
+                        ImGui.EndCombo();
+                    }
+
+
+                    if (ImGui.IsItemHovered())
+                    {
+                        ImGui.BeginTooltip();
+                        ImGui.Text("Choose one of the available options.");
+                        ImGui.EndTooltip();
+                    }
+
+
+                    if (isBroadcasting)
+                        ImGui.EndDisabled();
+
+                    ImGui.EndTabItem();
+                }
+
+                #if DEBUG
+                if (ImGui.BeginTabItem("Debug"))
+                {
+                    ImGui.Text("Broadcast Cache");
+
+                    if (ImGui.BeginTable("##BroadcastCacheTable", 4, ImGuiTableFlags.RowBg | ImGuiTableFlags.Borders | ImGuiTableFlags.ScrollY, new Vector2(-1, 225f)))
+                    {
+                        ImGui.TableSetupColumn("CID", ImGuiTableColumnFlags.WidthStretch);
+                        ImGui.TableSetupColumn("IsBroadcasting", ImGuiTableColumnFlags.WidthStretch);
+                        ImGui.TableSetupColumn("Expires In", ImGuiTableColumnFlags.WidthStretch);
+                        ImGui.TableSetupColumn("Syncshell GID", ImGuiTableColumnFlags.WidthStretch);
+                        ImGui.TableHeadersRow();
+
+                        var now = DateTime.UtcNow;
+
+                        foreach (var (cid, entry) in _broadcastScannerService.BroadcastCache)
+                        {
+                            ImGui.TableNextRow();
+
+                            ImGui.TableNextColumn();
+                            ImGui.TextUnformatted(cid.Truncate(12));
+                            if (ImGui.IsItemHovered())
+                            {
+                                ImGui.BeginTooltip();
+                                ImGui.TextUnformatted(cid);
+                                ImGui.EndTooltip();
+                            }
+
+                            ImGui.TableNextColumn();
+                            var colorBroadcast = entry.IsBroadcasting
+                                ? UIColors.Get("LightlessGreen")
+                                : UIColors.Get("DimRed");
+
+                            ImGui.TableSetBgColor(ImGuiTableBgTarget.CellBg, ImGui.GetColorU32(colorBroadcast));
+                            ImGui.TextUnformatted(entry.IsBroadcasting.ToString());
+
+                            ImGui.TableNextColumn();
+                            var remaining = entry.ExpiryTime - now;
+                            var colorTtl =
+                                remaining <= TimeSpan.Zero ? UIColors.Get("DimRed") :
+                                remaining < TimeSpan.FromSeconds(10) ? UIColors.Get("LightlessYellow") :
+                                (Vector4?)null;
+
+                            if (colorTtl != null)
+                                ImGui.TableSetBgColor(ImGuiTableBgTarget.CellBg, ImGui.GetColorU32(colorTtl.Value));
+
+                            ImGui.TextUnformatted(remaining > TimeSpan.Zero
+                                ? remaining.ToString("hh\\:mm\\:ss")
+                                : "Expired");
+
+                            ImGui.TableNextColumn();
+                            ImGui.TextUnformatted(entry.GID ?? "-");
+                        }
+
+                        ImGui.EndTable();
+                    }
+
+                    ImGui.EndTabItem();
+                }
+                #endif
+
+                ImGui.EndTabBar();
+            }
+        }
+    }
+}

LightlessSync/UI/CharaDataHubUi.GposeTogether.cs

@@ -90,7 +90,7 @@ internal sealed partial class CharaDataHubUi
             if (!_uiSharedService.IsInGpose)
             {
                 ImGuiHelpers.ScaledDummy(5);
-                UiSharedService.DrawGroupedCenteredColorText("Assigning users to characters is only available in GPose.", ImGuiColors.DalamudYellow, 300);
+                UiSharedService.DrawGroupedCenteredColorText("Assigning users to characters is only available in GPose.", UIColors.Get("LightlessYellow"), 300);
             }
             UiSharedService.DistanceSeparator();
             ImGui.TextUnformatted("Users In Lobby");
@@ -104,7 +104,7 @@ internal sealed partial class CharaDataHubUi
 
                 if (!_charaDataGposeTogetherManager.UsersInLobby.Any() && !string.IsNullOrEmpty(_charaDataGposeTogetherManager.CurrentGPoseLobbyId))
                 {
-                    UiSharedService.DrawGroupedCenteredColorText("No other users in current GPose lobby", ImGuiColors.DalamudYellow);
+                    UiSharedService.DrawGroupedCenteredColorText("No other users in current GPose lobby", UIColors.Get("LightlessYellow"));
                 }
                 else
                 {

LightlessSync/UI/CharaDataHubUi.McdOnline.cs

@@ -23,7 +23,7 @@ internal sealed partial class CharaDataHubUi
         if (dataDto == null)
         {
             ImGuiHelpers.ScaledDummy(5);
-            UiSharedService.DrawGroupedCenteredColorText("Select an entry above to edit its data.", ImGuiColors.DalamudYellow);
+            UiSharedService.DrawGroupedCenteredColorText("Select an entry above to edit its data.", UIColors.Get("LightlessYellow"));
             return;
         }
 
@@ -31,7 +31,7 @@ internal sealed partial class CharaDataHubUi
 
         if (updateDto == null)
         {
-            UiSharedService.DrawGroupedCenteredColorText("Something went awfully wrong and there's no update DTO. Try updating Character Data via the button above.", ImGuiColors.DalamudYellow);
+            UiSharedService.DrawGroupedCenteredColorText("Something went awfully wrong and there's no update DTO. Try updating Character Data via the button above.", UIColors.Get("LightlessYellow"));
             return;
         }
 
@@ -75,7 +75,7 @@ internal sealed partial class CharaDataHubUi
                     }
                     if (_charaDataManager.CharaUpdateTask != null && !_charaDataManager.CharaUpdateTask.IsCompleted)
                     {
-                        UiSharedService.ColorTextWrapped("Updating data on server, please wait.", ImGuiColors.DalamudYellow);
+                        UiSharedService.ColorTextWrapped("Updating data on server, please wait.", UIColors.Get("LightlessYellow"));
                     }
                 }
 
@@ -85,7 +85,7 @@ internal sealed partial class CharaDataHubUi
                     {
                         if (_charaDataManager.UploadProgress != null)
                         {
-                            UiSharedService.ColorTextWrapped(_charaDataManager.UploadProgress.Value ?? string.Empty, ImGuiColors.DalamudYellow);
+                            UiSharedService.ColorTextWrapped(_charaDataManager.UploadProgress.Value ?? string.Empty, UIColors.Get("LightlessYellow"));
                         }
                         if ((!_charaDataManager.UploadTask?.IsCompleted ?? false) && _uiSharedService.IconTextButton(FontAwesomeIcon.Ban, "Cancel Upload"))
                         {
@@ -112,7 +112,7 @@ internal sealed partial class CharaDataHubUi
             UiSharedService.DrawGrouped(() =>
             {
                 ImGui.AlignTextToFramePadding();
-                UiSharedService.ColorTextWrapped($"You have {otherUpdates} other entries with unsaved changes.", ImGuiColors.DalamudYellow);
+                UiSharedService.ColorTextWrapped($"You have {otherUpdates} other entries with unsaved changes.", UIColors.Get("LightlessYellow"));
                 ImGui.SameLine();
                 using (ImRaii.Disabled(_charaDataManager.CharaUpdateTask != null && !_charaDataManager.CharaUpdateTask.IsCompleted))
                 {
@@ -259,7 +259,7 @@ internal sealed partial class CharaDataHubUi
             ImGui.SameLine();
             ImGuiHelpers.ScaledDummy(20, 1);
             ImGui.SameLine();
-            UiSharedService.ColorTextWrapped("New data was set. It may contain files that require to be uploaded (will happen on Saving to server)", ImGuiColors.DalamudYellow);
+            UiSharedService.ColorTextWrapped("New data was set. It may contain files that require to be uploaded (will happen on Saving to server)", UIColors.Get("LightlessYellow"));
         }
 
         ImGui.TextUnformatted("Contains Manipulation Data");
@@ -414,7 +414,7 @@ internal sealed partial class CharaDataHubUi
             }
         }
         ImGui.SameLine();
-        using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudYellow, poseCount == maxPoses))
+        using (ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("LightlessYellow"), poseCount == maxPoses))
             ImGui.TextUnformatted($"{poseCount}/{maxPoses} poses attached");
         ImGuiHelpers.ScaledDummy(5);
 
@@ -424,7 +424,7 @@ internal sealed partial class CharaDataHubUi
         if (!_uiSharedService.IsInGpose && _charaDataManager.BrioAvailable)
         {
             ImGuiHelpers.ScaledDummy(5);
-            UiSharedService.DrawGroupedCenteredColorText("To attach pose and world data you need to be in GPose.", ImGuiColors.DalamudYellow);
+            UiSharedService.DrawGroupedCenteredColorText("To attach pose and world data you need to be in GPose.", UIColors.Get("LightlessYellow"));
             ImGuiHelpers.ScaledDummy(5);
         }
         else if (!_charaDataManager.BrioAvailable)
@@ -443,7 +443,7 @@ internal sealed partial class CharaDataHubUi
             if (pose.Id == null)
             {
                 UiSharedService.ScaledSameLine(50);
-                _uiSharedService.IconText(FontAwesomeIcon.Plus, ImGuiColors.DalamudYellow);
+                _uiSharedService.IconText(FontAwesomeIcon.Plus, UIColors.Get("LightlessYellow"));
                 UiSharedService.AttachToolTip("This pose has not been added to the server yet. Save changes to upload this Pose data.");
             }
 
@@ -451,14 +451,14 @@ internal sealed partial class CharaDataHubUi
             if (poseHasChanges)
             {
                 UiSharedService.ScaledSameLine(50);
-                _uiSharedService.IconText(FontAwesomeIcon.ExclamationTriangle, ImGuiColors.DalamudYellow);
+                _uiSharedService.IconText(FontAwesomeIcon.ExclamationTriangle, UIColors.Get("LightlessYellow"));
                 UiSharedService.AttachToolTip("This pose has changes that have not been saved to the server yet.");
             }
 
             UiSharedService.ScaledSameLine(75);
             if (pose.Description == null && pose.WorldData == null && pose.PoseData == null)
             {
-                UiSharedService.ColorText("Pose scheduled for deletion", ImGuiColors.DalamudYellow);
+                UiSharedService.ColorText("Pose scheduled for deletion", UIColors.Get("LightlessYellow"));
             }
             else
             {
@@ -669,7 +669,7 @@ internal sealed partial class CharaDataHubUi
                     var idText = entry.FullId;
                     if (uDto?.HasChanges ?? false)
                     {
-                        UiSharedService.ColorText(idText, ImGuiColors.DalamudYellow);
+                        UiSharedService.ColorText(idText, UIColors.Get("LightlessYellow"));
                         UiSharedService.AttachToolTip("This entry has unsaved changes");
                     }
                     else
@@ -724,7 +724,7 @@ internal sealed partial class CharaDataHubUi
                     FontAwesomeIcon eIcon = FontAwesomeIcon.None;
                     if (!Equals(DateTime.MaxValue, entry.ExpiryDate))
                         eIcon = FontAwesomeIcon.Clock;
-                    _uiSharedService.IconText(eIcon, ImGuiColors.DalamudYellow);
+                    _uiSharedService.IconText(eIcon, UIColors.Get("LightlessYellow"));
                     if (ImGui.IsItemClicked()) SelectedDtoId = entry.Id;
                     if (eIcon != FontAwesomeIcon.None)
                     {
@@ -759,13 +759,13 @@ internal sealed partial class CharaDataHubUi
             if (_charaDataManager.OwnCharaData.Count == _charaDataManager.MaxCreatableCharaData)
             {
                 ImGui.AlignTextToFramePadding();
-                UiSharedService.ColorTextWrapped("You have reached the maximum Character Data entries and cannot create more.", ImGuiColors.DalamudYellow);
+                UiSharedService.ColorTextWrapped("You have reached the maximum Character Data entries and cannot create more.", UIColors.Get("LightlessYellow"));
             }
         }
 
         if (_charaDataManager.DataCreationTask != null && !_charaDataManager.DataCreationTask.IsCompleted)
         {
-            UiSharedService.ColorTextWrapped("Creating new character data entry on server...", ImGuiColors.DalamudYellow);
+            UiSharedService.ColorTextWrapped("Creating new character data entry on server...", UIColors.Get("LightlessYellow"));
         }
         else if (_charaDataManager.DataCreationTask != null && _charaDataManager.DataCreationTask.IsCompleted)
         {

LightlessSync/UI/CharaDataHubUi.NearbyPoses.cs

@@ -78,7 +78,7 @@ internal partial class CharaDataHubUi
         if (!_uiSharedService.IsInGpose)
         {
             ImGuiHelpers.ScaledDummy(5);
-            UiSharedService.DrawGroupedCenteredColorText("Spawning and applying pose data is only available in GPose.", ImGuiColors.DalamudYellow);
+            UiSharedService.DrawGroupedCenteredColorText("Spawning and applying pose data is only available in GPose.", UIColors.Get("LightlessYellow"));
             ImGuiHelpers.ScaledDummy(5);
         }
 
@@ -93,7 +93,7 @@ internal partial class CharaDataHubUi
         using var indent = ImRaii.PushIndent(5f);
         if (_charaDataNearbyManager.NearbyData.Count == 0)
         {
-            UiSharedService.DrawGroupedCenteredColorText("No Shared World Poses found nearby.", ImGuiColors.DalamudYellow);
+            UiSharedService.DrawGroupedCenteredColorText("No Shared World Poses found nearby.", UIColors.Get("LightlessYellow"));
         }
 
         bool wasAnythingHovered = false;

LightlessSync/UI/CharaDataHubUi.cs

@@ -190,7 +190,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase
             }
             if (!string.IsNullOrEmpty(_charaDataManager.DataApplicationProgress))
             {
-                UiSharedService.ColorTextWrapped(_charaDataManager.DataApplicationProgress, ImGuiColors.DalamudYellow);
+                UiSharedService.ColorTextWrapped(_charaDataManager.DataApplicationProgress, UIColors.Get("LightlessYellow"));
             }
             if (_charaDataManager.DataApplicationTask != null)
             {
@@ -436,7 +436,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase
         if (!_hasValidGposeTarget)
         {
             ImGuiHelpers.ScaledDummy(3);
-            UiSharedService.DrawGroupedCenteredColorText("Applying data is only available in GPose with a valid selected GPose target.", ImGuiColors.DalamudYellow, 350);
+            UiSharedService.DrawGroupedCenteredColorText("Applying data is only available in GPose with a valid selected GPose target.", UIColors.Get("LightlessYellow"), 350);
         }
 
         ImGuiHelpers.ScaledDummy(10);
@@ -595,7 +595,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase
 
                 if (_configService.Current.FavoriteCodes.Count == 0)
                 {
-                    UiSharedService.ColorTextWrapped("You have no favorites added. Add Favorites through the other tabs before you can use this tab.", ImGuiColors.DalamudYellow);
+                    UiSharedService.ColorTextWrapped("You have no favorites added. Add Favorites through the other tabs before you can use this tab.", UIColors.Get("LightlessYellow"));
                 }
             }
         }
@@ -644,7 +644,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase
                 ImGui.NewLine();
                 if (!_charaDataManager.DownloadMetaInfoTask?.IsCompleted ?? false)
                 {
-                    UiSharedService.ColorTextWrapped("Downloading meta info. Please wait.", ImGuiColors.DalamudYellow);
+                    UiSharedService.ColorTextWrapped("Downloading meta info. Please wait.", UIColors.Get("LightlessYellow"));
                 }
                 if ((_charaDataManager.DownloadMetaInfoTask?.IsCompleted ?? false) && !_charaDataManager.DownloadMetaInfoTask.Result.Success)
                 {
@@ -850,12 +850,12 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase
                         UiSharedService.ColorTextWrapped("Failure to read MCDF file. MCDF file is possibly corrupt. Re-export the MCDF file and try again.",
                             ImGuiColors.DalamudRed);
                         UiSharedService.ColorTextWrapped("Note: if this is your MCDF, try redrawing yourself, wait and re-export the file. " +
-                            "If you received it from someone else have them do the same.", ImGuiColors.DalamudYellow);
+                            "If you received it from someone else have them do the same.", UIColors.Get("LightlessYellow"));
                     }
                 }
                 else
                 {
-                    UiSharedService.ColorTextWrapped("Loading Character...", ImGuiColors.DalamudYellow);
+                    UiSharedService.ColorTextWrapped("Loading Character...", UIColors.Get("LightlessYellow"));
                 }
             }
         }
@@ -896,7 +896,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase
                 }, Directory.Exists(_configService.Current.LastSavedCharaDataLocation) ? _configService.Current.LastSavedCharaDataLocation : null);
             }
             UiSharedService.ColorTextWrapped("Note: For best results make sure you have everything you want to be shared as well as the correct character appearance" +
-                " equipped and redraw your character before exporting.", ImGuiColors.DalamudYellow);
+                " equipped and redraw your character before exporting.", UIColors.Get("LightlessYellow"));
 
             ImGui.Unindent();
         }

LightlessSync/UI/CompactUI.cs

@@ -1,9 +1,10 @@
-using Dalamud.Bindings.ImGui;
+using System;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
-using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Utility;
+using LightlessSync.API.Data.Enum;
 using LightlessSync.API.Data.Extensions;
 using LightlessSync.API.Dto.Group;
 using LightlessSync.Interop.Ipc;
@@ -15,6 +16,7 @@ using LightlessSync.Services.Mediator;
 using LightlessSync.Services.ServerConfiguration;
 using LightlessSync.UI.Components;
 using LightlessSync.UI.Handlers;
+using LightlessSync.Utils;
 using LightlessSync.WebAPI;
 using LightlessSync.WebAPI.Files;
 using LightlessSync.WebAPI.Files.Models;
@@ -23,6 +25,7 @@ using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
 using System.Collections.Immutable;
 using System.Globalization;
+using System.Linq;
 using System.Numerics;
 using System.Reflection;
 
@@ -30,35 +33,61 @@ namespace LightlessSync.UI;
 
 public class CompactUi : WindowMediatorSubscriberBase
 {
+    private readonly CharacterAnalyzer _characterAnalyzer;
     private readonly ApiController _apiController;
     private readonly LightlessConfigService _configService;
+    private readonly LightlessMediator _lightlessMediator;
     private readonly ConcurrentDictionary<GameObjectHandler, Dictionary<string, FileDownloadStatus>> _currentDownloads = new();
     private readonly DrawEntityFactory _drawEntityFactory;
     private readonly FileUploadManager _fileTransferManager;
+    private readonly PlayerPerformanceConfigService _playerPerformanceConfig;
     private readonly PairManager _pairManager;
-    private readonly SelectTagForPairUi _selectGroupForPairUi;
+    private readonly SelectTagForPairUi _selectTagForPairUi;
+    private readonly SelectTagForSyncshellUi _selectTagForSyncshellUi;
+    private readonly SelectSyncshellForTagUi _selectSyncshellForTagUi;
+    private readonly RenameSyncshellTagUi _renameSyncshellTagUi;
     private readonly SelectPairForTagUi _selectPairsForGroupUi;
+    private readonly RenamePairTagUi _renamePairTagUi;
     private readonly IpcManager _ipcManager;
     private readonly ServerConfigurationManager _serverManager;
     private readonly TopTabMenu _tabMenu;
     private readonly TagHandler _tagHandler;
     private readonly UiSharedService _uiSharedService;
+    private readonly BroadcastService _broadcastService;
+
     private List<IDrawFolder> _drawFolders;
+    private Dictionary<ObjectKind, Dictionary<string, CharacterAnalyzer.FileDataEntry>>? _cachedAnalysis;
     private Pair? _lastAddedUser;
     private string _lastAddedUserComment = string.Empty;
     private Vector2 _lastPosition = Vector2.One;
     private Vector2 _lastSize = Vector2.One;
-    private int _secretKeyIdx = -1;
     private bool _showModalForUserAddition;
     private float _transferPartHeight;
     private bool _wasOpen;
     private float _windowContentWidth;
 
-    public CompactUi(ILogger<CompactUi> logger, UiSharedService uiShared, LightlessConfigService configService, ApiController apiController, PairManager pairManager,
+    public CompactUi(
-        ServerConfigurationManager serverManager, LightlessMediator mediator, FileUploadManager fileTransferManager,
+        ILogger<CompactUi> logger,
-        TagHandler tagHandler, DrawEntityFactory drawEntityFactory, SelectTagForPairUi selectTagForPairUi, SelectPairForTagUi selectPairForTagUi,
+        UiSharedService uiShared,
-        PerformanceCollectorService performanceCollectorService, IpcManager ipcManager)
+        LightlessConfigService configService,
-        : base(logger, mediator, "###LightlessSyncMainUI", performanceCollectorService)
+        ApiController apiController,
+        PairManager pairManager,
+        ServerConfigurationManager serverManager,
+        LightlessMediator mediator,
+        FileUploadManager fileTransferManager,
+        TagHandler tagHandler,
+        DrawEntityFactory drawEntityFactory,
+        SelectTagForPairUi selectTagForPairUi,
+        SelectPairForTagUi selectPairForTagUi,
+        RenamePairTagUi renameTagUi,
+        SelectTagForSyncshellUi selectTagForSyncshellUi,
+        SelectSyncshellForTagUi selectSyncshellForTagUi,
+        RenameSyncshellTagUi renameSyncshellTagUi,
+        PerformanceCollectorService performanceCollectorService,
+        IpcManager ipcManager,
+        BroadcastService broadcastService,
+        CharacterAnalyzer characterAnalyzer,
+        PlayerPerformanceConfigService playerPerformanceConfig, PairRequestService pairRequestService, DalamudUtilService dalamudUtilService) : base(logger, mediator, "###LightlessSyncMainUI", performanceCollectorService)
     {
         _uiSharedService = uiShared;
         _configService = configService;
@@ -68,12 +97,17 @@ public class CompactUi : WindowMediatorSubscriberBase
         _fileTransferManager = fileTransferManager;
         _tagHandler = tagHandler;
         _drawEntityFactory = drawEntityFactory;
-        _selectGroupForPairUi = selectTagForPairUi;
+        _selectTagForPairUi = selectTagForPairUi;
+        _selectTagForSyncshellUi = selectTagForSyncshellUi;
+        _selectSyncshellForTagUi = selectSyncshellForTagUi;
+        _renameSyncshellTagUi = renameSyncshellTagUi;
         _selectPairsForGroupUi = selectPairForTagUi;
+        _renamePairTagUi = renameTagUi;
         _ipcManager = ipcManager;
-        _tabMenu = new TopTabMenu(Mediator, _apiController, _pairManager, _uiSharedService);
+        _broadcastService = broadcastService;
+        _tabMenu = new TopTabMenu(Mediator, _apiController, _pairManager, _uiSharedService, pairRequestService, dalamudUtilService);
 
-        AllowPinning = false;
+        AllowPinning = true;
         AllowClickthrough = false;
         TitleBarButtons = new()
         {
@@ -106,10 +140,10 @@ public class CompactUi : WindowMediatorSubscriberBase
                     ImGui.Text("Open Lightless Event Viewer");
                     ImGui.EndTooltip();
                 }
-            }
+            },
         };
 
-        _drawFolders = GetDrawFolders().ToList();
+        _drawFolders = [.. DrawFolders];
 
 #if DEBUG
         string dev = "Dev Build";
@@ -126,7 +160,7 @@ public class CompactUi : WindowMediatorSubscriberBase
         Mediator.Subscribe<CutsceneEndMessage>(this, (_) => UiSharedService_GposeEnd());
         Mediator.Subscribe<DownloadStartedMessage>(this, (msg) => _currentDownloads[msg.DownloadId] = msg.DownloadStatus);
         Mediator.Subscribe<DownloadFinishedMessage>(this, (msg) => _currentDownloads.TryRemove(msg.DownloadId, out _));
-        Mediator.Subscribe<RefreshUiMessage>(this, (msg) => _drawFolders = GetDrawFolders().ToList());
+        Mediator.Subscribe<RefreshUiMessage>(this, (msg) => _drawFolders = DrawFolders.ToList());
 
         Flags |= ImGuiWindowFlags.NoDocking;
 
@@ -135,6 +169,9 @@ public class CompactUi : WindowMediatorSubscriberBase
             MinimumSize = new Vector2(375, 400),
             MaximumSize = new Vector2(375, 2000),
         };
+        _characterAnalyzer = characterAnalyzer;
+        _playerPerformanceConfig = playerPerformanceConfig;
+        _lightlessMediator = mediator;
     }
 
     protected override void DrawInternal()
@@ -149,10 +186,10 @@ public class CompactUi : WindowMediatorSubscriberBase
                 var uidTextSize = ImGui.CalcTextSize(unsupported);
                 ImGui.SetCursorPosX((ImGui.GetWindowContentRegionMax().X + ImGui.GetWindowContentRegionMin().X) / 2 - uidTextSize.X / 2);
                 ImGui.AlignTextToFramePadding();
-                ImGui.TextColored(ImGuiColors.DalamudRed, unsupported);
+                ImGui.TextColored(UIColors.Get("DimRed"), unsupported);
             }
             UiSharedService.ColorTextWrapped($"Your Lightless Sync installation is out of date, the current version is {ver.Major}.{ver.Minor}.{ver.Build}. " +
-                $"It is highly recommended to keep Lightless Sync up to date. Open /xlplugins and update the plugin.", ImGuiColors.DalamudRed);
+                $"It is highly recommended to keep Lightless Sync up to date. Open /xlplugins and update the plugin.", UIColors.Get("DimRed"));
         }
 
         if (!_ipcManager.Initialized)
@@ -164,12 +201,12 @@ public class CompactUi : WindowMediatorSubscriberBase
                 var uidTextSize = ImGui.CalcTextSize(unsupported);
                 ImGui.SetCursorPosX((ImGui.GetWindowContentRegionMax().X + ImGui.GetWindowContentRegionMin().X) / 2 - uidTextSize.X / 2);
                 ImGui.AlignTextToFramePadding();
-                ImGui.TextColored(ImGuiColors.DalamudRed, unsupported);
+                ImGui.TextColored(UIColors.Get("DimRed"), unsupported);
             }
             var penumAvailable = _ipcManager.Penumbra.APIAvailable;
             var glamAvailable = _ipcManager.Glamourer.APIAvailable;
 
-            UiSharedService.ColorTextWrapped($"One or more Plugins essential for Lightless operation are unavailable. Enable or update following plugins:", ImGuiColors.DalamudRed);
+            UiSharedService.ColorTextWrapped($"One or more Plugins essential for Lightless operation are unavailable. Enable or update following plugins:", UIColors.Get("DimRed"));
             using var indent = ImRaii.PushIndent(10f);
             if (!penumAvailable)
             {
@@ -185,7 +222,7 @@ public class CompactUi : WindowMediatorSubscriberBase
         }
 
         using (ImRaii.PushId("header")) DrawUIDHeader();
-        ImGui.Separator();
+        _uiSharedService.RoundedSeparator(UIColors.Get("LightlessPurple"), 2.5f, 1f, 12f);
         using (ImRaii.PushId("serverstatus")) DrawServerStatus();
         ImGui.Separator();
 
@@ -197,8 +234,12 @@ public class CompactUi : WindowMediatorSubscriberBase
             float pairlistEnd = ImGui.GetCursorPosY();
             using (ImRaii.PushId("transfers")) DrawTransfers();
             _transferPartHeight = ImGui.GetCursorPosY() - pairlistEnd - ImGui.GetTextLineHeight();
-            using (ImRaii.PushId("group-user-popup")) _selectPairsForGroupUi.Draw(_pairManager.DirectPairs);
+            using (ImRaii.PushId("group-pair-popup")) _selectPairsForGroupUi.Draw(_pairManager.DirectPairs);
-            using (ImRaii.PushId("grouping-popup")) _selectGroupForPairUi.Draw();
+            using (ImRaii.PushId("group-syncshell-popup")) _selectSyncshellForTagUi.Draw([.. _pairManager.Groups.Values]);
+            using (ImRaii.PushId("group-pair-edit")) _renamePairTagUi.Draw();
+            using (ImRaii.PushId("group-syncshell-edit")) _renameSyncshellTagUi.Draw();
+            using (ImRaii.PushId("grouping-pair-popup")) _selectTagForPairUi.Draw();
+            using (ImRaii.PushId("grouping-syncshell-popup")) _selectTagForSyncshellUi.Draw();
         }
 
         if (_configService.Current.OpenPopupOnAdd && _pairManager.LastAddedUser != null)
@@ -284,7 +325,7 @@ public class CompactUi : WindowMediatorSubscriberBase
         else
         {
             ImGui.AlignTextToFramePadding();
-            ImGui.TextColored(ImGuiColors.DalamudRed, "Not connected to any server");
+            ImGui.TextColored(UIColors.Get("DimRed"), "Not connected to any server");
         }
 
         if (printShard)
@@ -336,7 +377,7 @@ public class CompactUi : WindowMediatorSubscriberBase
 
     private void DrawTransfers()
     {
-        var currentUploads = _fileTransferManager.CurrentUploads.ToList();
+        var currentUploads = _fileTransferManager.GetCurrentUploadsSnapshot();
         ImGui.AlignTextToFramePadding();
         _uiSharedService.IconText(FontAwesomeIcon.Upload);
         ImGui.SameLine(35 * ImGuiHelpers.GlobalScale);
@@ -346,10 +387,12 @@ public class CompactUi : WindowMediatorSubscriberBase
             var totalUploads = currentUploads.Count;
 
             var doneUploads = currentUploads.Count(c => c.IsTransferred);
+            var activeUploads = currentUploads.Count(c => !c.IsTransferred);
+            var uploadSlotLimit = Math.Clamp(_configService.Current.ParallelUploads, 1, 8);
             var totalUploaded = currentUploads.Sum(c => c.Transferred);
             var totalToUpload = currentUploads.Sum(c => c.Total);
 
-            ImGui.TextUnformatted($"{doneUploads}/{totalUploads}");
+            ImGui.TextUnformatted($"{doneUploads}/{totalUploads} (slots {activeUploads}/{uploadSlotLimit})");
             var uploadText = $"({UiSharedService.ByteToString(totalUploaded)}/{UiSharedService.ByteToString(totalToUpload)})";
             var textSize = ImGui.CalcTextSize(uploadText);
             ImGui.SameLine(_windowContentWidth - textSize.X);
@@ -362,7 +405,7 @@ public class CompactUi : WindowMediatorSubscriberBase
             ImGui.TextUnformatted("No uploads in progress");
         }
 
-        var currentDownloads = _currentDownloads.SelectMany(d => d.Value.Values).ToList();
+        var currentDownloads = BuildCurrentDownloadSnapshot();
         ImGui.AlignTextToFramePadding();
         _uiSharedService.IconText(FontAwesomeIcon.Download);
         ImGui.SameLine(35 * ImGuiHelpers.GlobalScale);
@@ -389,35 +432,250 @@ public class CompactUi : WindowMediatorSubscriberBase
         }
     }
 
+
+    private List<FileDownloadStatus> BuildCurrentDownloadSnapshot()
+    {
+        List<FileDownloadStatus> snapshot = new();
+
+        foreach (var kvp in _currentDownloads.ToArray())
+        {
+            var value = kvp.Value;
+            if (value == null || value.Count == 0)
+                continue;
+
+            try
+            {
+                snapshot.AddRange(value.Values.ToArray());
+            }
+            catch (System.ArgumentException)
+            {
+                // skibidi
+            }
+        }
+
+        return snapshot;
+    }
+
     private void DrawUIDHeader()
     {
         var uidText = GetUidText();
 
+        Vector4? vanityTextColor = null;
+        Vector4? vanityGlowColor = null;
+        bool useVanityColors = false;
+
+        if (_configService.Current.useColoredUIDs && _apiController.HasVanity)
+        {
+            if (!string.IsNullOrWhiteSpace(_apiController.TextColorHex))
+            {
+                vanityTextColor = UIColors.HexToRgba(_apiController.TextColorHex);
+            }
+
+            if (!string.IsNullOrWhiteSpace(_apiController.TextGlowColorHex))
+            {
+                vanityGlowColor = UIColors.HexToRgba(_apiController.TextGlowColorHex);
+            }
+
+            useVanityColors = vanityTextColor is not null || vanityGlowColor is not null;
+        }
+
+        //Getting information of character and triangles threshold to show overlimit status in UID bar.
+        _cachedAnalysis = _characterAnalyzer.LastAnalysis.DeepClone();
+
+        Vector2 uidTextSize, iconSize;
+        using (_uiSharedService.UidFont.Push())
+            uidTextSize = ImGui.CalcTextSize(uidText);
+
+        using (_uiSharedService.IconFont.Push())
+            iconSize = ImGui.CalcTextSize(FontAwesomeIcon.PersonCirclePlus.ToIconString());
+
+        float contentWidth = ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X;
+        float uidStartX = (contentWidth - uidTextSize.X) / 2f;
+        float cursorY = ImGui.GetCursorPosY();
+
+        if (_configService.Current.BroadcastEnabled && _apiController.IsConnected)
+        {
+            float iconYOffset = (uidTextSize.Y - iconSize.Y) * 0.5f;
+            var buttonSize = new Vector2(iconSize.X, uidTextSize.Y);
+
+            ImGui.SetCursorPos(new Vector2(ImGui.GetStyle().ItemSpacing.X + 5f, cursorY));
+            ImGui.InvisibleButton("BroadcastIcon", buttonSize);
+
+            var iconPos = ImGui.GetItemRectMin() + new Vector2(0f, iconYOffset);
+            using (_uiSharedService.IconFont.Push())
+                ImGui.GetWindowDrawList().AddText(iconPos, ImGui.GetColorU32(UIColors.Get("LightlessGreen")), FontAwesomeIcon.PersonCirclePlus.ToIconString());
+
+
+            if (ImGui.IsItemHovered())
+            {
+                ImGui.BeginTooltip();
+
+                ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("PairBlue"));
+                ImGui.Text("Lightfinder");
+                ImGui.PopStyleColor();
+
+                ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("DimRed"));
+                ImGui.TextWrapped("Use Lightfinder when you're okay with being visible to other users and understand that you are responsible for your own experience.");
+                ImGui.PopStyleColor();
+
+                ImGuiHelpers.ScaledDummy(0.2f);
+                _uiSharedService.ColoredSeparator(UIColors.Get("LightlessPurple"), 2f);
+
+                if (_configService.Current.BroadcastEnabled)
+                {
+                    ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("LightlessGreen"));
+                    ImGui.Text("The Lightfinder calls, and somewhere, a soul may answer."); // cringe..
+                    ImGui.PopStyleColor();
+
+                    var ttl = _broadcastService.RemainingTtl;
+                    if (ttl is { } remaining && remaining > TimeSpan.Zero)
+                    {
+                        ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("LightlessYellow"));
+                        ImGui.Text($"Still shining, for {remaining:hh\\:mm\\:ss}");
+                        ImGui.PopStyleColor();
+                    }
+                    else
+                    {
+                        ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("DimRed"));
+                        ImGui.Text("The Lightfinder's light wanes, but not in vain."); // cringe..
+                        ImGui.PopStyleColor();
+                    }
+                }
+                else
+                {
+                    ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("DimRed"));
+                    ImGui.Text("The Lightfinder rests, waiting to shine again."); // cringe..
+                    ImGui.PopStyleColor();
+                }
+
+                var cooldown = _broadcastService.RemainingCooldown;
+                if (cooldown is { } cd)
+                {
+                    ImGui.PushStyleColor(ImGuiCol.Text, UIColors.Get("DimRed"));
+                    ImGui.Text($"The Lightfinder gathers its strength... ({Math.Ceiling(cd.TotalSeconds)}s)");
+                    ImGui.PopStyleColor();
+                }
+
+                ImGui.EndTooltip();
+            }
+
+            if (ImGui.IsItemClicked())
+                _lightlessMediator.Publish(new UiToggleMessage(typeof(BroadcastUI)));
+        }
+
+        ImGui.SetCursorPosY(cursorY);
+        ImGui.SetCursorPosX(uidStartX);
+
+        bool headerItemClicked;
         using (_uiSharedService.UidFont.Push())
         {
-            var uidTextSize = ImGui.CalcTextSize(uidText);
+            if (useVanityColors)
-            ImGui.SetCursorPosX((ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X) / 2 - (uidTextSize.X / 2));
+            {
-            ImGui.TextColored(GetUidColor(), uidText);
+                var seString = SeStringUtils.BuildFormattedPlayerName(uidText, vanityTextColor, vanityGlowColor);
+                var cursorPos = ImGui.GetCursorScreenPos();
+                var fontPtr = ImGui.GetFont();
+                SeStringUtils.RenderSeStringWithHitbox(seString, cursorPos, fontPtr);
+            }
+            else
+            {
+                ImGui.TextColored(GetUidColor(), uidText);
+            }
+        }
+
+        headerItemClicked = ImGui.IsItemClicked();
+
+        if (headerItemClicked)
+        {
+            ImGui.SetClipboardText(uidText);
+        }
+
+        UiSharedService.AttachToolTip("Click to copy");
+
+        if (_cachedAnalysis != null && _apiController.ServerState is ServerState.Connected)
+        {
+            var firstEntry = _cachedAnalysis.FirstOrDefault();
+            var valueDict = firstEntry.Value;
+            if (valueDict != null && valueDict.Count > 0)
+            {
+                var groupedfiles = valueDict
+                    .Select(v => v.Value)
+                    .Where(v => v != null)
+                    .GroupBy(f => f.FileType, StringComparer.Ordinal)
+                    .OrderBy(k => k.Key, StringComparer.Ordinal)
+                    .ToList();
+
+                var actualTriCount = valueDict
+                    .Select(v => v.Value)
+                    .Where(v => v != null)
+                    .Sum(f => f.Triangles);
+
+                if (groupedfiles != null)
+                {
+                    //Checking of VRAM threshhold
+                    var texGroup = groupedfiles.SingleOrDefault(v => string.Equals(v.Key, "tex", StringComparison.Ordinal));
+                    var actualVramUsage = texGroup != null ? texGroup.Sum(f => f.OriginalSize) : 0L;
+                    var isOverVRAMUsage = _playerPerformanceConfig.Current.VRAMSizeWarningThresholdMiB * 1024 * 1024 < actualVramUsage;
+                    var isOverTriHold = actualTriCount > (_playerPerformanceConfig.Current.TrisWarningThresholdThousands * 1000);
+
+                    if ((isOverTriHold || isOverVRAMUsage) && _playerPerformanceConfig.Current.WarnOnExceedingThresholds)
+                    {
+                        ImGui.SameLine();
+                        ImGui.SetCursorPosY(cursorY + 15f);
+                        _uiSharedService.IconText(FontAwesomeIcon.ExclamationTriangle, UIColors.Get("LightlessYellow"));
+
+                        string warningMessage = "";
+                        if (isOverTriHold)
+                        {
+                            warningMessage += $"You exceed your own triangles threshold by " +
+                                $"{actualTriCount - _playerPerformanceConfig.Current.TrisWarningThresholdThousands * 1000} triangles.";
+                            warningMessage += Environment.NewLine;
+
+                        }
+                        if (isOverVRAMUsage)
+                        {
+                            warningMessage += $"You exceed your own VRAM threshold by " +
+                                    $"{UiSharedService.ByteToString(actualVramUsage - (_playerPerformanceConfig.Current.VRAMSizeWarningThresholdMiB * 1024 * 1024))}.";
+                        }
+                        UiSharedService.AttachToolTip(warningMessage);
+                        if (ImGui.IsItemClicked())
+                        {
+                            _lightlessMediator.Publish(new UiToggleMessage(typeof(DataAnalysisUi)));
+                        }
+                    }
+                }
+            }
         }
 
         if (_apiController.ServerState is ServerState.Connected)
         {
-            if (ImGui.IsItemClicked())
+            if (headerItemClicked)
             {
                 ImGui.SetClipboardText(_apiController.DisplayName);
             }
-            UiSharedService.AttachToolTip("Click to copy");
 
             if (!string.Equals(_apiController.DisplayName, _apiController.UID, StringComparison.Ordinal))
             {
                 var origTextSize = ImGui.CalcTextSize(_apiController.UID);
                 ImGui.SetCursorPosX((ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X) / 2 - (origTextSize.X / 2));
-                ImGui.TextColored(GetUidColor(), _apiController.UID);
+
-                if (ImGui.IsItemClicked())
+                if (useVanityColors)
+                {
+                    var seString = SeStringUtils.BuildFormattedPlayerName(_apiController.UID, vanityTextColor, vanityGlowColor);
+                    var cursorPos = ImGui.GetCursorScreenPos();
+                    var fontPtr = ImGui.GetFont();
+                    SeStringUtils.RenderSeStringWithHitbox(seString, cursorPos, fontPtr);
+                }
+                else
+                {
+                    ImGui.TextColored(GetUidColor(), _apiController.UID);
+                }
+
+                bool uidFooterClicked = ImGui.IsItemClicked();
+                UiSharedService.AttachToolTip("Click to copy");
+                if (uidFooterClicked)
                 {
                     ImGui.SetClipboardText(_apiController.UID);
                 }
-                UiSharedService.AttachToolTip("Click to copy");
             }
         }
         else
@@ -426,138 +684,164 @@ public class CompactUi : WindowMediatorSubscriberBase
         }
     }
 
-    private IEnumerable<IDrawFolder> GetDrawFolders()
+    private IEnumerable<IDrawFolder> DrawFolders
     {
-        List<IDrawFolder> drawFolders = [];
+        get
+        {
+            var drawFolders = new List<IDrawFolder>();
+            var filter = _tabMenu.Filter;
 
-        var allPairs = _pairManager.PairsWithGroups
+            var allPairs = _pairManager.PairsWithGroups.ToDictionary(k => k.Key, k => k.Value);
-            .ToDictionary(k => k.Key, k => k.Value);
+            var filteredPairs = allPairs.Where(p => PassesFilter(p.Key, filter)).ToDictionary(k => k.Key, k => k.Value);
-        var filteredPairs = allPairs
+
-            .Where(p =>
+            //Filter of online/visible pairs
+            if (_configService.Current.ShowVisibleUsersSeparately)
             {
-                if (_tabMenu.Filter.IsNullOrEmpty()) return true;
+                var allVisiblePairs = ImmutablePairList(allPairs.Where(p => FilterVisibleUsers(p.Key)));
-                return p.Key.UserData.AliasOrUID.Contains(_tabMenu.Filter, StringComparison.OrdinalIgnoreCase) ||
+                var filteredVisiblePairs = BasicSortedDictionary(filteredPairs.Where(p => FilterVisibleUsers(p.Key)));
-                       (p.Key.GetNote()?.Contains(_tabMenu.Filter, StringComparison.OrdinalIgnoreCase) ?? false) ||
-                       (p.Key.PlayerName?.Contains(_tabMenu.Filter, StringComparison.OrdinalIgnoreCase) ?? false);
-            })
-            .ToDictionary(k => k.Key, k => k.Value);
 
-        string? AlphabeticalSort(KeyValuePair<Pair, List<GroupFullInfoDto>> u)
+                drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(TagHandler.CustomVisibleTag, filteredVisiblePairs, allVisiblePairs));
-            => (_configService.Current.ShowCharacterNameInsteadOfNotesForVisible && !string.IsNullOrEmpty(u.Key.PlayerName)
-                    ? (_configService.Current.PreferNotesOverNamesForVisible ? u.Key.GetNote() : u.Key.PlayerName)
-                    : (u.Key.GetNote() ?? u.Key.UserData.AliasOrUID));
-        bool FilterOnlineOrPausedSelf(KeyValuePair<Pair, List<GroupFullInfoDto>> u)
-            => (u.Key.IsOnline || (!u.Key.IsOnline && !_configService.Current.ShowOfflineUsersSeparately)
-                    || u.Key.UserPair.OwnPermissions.IsPaused());
-        Dictionary<Pair, List<GroupFullInfoDto>> BasicSortedDictionary(IEnumerable<KeyValuePair<Pair, List<GroupFullInfoDto>>> u)
-            => u.OrderByDescending(u => u.Key.IsVisible)
-                .ThenByDescending(u => u.Key.IsOnline)
-                .ThenBy(AlphabeticalSort, StringComparer.OrdinalIgnoreCase)
-                .ToDictionary(u => u.Key, u => u.Value);
-        ImmutableList<Pair> ImmutablePairList(IEnumerable<KeyValuePair<Pair, List<GroupFullInfoDto>>> u)
-            => u.Select(k => k.Key).ToImmutableList();
-        bool FilterVisibleUsers(KeyValuePair<Pair, List<GroupFullInfoDto>> u)
-            => u.Key.IsVisible
-                && (_configService.Current.ShowSyncshellUsersInVisible || !(!_configService.Current.ShowSyncshellUsersInVisible && !u.Key.IsDirectlyPaired));
-        bool FilterTagusers(KeyValuePair<Pair, List<GroupFullInfoDto>> u, string tag)
-            => u.Key.IsDirectlyPaired && !u.Key.IsOneSidedPair && _tagHandler.HasTag(u.Key.UserData.UID, tag);
-        bool FilterGroupUsers(KeyValuePair<Pair, List<GroupFullInfoDto>> u, GroupFullInfoDto group)
-            => u.Value.Exists(g => string.Equals(g.GID, group.GID, StringComparison.Ordinal));
-        bool FilterNotTaggedUsers(KeyValuePair<Pair, List<GroupFullInfoDto>> u)
-            => u.Key.IsDirectlyPaired && !u.Key.IsOneSidedPair && !_tagHandler.HasAnyTag(u.Key.UserData.UID);
-        bool FilterOfflineUsers(KeyValuePair<Pair, List<GroupFullInfoDto>> u)
-            => ((u.Key.IsDirectlyPaired && _configService.Current.ShowSyncshellOfflineUsersSeparately)
-                || !_configService.Current.ShowSyncshellOfflineUsersSeparately)
-                && (!u.Key.IsOneSidedPair || u.Value.Any()) && !u.Key.IsOnline && !u.Key.UserPair.OwnPermissions.IsPaused();
-        bool FilterOfflineSyncshellUsers(KeyValuePair<Pair, List<GroupFullInfoDto>> u)
-            => (!u.Key.IsDirectlyPaired && !u.Key.IsOnline && !u.Key.UserPair.OwnPermissions.IsPaused());
-
-
-        if (_configService.Current.ShowVisibleUsersSeparately)
-        {
-            var allVisiblePairs = ImmutablePairList(allPairs
-                .Where(FilterVisibleUsers));
-            var filteredVisiblePairs = BasicSortedDictionary(filteredPairs
-                .Where(FilterVisibleUsers));
-
-            drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(TagHandler.CustomVisibleTag, filteredVisiblePairs, allVisiblePairs));
-        }
-
-        List<IDrawFolder> groupFolders = new();
-        foreach (var group in _pairManager.GroupPairs.Select(g => g.Key).OrderBy(g => g.GroupAliasOrGID, StringComparer.OrdinalIgnoreCase))
-        {
-            var allGroupPairs = ImmutablePairList(allPairs
-                .Where(u => FilterGroupUsers(u, group)));
-
-            var filteredGroupPairs = filteredPairs
-                .Where(u => FilterGroupUsers(u, group) && FilterOnlineOrPausedSelf(u))
-                .OrderByDescending(u => u.Key.IsOnline)
-                .ThenBy(u =>
-                {
-                    if (string.Equals(u.Key.UserData.UID, group.OwnerUID, StringComparison.Ordinal)) return 0;
-                    if (group.GroupPairUserInfos.TryGetValue(u.Key.UserData.UID, out var info))
-                    {
-                        if (info.IsModerator()) return 1;
-                        if (info.IsPinned()) return 2;
-                    }
-                    return u.Key.IsVisible ? 3 : 4;
-                })
-                .ThenBy(AlphabeticalSort, StringComparer.OrdinalIgnoreCase)
-                .ToDictionary(k => k.Key, k => k.Value);
-
-            groupFolders.Add(_drawEntityFactory.CreateDrawGroupFolder(group, filteredGroupPairs, allGroupPairs));
-        }
-
-        if (_configService.Current.GroupUpSyncshells)
-            drawFolders.Add(new DrawGroupedGroupFolder(groupFolders, _tagHandler, _uiSharedService));
-        else
-            drawFolders.AddRange(groupFolders);
-
-        var tags = _tagHandler.GetAllTagsSorted();
-        foreach (var tag in tags)
-        {
-            var allTagPairs = ImmutablePairList(allPairs
-                .Where(u => FilterTagusers(u, tag)));
-            var filteredTagPairs = BasicSortedDictionary(filteredPairs
-                .Where(u => FilterTagusers(u, tag) && FilterOnlineOrPausedSelf(u)));
-
-            drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(tag, filteredTagPairs, allTagPairs));
-        }
-
-        var allOnlineNotTaggedPairs = ImmutablePairList(allPairs
-            .Where(FilterNotTaggedUsers));
-        var onlineNotTaggedPairs = BasicSortedDictionary(filteredPairs
-            .Where(u => FilterNotTaggedUsers(u) && FilterOnlineOrPausedSelf(u)));
-
-        drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder((_configService.Current.ShowOfflineUsersSeparately ? TagHandler.CustomOnlineTag : TagHandler.CustomAllTag),
-            onlineNotTaggedPairs, allOnlineNotTaggedPairs));
-
-        if (_configService.Current.ShowOfflineUsersSeparately)
-        {
-            var allOfflinePairs = ImmutablePairList(allPairs
-                .Where(FilterOfflineUsers));
-            var filteredOfflinePairs = BasicSortedDictionary(filteredPairs
-                .Where(FilterOfflineUsers));
-
-            drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(TagHandler.CustomOfflineTag, filteredOfflinePairs, allOfflinePairs));
-            if (_configService.Current.ShowSyncshellOfflineUsersSeparately)
-            {
-                var allOfflineSyncshellUsers = ImmutablePairList(allPairs
-                    .Where(FilterOfflineSyncshellUsers));
-                var filteredOfflineSyncshellUsers = BasicSortedDictionary(filteredPairs
-                    .Where(FilterOfflineSyncshellUsers));
-
-                drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(TagHandler.CustomOfflineSyncshellTag,
-                    filteredOfflineSyncshellUsers,
-                    allOfflineSyncshellUsers));
             }
+
+            //Filter of not foldered syncshells
+            var groupFolders = new List<IDrawFolder>();
+            foreach (var group in _pairManager.GroupPairs.Select(g => g.Key).OrderBy(g => g.GroupAliasOrGID, StringComparer.OrdinalIgnoreCase))
+            {
+                GetGroups(allPairs, filteredPairs, group, out ImmutableList<Pair> allGroupPairs, out Dictionary<Pair, List<GroupFullInfoDto>> filteredGroupPairs);
+
+                if (FilterNotTaggedSyncshells(group))
+                {
+                    groupFolders.Add(_drawEntityFactory.CreateDrawGroupFolder(group, filteredGroupPairs, allGroupPairs));
+                }
+            }
+
+            //Filter of grouped up syncshells (All Syncshells Folder)
+            if (_configService.Current.GroupUpSyncshells)
+                drawFolders.Add(new DrawGroupedGroupFolder(groupFolders, _tagHandler, _uiSharedService,
+                    _selectSyncshellForTagUi, _renameSyncshellTagUi, ""));
+            else
+                drawFolders.AddRange(groupFolders);
+
+            //Filter of grouped/foldered pairs
+            foreach (var tag in _tagHandler.GetAllPairTagsSorted())
+            {
+                var allTagPairs = ImmutablePairList(allPairs.Where(p => FilterTagUsers(p.Key, tag)));
+                var filteredTagPairs = BasicSortedDictionary(filteredPairs.Where(p => FilterTagUsers(p.Key, tag) && FilterOnlineOrPausedSelf(p.Key)));
+
+                drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(tag, filteredTagPairs, allTagPairs));
+            }
+
+            //Filter of grouped/foldered syncshells
+            foreach (var syncshellTag in _tagHandler.GetAllSyncshellTagsSorted())
+            {
+                var syncshellFolderTags = new List<IDrawFolder>();
+                foreach (var group in _pairManager.GroupPairs.Select(g => g.Key).OrderBy(g => g.GroupAliasOrGID, StringComparer.OrdinalIgnoreCase))
+                {
+                    if (_tagHandler.HasSyncshellTag(group.GID, syncshellTag))
+                    {
+                        GetGroups(allPairs, filteredPairs, group,
+                            out ImmutableList<Pair> allGroupPairs,
+                            out Dictionary<Pair, List<GroupFullInfoDto>> filteredGroupPairs);
+
+                        syncshellFolderTags.Add(_drawEntityFactory.CreateDrawGroupFolder($"tag_{group.GID}", group, filteredGroupPairs, allGroupPairs));
+                    }
+                }
+
+                drawFolders.Add(new DrawGroupedGroupFolder(syncshellFolderTags, _tagHandler, _uiSharedService, _selectSyncshellForTagUi, _renameSyncshellTagUi, syncshellTag));
+            }
+
+            //Filter of not grouped/foldered and offline pairs
+            var allOnlineNotTaggedPairs = ImmutablePairList(allPairs.Where(p => FilterNotTaggedUsers(p.Key)));
+            var onlineNotTaggedPairs = BasicSortedDictionary(filteredPairs.Where(p => FilterNotTaggedUsers(p.Key) && FilterOnlineOrPausedSelf(p.Key)));
+
+            drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder((_configService.Current.ShowOfflineUsersSeparately ? TagHandler.CustomOnlineTag : TagHandler.CustomAllTag), onlineNotTaggedPairs, allOnlineNotTaggedPairs));
+
+            if (_configService.Current.ShowOfflineUsersSeparately)
+            {
+                var allOfflinePairs = ImmutablePairList(allPairs.Where(p => FilterOfflineUsers(p.Key, p.Value)));
+                var filteredOfflinePairs = BasicSortedDictionary(filteredPairs.Where(p => FilterOfflineUsers(p.Key, p.Value)));
+
+                drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(TagHandler.CustomOfflineTag, filteredOfflinePairs, allOfflinePairs));
+
+                if (_configService.Current.ShowSyncshellOfflineUsersSeparately)
+                {
+                    var allOfflineSyncshellUsers = ImmutablePairList(allPairs.Where(p => FilterOfflineSyncshellUsers(p.Key)));
+                    var filteredOfflineSyncshellUsers = BasicSortedDictionary(filteredPairs.Where(p => FilterOfflineSyncshellUsers(p.Key)));
+
+                    drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(TagHandler.CustomOfflineSyncshellTag, filteredOfflineSyncshellUsers, allOfflineSyncshellUsers));
+                }
+            }
+
+            //Unpaired 
+            drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(TagHandler.CustomUnpairedTag,
+                BasicSortedDictionary(filteredPairs.Where(p => p.Key.IsOneSidedPair)),
+                ImmutablePairList(allPairs.Where(p => p.Key.IsOneSidedPair))));
+
+            return drawFolders;
+        }
+    }
+
+    private static bool PassesFilter(Pair pair, string filter)
+    {
+        if (string.IsNullOrEmpty(filter)) return true;
+
+        return pair.UserData.AliasOrUID.Contains(filter, StringComparison.OrdinalIgnoreCase) || (pair.GetNote()?.Contains(filter, StringComparison.OrdinalIgnoreCase) ?? false) || (pair.PlayerName?.Contains(filter, StringComparison.OrdinalIgnoreCase) ?? false);
+    }
+
+    private string AlphabeticalSortKey(Pair pair)
+    {
+        if (_configService.Current.ShowCharacterNameInsteadOfNotesForVisible && !string.IsNullOrEmpty(pair.PlayerName))
+        {
+            return _configService.Current.PreferNotesOverNamesForVisible ? (pair.GetNote() ?? string.Empty) : pair.PlayerName;
         }
 
-        drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(TagHandler.CustomUnpairedTag,
+        return pair.GetNote() ?? pair.UserData.AliasOrUID;
-            BasicSortedDictionary(filteredPairs.Where(u => u.Key.IsOneSidedPair)),
+    }
-            ImmutablePairList(allPairs.Where(u => u.Key.IsOneSidedPair))));
 
-        return drawFolders;
+    private bool FilterOnlineOrPausedSelf(Pair pair) => pair.IsOnline || (!pair.IsOnline && !_configService.Current.ShowOfflineUsersSeparately) || pair.UserPair.OwnPermissions.IsPaused();
+
+    private bool FilterVisibleUsers(Pair pair) => pair.IsVisible && (_configService.Current.ShowSyncshellUsersInVisible || pair.IsDirectlyPaired);
+
+    private bool FilterTagUsers(Pair pair, string tag) => pair.IsDirectlyPaired && !pair.IsOneSidedPair && _tagHandler.HasPairTag(pair.UserData.UID, tag);
+
+    private static bool FilterGroupUsers(List<GroupFullInfoDto> groups, GroupFullInfoDto group) => groups.Exists(g => string.Equals(g.GID, group.GID, StringComparison.Ordinal));
+
+    private bool FilterNotTaggedUsers(Pair pair) => pair.IsDirectlyPaired && !pair.IsOneSidedPair && !_tagHandler.HasAnyPairTag(pair.UserData.UID);
+
+    private bool FilterNotTaggedSyncshells(GroupFullInfoDto group) => !_tagHandler.HasAnySyncshellTag(group.GID) || _configService.Current.ShowGroupedSyncshellsInAll;
+
+    private bool FilterOfflineUsers(Pair pair, List<GroupFullInfoDto> groups) => ((pair.IsDirectlyPaired && _configService.Current.ShowSyncshellOfflineUsersSeparately) || !_configService.Current.ShowSyncshellOfflineUsersSeparately) && (!pair.IsOneSidedPair || groups.Count != 0) && !pair.IsOnline && !pair.UserPair.OwnPermissions.IsPaused();
+
+    private static bool FilterOfflineSyncshellUsers(Pair pair) => !pair.IsDirectlyPaired && !pair.IsOnline && !pair.UserPair.OwnPermissions.IsPaused();
+
+    private Dictionary<Pair, List<GroupFullInfoDto>> BasicSortedDictionary(IEnumerable<KeyValuePair<Pair, List<GroupFullInfoDto>>> pairs) => pairs.OrderByDescending(u => u.Key.IsVisible).ThenByDescending(u => u.Key.IsOnline).ThenBy(u => AlphabeticalSortKey(u.Key), StringComparer.OrdinalIgnoreCase).ToDictionary(u => u.Key, u => u.Value);
+
+    private static ImmutableList<Pair> ImmutablePairList(IEnumerable<KeyValuePair<Pair, List<GroupFullInfoDto>>> pairs) => [.. pairs.Select(k => k.Key)];
+
+    private void GetGroups(Dictionary<Pair, List<GroupFullInfoDto>> allPairs,
+                           Dictionary<Pair, List<GroupFullInfoDto>> filteredPairs,
+                           GroupFullInfoDto group,
+                           out ImmutableList<Pair> allGroupPairs,
+                           out Dictionary<Pair, List<GroupFullInfoDto>> filteredGroupPairs)
+    {
+        allGroupPairs = ImmutablePairList(allPairs
+            .Where(u => FilterGroupUsers(u.Value, group)));
+
+        filteredGroupPairs = filteredPairs
+            .Where(u => FilterGroupUsers(u.Value, group) && FilterOnlineOrPausedSelf(u.Key))
+            .OrderByDescending(u => u.Key.IsOnline)
+            .ThenBy(u =>
+            {
+                if (string.Equals(u.Key.UserData.UID, group.OwnerUID, StringComparison.Ordinal)) return 0;
+                if (group.GroupPairUserInfos.TryGetValue(u.Key.UserData.UID, out var info))
+                {
+                    if (info.IsModerator()) return 1;
+                    if (info.IsPinned()) return 2;
+                }
+                return u.Key.IsVisible ? 3 : 4;
+            })
+            .ThenBy(u => AlphabeticalSortKey(u.Key), StringComparer.OrdinalIgnoreCase)
+            .ToDictionary(k => k.Key, k => k.Value);
     }
 
     private string GetServerError()
@@ -587,21 +871,21 @@ public class CompactUi : WindowMediatorSubscriberBase
     {
         return _apiController.ServerState switch
         {
-            ServerState.Connecting => ImGuiColors.DalamudYellow,
+            ServerState.Connecting => UIColors.Get("LightlessYellow"),
-            ServerState.Reconnecting => ImGuiColors.DalamudRed,
+            ServerState.Reconnecting => UIColors.Get("DimRed"),
             ServerState.Connected => UIColors.Get("LightlessPurple"),
-            ServerState.Disconnected => ImGuiColors.DalamudYellow,
+            ServerState.Disconnected => UIColors.Get("LightlessYellow"),
-            ServerState.Disconnecting => ImGuiColors.DalamudYellow,
+            ServerState.Disconnecting => UIColors.Get("LightlessYellow"),
-            ServerState.Unauthorized => ImGuiColors.DalamudRed,
+            ServerState.Unauthorized => UIColors.Get("DimRed"),
-            ServerState.VersionMisMatch => ImGuiColors.DalamudRed,
+            ServerState.VersionMisMatch => UIColors.Get("DimRed"),
-            ServerState.Offline => ImGuiColors.DalamudRed,
+            ServerState.Offline => UIColors.Get("DimRed"),
-            ServerState.RateLimited => ImGuiColors.DalamudYellow,
+            ServerState.RateLimited => UIColors.Get("LightlessYellow"),
-            ServerState.NoSecretKey => ImGuiColors.DalamudYellow,
+            ServerState.NoSecretKey => UIColors.Get("LightlessYellow"),
-            ServerState.MultiChara => ImGuiColors.DalamudYellow,
+            ServerState.MultiChara => UIColors.Get("LightlessYellow"),
-            ServerState.OAuthMisconfigured => ImGuiColors.DalamudRed,
+            ServerState.OAuthMisconfigured => UIColors.Get("DimRed"),
-            ServerState.OAuthLoginTokenStale => ImGuiColors.DalamudRed,
+            ServerState.OAuthLoginTokenStale => UIColors.Get("DimRed"),
-            ServerState.NoAutoLogon => ImGuiColors.DalamudYellow,
+            ServerState.NoAutoLogon => UIColors.Get("LightlessYellow"),
-            _ => ImGuiColors.DalamudRed
+            _ => UIColors.Get("DimRed")
         };
     }
 

LightlessSync/UI/Components/DrawFolderGroup.cs

@@ -19,16 +19,18 @@ public class DrawFolderGroup : DrawFolderBase
     private readonly GroupFullInfoDto _groupFullInfoDto;
     private readonly IdDisplayHandler _idDisplayHandler;
     private readonly LightlessMediator _lightlessMediator;
+    private readonly SelectTagForSyncshellUi _selectTagForSyncshellUi;
 
     public DrawFolderGroup(string id, GroupFullInfoDto groupFullInfoDto, ApiController apiController,
         IImmutableList<DrawUserPair> drawPairs, IImmutableList<Pair> allPairs, TagHandler tagHandler, IdDisplayHandler idDisplayHandler,
-        LightlessMediator lightlessMediator, UiSharedService uiSharedService) :
+        LightlessMediator lightlessMediator, UiSharedService uiSharedService, SelectTagForSyncshellUi selectTagForSyncshellUi) :
         base(id, drawPairs, allPairs, tagHandler, uiSharedService)
     {
         _groupFullInfoDto = groupFullInfoDto;
         _apiController = apiController;
         _idDisplayHandler = idDisplayHandler;
         _lightlessMediator = lightlessMediator;
+        _selectTagForSyncshellUi = selectTagForSyncshellUi;
     }
 
     protected override bool RenderIfEmpty => true;
@@ -99,6 +101,13 @@ public class DrawFolderGroup : DrawFolderBase
         }
         UiSharedService.AttachToolTip("Copies all your notes for all users in this Syncshell to the clipboard." + Environment.NewLine + "They can be imported via Settings -> General -> Notes -> Import notes from clipboard");
 
+        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Folder, "Syncshell Groups", menuWidth, true))
+        {
+            ImGui.CloseCurrentPopup();
+            _selectTagForSyncshellUi.Open(_groupFullInfoDto);
+        }
+        UiSharedService.AttachToolTip("Choose syncshell groups for " + _groupFullInfoDto.GID);
+
         if (_uiSharedService.IconTextButton(FontAwesomeIcon.ArrowCircleLeft, "Leave Syncshell", menuWidth, true) && UiSharedService.CtrlPressed())
         {
             _ = _apiController.GroupLeave(_groupFullInfoDto);
@@ -185,7 +194,7 @@ public class DrawFolderGroup : DrawFolderBase
 
         _uiSharedService.IconText(FontAwesomeIcon.UsersCog, (_groupFullInfoDto.GroupPermissions.IsPreferDisableAnimations() != individualAnimDisabled
             || _groupFullInfoDto.GroupPermissions.IsPreferDisableSounds() != individualSoundsDisabled
-            || _groupFullInfoDto.GroupPermissions.IsPreferDisableVFX() != individualVFXDisabled) ? ImGuiColors.DalamudYellow : null);
+            || _groupFullInfoDto.GroupPermissions.IsPreferDisableVFX() != individualVFXDisabled) ? UIColors.Get("LightlessYellow") : null);
         if (ImGui.IsItemHovered())
         {
             ImGui.BeginTooltip();

LightlessSync/UI/Components/DrawFolderTag.cs

@@ -13,13 +13,15 @@ public class DrawFolderTag : DrawFolderBase
 {
     private readonly ApiController _apiController;
     private readonly SelectPairForTagUi _selectPairForTagUi;
+    private readonly RenamePairTagUi _renameTagUi;
 
     public DrawFolderTag(string id, IImmutableList<DrawUserPair> drawPairs, IImmutableList<Pair> allPairs,
-        TagHandler tagHandler, ApiController apiController, SelectPairForTagUi selectPairForTagUi, UiSharedService uiSharedService)
+        TagHandler tagHandler, ApiController apiController, SelectPairForTagUi selectPairForTagUi, RenamePairTagUi renameTagUi, UiSharedService uiSharedService)
         : base(id, drawPairs, allPairs, tagHandler, uiSharedService)
     {
         _apiController = apiController;
         _selectPairForTagUi = selectPairForTagUi;
+        _renameTagUi = renameTagUi;
     }
 
     protected override bool RenderIfEmpty => _id switch
@@ -100,14 +102,17 @@ public class DrawFolderTag : DrawFolderBase
     protected override void DrawMenu(float menuWidth)
     {
         ImGui.TextUnformatted("Group Menu");
-        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Users, "Select Pairs", menuWidth, true))
+        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Users, "Select Pairs", menuWidth, isInPopup: true))
         {
             _selectPairForTagUi.Open(_id);
         }
-        UiSharedService.AttachToolTip("Select Individual Pairs for this Pair Group");
+        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Edit, "Rename Pair Group", menuWidth, isInPopup: true))
-        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Delete Pair Group", menuWidth, true) && UiSharedService.CtrlPressed())
         {
-            _tagHandler.RemoveTag(_id);
+            _renameTagUi.Open(_id);
+        }
+        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Delete Pair Group", menuWidth, isInPopup: true) && UiSharedService.CtrlPressed())
+        {
+            _tagHandler.RemovePairTag(_id);
         }
         UiSharedService.AttachToolTip("Hold CTRL to remove this Group permanently." + Environment.NewLine +
             "Note: this will not unpair with users in this Group.");

LightlessSync/UI/Components/DrawGroupedGroupFolder.cs

@@ -9,27 +9,37 @@ namespace LightlessSync.UI.Components;
 
 public class DrawGroupedGroupFolder : IDrawFolder
 {
+    private readonly string _tag;
     private readonly IEnumerable<IDrawFolder> _groups;
     private readonly TagHandler _tagHandler;
     private readonly UiSharedService _uiSharedService;
+    private readonly SelectSyncshellForTagUi _selectSyncshellForTagUi;
+    private readonly RenameSyncshellTagUi _renameSyncshellTagUi;
     private bool _wasHovered = false;
+    private float _menuWidth;
 
     public IImmutableList<DrawUserPair> DrawPairs => throw new NotSupportedException();
     public int OnlinePairs => _groups.SelectMany(g => g.DrawPairs).Where(g => g.Pair.IsOnline).DistinctBy(g => g.Pair.UserData.UID).Count();
     public int TotalPairs => _groups.Sum(g => g.TotalPairs);
 
-    public DrawGroupedGroupFolder(IEnumerable<IDrawFolder> groups, TagHandler tagHandler, UiSharedService uiSharedService)
+    public DrawGroupedGroupFolder(IEnumerable<IDrawFolder> groups, TagHandler tagHandler, UiSharedService uiSharedService, SelectSyncshellForTagUi selectSyncshellForTagUi, RenameSyncshellTagUi renameSyncshellTagUi, string tag)
     {
         _groups = groups;
         _tagHandler = tagHandler;
         _uiSharedService = uiSharedService;
+        _selectSyncshellForTagUi = selectSyncshellForTagUi;
+        _renameSyncshellTagUi = renameSyncshellTagUi;
+        _tag = tag;
     }
 
     public void Draw()
     {
-        if (!_groups.Any()) return;
-
         string _id = "__folder_syncshells";
+        if (_tag != "")
+        {
+            _id = $"__folder_{_tag}";
+        }
+
         using var id = ImRaii.PushId(_id);
         var color = ImRaii.PushColor(ImGuiCol.ChildBg, ImGui.GetColorU32(ImGuiCol.FrameBgHovered), _wasHovered);
         using (ImRaii.Child("folder__" + _id, new System.Numerics.Vector2(UiSharedService.GetWindowContentRegionWidth() - ImGui.GetCursorPosX(), ImGui.GetFrameHeight())))
@@ -49,18 +59,36 @@ public class DrawGroupedGroupFolder : IDrawFolder
 
             ImGui.SameLine();
             ImGui.AlignTextToFramePadding();
-            _uiSharedService.IconText(FontAwesomeIcon.UsersRectangle);
+
-            using (ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, ImGui.GetStyle().ItemSpacing with { X = ImGui.GetStyle().ItemSpacing.X / 2f }))
+            if (_tag != "")
             {
-                ImGui.SameLine();
+                _uiSharedService.IconText(FontAwesomeIcon.FolderPlus);
-                ImGui.AlignTextToFramePadding();
+            } 
-                ImGui.TextUnformatted("[" + OnlinePairs.ToString() + "]");
+            else
+            {
+                _uiSharedService.IconText(FontAwesomeIcon.UsersRectangle);
             }
+
+            using (ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, ImGui.GetStyle().ItemSpacing with { X = ImGui.GetStyle().ItemSpacing.X / 2f }))
+                {
+                    ImGui.SameLine();
+                    ImGui.AlignTextToFramePadding();
+                    ImGui.TextUnformatted("[" + OnlinePairs.ToString() + "]");
+                }
             UiSharedService.AttachToolTip(OnlinePairs + " online in all of your joined syncshells" + Environment.NewLine +
                 TotalPairs + " pairs combined in all of your joined syncshells");
             ImGui.SameLine();
             ImGui.AlignTextToFramePadding();
-            ImGui.TextUnformatted("All Syncshells");
+            if (_tag != "")
+            {
+                ImGui.TextUnformatted(_tag);
+
+                ImGui.SameLine();
+                DrawMenu();
+            } else
+            {
+                ImGui.TextUnformatted("All Syncshells");
+            }
         }
         color.Dispose();
         _wasHovered = ImGui.IsItemHovered();
@@ -76,4 +104,40 @@ public class DrawGroupedGroupFolder : IDrawFolder
             }
         }
     }
+
+    protected void DrawMenu()
+    {
+        var barButtonSize = _uiSharedService.GetIconButtonSize(FontAwesomeIcon.EllipsisV);
+        var windowEndX = ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth();
+
+        ImGui.SameLine(windowEndX - barButtonSize.X);
+        if (_uiSharedService.IconButton(FontAwesomeIcon.EllipsisV))
+        {
+            ImGui.OpenPopup("User Flyout Menu");
+        }
+        if (ImGui.BeginPopup("User Flyout Menu"))
+        {
+            using (ImRaii.PushId($"buttons-syncshell-{_tag}")) GroupMenu(_menuWidth);
+            _menuWidth = ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X;
+            ImGui.EndPopup();
+        }
+    }
+
+    protected void GroupMenu(float menuWidth)
+    {
+        ImGui.TextUnformatted("Syncshell Group Menu");
+        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Users, "Select Syncshells", menuWidth, isInPopup: true))
+        {
+            _selectSyncshellForTagUi.Open(_tag);
+        }
+        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Edit, "Rename Syncshell Group", menuWidth, isInPopup: true))
+        {
+            _renameSyncshellTagUi.Open(_tag);
+        }
+        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Delete Syncshell Group", menuWidth, isInPopup: true) && UiSharedService.CtrlPressed())
+        {
+            _tagHandler.RemoveSyncshellTag(_tag);
+        }
+        UiSharedService.AttachToolTip("Hold CTRL to remove this Group permanently.");
+    }
 }

LightlessSync/UI/Components/DrawUserPair.cs

@@ -1,6 +1,5 @@
 using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
-using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using LightlessSync.API.Data.Extensions;
@@ -12,6 +11,7 @@ using LightlessSync.Services;
 using LightlessSync.Services.Mediator;
 using LightlessSync.Services.ServerConfiguration;
 using LightlessSync.UI.Handlers;
+using LightlessSync.Utils;
 using LightlessSync.WebAPI;
 
 namespace LightlessSync.UI.Components;
@@ -196,7 +196,7 @@ public class DrawUserPair
 
         if (_pair.IsPaused)
         {
-            using var _ = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudYellow);
+            using var _ = ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("LightlessYellow"));
             _uiSharedService.IconText(FontAwesomeIcon.PauseCircle);
             userPairText = _pair.UserData.AliasOrUID + " is paused";
         }
@@ -274,7 +274,7 @@ public class DrawUserPair
         {
             ImGui.SameLine();
 
-            _uiSharedService.IconText(FontAwesomeIcon.ExclamationTriangle, ImGuiColors.DalamudYellow);
+            _uiSharedService.IconText(FontAwesomeIcon.ExclamationTriangle, UIColors.Get("LightlessYellow"));
 
             string userWarningText = "WARNING: This user exceeds one or more of your defined thresholds:" + UiSharedService.TooltipSeparator;
             bool shownVram = false;
@@ -295,6 +295,31 @@ public class DrawUserPair
         }
 
         ImGui.SameLine();
+
+        if (_pair.UserData.IsAdmin || _pair.UserData.IsModerator)
+        {
+            ImGui.SameLine();
+
+            var iconId = _pair.UserData.IsAdmin ? 67 : 68;
+            var colorKey = _pair.UserData.IsAdmin ? "LightlessAdminText" : "LightlessModeratorText";
+            var roleColor = UIColors.Get(colorKey);
+
+            var iconPos = ImGui.GetCursorScreenPos();
+            SeStringUtils.RenderIconWithHitbox(iconId, iconPos);
+
+            if (ImGui.IsItemHovered())
+            {
+                ImGui.BeginTooltip();
+                using (ImRaii.PushColor(ImGuiCol.Text, roleColor))
+                {
+                    ImGui.TextUnformatted(_pair.UserData.IsAdmin
+                        ? "Official Lightless Developer"
+                        : "Official Lightless Moderator");
+                }
+                ImGui.EndTooltip();
+            }
+        }
+
     }
 
     private void DrawName(float leftSide, float rightSide)
@@ -376,7 +401,7 @@ public class DrawUserPair
                 currentRightSide -= (_uiSharedService.GetIconSize(individualIcon).X + spacingX);
 
                 ImGui.SameLine(currentRightSide);
-                using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudYellow, individualAnimDisabled || individualSoundsDisabled || individualVFXDisabled))
+                using (ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("LightlessYellow"), individualAnimDisabled || individualSoundsDisabled || individualVFXDisabled))
                     _uiSharedService.IconText(individualIcon);
                 if (ImGui.IsItemHovered())
                 {

LightlessSync/UI/Components/RenamePairTagUi.cs

@@ -0,0 +1,79 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
+using LightlessSync.UI.Handlers;
+
+using System.Numerics;
+
+namespace LightlessSync.UI.Components;
+
+public class RenamePairTagUi
+{
+    private readonly TagHandler _tagHandler;
+    private readonly UiSharedService _uiSharedService;
+    private string _desiredName = string.Empty;
+    private bool _opened = false;
+    private bool _show = false;
+    private string _tag = string.Empty;
+
+    public RenamePairTagUi(TagHandler tagHandler, UiSharedService uiSharedService)
+    {
+        _tagHandler = tagHandler;
+        _uiSharedService = uiSharedService;
+    }
+
+    public void Draw()
+    {
+        var workHeight = ImGui.GetMainViewport().WorkSize.Y / ImGuiHelpers.GlobalScale;
+        var minSize = new Vector2(300, workHeight < 110 ? workHeight : 110) * ImGuiHelpers.GlobalScale;
+        var maxSize = new Vector2(300, 110) * ImGuiHelpers.GlobalScale;
+
+        var popupName = $"Renaming Pair Group {_tag}";
+
+        if (!_show)
+        {
+            _opened = false;
+        }
+
+        if (_show && !_opened)
+        {
+            ImGui.SetNextWindowSize(minSize);
+            UiSharedService.CenterNextWindow(minSize.X, minSize.Y, ImGuiCond.Always);
+            ImGui.OpenPopup(popupName);
+            _opened = true;
+        }
+
+        ImGui.SetNextWindowSizeConstraints(minSize, maxSize);
+        if (ImGui.BeginPopupModal(popupName, ref _show, ImGuiWindowFlags.Popup | ImGuiWindowFlags.Modal))
+        {
+            ImGui.TextUnformatted($"Renaming {_tag}");
+
+            ImGui.InputTextWithHint("##desiredname", "Enter new group name", ref _desiredName, 20, ImGuiInputTextFlags.None);
+            using (ImRaii.Disabled(string.IsNullOrEmpty(_desiredName)))
+            {
+                if (_uiSharedService.IconTextButton(Dalamud.Interface.FontAwesomeIcon.Plus, "Rename Group"))
+                {
+                    RenameTag(_tag, _desiredName);
+                    _show = false;
+                }
+            }
+            ImGui.EndPopup();
+        }
+        else
+        {
+            _show = false;
+        }
+    }
+
+    public void Open(string tag)
+    {
+        _tag = tag;
+        _desiredName = "";
+        _show = true;
+    }
+
+    public void RenameTag(string oldTag, string newTag)
+    {
+        _tagHandler.RenamePairTag(oldTag, newTag);
+    }
+}

LightlessSync/UI/Components/RenameSyncshellTagUi.cs

@@ -0,0 +1,79 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
+using LightlessSync.UI.Handlers;
+
+using System.Numerics;
+
+namespace LightlessSync.UI.Components;
+
+public class RenameSyncshellTagUi
+{
+    private readonly TagHandler _tagHandler;
+    private readonly UiSharedService _uiSharedService;
+    private string _desiredName = string.Empty;
+    private bool _opened = false;
+    private bool _show = false;
+    private string _tag = string.Empty;
+
+    public RenameSyncshellTagUi(TagHandler tagHandler, UiSharedService uiSharedService)
+    {
+        _tagHandler = tagHandler;
+        _uiSharedService = uiSharedService;
+    }
+
+    public void Draw()
+    {
+        var workHeight = ImGui.GetMainViewport().WorkSize.Y / ImGuiHelpers.GlobalScale;
+        var minSize = new Vector2(300, workHeight < 110 ? workHeight : 110) * ImGuiHelpers.GlobalScale;
+        var maxSize = new Vector2(300, 110) * ImGuiHelpers.GlobalScale;
+
+        var popupName = $"Renaming Syncshell Group {_tag}";
+
+        if (!_show)
+        {
+            _opened = false;
+        }
+
+        if (_show && !_opened)
+        {
+            ImGui.SetNextWindowSize(minSize);
+            UiSharedService.CenterNextWindow(minSize.X, minSize.Y, ImGuiCond.Always);
+            ImGui.OpenPopup(popupName);
+            _opened = true;
+        }
+
+        ImGui.SetNextWindowSizeConstraints(minSize, maxSize);
+        if (ImGui.BeginPopupModal(popupName, ref _show, ImGuiWindowFlags.Popup | ImGuiWindowFlags.Modal))
+        {
+            ImGui.TextUnformatted($"Renaming {_tag}");
+
+            ImGui.InputTextWithHint("##desiredname", "Enter new group name", ref _desiredName, 20, ImGuiInputTextFlags.None);
+            using (ImRaii.Disabled(string.IsNullOrEmpty(_desiredName)))
+            {
+                if (_uiSharedService.IconTextButton(Dalamud.Interface.FontAwesomeIcon.Plus, "Rename Group"))
+                {
+                    RenameTag(_tag, _desiredName);
+                    _show = false;
+                }
+            }
+            ImGui.EndPopup();
+        }
+        else
+        {
+            _show = false;
+        }
+    }
+
+    public void Open(string tag)
+    {
+        _tag = tag;
+        _desiredName = "";
+        _show = true;
+    }
+
+    public void RenameTag(string oldTag, string newTag)
+    {
+        _tagHandler.RenameSyncshellTag(oldTag, newTag);
+    }
+}

LightlessSync/UI/Components/SelectPairForTagUi.cs

@@ -60,7 +60,7 @@ public class SelectPairForTagUi
                 {
                     if (isInGroup)
                     {
-                        _tagHandler.AddTagToPairedUid(item.UserData.UID, _tag);
+                        _tagHandler.AddPairTagToPairedUid(item.UserData.UID, _tag);
                         _peopleInGroup.Add(item.UserData.UID);
                     }
                     else

LightlessSync/UI/Components/SelectSyncshellForTagUi.cs

@@ -0,0 +1,86 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface.Utility;
+using LightlessSync.API.Dto.Group;
+using LightlessSync.UI.Handlers;
+
+using System.Numerics;
+
+namespace LightlessSync.UI.Components;
+
+public class SelectSyncshellForTagUi
+{
+    private readonly TagHandler _tagHandler;
+    private string _filter = string.Empty;
+    private bool _opened = false;
+    private HashSet<string> _syncshellsInGroup = new(StringComparer.Ordinal);
+    private bool _show = false;
+    private string _tag = string.Empty;
+
+    public SelectSyncshellForTagUi(TagHandler tagHandler)
+    {
+        _tagHandler = tagHandler;
+    }
+
+    public void Draw(List<GroupFullInfoDto> groups)
+    {
+        var workHeight = ImGui.GetMainViewport().WorkSize.Y / ImGuiHelpers.GlobalScale;
+        var minSize = new Vector2(300, workHeight < 400 ? workHeight : 400) * ImGuiHelpers.GlobalScale;
+        var maxSize = new Vector2(300, 1000) * ImGuiHelpers.GlobalScale;
+
+        var popupName = $"Choose Syncshells for Group {_tag}";
+
+        if (!_show)
+        {
+            _opened = false;
+        }
+
+        if (_show && !_opened)
+        {
+            ImGui.SetNextWindowSize(minSize);
+            UiSharedService.CenterNextWindow(minSize.X, minSize.Y, ImGuiCond.Always);
+            ImGui.OpenPopup(popupName);
+            _opened = true;
+        }
+
+        ImGui.SetNextWindowSizeConstraints(minSize, maxSize);
+        if (ImGui.BeginPopupModal(popupName, ref _show, ImGuiWindowFlags.Popup | ImGuiWindowFlags.Modal))
+        {
+            ImGui.TextUnformatted($"Select syncshells for group {_tag}");
+
+            ImGui.InputTextWithHint("##filter", "Filter", ref _filter, 255, ImGuiInputTextFlags.None);
+            foreach (var group in groups
+                .Where(g => string.IsNullOrEmpty(_filter) || g.GID.Contains(_filter, StringComparison.OrdinalIgnoreCase))
+                .OrderBy(g => g.GroupAliasOrGID, StringComparer.OrdinalIgnoreCase)
+                .ToList())
+            {
+                var isInGroup = _syncshellsInGroup.Contains(group.GID);
+                if (ImGui.Checkbox(group.GroupAliasOrGID, ref isInGroup))
+                {
+                    if (isInGroup)
+                    {
+                        _tagHandler.AddTagToSyncshell(group.GID, _tag);
+                        _syncshellsInGroup.Add(group.GID);
+                    }
+                    else
+                    {
+                        _tagHandler.RemoveTagFromSyncshell(group.GID, _tag);
+                        _syncshellsInGroup.Remove(group.GID);
+                    }
+                }
+            }
+            ImGui.EndPopup();
+        }
+        else
+        {
+            _filter = string.Empty;
+            _show = false;
+        }
+    }
+
+    public void Open(string tag)
+    {
+        _syncshellsInGroup = _tagHandler.GetOtherSyncshellsForTag(tag);
+        _tag = tag;
+        _show = true;
+    }
+}

LightlessSync/UI/Components/SelectTagForPairUi.cs

@@ -59,7 +59,7 @@ public class SelectTagForPairUi
 
         if (ImGui.BeginPopup(popupName))
         {
-            var tags = _tagHandler.GetAllTagsSorted();
+            var tags = _tagHandler.GetAllPairTagsSorted();
             var childHeight = tags.Count != 0 ? tags.Count * 25 : 1;
             var childSize = new Vector2(0, childHeight > 100 ? 100 : childHeight) * ImGuiHelpers.GlobalScale;
 
@@ -80,7 +80,7 @@ public class SelectTagForPairUi
                 HandleAddTag();
             }
             ImGui.SameLine();
-            ImGui.InputTextWithHint("##category_name", "New Group", ref _tagNameToAdd, 40);
+            ImGui.InputTextWithHint("##category_name", "New Group", ref _tagNameToAdd, 20);
             if (ImGui.IsKeyDown(ImGuiKey.Enter))
             {
                 HandleAddTag();
@@ -101,13 +101,13 @@ public class SelectTagForPairUi
 
     private void DrawGroupName(Pair pair, string name)
     {
-        var hasTagBefore = _tagHandler.HasTag(pair.UserData.UID, name);
+        var hasTagBefore = _tagHandler.HasPairTag(pair.UserData.UID, name);
         var hasTag = hasTagBefore;
         if (ImGui.Checkbox(name, ref hasTag))
         {
             if (hasTag)
             {
-                _tagHandler.AddTagToPairedUid(pair.UserData.UID, name);
+                _tagHandler.AddPairTagToPairedUid(pair.UserData.UID, name);
             }
             else
             {
@@ -120,10 +120,10 @@ public class SelectTagForPairUi
     {
         if (!_tagNameToAdd.IsNullOrWhitespace() && _tagNameToAdd is not (TagHandler.CustomOfflineTag or TagHandler.CustomOnlineTag or TagHandler.CustomVisibleTag))
         {
-            _tagHandler.AddTag(_tagNameToAdd);
+            _tagHandler.AddPairTag(_tagNameToAdd);
             if (_pair != null)
             {
-                _tagHandler.AddTagToPairedUid(_pair.UserData.UID, _tagNameToAdd);
+                _tagHandler.AddPairTagToPairedUid(_pair.UserData.UID, _tagNameToAdd);
             }
             _tagNameToAdd = string.Empty;
         }

LightlessSync/UI/Components/SelectTagForSyncshellUi.cs

@@ -0,0 +1,132 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface;
+using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
+using Dalamud.Utility;
+using LightlessSync.API.Dto.Group;
+using LightlessSync.UI.Handlers;
+
+using System.Numerics;
+
+namespace LightlessSync.UI.Components;
+
+public class SelectTagForSyncshellUi
+{
+    private readonly TagHandler _tagHandler;
+    private readonly UiSharedService _uiSharedService;
+
+    /// <summary>
+    /// The group UI is always open for a specific pair. This defines which pair the UI is open for.
+    /// </summary>
+    /// <returns></returns>
+    private GroupFullInfoDto? _group;
+
+    /// <summary>
+    /// Should the panel show, yes/no
+    /// </summary>
+    private bool _show;
+
+    /// <summary>
+    /// For the add category option, this stores the currently typed in tag name
+    /// </summary>
+    private string _tagNameToAdd = "";
+
+    public SelectTagForSyncshellUi(TagHandler tagHandler, UiSharedService uiSharedService)
+    {
+        _show = false;
+        _group = null;
+        _tagHandler = tagHandler;
+        _uiSharedService = uiSharedService;
+    }
+
+    public void Draw()
+    {
+        if (_group == null)
+        {
+            return;
+        }
+
+        var name = _group.GroupAliasOrGID;
+        var popupName = $"Choose Groups for {_group.GroupAliasOrGID}";
+        // Is the popup supposed to show but did not open yet? Open it
+        if (_show)
+        {
+            ImGui.OpenPopup(popupName);
+            _show = false;
+        }
+
+        if (ImGui.BeginPopup(popupName))
+        {
+            var tags = _tagHandler.GetAllSyncshellTagsSorted();
+            var childHeight = tags.Count != 0 ? tags.Count * 25 : 1;
+            var childSize = new Vector2(0, childHeight > 100 ? 100 : childHeight) * ImGuiHelpers.GlobalScale;
+
+            ImGui.TextUnformatted($"Select the groups you want {name} to be in.");
+            if (ImGui.BeginChild(name + "##listGroups", childSize))
+            {
+                foreach (var tag in tags)
+                {
+                    using (ImRaii.PushId($"groups-syncshell-{_group.GID}-{tag}")) DrawGroupName(_group, tag);
+                }
+                ImGui.EndChild();
+            }
+
+            ImGui.Separator();
+            ImGui.TextUnformatted($"Create a new group for {name}.");
+            if (_uiSharedService.IconButton(FontAwesomeIcon.Plus))
+            {
+                HandleAddTag();
+            }
+            ImGui.SameLine();
+            ImGui.InputTextWithHint("##category_name", "New Group", ref _tagNameToAdd, 20);
+            if (ImGui.IsKeyDown(ImGuiKey.Enter))
+            {
+                HandleAddTag();
+            }
+            ImGui.EndPopup();
+        }
+    }
+
+    public void Open(GroupFullInfoDto group)
+    {
+        _group = group;
+        // Using "_show" here to de-couple the opening of the popup
+        // The popup name is derived from the name the user currently sees, which is
+        // based on the showUidForEntry dictionary.
+        // We'd have to derive the name here to open it popup modal here, when the Open() is called
+        _show = true;
+    }
+
+    private void DrawGroupName(GroupFullInfoDto group, string name)
+    {
+        var hasTag = _tagHandler.HasSyncshellTag(group.GID, name);
+        if (ImGui.Checkbox(name, ref hasTag))
+        {
+            if (hasTag)
+            {
+                _tagHandler.AddTagToSyncshell(group.GID, name);
+            }
+            else
+            {
+                _tagHandler.RemoveTagFromSyncshell(group.GID, name);
+            }
+        }
+    }
+
+    private void HandleAddTag()
+    {
+        if (!_tagNameToAdd.IsNullOrWhitespace())
+        {
+            _tagHandler.AddSyncshellTag(_tagNameToAdd);
+            if (_group != null)
+            {
+                _tagHandler.AddTagToSyncshell(_group.GID, _tagNameToAdd);
+            }
+            _tagNameToAdd = string.Empty;
+        }
+        else
+        {
+            _tagNameToAdd = string.Empty;
+        }
+    }
+}

LightlessSync/UI/DataAnalysisUi.cs

@@ -371,7 +371,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
             ImGuiHelpers.ScaledDummy(5);
             UiSharedService.DrawGroupedCenteredColorText("Important Note: If you need to fix an animation that should apply across multiple jobs, you need to repeat this process with at least one additional job, " +
                 "otherwise the animation will only be fixed for the currently active job. This goes primarily for emotes that are used across multiple jobs.",
-                ImGuiColors.DalamudYellow, 800);
+                UIColors.Get("LightlessYellow"), 800);
             ImGuiHelpers.ScaledDummy(5);
             UiSharedService.DrawGroupedCenteredColorText("WARNING: WHILE RECORDING TRANSIENT DATA, DO NOT CHANGE YOUR APPEARANCE, ENABLED MODS OR ANYTHING. JUST DO THE ANIMATION(S) OR WHATEVER YOU NEED DOING AND STOP THE RECORDING.",
                 ImGuiColors.DalamudRed, 800);
@@ -399,7 +399,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
         if (_transientResourceManager.IsTransientRecording)
         {
             ImGui.SameLine();
-            UiSharedService.ColorText($"RECORDING - Time Remaining: {_transientResourceManager.RecordTimeRemaining.Value}", ImGuiColors.DalamudYellow);
+            UiSharedService.ColorText($"RECORDING - Time Remaining: {_transientResourceManager.RecordTimeRemaining.Value}", UIColors.Get("LightlessYellow"));
             ImGuiHelpers.ScaledDummy(5);
             UiSharedService.DrawGroupedCenteredColorText("DO NOT CHANGE YOUR APPEARANCE OR MODS WHILE RECORDING, YOU CAN ACCIDENTALLY MAKE SOME OF YOUR APPEARANCE RELATED MODS PERMANENT.", ImGuiColors.DalamudRed, 800);
         }
@@ -422,7 +422,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
         if (_transientResourceManager.RecordedTransients.Any(k => !k.AlreadyTransient))
         {
             ImGuiHelpers.ScaledDummy(5);
-            UiSharedService.DrawGroupedCenteredColorText("Please review the recorded mod files before saving and deselect files that got into the recording on accident.", ImGuiColors.DalamudYellow);
+            UiSharedService.DrawGroupedCenteredColorText("Please review the recorded mod files before saving and deselect files that got into the recording on accident.", UIColors.Get("LightlessYellow"));
             ImGuiHelpers.ScaledDummy(5);
         }
 
@@ -485,7 +485,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
         if (isAnalyzing)
         {
             UiSharedService.ColorTextWrapped($"Analyzing {_characterAnalyzer.CurrentFile}/{_characterAnalyzer.TotalFiles}",
-                ImGuiColors.DalamudYellow);
+                UIColors.Get("LightlessYellow"));
             if (_uiSharedService.IconTextButton(FontAwesomeIcon.StopCircle, "Cancel analysis"))
             {
                 _characterAnalyzer.CancelAnalyze();
@@ -496,7 +496,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
             if (_cachedAnalysis!.Any(c => c.Value.Any(f => !f.Value.IsComputed)))
             {
                 UiSharedService.ColorTextWrapped("Some entries in the analysis have file size not determined yet, press the button below to analyze your current data",
-                    ImGuiColors.DalamudYellow);
+                    UIColors.Get("LightlessYellow"));
                 if (_uiSharedService.IconTextButton(FontAwesomeIcon.PlayCircle, "Start analysis (missing entries)"))
                 {
                     _ = _characterAnalyzer.ComputeAnalysis(print: false);
@@ -547,73 +547,147 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
             using var tab = ImRaii.TabItem(tabText + "###" + kvp.Key.ToString());
             if (tab.Success)
             {
-                var groupedfiles = kvp.Value.Select(v => v.Value).GroupBy(f => f.FileType, StringComparer.Ordinal)
+                var groupedfiles = kvp.Value.Select(v => v.Value).GroupBy(f => f.FileType, StringComparer.Ordinal).OrderBy(k => k.Key, StringComparer.Ordinal).ToList();
-                    .OrderBy(k => k.Key, StringComparer.Ordinal).ToList();
 
-                ImGui.TextUnformatted("Files for " + kvp.Key);
+                ImGui.PushStyleVar(ImGuiStyleVar.CellPadding, new Vector2(1f, 1f));
-                ImGui.SameLine();
+                ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(1f, 1f));
-                ImGui.TextUnformatted(kvp.Value.Count.ToString());
-                ImGui.SameLine();
 
-                using (var font = ImRaii.PushFont(UiBuilder.IconFont))
+                if (ImGui.BeginTable($"##fileStats_{kvp.Key}", 3,
+                    ImGuiTableFlags.BordersInnerV | ImGuiTableFlags.SizingFixedFit))
                 {
-                    ImGui.TextUnformatted(FontAwesomeIcon.InfoCircle.ToIconString());
+                    ImGui.TableNextRow();
-                }
+                    ImGui.TableNextColumn();
-                if (ImGui.IsItemHovered())
+                    ImGui.TextUnformatted($"Files for {kvp.Key}");
-                {
+                    ImGui.TableNextColumn();
-                    string text = "";
+                    ImGui.TextUnformatted(kvp.Value.Count.ToString());
-                    text = string.Join(Environment.NewLine, groupedfiles
-                        .Select(f => f.Key + ": " + f.Count() + " files, size: " + UiSharedService.ByteToString(f.Sum(v => v.OriginalSize))
-                        + ", compressed: " + UiSharedService.ByteToString(f.Sum(v => v.CompressedSize))));
-                    ImGui.SetTooltip(text);
-                }
-                ImGui.TextUnformatted($"{kvp.Key} size (actual):");
-                ImGui.SameLine();
-                ImGui.TextUnformatted(UiSharedService.ByteToString(kvp.Value.Sum(c => c.Value.OriginalSize)));
-                ImGui.TextUnformatted($"{kvp.Key} size (compressed for up/download only):");
-                ImGui.SameLine();
-                ImGui.TextUnformatted(UiSharedService.ByteToString(kvp.Value.Sum(c => c.Value.CompressedSize)));
-                ImGui.Separator();
-
-                var vramUsage = groupedfiles.SingleOrDefault(v => string.Equals(v.Key, "tex", StringComparison.Ordinal));
-                if (vramUsage != null)
-                {
-                    var actualVramUsage = vramUsage.Sum(f => f.OriginalSize);
-                    ImGui.TextUnformatted($"{kvp.Key} VRAM usage:");
                     ImGui.SameLine();
-                    ImGui.TextUnformatted(UiSharedService.ByteToString(actualVramUsage));
+                    using (var font = ImRaii.PushFont(UiBuilder.IconFont))
+                        ImGui.TextUnformatted(FontAwesomeIcon.InfoCircle.ToIconString());
+                    if (ImGui.IsItemHovered())
+                    {
+                        string text = string.Join(Environment.NewLine, groupedfiles.Select(f =>
+                            $"{f.Key}: {f.Count()} files, size: {UiSharedService.ByteToString(f.Sum(v => v.OriginalSize))}, compressed: {UiSharedService.ByteToString(f.Sum(v => v.CompressedSize))}"));
+                        ImGui.SetTooltip(text);
+                    }
+                    ImGui.TableNextColumn();
+
+                    ImGui.TableNextRow();
+                    ImGui.TableNextColumn();
+                    ImGui.TextUnformatted($"{kvp.Key} size (actual):");
+                    ImGui.TableNextColumn();
+                    ImGui.TextUnformatted(UiSharedService.ByteToString(kvp.Value.Sum(c => c.Value.OriginalSize)));
+                    ImGui.TableNextColumn();
+
+                    ImGui.TableNextRow();
+                    ImGui.TableNextColumn();
+                    ImGui.TextUnformatted($"{kvp.Key} size (compressed for up/download only):");
+                    _uiSharedService.ColoredSeparator(UIColors.Get("LightlessPurpleDefault"), 1.5f);
+                    ImGui.TableNextColumn();
+                    ImGui.TextUnformatted(UiSharedService.ByteToString(kvp.Value.Sum(c => c.Value.CompressedSize)));
+                    _uiSharedService.ColoredSeparator(UIColors.Get("LightlessPurpleDefault"), 1.5f);
+                    ImGui.TableNextColumn();
+
+                    var vramUsage = groupedfiles.SingleOrDefault(v => string.Equals(v.Key, "tex", StringComparison.Ordinal));
+                    if (vramUsage != null)
+                    {
+                        var actualVramUsage = vramUsage.Sum(f => f.OriginalSize);
+
+                        ImGui.TableNextRow();
+                        ImGui.TableNextColumn();
+                        ImGui.TextUnformatted($"{kvp.Key} VRAM usage:");
+                        ImGui.TableNextColumn();
+                        ImGui.TextUnformatted(UiSharedService.ByteToString(actualVramUsage));
+                        ImGui.TableNextColumn();
+
+                        if (_playerPerformanceConfig.Current.WarnOnExceedingThresholds
+                            || _playerPerformanceConfig.Current.ShowPerformanceIndicator)
+                        {
+                            var currentVramWarning = _playerPerformanceConfig.Current.VRAMSizeWarningThresholdMiB;
+
+                            ImGui.TableNextRow();
+                            ImGui.TableNextColumn();
+                            ImGui.TextUnformatted("Configured VRAM threshold:");
+                            ImGui.TableNextColumn();
+                            ImGui.TextUnformatted($"{currentVramWarning} MiB.");
+                            ImGui.TableNextColumn();
+                            if (currentVramWarning * 1024 * 1024 < actualVramUsage)
+                            {
+                                UiSharedService.ColorText(
+                                    $"You exceed your own threshold by {UiSharedService.ByteToString(actualVramUsage - (currentVramWarning * 1024 * 1024))}",
+                                    UIColors.Get("LightlessYellow"));
+                            }
+                        }
+                    }
+
+                    var actualTriCount = kvp.Value.Sum(f => f.Value.Triangles);
+                    ImGui.TableNextRow();
+                    ImGui.TableNextColumn();
+                    ImGui.TextUnformatted($"{kvp.Key} modded model triangles:");
+                    ImGui.TableNextColumn();
+                    ImGui.TextUnformatted(actualTriCount.ToString());
+                    ImGui.TableNextColumn();
+
                     if (_playerPerformanceConfig.Current.WarnOnExceedingThresholds
                         || _playerPerformanceConfig.Current.ShowPerformanceIndicator)
                     {
-                        using var _ = ImRaii.PushIndent(10f);
+                        var currentTriWarning = _playerPerformanceConfig.Current.TrisWarningThresholdThousands;
-                        var currentVramWarning = _playerPerformanceConfig.Current.VRAMSizeWarningThresholdMiB;
+
-                        ImGui.TextUnformatted($"Configured VRAM warning threshold: {currentVramWarning} MiB.");
+                        ImGui.TableNextRow();
-                        if (currentVramWarning * 1024 * 1024 < actualVramUsage)
+                        ImGui.TableNextColumn();
+                        ImGui.TextUnformatted("Configured triangle threshold:");
+                        ImGui.TableNextColumn();
+                        ImGui.TextUnformatted($"{currentTriWarning * 1000} triangles.");
+                        ImGui.TableNextColumn();
+                        if (currentTriWarning * 1000 < actualTriCount)
                         {
-                            UiSharedService.ColorText($"You exceed your own threshold by " +
+                            UiSharedService.ColorText(
-                                $"{UiSharedService.ByteToString(actualVramUsage - (currentVramWarning * 1024 * 1024))}.",
+                                $"You exceed your own threshold by {actualTriCount - (currentTriWarning * 1000)}",
-                                ImGuiColors.DalamudYellow);
+                                UIColors.Get("LightlessYellow"));
                         }
                     }
+
+                    ImGui.EndTable();
                 }
 
-                var actualTriCount = kvp.Value.Sum(f => f.Value.Triangles);
+                ImGui.PopStyleVar(2);
-                ImGui.TextUnformatted($"{kvp.Key} modded model triangles: {actualTriCount}");
+
-                if (_playerPerformanceConfig.Current.WarnOnExceedingThresholds
+                _uiSharedService.ColoredSeparator(UIColors.Get("LightlessPurple"), 2f);
-                    || _playerPerformanceConfig.Current.ShowPerformanceIndicator)
+
+                _uiSharedService.MediumText("Selected file:", UIColors.Get("LightlessBlue"));
+                ImGui.SameLine();
+                _uiSharedService.MediumText(_selectedHash, UIColors.Get("LightlessYellow"));
+
+                if (_cachedAnalysis[_selectedObjectTab].TryGetValue(_selectedHash, out CharacterAnalyzer.FileDataEntry? item))
                 {
-                    using var _ = ImRaii.PushIndent(10f);
+                    var filePaths = item.FilePaths;
-                    var currentTriWarning = _playerPerformanceConfig.Current.TrisWarningThresholdThousands;
+                    UiSharedService.ColorText("Local file path:", UIColors.Get("LightlessBlue"));
-                    ImGui.TextUnformatted($"Configured triangle warning threshold: {currentTriWarning * 1000} triangles.");
+                    ImGui.SameLine();
-                    if (currentTriWarning * 1000 < actualTriCount)
+                    UiSharedService.TextWrapped(filePaths[0]);
+                    if (filePaths.Count > 1)
                     {
-                        UiSharedService.ColorText($"You exceed your own threshold by " +
+                        ImGui.SameLine();
-                            $"{actualTriCount - (currentTriWarning * 1000)} triangles.",
+                        ImGui.TextUnformatted($"(and {filePaths.Count - 1} more)");
-                            ImGuiColors.DalamudYellow);
+                        ImGui.SameLine();
+                        _uiSharedService.IconText(FontAwesomeIcon.InfoCircle);
+                        UiSharedService.AttachToolTip(string.Join(Environment.NewLine, filePaths.Skip(1)));
+                    }
+
+                    var gamepaths = item.GamePaths;
+                    UiSharedService.ColorText("Used by game path:", UIColors.Get("LightlessBlue"));
+                    ImGui.SameLine();
+                    UiSharedService.TextWrapped(gamepaths[0]);
+                    if (gamepaths.Count > 1)
+                    {
+                        ImGui.SameLine();
+                        ImGui.TextUnformatted($"(and {gamepaths.Count - 1} more)");
+                        ImGui.SameLine();
+                        _uiSharedService.IconText(FontAwesomeIcon.InfoCircle);
+                        UiSharedService.AttachToolTip(string.Join(Environment.NewLine, gamepaths.Skip(1)));
                     }
                 }
 
                 ImGui.Separator();
+
                 if (_selectedObjectTab != kvp.Key)
                 {
                     _selectedHash = string.Empty;
@@ -629,7 +703,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
                 {
                     string fileGroupText = fileGroup.Key + " [" + fileGroup.Count() + "]";
                     var requiresCompute = fileGroup.Any(k => !k.IsComputed);
-                    using var tabcol = ImRaii.PushColor(ImGuiCol.Tab, UiSharedService.Color(ImGuiColors.DalamudYellow), requiresCompute);
+                    using var tabcol = ImRaii.PushColor(ImGuiCol.Tab, UiSharedService.Color(UIColors.Get("LightlessYellow")), requiresCompute);
                     if (requiresCompute)
                     {
                         fileGroupText += " (!)";
@@ -668,7 +742,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
                         ImGui.Checkbox("Enable BC7 Conversion Mode", ref _enableBc7ConversionMode);
                         if (_enableBc7ConversionMode)
                         {
-                            UiSharedService.ColorText("WARNING BC7 CONVERSION:", ImGuiColors.DalamudYellow);
+                            UiSharedService.ColorText("WARNING BC7 CONVERSION:", UIColors.Get("LightlessYellow"));
                             ImGui.SameLine();
                             UiSharedService.ColorText("Converting textures to BC7 is irreversible!", ImGuiColors.DalamudRed);
                             UiSharedService.ColorTextWrapped("- Converting textures to BC7 will reduce their size (compressed and uncompressed) drastically. It is recommended to be used for large (4k+) textures." +
@@ -676,7 +750,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
                             Environment.NewLine + "- Before converting textures, make sure to have the original files of the mod you are converting so you can reimport it in case of issues." +
                             Environment.NewLine + "- Conversion will convert all found texture duplicates (entries with more than 1 file path) automatically." +
                             Environment.NewLine + "- Converting textures to BC7 is a very expensive operation and, depending on the amount of textures to convert, will take a while to complete."
-                                , ImGuiColors.DalamudYellow);
+                                , UIColors.Get("LightlessYellow"));
                             if (_texturesToConvert.Count > 0 && _uiSharedService.IconTextButton(FontAwesomeIcon.PlayCircle, "Start conversion of " + _texturesToConvert.Count + " texture(s)"))
                             {
                                 _conversionCancellationTokenSource = _conversionCancellationTokenSource.CancelRecreate();
@@ -692,41 +766,6 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
                 }
             }
         }
-
-        ImGui.Separator();
-
-        ImGui.TextUnformatted("Selected file:");
-        ImGui.SameLine();
-        UiSharedService.ColorText(_selectedHash, ImGuiColors.DalamudYellow);
-
-        if (_cachedAnalysis[_selectedObjectTab].TryGetValue(_selectedHash, out CharacterAnalyzer.FileDataEntry? item))
-        {
-            var filePaths = item.FilePaths;
-            ImGui.TextUnformatted("Local file path:");
-            ImGui.SameLine();
-            UiSharedService.TextWrapped(filePaths[0]);
-            if (filePaths.Count > 1)
-            {
-                ImGui.SameLine();
-                ImGui.TextUnformatted($"(and {filePaths.Count - 1} more)");
-                ImGui.SameLine();
-                _uiSharedService.IconText(FontAwesomeIcon.InfoCircle);
-                UiSharedService.AttachToolTip(string.Join(Environment.NewLine, filePaths.Skip(1)));
-            }
-
-            var gamepaths = item.GamePaths;
-            ImGui.TextUnformatted("Used by game path:");
-            ImGui.SameLine();
-            UiSharedService.TextWrapped(gamepaths[0]);
-            if (gamepaths.Count > 1)
-            {
-                ImGui.SameLine();
-                ImGui.TextUnformatted($"(and {gamepaths.Count - 1} more)");
-                ImGui.SameLine();
-                _uiSharedService.IconText(FontAwesomeIcon.InfoCircle);
-                UiSharedService.AttachToolTip(string.Join(Environment.NewLine, gamepaths.Skip(1)));
-            }
-        }
     }
 
     public override void OnOpen()
@@ -823,8 +862,8 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
             }
             if (string.Equals(_selectedHash, item.Hash, StringComparison.Ordinal))
             {
-                ImGui.TableSetBgColor(ImGuiTableBgTarget.RowBg1, UiSharedService.Color(ImGuiColors.DalamudYellow));
+                ImGui.TableSetBgColor(ImGuiTableBgTarget.RowBg1, UiSharedService.Color(UIColors.Get("LightlessYellow")));
-                ImGui.TableSetBgColor(ImGuiTableBgTarget.RowBg0, UiSharedService.Color(ImGuiColors.DalamudYellow));
+                ImGui.TableSetBgColor(ImGuiTableBgTarget.RowBg0, UiSharedService.Color(UIColors.Get("LightlessYellow")));
             }
             ImGui.TextUnformatted(item.Hash);
             if (ImGui.IsItemClicked()) _selectedHash = item.Hash;
@@ -855,7 +894,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
                     }
                     var filePath = item.FilePaths[0];
                     bool toConvert = _texturesToConvert.ContainsKey(filePath);
-                    if (ImGui.Checkbox("###convert" + item.Hash, ref toConvert))
+                    if (UiSharedService.CheckboxWithBorder("###convert" + item.Hash, ref toConvert, UIColors.Get("LightlessPurple"), 1.5f))
                     {
                         if (toConvert && !_texturesToConvert.ContainsKey(filePath))
                         {

LightlessSync/UI/DownloadUi.cs

@@ -1,4 +1,5 @@
-using Dalamud.Bindings.ImGui;
+using System;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Colors;
 using LightlessSync.LightlessConfiguration;
 using LightlessSync.PlayerData.Handlers;
@@ -19,14 +20,16 @@ public class DownloadUi : WindowMediatorSubscriberBase
     private readonly DalamudUtilService _dalamudUtilService;
     private readonly FileUploadManager _fileTransferManager;
     private readonly UiSharedService _uiShared;
+    private readonly PairProcessingLimiter _pairProcessingLimiter;
     private readonly ConcurrentDictionary<GameObjectHandler, bool> _uploadingPlayers = new();
 
     public DownloadUi(ILogger<DownloadUi> logger, DalamudUtilService dalamudUtilService, LightlessConfigService configService,
-        FileUploadManager fileTransferManager, LightlessMediator mediator, UiSharedService uiShared, PerformanceCollectorService performanceCollectorService)
+        PairProcessingLimiter pairProcessingLimiter, FileUploadManager fileTransferManager, LightlessMediator mediator, UiSharedService uiShared, PerformanceCollectorService performanceCollectorService)
         : base(logger, mediator, "Lightless Sync Downloads", performanceCollectorService)
     {
         _dalamudUtilService = dalamudUtilService;
         _configService = configService;
+        _pairProcessingLimiter = pairProcessingLimiter;
         _fileTransferManager = fileTransferManager;
         _uiShared = uiShared;
 
@@ -73,11 +76,25 @@ public class DownloadUi : WindowMediatorSubscriberBase
     {
         if (_configService.Current.ShowTransferWindow)
         {
+            var limiterSnapshot = _pairProcessingLimiter.GetSnapshot();
+            if (limiterSnapshot.IsEnabled)
+            {
+                var queueColor = limiterSnapshot.Waiting > 0 ? ImGuiColors.DalamudYellow : ImGuiColors.DalamudGrey;
+                var queueText = $"Pair queue {limiterSnapshot.InFlight}/{limiterSnapshot.Limit}";
+                queueText += limiterSnapshot.Waiting > 0 ? $" ({limiterSnapshot.Waiting} waiting, {limiterSnapshot.Remaining} free)" : $" ({limiterSnapshot.Remaining} free)";
+                UiSharedService.DrawOutlinedFont(queueText, queueColor, new Vector4(0, 0, 0, 255), 1);
+                ImGui.NewLine();
+            }
+            else
+            {
+                UiSharedService.DrawOutlinedFont("Pair apply limiter disabled", ImGuiColors.DalamudGrey, new Vector4(0, 0, 0, 255), 1);
+                ImGui.NewLine();
+            }
             try
             {
-                if (_fileTransferManager.CurrentUploads.Any())
+                if (_fileTransferManager.IsUploading)
                 {
-                    var currentUploads = _fileTransferManager.CurrentUploads.ToList();
+                    var currentUploads = _fileTransferManager.GetCurrentUploadsSnapshot();
                     var totalUploads = currentUploads.Count;
 
                     var doneUploads = currentUploads.Count(c => c.IsTransferred);
@@ -169,7 +186,7 @@ public class DownloadUi : WindowMediatorSubscriberBase
                 var dlProgressPercent = transferredBytes / (double)totalBytes;
                 drawList.AddRectFilled(dlBarStart,
                     dlBarEnd with { X = dlBarStart.X + (float)(dlProgressPercent * dlBarWidth) },
-                    UiSharedService.Color(173, 138, 245, transparency), 1);
+                    UiSharedService.Color(UIColors.Get("LightlessPurple")));
 
                 if (_configService.Current.TransferBarsShowText)
                 {
@@ -214,7 +231,7 @@ public class DownloadUi : WindowMediatorSubscriberBase
     {
         if (_uiShared.EditTrackerPosition) return true;
         if (!_configService.Current.ShowTransferWindow && !_configService.Current.ShowTransferBars) return false;
-        if (!_currentDownloads.Any() && !_fileTransferManager.CurrentUploads.Any() && !_uploadingPlayers.Any()) return false;
+        if (!_currentDownloads.Any() && !_fileTransferManager.IsUploading && !_uploadingPlayers.Any()) return false;
         if (!IsOpen) return false;
         return true;
     }

LightlessSync/UI/DrawEntityFactory.cs

@@ -23,19 +23,25 @@ public class DrawEntityFactory
     private readonly PlayerPerformanceConfigService _playerPerformanceConfigService;
     private readonly CharaDataManager _charaDataManager;
     private readonly SelectTagForPairUi _selectTagForPairUi;
+    private readonly RenamePairTagUi _renamePairTagUi;
+    private readonly SelectTagForSyncshellUi _selectTagForSyncshellUi;
+    private readonly RenameSyncshellTagUi _renameSyncshellTagUi;
+    private readonly SelectSyncshellForTagUi _selectSyncshellForTagUi;
     private readonly TagHandler _tagHandler;
     private readonly IdDisplayHandler _uidDisplayHandler;
 
     public DrawEntityFactory(ILogger<DrawEntityFactory> logger, ApiController apiController, IdDisplayHandler uidDisplayHandler,
-        SelectTagForPairUi selectTagForPairUi, LightlessMediator mediator,
+        SelectTagForPairUi selectTagForPairUi, RenamePairTagUi renamePairTagUi, LightlessMediator mediator,
         TagHandler tagHandler, SelectPairForTagUi selectPairForTagUi,
         ServerConfigurationManager serverConfigurationManager, UiSharedService uiSharedService,
-        PlayerPerformanceConfigService playerPerformanceConfigService, CharaDataManager charaDataManager)
+        PlayerPerformanceConfigService playerPerformanceConfigService, CharaDataManager charaDataManager, 
+        SelectTagForSyncshellUi selectTagForSyncshellUi, RenameSyncshellTagUi renameSyncshellTagUi, SelectSyncshellForTagUi selectSyncshellForTagUi)
     {
         _logger = logger;
         _apiController = apiController;
         _uidDisplayHandler = uidDisplayHandler;
         _selectTagForPairUi = selectTagForPairUi;
+        _renamePairTagUi = renamePairTagUi;
         _mediator = mediator;
         _tagHandler = tagHandler;
         _selectPairForTagUi = selectPairForTagUi;
@@ -43,6 +49,9 @@ public class DrawEntityFactory
         _uiSharedService = uiSharedService;
         _playerPerformanceConfigService = playerPerformanceConfigService;
         _charaDataManager = charaDataManager;
+        _selectTagForSyncshellUi = selectTagForSyncshellUi;
+        _renameSyncshellTagUi = renameSyncshellTagUi;
+        _selectSyncshellForTagUi = selectSyncshellForTagUi;
     }
 
     public DrawFolderGroup CreateDrawGroupFolder(GroupFullInfoDto groupFullInfoDto,
@@ -51,15 +60,24 @@ public class DrawEntityFactory
     {
         return new DrawFolderGroup(groupFullInfoDto.Group.GID, groupFullInfoDto, _apiController,
             filteredPairs.Select(p => CreateDrawPair(groupFullInfoDto.Group.GID + p.Key.UserData.UID, p.Key, p.Value, groupFullInfoDto)).ToImmutableList(),
-            allPairs, _tagHandler, _uidDisplayHandler, _mediator, _uiSharedService);
+            allPairs, _tagHandler, _uidDisplayHandler, _mediator, _uiSharedService, _selectTagForSyncshellUi);
+    }
+
+    public DrawFolderGroup CreateDrawGroupFolder(string id, GroupFullInfoDto groupFullInfoDto,
+    Dictionary<Pair, List<GroupFullInfoDto>> filteredPairs,
+    IImmutableList<Pair> allPairs)
+    {
+        return new DrawFolderGroup(id, groupFullInfoDto, _apiController,
+            filteredPairs.Select(p => CreateDrawPair(groupFullInfoDto.Group.GID + p.Key.UserData.UID, p.Key, p.Value, groupFullInfoDto)).ToImmutableList(),
+            allPairs, _tagHandler, _uidDisplayHandler, _mediator, _uiSharedService, _selectTagForSyncshellUi);
     }
 
     public DrawFolderTag CreateDrawTagFolder(string tag,
         Dictionary<Pair, List<GroupFullInfoDto>> filteredPairs,
         IImmutableList<Pair> allPairs)
     {
-        return new(tag, filteredPairs.Select(u => CreateDrawPair(tag, u.Key, u.Value, null)).ToImmutableList(),
+        return new(tag, filteredPairs.Select(u => CreateDrawPair(tag, u.Key, u.Value, currentGroup: null)).ToImmutableList(),
-            allPairs, _tagHandler, _apiController, _selectPairForTagUi, _uiSharedService);
+            allPairs, _tagHandler, _apiController, _selectPairForTagUi, _renamePairTagUi, _uiSharedService);
     }
 
     public DrawUserPair CreateDrawPair(string id, Pair user, List<GroupFullInfoDto> groups, GroupFullInfoDto? currentGroup)

LightlessSync/UI/DtrEntry.cs

@@ -6,7 +6,9 @@ using LightlessSync.LightlessConfiguration;
 using LightlessSync.LightlessConfiguration.Configurations;
 using LightlessSync.PlayerData.Pairs;
 using LightlessSync.Services.Mediator;
+using LightlessSync.Services.ServerConfiguration;
 using LightlessSync.WebAPI;
+using LightlessSync.WebAPI.SignalR.Utils;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using System.Runtime.InteropServices;
@@ -16,6 +18,7 @@ namespace LightlessSync.UI;
 public sealed class DtrEntry : IDisposable, IHostedService
 {
     private readonly ApiController _apiController;
+    private readonly ServerConfigurationManager _serverManager;
     private readonly CancellationTokenSource _cancellationTokenSource = new();
     private readonly ConfigurationServiceBase<LightlessConfig> _configService;
     private readonly IDtrBar _dtrBar;
@@ -28,7 +31,7 @@ public sealed class DtrEntry : IDisposable, IHostedService
     private string? _tooltip;
     private Colors _colors;
 
-    public DtrEntry(ILogger<DtrEntry> logger, IDtrBar dtrBar, ConfigurationServiceBase<LightlessConfig> configService, LightlessMediator lightlessMediator, PairManager pairManager, ApiController apiController)
+    public DtrEntry(ILogger<DtrEntry> logger, IDtrBar dtrBar, ConfigurationServiceBase<LightlessConfig> configService, LightlessMediator lightlessMediator, PairManager pairManager, ApiController apiController, ServerConfigurationManager serverManager)
     {
         _logger = logger;
         _dtrBar = dtrBar;
@@ -37,6 +40,7 @@ public sealed class DtrEntry : IDisposable, IHostedService
         _lightlessMediator = lightlessMediator;
         _pairManager = pairManager;
         _apiController = apiController;
+        _serverManager = serverManager;
     }
 
     public void Dispose()
@@ -59,7 +63,7 @@ public sealed class DtrEntry : IDisposable, IHostedService
 
     public async Task StopAsync(CancellationToken cancellationToken)
     {
-        _cancellationTokenSource.Cancel();
+        await _cancellationTokenSource.CancelAsync().ConfigureAwait(false);
         try
         {
             await _runTask!.ConfigureAwait(false);
@@ -89,10 +93,43 @@ public sealed class DtrEntry : IDisposable, IHostedService
     {
         _logger.LogTrace("Creating new DtrBar entry");
         var entry = _dtrBar.Get("Lightless Sync");
-        entry.OnClick = _ => _lightlessMediator.Publish(new UiToggleMessage(typeof(CompactUi)));
+        entry.OnClick = interactionEvent => OnClickEvent(interactionEvent);
 
         return entry;
     }
+    
+    private void OnClickEvent(DtrInteractionEvent interactionEvent) 
+    {
+        if (interactionEvent.ClickType.Equals(MouseClickType.Left) && !interactionEvent.ModifierKeys.Equals(ClickModifierKeys.Shift))
+        {
+            _lightlessMediator.Publish(new UiToggleMessage(typeof(CompactUi)));
+        } 
+        else if (interactionEvent.ClickType.Equals(MouseClickType.Left) && interactionEvent.ModifierKeys.Equals(ClickModifierKeys.Shift))
+        {
+            _lightlessMediator.Publish(new UiToggleMessage(typeof(SettingsUi)));
+        }
+
+        if (interactionEvent.ClickType.Equals(MouseClickType.Right))
+        {
+            bool isConnectingOrConnected = _apiController.ServerState is ServerState.Connected or ServerState.Connecting or ServerState.Reconnecting;
+
+            if (_apiController.ServerState is not (ServerState.Reconnecting or ServerState.Disconnecting))
+            {
+                if (isConnectingOrConnected && !_serverManager.CurrentServer.FullPause)
+                {
+                    _serverManager.CurrentServer.FullPause = true;
+                    _serverManager.Save();
+                }
+                else if (!isConnectingOrConnected && _serverManager.CurrentServer.FullPause)
+                {
+                    _serverManager.CurrentServer.FullPause = false;
+                    _serverManager.Save();
+                }
+
+                _ = _apiController.CreateConnectionsAsync();
+            }
+        }
+    }
 
     private async Task RunAsync()
     {

LightlessSync/UI/EditProfileUi.cs

@@ -4,14 +4,18 @@ using Dalamud.Interface.Colors;
 using Dalamud.Interface.ImGuiFileDialog;
 using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
 using LightlessSync.API.Data;
 using LightlessSync.API.Dto.User;
 using LightlessSync.Services;
 using LightlessSync.Services.Mediator;
+using LightlessSync.UI.Style;
+using LightlessSync.Utils;
 using LightlessSync.WebAPI;
 using Microsoft.Extensions.Logging;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
+using System.Numerics;
 
 namespace LightlessSync.UI;
 
@@ -30,6 +34,16 @@ public class EditProfileUi : WindowMediatorSubscriberBase
     private bool _showFileDialogError = false;
     private bool _wasOpen;
 
+    private Vector4 _currentBg = new(0.15f, 0.15f, 0.15f, 1f);
+    private bool vanityInitialized; // useless for now
+    private bool textEnabled;
+    private bool glowEnabled;
+    private Vector4 textColor;
+    private Vector4 glowColor;
+
+    private record VanityState(bool TextEnabled, bool GlowEnabled, Vector4 TextColor, Vector4 GlowColor);
+    private VanityState _savedVanity;
+
     public EditProfileUi(ILogger<EditProfileUi> logger, LightlessMediator mediator,
         ApiController apiController, UiSharedService uiSharedService, FileDialogManager fileDialogManager,
         LightlessProfileManager lightlessProfileManager, PerformanceCollectorService performanceCollectorService)
@@ -38,8 +52,8 @@ public class EditProfileUi : WindowMediatorSubscriberBase
         IsOpen = false;
         this.SizeConstraints = new()
         {
-            MinimumSize = new(768, 512),
+            MinimumSize = new(850, 640),
-            MaximumSize = new(768, 2000)
+            MaximumSize = new(850, 700)
         };
         _apiController = apiController;
         _uiSharedService = uiSharedService;
@@ -57,172 +71,320 @@ public class EditProfileUi : WindowMediatorSubscriberBase
                 _pfpTextureWrap = null;
             }
         });
+        Mediator.Subscribe<ConnectedMessage>(this, msg =>
+        {
+            LoadVanity();
+        });
+    }
+
+    private void LoadVanity()
+    {
+        textEnabled = !string.IsNullOrEmpty(_apiController.TextColorHex);
+        glowEnabled = !string.IsNullOrEmpty(_apiController.TextGlowColorHex);
+
+        textColor = textEnabled ? UIColors.HexToRgba(_apiController.TextColorHex!) : Vector4.One;
+        glowColor = glowEnabled ? UIColors.HexToRgba(_apiController.TextGlowColorHex!) : Vector4.Zero;
+
+        _savedVanity = new VanityState(textEnabled, glowEnabled, textColor, glowColor);
+        vanityInitialized = true;
     }
 
     protected override void DrawInternal()
     {
-        _uiSharedService.BigText("Current Profile (as saved on server)");
+        _uiSharedService.UnderlinedBigText("Notes and Rules for Profiles", UIColors.Get("LightlessYellow"));
+        ImGui.Dummy(new Vector2(5));
+
+        ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(1, 1));
+
+        _uiSharedService.DrawNoteLine("# ", UIColors.Get("LightlessBlue"), "All users that are paired and unpaused with you will be able to see your profile picture and description.");
+        _uiSharedService.DrawNoteLine("! ", UIColors.Get("LightlessYellow"), "Other users have the possibility to report your profile for breaking the rules.");
+        _uiSharedService.DrawNoteLine("!!! ", UIColors.Get("DimRed"), "AVOID: Anything as profile image that can be considered highly illegal or obscene (bestiality, anything that could be considered a sexual act with a minor (that includes Lalafells), etc.)");
+        _uiSharedService.DrawNoteLine("!!! ", UIColors.Get("DimRed"), "AVOID: Slurs of any kind in the description that can be considered highly offensive");
+        _uiSharedService.DrawNoteLine("! ", UIColors.Get("LightlessYellow"), "In case of valid reports from other users this can lead to disabling your profile forever or terminating your Lightless account indefinitely.");
+        _uiSharedService.DrawNoteLine("! ", UIColors.Get("LightlessYellow"), "Judgement of your profile validity from reports through staff is not up to debate and the decisions to disable your profile/account permanent.");
+        _uiSharedService.DrawNoteLine("! ", UIColors.Get("LightlessBlue"), "If your profile picture or profile description could be considered NSFW, enable the toggle in profile settings.");
+
+        ImGui.PopStyleVar();
+
+        ImGui.Dummy(new Vector2(3));
 
         var profile = _lightlessProfileManager.GetLightlessProfile(new UserData(_apiController.UID));
 
-        if (profile.IsFlagged)
+        if (ImGui.BeginTabBar("##EditProfileTabs"))
-        {
+        { 
-            UiSharedService.ColorTextWrapped(profile.Description, ImGuiColors.DalamudRed);
+            if (ImGui.BeginTabItem("Current Profile"))
-            return;
-        }
-
-        if (!_profileImage.SequenceEqual(profile.ImageData.Value))
-        {
-            _profileImage = profile.ImageData.Value;
-            _pfpTextureWrap?.Dispose();
-            _pfpTextureWrap = _uiSharedService.LoadImage(_profileImage);
-        }
-
-        if (!string.Equals(_profileDescription, profile.Description, StringComparison.OrdinalIgnoreCase))
-        {
-            _profileDescription = profile.Description;
-            _descriptionText = _profileDescription;
-        }
-
-        if (_pfpTextureWrap != null)
-        {
-            ImGui.Image(_pfpTextureWrap.Handle, ImGuiHelpers.ScaledVector2(_pfpTextureWrap.Width, _pfpTextureWrap.Height));
-        }
-
-        var spacing = ImGui.GetStyle().ItemSpacing.X;
-        ImGuiHelpers.ScaledRelativeSameLine(256, spacing);
-        using (_uiSharedService.GameFont.Push())
-        {
-            var descriptionTextSize = ImGui.CalcTextSize(profile.Description, wrapWidth: 256f);
-            var childFrame = ImGuiHelpers.ScaledVector2(256 + ImGui.GetStyle().WindowPadding.X + ImGui.GetStyle().WindowBorderSize, 256);
-            if (descriptionTextSize.Y > childFrame.Y)
             {
-                _adjustedForScollBarsOnlineProfile = true;
+                _uiSharedService.MediumText("Current Profile (as saved on server)", UIColors.Get("LightlessPurple"));
-            }
+                ImGui.Dummy(new Vector2(5));
-            else
-            {
-                _adjustedForScollBarsOnlineProfile = false;
-            }
-            childFrame = childFrame with
-            {
-                X = childFrame.X + (_adjustedForScollBarsOnlineProfile ? ImGui.GetStyle().ScrollbarSize : 0),
-            };
-            if (ImGui.BeginChildFrame(101, childFrame))
-            {
-                UiSharedService.TextWrapped(profile.Description);
-            }
-            ImGui.EndChildFrame();
-        }
 
-        var nsfw = profile.IsNSFW;
+                if (profile.IsFlagged)
-        ImGui.BeginDisabled();
-        ImGui.Checkbox("Is NSFW", ref nsfw);
-        ImGui.EndDisabled();
-
-        ImGui.Separator();
-        _uiSharedService.BigText("Notes and Rules for Profiles");
-
-        ImGui.TextWrapped($"- All users that are paired and unpaused with you will be able to see your profile picture and description.{Environment.NewLine}" +
-            $"- Other users have the possibility to report your profile for breaking the rules.{Environment.NewLine}" +
-            $"- !!! AVOID: anything as profile image that can be considered highly illegal or obscene (bestiality, anything that could be considered a sexual act with a minor (that includes Lalafells), etc.){Environment.NewLine}" +
-            $"- !!! AVOID: slurs of any kind in the description that can be considered highly offensive{Environment.NewLine}" +
-            $"- In case of valid reports from other users this can lead to disabling your profile forever or terminating your Lightless account indefinitely.{Environment.NewLine}" +
-            $"- Judgement of your profile validity from reports through staff is not up to debate and the decisions to disable your profile/account permanent.{Environment.NewLine}" +
-            $"- If your profile picture or profile description could be considered NSFW, enable the toggle below.");
-        ImGui.Separator();
-        _uiSharedService.BigText("Profile Settings");
-
-        if (_uiSharedService.IconTextButton(FontAwesomeIcon.FileUpload, "Upload new profile picture"))
-        {
-            _fileDialogManager.OpenFileDialog("Select new Profile picture", ".png", (success, file) =>
-            {
-                if (!success) return;
-                _ = Task.Run(async () =>
                 {
-                    var fileContent = File.ReadAllBytes(file);
+                    UiSharedService.ColorTextWrapped(profile.Description, ImGuiColors.DalamudRed);
-                    using MemoryStream ms = new(fileContent);
+                    return;
-                    var format = await Image.DetectFormatAsync(ms).ConfigureAwait(false);
+                }
-                    if (!format.FileExtensions.Contains("png", StringComparer.OrdinalIgnoreCase))
+
+                if (!_profileImage.SequenceEqual(profile.ImageData.Value))
+                {
+                    _profileImage = profile.ImageData.Value;
+                    _pfpTextureWrap?.Dispose();
+                    _pfpTextureWrap = _uiSharedService.LoadImage(_profileImage);
+                }
+
+                if (!string.Equals(_profileDescription, profile.Description, StringComparison.OrdinalIgnoreCase))
+                {
+                    _profileDescription = profile.Description;
+                    _descriptionText = _profileDescription;
+                }
+
+                if (_pfpTextureWrap != null)
+                {
+                    ImGui.Image(_pfpTextureWrap.Handle, ImGuiHelpers.ScaledVector2(_pfpTextureWrap.Width, _pfpTextureWrap.Height));
+                }
+
+                var spacing = ImGui.GetStyle().ItemSpacing.X;
+                ImGuiHelpers.ScaledRelativeSameLine(256, spacing);
+                using (_uiSharedService.GameFont.Push())
+                {
+                    var descriptionTextSize = ImGui.CalcTextSize(profile.Description, wrapWidth: 256f);
+                    var childFrame = ImGuiHelpers.ScaledVector2(256 + ImGui.GetStyle().WindowPadding.X + ImGui.GetStyle().WindowBorderSize, 256);
+                    if (descriptionTextSize.Y > childFrame.Y)
                     {
-                        _showFileDialogError = true;
+                        _adjustedForScollBarsOnlineProfile = true;
-                        return;
                     }
-                    using var image = Image.Load<Rgba32>(fileContent);
+                    else
-
-                    if (image.Width > 256 || image.Height > 256 || (fileContent.Length > 250 * 1024))
                     {
-                        _showFileDialogError = true;
+                        _adjustedForScollBarsOnlineProfile = false;
-                        return;
                     }
+                    childFrame = childFrame with
+                    {
+                        X = childFrame.X + (_adjustedForScollBarsOnlineProfile ? ImGui.GetStyle().ScrollbarSize : 0),
+                    };
+                    if (ImGui.BeginChildFrame(101, childFrame))
+                    {
+                        UiSharedService.TextWrapped(profile.Description);
+                    }
+                    ImGui.EndChildFrame();
+                }
 
-                    _showFileDialogError = false;
+                var nsfw = profile.IsNSFW;
-                    await _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, IsNSFW: null, Convert.ToBase64String(fileContent), Description: null))
+                ImGui.BeginDisabled();
-                        .ConfigureAwait(false);
+                ImGui.Checkbox("Is NSFW", ref nsfw);
-                });
+                ImGui.EndDisabled();
-            });
-        }
-        UiSharedService.AttachToolTip("Select and upload a new profile picture");
-        ImGui.SameLine();
-        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Clear uploaded profile picture"))
-        {
-            _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, IsNSFW: null, "", Description: null));
-        }
-        UiSharedService.AttachToolTip("Clear your currently uploaded profile picture");
-        if (_showFileDialogError)
-        {
-            UiSharedService.ColorTextWrapped("The profile picture must be a PNG file with a maximum height and width of 256px and 250KiB size", ImGuiColors.DalamudRed);
-        }
-        var isNsfw = profile.IsNSFW;
-        if (ImGui.Checkbox("Profile is NSFW", ref isNsfw))
-        {
-            _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, isNsfw, ProfilePictureBase64: null, Description: null));
-        }
-        _uiSharedService.DrawHelpText("If your profile description or image can be considered NSFW, toggle this to ON");
-        var widthTextBox = 400;
-        var posX = ImGui.GetCursorPosX();
-        ImGui.TextUnformatted($"Description {_descriptionText.Length}/1500");
-        ImGui.SetCursorPosX(posX);
-        ImGuiHelpers.ScaledRelativeSameLine(widthTextBox, ImGui.GetStyle().ItemSpacing.X);
-        ImGui.TextUnformatted("Preview (approximate)");
-        using (_uiSharedService.GameFont.Push())
-            ImGui.InputTextMultiline("##description", ref _descriptionText, 1500, ImGuiHelpers.ScaledVector2(widthTextBox, 200));
 
-        ImGui.SameLine();
+                _uiSharedService.ColoredSeparator(UIColors.Get("LightlessPurple"), 1.5f);
-
+                ImGui.EndTabItem();
-        using (_uiSharedService.GameFont.Push())
-        {
-            var descriptionTextSizeLocal = ImGui.CalcTextSize(_descriptionText, wrapWidth: 256f);
-            var childFrameLocal = ImGuiHelpers.ScaledVector2(256 + ImGui.GetStyle().WindowPadding.X + ImGui.GetStyle().WindowBorderSize, 200);
-            if (descriptionTextSizeLocal.Y > childFrameLocal.Y)
-            {
-                _adjustedForScollBarsLocalProfile = true;
             }
-            else
-            {
-                _adjustedForScollBarsLocalProfile = false;
-            }
-            childFrameLocal = childFrameLocal with
-            {
-                X = childFrameLocal.X + (_adjustedForScollBarsLocalProfile ? ImGui.GetStyle().ScrollbarSize : 0),
-            };
-            if (ImGui.BeginChildFrame(102, childFrameLocal))
-            {
-                UiSharedService.TextWrapped(_descriptionText);
-            }
-            ImGui.EndChildFrame();
-        }
 
-        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Save, "Save Description"))
+            if (ImGui.BeginTabItem("Profile Settings"))
-        {
+            {
-            _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, IsNSFW: null, ProfilePictureBase64: null, _descriptionText));
+                _uiSharedService.MediumText("Profile Settings", UIColors.Get("LightlessPurple"));
+                ImGui.Dummy(new Vector2(5));
+
+                if (_uiSharedService.IconTextButton(FontAwesomeIcon.FileUpload, "Upload new profile picture"))
+                {
+                    _fileDialogManager.OpenFileDialog("Select new Profile picture", ".png", (success, file) =>
+                    {
+                        if (!success) return;
+                        _ = Task.Run(async () =>
+                        {
+                            var fileContent = File.ReadAllBytes(file);
+                            using MemoryStream ms = new(fileContent);
+                            var format = await Image.DetectFormatAsync(ms).ConfigureAwait(false);
+                            if (!format.FileExtensions.Contains("png", StringComparer.OrdinalIgnoreCase))
+                            {
+                                _showFileDialogError = true;
+                                return;
+                            }
+                            using var image = Image.Load<Rgba32>(fileContent);
+
+                            if (image.Width > 256 || image.Height > 256 || (fileContent.Length > 250 * 1024))
+                            {
+                                _showFileDialogError = true;
+                                return;
+                            }
+
+                            _showFileDialogError = false;
+                            await _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, IsNSFW: null, Convert.ToBase64String(fileContent), Description: null))
+                                .ConfigureAwait(false);
+                        });
+                    });
+                }
+                UiSharedService.AttachToolTip("Select and upload a new profile picture");
+                ImGui.SameLine();
+                if (_uiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Clear uploaded profile picture"))
+                {
+                    _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, IsNSFW: null, "", Description: null));
+                }
+                UiSharedService.AttachToolTip("Clear your currently uploaded profile picture");
+                if (_showFileDialogError)
+                {
+                    UiSharedService.ColorTextWrapped("The profile picture must be a PNG file with a maximum height and width of 256px and 250KiB size", ImGuiColors.DalamudRed);
+                }
+                var isNsfw = profile.IsNSFW;
+                if (ImGui.Checkbox("Profile is NSFW", ref isNsfw))
+                {
+                    _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, isNsfw, ProfilePictureBase64: null, Description: null));
+                }
+                _uiSharedService.DrawHelpText("If your profile description or image can be considered NSFW, toggle this to ON");
+                var widthTextBox = 400;
+                var posX = ImGui.GetCursorPosX();
+                ImGui.TextUnformatted($"Description {_descriptionText.Length}/1500");
+                ImGui.SetCursorPosX(posX);
+                ImGuiHelpers.ScaledRelativeSameLine(widthTextBox, ImGui.GetStyle().ItemSpacing.X);
+                ImGui.TextUnformatted("Preview (approximate)");
+                using (_uiSharedService.GameFont.Push())
+                    ImGui.InputTextMultiline("##description", ref _descriptionText, 1500, ImGuiHelpers.ScaledVector2(widthTextBox, 200));
+
+                ImGui.SameLine();
+
+                using (_uiSharedService.GameFont.Push())
+                {
+                    var descriptionTextSizeLocal = ImGui.CalcTextSize(_descriptionText, wrapWidth: 256f);
+                    var childFrameLocal = ImGuiHelpers.ScaledVector2(256 + ImGui.GetStyle().WindowPadding.X + ImGui.GetStyle().WindowBorderSize, 200);
+                    if (descriptionTextSizeLocal.Y > childFrameLocal.Y)
+                    {
+                        _adjustedForScollBarsLocalProfile = true;
+                    }
+                    else
+                    {
+                        _adjustedForScollBarsLocalProfile = false;
+                    }
+                    childFrameLocal = childFrameLocal with
+                    {
+                        X = childFrameLocal.X + (_adjustedForScollBarsLocalProfile ? ImGui.GetStyle().ScrollbarSize : 0),
+                    };
+                    if (ImGui.BeginChildFrame(102, childFrameLocal))
+                    {
+                        UiSharedService.TextWrapped(_descriptionText);
+                    }
+                    ImGui.EndChildFrame();
+                }
+
+                if (_uiSharedService.IconTextButton(FontAwesomeIcon.Save, "Save Description"))
+                {
+                    _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, IsNSFW: null, ProfilePictureBase64: null, _descriptionText));
+                }
+                UiSharedService.AttachToolTip("Sets your profile description text");
+                ImGui.SameLine();
+                if (_uiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Clear Description"))
+                {
+                    _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, IsNSFW: null, ProfilePictureBase64: null, ""));
+                }
+                UiSharedService.AttachToolTip("Clears your profile description text");
+
+                ImGui.EndTabItem();
+            }
+
+            if (ImGui.BeginTabItem("Vanity Settings"))
+            {
+                _uiSharedService.MediumText("Supporter Vanity Settings", UIColors.Get("LightlessPurple"));
+                ImGui.Dummy(new Vector2(4));
+                _uiSharedService.DrawNoteLine("# ", UIColors.Get("LightlessPurple"), "Must be a supporter through Patreon/Ko-fi to access these settings.");
+
+                var hasVanity = _apiController.HasVanity;
+
+                if (!hasVanity)
+                {
+                    UiSharedService.ColorTextWrapped("You do not currently have vanity access. Become a supporter to unlock these features.", UIColors.Get("DimRed"));
+                    ImGui.Dummy(new Vector2(8));
+                    ImGui.BeginDisabled();
+                }
+
+                _uiSharedService.ColoredSeparator(UIColors.Get("LightlessPurpleDefault"), 1.5f);
+                _uiSharedService.MediumText("Colored UID", UIColors.Get("LightlessPurple"));
+                ImGui.Dummy(new Vector2(5));
+
+                var font = UiBuilder.MonoFont;
+                var playerUID = _apiController.UID;
+                var playerDisplay = _apiController.DisplayName;
+
+                var previewTextColor = textEnabled ? textColor : Vector4.One;
+                var previewGlowColor = glowEnabled ? glowColor : Vector4.Zero;
+
+                var seString = SeStringUtils.BuildFormattedPlayerName(playerDisplay, previewTextColor, previewGlowColor);
+
+                using (ImRaii.PushFont(font))
+                {
+                    var drawList = ImGui.GetWindowDrawList();
+                    var textSize = ImGui.CalcTextSize(seString.TextValue);
+
+                    float minWidth = 150f * ImGuiHelpers.GlobalScale;
+                    float bgWidth = Math.Max(textSize.X + 20f, minWidth);
+
+                    float paddingY = 5f * ImGuiHelpers.GlobalScale;
+
+                    var cursor = ImGui.GetCursorScreenPos();
+
+                    var rectMin = cursor;
+                    var rectMax = rectMin + new Vector2(bgWidth, textSize.Y + (paddingY * 2f));
+
+                    float boost = Luminance.ComputeHighlight(previewTextColor, previewGlowColor);
+
+                    var baseBg = new Vector4(0.15f + boost, 0.15f + boost, 0.15f + boost, 1f);
+                    var bgColor = Luminance.BackgroundContrast(previewTextColor, previewGlowColor, baseBg, ref _currentBg);
+
+                    var borderColor = UIColors.Get("LightlessPurple");
+
+                    drawList.AddRectFilled(rectMin, rectMax, ImGui.GetColorU32(bgColor), 6.0f);
+                    drawList.AddRect(rectMin, rectMax, ImGui.GetColorU32(borderColor), 6.0f, ImDrawFlags.None, 1.5f);
+
+                    var textPos = new Vector2(
+                        rectMin.X + (bgWidth - textSize.X) * 0.5f,
+                        rectMin.Y + paddingY
+                    );
+
+                    SeStringUtils.RenderSeStringWithHitbox(seString, textPos, font);
+
+                    ImGui.Dummy(new Vector2(5));
+                }
+
+                const float colorPickAlign = 90f;
+
+                _uiSharedService.DrawNoteLine("- ", UIColors.Get("LightlessPurple"), "Text Color");
+                ImGui.SameLine(colorPickAlign);
+                ImGui.Checkbox("##toggleTextColor", ref textEnabled);
+                ImGui.SameLine();
+                ImGui.BeginDisabled(!textEnabled);
+                ImGui.ColorEdit4($"##color_text", ref textColor, ImGuiColorEditFlags.NoInputs | ImGuiColorEditFlags.AlphaPreviewHalf);
+                ImGui.EndDisabled();
+
+                _uiSharedService.DrawNoteLine("- ", UIColors.Get("LightlessPurple"), "Glow Color");
+                ImGui.SameLine(colorPickAlign);
+                ImGui.Checkbox("##toggleGlowColor", ref glowEnabled);
+                ImGui.SameLine();
+                ImGui.BeginDisabled(!glowEnabled);
+                ImGui.ColorEdit4($"##color_glow", ref glowColor, ImGuiColorEditFlags.NoInputs | ImGuiColorEditFlags.AlphaPreviewHalf);
+                ImGui.EndDisabled();
+
+                bool changed = !Equals(_savedVanity, new VanityState(textEnabled, glowEnabled, textColor, glowColor));
+
+                if (!changed)
+                    ImGui.BeginDisabled();
+
+                if (_uiSharedService.IconTextButton(FontAwesomeIcon.Save, "Save Changes"))
+                {
+                    string? newText = textEnabled ? UIColors.RgbaToHex(textColor) : string.Empty;
+                    string? newGlow = glowEnabled ? UIColors.RgbaToHex(glowColor) : string.Empty;
+
+                    _ = _apiController.UserUpdateVanityColors(new UserVanityColorsDto(newText, newGlow));
+
+                    _savedVanity = new VanityState(textEnabled, glowEnabled, textColor, glowColor);
+                }
+
+                if (!changed)
+                    ImGui.EndDisabled();
+
+                ImGui.Dummy(new Vector2(5));
+                _uiSharedService.ColoredSeparator(UIColors.Get("LightlessPurple"), 1.5f);
+
+                if (!hasVanity)
+                    ImGui.EndDisabled();
+
+                ImGui.EndTabItem();
+            }
+
+            ImGui.EndTabBar();
         }
-        UiSharedService.AttachToolTip("Sets your profile description text");
-        ImGui.SameLine();
-        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Clear Description"))
-        {
-            _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, IsNSFW: null, ProfilePictureBase64: null, ""));
-        }
-        UiSharedService.AttachToolTip("Clears your profile description text");
     }
 
     protected override void Dispose(bool disposing)

LightlessSync/UI/EventViewerUI.cs

@@ -110,7 +110,7 @@ internal class EventViewerUI : WindowMediatorSubscriberBase
         {
             ImGui.SameLine();
             ImGui.AlignTextToFramePadding();
-            UiSharedService.ColorTextWrapped("New events are available, press refresh to update", ImGuiColors.DalamudYellow);
+            UiSharedService.ColorTextWrapped("New events are available, press refresh to update", UIColors.Get("LightlessYellow"));
         }
 
         var buttonSize = _uiSharedService.GetIconTextButtonSize(FontAwesomeIcon.FolderOpen, "Open EventLog Folder");
@@ -180,7 +180,7 @@ internal class EventViewerUI : WindowMediatorSubscriberBase
                 var iconColor = ev.EventSeverity switch
                 {
                     EventSeverity.Informational => new Vector4(),
-                    EventSeverity.Warning => ImGuiColors.DalamudYellow,
+                    EventSeverity.Warning => UIColors.Get("LightlessYellow"),
                     EventSeverity.Error => ImGuiColors.DalamudRed,
                     _ => new Vector4()
                 };

LightlessSync/UI/Handlers/IdDisplayHandler.cs

@@ -1,11 +1,16 @@
-using Dalamud.Bindings.ImGui;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
+using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using LightlessSync.API.Dto.Group;
 using LightlessSync.LightlessConfiguration;
 using LightlessSync.PlayerData.Pairs;
 using LightlessSync.Services.Mediator;
 using LightlessSync.Services.ServerConfiguration;
+using LightlessSync.UI.Style;
+using LightlessSync.Utils;
+using System;
+using System.Numerics;
 
 namespace LightlessSync.UI.Handlers;
 
@@ -22,6 +27,9 @@ public class IdDisplayHandler
     private bool _popupShown = false;
     private DateTime? _popupTime;
 
+    private Vector4 _currentBg = new(0.15f, 0.15f, 0.15f, 1f);
+    private float _highlightBoost;
+
     public IdDisplayHandler(LightlessMediator mediator, ServerConfigurationManager serverManager, LightlessConfigService lightlessConfigService)
     {
         _mediator = mediator;
@@ -43,9 +51,9 @@ public class IdDisplayHandler
             if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
             {
                 var prevState = textIsUid;
-                if (_showIdForEntry.ContainsKey(group.GID))
+                if (_showIdForEntry.TryGetValue(group.GID, out bool value))
                 {
-                    prevState = _showIdForEntry[group.GID];
+                    prevState = value;
                 }
                 _showIdForEntry[group.GID] = !prevState;
             }
@@ -89,11 +97,108 @@ public class IdDisplayHandler
     {
         ImGui.SameLine(textPosX);
         (bool textIsUid, string playerText) = GetPlayerText(pair);
+
         if (!string.Equals(_editEntry, pair.UserData.UID, StringComparison.Ordinal))
         {
             ImGui.AlignTextToFramePadding();
 
-            using (ImRaii.PushFont(UiBuilder.MonoFont, textIsUid)) ImGui.TextUnformatted(playerText);
+            var font = textIsUid ? UiBuilder.MonoFont : ImGui.GetFont();
+
+            Vector4? textColor = null;
+            Vector4? glowColor = null;
+
+            if (pair.UserData.HasVanity)
+            {
+                if (!string.IsNullOrWhiteSpace(pair.UserData.TextColorHex))
+                {
+                    textColor = UIColors.HexToRgba(pair.UserData.TextColorHex);
+                }
+
+                if (!string.IsNullOrWhiteSpace(pair.UserData.TextGlowColorHex))
+                {
+                    glowColor = UIColors.HexToRgba(pair.UserData.TextGlowColorHex);
+                }
+            }
+
+            var useVanityColors = _lightlessConfigService.Current.useColoredUIDs && (textColor != null || glowColor != null);
+            var seString = useVanityColors
+                ? SeStringUtils.BuildFormattedPlayerName(playerText, textColor, glowColor)
+                : SeStringUtils.BuildPlain(playerText);
+
+            var rowStart = ImGui.GetCursorScreenPos();
+            var drawList = ImGui.GetWindowDrawList();
+            bool useHighlight = false;
+            float highlightPadX = 0f;
+            float highlightPadY = 0f;
+
+            if (useVanityColors)
+            {
+                float boost = Luminance.ComputeHighlight(textColor, glowColor);
+
+                if (boost > 0f)
+                {
+                    var style = ImGui.GetStyle();
+                    useHighlight = true;
+                    highlightPadX = MathF.Max(style.FramePadding.X * 0.6f, 2f * ImGuiHelpers.GlobalScale);
+                    highlightPadY = MathF.Max(style.FramePadding.Y * 0.55f, 1.25f * ImGuiHelpers.GlobalScale);
+                    drawList.ChannelsSplit(2);
+                    drawList.ChannelsSetCurrent(1);
+
+                    _highlightBoost = boost;
+                }
+                else
+                {
+                    _highlightBoost = 0f;
+                }
+            }
+
+            Vector2 itemMin;
+            Vector2 itemMax;
+            Vector2 textSize;
+            using (ImRaii.PushFont(font, textIsUid))
+            {
+                SeStringUtils.RenderSeStringWithHitbox(seString, rowStart, font);
+                itemMin = ImGui.GetItemRectMin();
+                itemMax = ImGui.GetItemRectMax();
+                //textSize = itemMax - itemMin;
+            }
+
+            if (useHighlight)
+            {
+                var style = ImGui.GetStyle();
+                var frameHeight = ImGui.GetFrameHeight();
+                var rowTop = rowStart.Y - style.FramePadding.Y;
+                var rowBottom = rowTop + frameHeight;
+
+                var highlightMin = new Vector2(itemMin.X - highlightPadX, rowTop - highlightPadY);
+                var highlightMax = new Vector2(itemMax.X + highlightPadX, rowBottom + highlightPadY);
+
+                var windowPos = ImGui.GetWindowPos();
+                var contentMin = windowPos + ImGui.GetWindowContentRegionMin();
+                var contentMax = windowPos + ImGui.GetWindowContentRegionMax();
+                highlightMin.X = MathF.Max(highlightMin.X, contentMin.X);
+                highlightMax.X = MathF.Min(highlightMax.X, contentMax.X);
+                highlightMin.Y = MathF.Max(highlightMin.Y, contentMin.Y);
+                highlightMax.Y = MathF.Min(highlightMax.Y, contentMax.Y);
+
+                var highlightColor = new Vector4(
+                    0.25f + _highlightBoost,
+                    0.25f + _highlightBoost,
+                    0.25f + _highlightBoost,
+                    1f
+                );
+
+                highlightColor = Luminance.BackgroundContrast(textColor, glowColor, highlightColor, ref _currentBg);
+
+                float rounding = style.FrameRounding > 0f ? style.FrameRounding : 5f * ImGuiHelpers.GlobalScale;
+                drawList.ChannelsSetCurrent(0);
+                drawList.AddRectFilled(highlightMin, highlightMax, ImGui.GetColorU32(highlightColor), rounding);
+
+                var borderColor = style.Colors[(int)ImGuiCol.Border];
+                borderColor.W *= 0.25f;
+                drawList.AddRect(highlightMin, highlightMax, ImGui.GetColorU32(borderColor), rounding);
+                drawList.ChannelsMerge();
+            }
 
             if (ImGui.IsItemHovered())
             {
@@ -173,10 +278,12 @@ public class IdDisplayHandler
             {
                 _editEntry = string.Empty;
             }
+
             UiSharedService.AttachToolTip("Hit ENTER to save\nRight click to cancel");
         }
     }
 
+
     public (bool isGid, string text) GetGroupText(GroupFullInfoDto group)
     {
         var textIsGid = true;

LightlessSync/UI/Handlers/TagHandler.cs

@@ -17,61 +17,146 @@ public class TagHandler
         _serverConfigurationManager = serverConfigurationManager;
     }
 
-    public void AddTag(string tag)
+    /// <summary>
-    {
+    /// Creation of an pair tag
-        _serverConfigurationManager.AddTag(tag);
+    /// </summary>
-    }
+    /// <param name="tag">Name of the tag</param>
+    public void AddPairTag(string tag) => _serverConfigurationManager.AddPairTag(tag);
 
-    public void AddTagToPairedUid(string uid, string tagName)
+    /// <summary>
-    {
+    /// Creation of an syncshell tag
-        _serverConfigurationManager.AddTagForUid(uid, tagName);
+    /// </summary>
-    }
+    /// <param name="tag">Name of the tag</param>
+    public void AddSyncshellTag(string tag) => _serverConfigurationManager.AddSyncshellTag(tag);
 
-    public List<string> GetAllTagsSorted()
+    /// <summary>
-    {
+    /// Add pair to tag
-        return
+    /// </summary>
-        [
+    /// <param name="uid">UID that will be added to tag/param>
+    /// <param name="tagName">Name of the tag</param>
+    public void AddPairTagToPairedUid(string uid, string tagName) => _serverConfigurationManager.AddTagForUid(uid, tagName);
+
+    /// <summary>
+    /// Add syncshell to tag
+    /// </summary>
+    /// <param name="name">Syncshell that will be added to tag/param>
+    /// <param name="tagName">Name of the tag</param>
+    public void AddTagToSyncshell(string name, string tagName) => _serverConfigurationManager.AddTagForSyncshell(name, tagName);
+
+    /// <summary>
+    /// Get all pair tags
+    /// </summary>
+    public List<string> GetAllPairTagsSorted() => [
             .. _serverConfigurationManager.GetServerAvailablePairTags()
-                        .OrderBy(s => s, StringComparer.OrdinalIgnoreCase)
+                        .Order(StringComparer.OrdinalIgnoreCase)
 ,
         ];
-    }
 
-    public HashSet<string> GetOtherUidsForTag(string tag)
+    /// <summary>
-    {
+    /// Get all syncshell tags
-        return _serverConfigurationManager.GetUidsForTag(tag);
+    /// </summary>
-    }
+    public List<string> GetAllSyncshellTagsSorted() => [
+            .. _serverConfigurationManager.GetServerAvailableSyncshellTags()
+                        .Order(StringComparer.OrdinalIgnoreCase)
+,
+        ];
 
-    public bool HasAnyTag(string uid)
+    /// <summary>
-    {
+    /// Get all UIDs bound to an given tag
-        return _serverConfigurationManager.HasTags(uid);
+    /// </summary>
-    }
+    /// <param name="name">Name of the tag</param>
+    public HashSet<string> GetOtherUidsForTag(string tag) => _serverConfigurationManager.GetUidsForPairTag(tag);
 
-    public bool HasTag(string uid, string tagName)
+    /// <summary>
-    {
+    /// Get all syncshells bound to an given tag
-        return _serverConfigurationManager.ContainsTag(uid, tagName);
+    /// </summary>
-    }
+    /// <param name="name">Name of the tag</param>
+    public HashSet<string> GetOtherSyncshellsForTag(string tag) => _serverConfigurationManager.GetNamesForSyncshellTag(tag);
+
+    /// <summary>
+    /// Checking if the UID is connected to any tag
+    /// </summary>
+    /// <param name="uid">Syncshell that needs to be checked</param>
+    public bool HasAnyPairTag(string uid) => _serverConfigurationManager.HasPairTags(uid);
+
+    /// <summary>
+    /// Checking if the syncshell is connected to the tag
+    /// </summary>
+    /// <param name="name">Syncshell that needs to be checked</param>
+    public bool HasAnySyncshellTag(string name) => _serverConfigurationManager.HasSyncshellTags(name);
+
+    /// <summary>
+    /// Checking if the UID is connected to the tag
+    /// </summary>
+    /// <param name="uid">UID that needs to be checked</param>
+    /// <param name="tagName">Name of the tag</param>
+    public bool HasPairTag(string uid, string tagName) => _serverConfigurationManager.ContainsPairTag(uid, tagName);
+
+    /// <summary>
+    /// Checking if the syncshell is connected to the tag
+    /// </summary>
+    /// <param name="name">Syncshell that needs to be checked</param>
+    /// <param name="tagName">Name of the tag</param>
+    public bool HasSyncshellTag(string name, string tagName) => _serverConfigurationManager.ContainsSyncshellTag(name, tagName);
 
     /// <summary>
     /// Is this tag opened in the paired clients UI?
     /// </summary>
     /// <param name="tag">the tag</param>
     /// <returns>open true/false</returns>
-    public bool IsTagOpen(string tag)
+    public bool IsTagOpen(string tag) => _serverConfigurationManager.ContainsOpenPairTag(tag);
+
+    /// <summary>
+    /// Removal of Pair Tags from Storage
+    /// </summary>
+    /// <param name="tag">Name of the tag</param>
+    public void RemovePairTag(string tag) => _serverConfigurationManager.RemovePairTag(tag);
+
+    /// <summary>
+    /// Removal of Syncshell Tags from Storage
+    /// </summary>
+    /// <param name="tag">Name of the tag</param>
+    public void RemoveSyncshellTag(string tag) => _serverConfigurationManager.RemoveSyncshellTag(tag);
+
+    /// <summary>
+    /// Removal of UID in a Tag
+    /// </summary>
+    /// <param name="uid">UID of user thats bound to the tag</param>
+    /// <param name="tagName">Name of the tag</param>
+    public void RemoveTagFromPairedUid(string uid, string tagName) => _serverConfigurationManager.RemoveTagForUid(uid, tagName);
+
+    /// <summary>
+    /// Removal of Syncshell in a Tag
+    /// </summary>
+    /// <param name="name">Syncshell thats bound to the tag</param>
+    /// <param name="tagName">Name of the tag</param>
+    public void RemoveTagFromSyncshell(string name, string tagName) => _serverConfigurationManager.RemoveTagForSyncshell(name, tagName);
+
+    /// <summary>
+    /// Rename of a pair tag
+    /// </summary>
+    /// <param name="oldName">Old pair tag name</param>
+    /// <param name="newName">New pair tag name</param>
+    public void RenamePairTag(string oldName, string newName)
     {
-        return _serverConfigurationManager.ContainsOpenPairTag(tag);
+        _serverConfigurationManager.RenamePairTag(oldName, newName);
     }
 
-    public void RemoveTag(string tag)
+    /// <summary>
+    /// Rename of a syncshell tag
+    /// </summary>
+    /// <param name="oldName">Old syncshell tag name</param>
+    /// <param name="newName">New syncshell tag name</param>
+    public void RenameSyncshellTag(string oldName, string newName)
     {
-        _serverConfigurationManager.RemoveTag(tag);
+        _serverConfigurationManager.RenameSyncshellTag(oldName, newName);
-    }
-
-    public void RemoveTagFromPairedUid(string uid, string tagName)
-    {
-        _serverConfigurationManager.RemoveTagForUid(uid, tagName);
     }
 
+    /// <summary>
+    /// Changes the tag to open/close
+    /// </summary>
+    /// <param name="tag">The Tag that will be modified</param>
+    /// <param name="open">True/False</param>
     public void SetTagOpen(string tag, bool open)
     {
         if (open)

LightlessSync/UI/IntroUI.cs

@@ -78,7 +78,7 @@ public partial class IntroUi : WindowMediatorSubscriberBase
 
             UiSharedService.ColorTextWrapped("Note: Any modifications you have applied through anything but Penumbra cannot be shared and your character state on other clients " +
                                  "might look broken because of this or others players mods might not apply on your end altogether. " +
-                                 "If you want to use this plugin you will have to move your mods to Penumbra.", ImGuiColors.DalamudYellow);
+                                 "If you want to use this plugin you will have to move your mods to Penumbra.", UIColors.Get("LightlessYellow"));
             if (!_uiShared.DrawOtherPluginState()) return;
             ImGui.Separator();
             if (ImGui.Button("Next##toAgreement"))
@@ -167,13 +167,13 @@ public partial class IntroUi : WindowMediatorSubscriberBase
             }
             else
             {
-                UiSharedService.TextWrapped("To not unnecessary download files already present on your computer, Lightless Sync will have to scan your Penumbra mod directory. " +
+                UiSharedService.TextWrapped("To not unnecessarily download files already present on your computer, Lightless Sync will have to scan your Penumbra mod directory. " +
                                      "Additionally, a local storage folder must be set where Lightless Sync will download other character files to. " +
                                      "Once the storage folder is set and the scan complete, this page will automatically forward to registration at a service.");
                 UiSharedService.TextWrapped("Note: The initial scan, depending on the amount of mods you have, might take a while. Please wait until it is completed.");
                 UiSharedService.ColorTextWrapped("Warning: once past this step you should not delete the FileCache.csv of Lightless Sync in the Plugin Configurations folder of Dalamud. " +
-                                          "Otherwise on the next launch a full re-scan of the file cache database will be initiated.", ImGuiColors.DalamudYellow);
+                                          "Otherwise on the next launch a full re-scan of the file cache database will be initiated.", UIColors.Get("LightlessYellow"));
-                UiSharedService.ColorTextWrapped("Warning: if the scan is hanging and does nothing for a long time, chances are high your Penumbra folder is not set up properly.", ImGuiColors.DalamudYellow);
+                UiSharedService.ColorTextWrapped("Warning: if the scan is hanging and does nothing for a long time, chances are high your Penumbra folder is not set up properly.", UIColors.Get("LightlessYellow"));
                 _uiShared.DrawCacheDirectorySetting();
             }
 
@@ -197,7 +197,7 @@ public partial class IntroUi : WindowMediatorSubscriberBase
                     _configService.Save();
                 }
                 UiSharedService.ColorTextWrapped("The File Compactor can save a tremendeous amount of space on the hard disk for downloads through Lightless. It will incur a minor CPU penalty on download but can speed up " +
-                    "loading of other characters. It is recommended to keep it enabled. You can change this setting later anytime in the Lightless settings.", ImGuiColors.DalamudYellow);
+                    "loading of other characters. It is recommended to keep it enabled. You can change this setting later anytime in the Lightless settings.", UIColors.Get("LightlessYellow"));
             }
         }
         else if (!_uiShared.ApiController.ServerAlive)
@@ -255,7 +255,7 @@ public partial class IntroUi : WindowMediatorSubscriberBase
                 ImGuiHelpers.ScaledDummy(5);
                 UiSharedService.DrawGroupedCenteredColorText("Strongly consider to use OAuth2 to authenticate, if the server supports it (the current main server does). " +
                     "The authentication flow is simpler and you do not require to store or maintain Secret Keys. " +
-                    "You already implicitly register using Discord, so the OAuth2 method will be cleaner and more straight-forward to use.", ImGuiColors.DalamudYellow, 500);
+                    "You already implicitly register using Discord, so the OAuth2 method will be cleaner and more straight-forward to use.", UIColors.Get("LightlessYellow"), 500);
                 ImGuiHelpers.ScaledDummy(5);
 
                 ImGui.AlignTextToFramePadding();

LightlessSync/UI/JoinSyncshellUI.cs

@@ -63,7 +63,7 @@ internal class JoinSyncshellUI : WindowMediatorSubscriberBase
                 "Joining a Syncshell will pair you implicitly with all existing users in the Syncshell." + Environment.NewLine +
                 "All permissions to all users in the Syncshell will be set to the preferred Syncshell permissions on joining, excluding prior set preferred permissions.");
             ImGui.Separator();
-            ImGui.TextUnformatted("Note: Syncshell ID and Password are case sensitive. MSS- is part of Syncshell IDs, unless using Vanity IDs.");
+            ImGui.TextUnformatted("Note: Syncshell ID and Password are case sensitive. LLS- is part of Syncshell IDs, unless using Vanity IDs.");
 
             ImGui.AlignTextToFramePadding();
             ImGui.TextUnformatted("Syncshell ID");
@@ -88,7 +88,7 @@ internal class JoinSyncshellUI : WindowMediatorSubscriberBase
                 UiSharedService.ColorTextWrapped("Failed to join the Syncshell. This is due to one of following reasons:" + Environment.NewLine +
                     "- The Syncshell does not exist or the password is incorrect" + Environment.NewLine +
                     "- You are already in that Syncshell or are banned from that Syncshell" + Environment.NewLine +
-                    "- The Syncshell is at capacity or has invites disabled" + Environment.NewLine, ImGuiColors.DalamudYellow);
+                    "- The Syncshell is at capacity or has invites disabled" + Environment.NewLine, UIColors.Get("LightlessYellow"));
             }
         }
         else
@@ -111,7 +111,7 @@ internal class JoinSyncshellUI : WindowMediatorSubscriberBase
                 || _groupJoinInfo.GroupPermissions.IsPreferDisableAnimations() != _ownPermissions.DisableGroupAnimations)
             {
                 ImGuiHelpers.ScaledDummy(2f);
-                UiSharedService.ColorText("Your current preferred default Syncshell permissions deviate from the suggested permissions:", ImGuiColors.DalamudYellow);
+                UiSharedService.ColorText("Your current preferred default Syncshell permissions deviate from the suggested permissions:", UIColors.Get("LightlessYellow"));
                 if (_groupJoinInfo.GroupPermissions.IsPreferDisableSounds() != _ownPermissions.DisableGroupSounds)
                 {
                     ImGui.AlignTextToFramePadding();

LightlessSync/UI/PermissionWindowUI.cs

@@ -102,7 +102,7 @@ public class PermissionWindowUI : WindowMediatorSubscriberBase
         {
             _ownPermissions.SetDisableAnimations(disableAnimations);
         }
-        _uiSharedService.DrawHelpText("Disabling sounds will remove all animations synced with this user on both sides." + UiSharedService.TooltipSeparator
+        _uiSharedService.DrawHelpText("Disabling animations will remove all animations synced with this user on both sides." + UiSharedService.TooltipSeparator
             + "Note: this is bidirectional, either user disabling animation sync will stop animation sync on both sides.");
         using (ImRaii.PushIndent(indentSize, false))
         {
@@ -116,7 +116,7 @@ public class PermissionWindowUI : WindowMediatorSubscriberBase
         {
             _ownPermissions.SetDisableVFX(disableVfx);
         }
-        _uiSharedService.DrawHelpText("Disabling sounds will remove all VFX synced with this user on both sides." + UiSharedService.TooltipSeparator
+        _uiSharedService.DrawHelpText("Disabling VFX will remove all VFX synced with this user on both sides." + UiSharedService.TooltipSeparator
             + "Note: this is bidirectional, either user disabling VFX sync will stop VFX sync on both sides.");
         using (ImRaii.PushIndent(indentSize, false))
         {

LightlessSync/UI/PopoutProfileUi.cs

@@ -135,12 +135,12 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase
                 if (_pair.UserPair.OwnPermissions.IsPaused())
                 {
                     ImGui.SameLine();
-                    UiSharedService.ColorText("You: paused", ImGuiColors.DalamudYellow);
+                    UiSharedService.ColorText("You: paused", UIColors.Get("LightlessYellow"));
                 }
                 if (_pair.UserPair.OtherPermissions.IsPaused())
                 {
                     ImGui.SameLine();
-                    UiSharedService.ColorText("They: paused", ImGuiColors.DalamudYellow);
+                    UiSharedService.ColorText("They: paused", UIColors.Get("LightlessYellow"));
                 }
             }
             if (_pair.UserPair.Groups.Any())

LightlessSync/UI/StandaloneProfileUi.cs

@@ -130,12 +130,12 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase
                 if (Pair.UserPair.OwnPermissions.IsPaused())
                 {
                     ImGui.SameLine();
-                    UiSharedService.ColorText("You: paused", ImGuiColors.DalamudYellow);
+                    UiSharedService.ColorText("You: paused", UIColors.Get("LightlessYellow"));
                 }
                 if (Pair.UserPair.OtherPermissions.IsPaused())
                 {
                     ImGui.SameLine();
-                    UiSharedService.ColorText("They: paused", ImGuiColors.DalamudYellow);
+                    UiSharedService.ColorText("They: paused", UIColors.Get("LightlessYellow"));
                 }
             }
 

LightlessSync/UI/Style/Luminance.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Numerics;
+
+namespace LightlessSync.UI.Style
+{
+    internal static class Luminance
+    {
+        public static float BrightnessThreshold { get; set; } = 0.4f;
+        public static float HighlightBoostMax { get; set; } = 0.1f;
+        public static float SmoothFactor { get; set; } = 0.15f;
+
+        private static float Brightness(Vector4 color)
+            => Math.Max(color.X, Math.Max(color.Y, color.Z));
+
+        public static float ComputeHighlight(Vector4? textColor, Vector4? glowColor)
+        {
+            float brightnessText = textColor.HasValue ? Brightness(textColor.Value) : 1f;
+            float brightnessGlow = glowColor.HasValue ? Brightness(glowColor.Value) : 1f;
+
+            if (brightnessText >= BrightnessThreshold || brightnessGlow >= BrightnessThreshold)
+                return 0f;
+
+            float deficit = Math.Min(BrightnessThreshold - brightnessText,
+                                     BrightnessThreshold - brightnessGlow);
+
+            float factor = Math.Clamp(deficit / BrightnessThreshold, 0f, 1f);
+            factor = MathF.Pow(factor, 2.0f);
+
+            return factor * HighlightBoostMax;
+        }
+
+        public static Vector4 BackgroundContrast(Vector4? textColor, Vector4? glowColor, Vector4 backgroundColor, ref Vector4 currentBg)
+        {
+            if (!textColor.HasValue && !glowColor.HasValue)
+                return backgroundColor;
+
+            float brightnessText = textColor.HasValue ? Brightness(textColor.Value) : 0f;
+            float brightnessGlow = glowColor.HasValue ? Brightness(glowColor.Value) : 0f;
+
+            float fgBrightness = Math.Max(brightnessText, brightnessGlow);
+            float bgBrightness = Brightness(backgroundColor);
+            float diff = Math.Abs(bgBrightness - fgBrightness);
+
+            bool shouldBeDark = fgBrightness > 0.5f;
+            Vector4 targetBg;
+
+            if (diff >= BrightnessThreshold)
+            {
+                targetBg = backgroundColor;
+            }
+            else
+            {
+                targetBg = shouldBeDark
+                    ? new Vector4(0.05f, 0.05f, 0.05f, backgroundColor.W)
+                    : new Vector4(0.95f, 0.95f, 0.95f, backgroundColor.W);
+            }
+
+            float t = Math.Clamp(SmoothFactor, 0f, 1f);
+            currentBg = t <= 0f ? targetBg : Vector4.Lerp(currentBg, targetBg, t);
+
+            return currentBg;
+        }
+    }
+}

LightlessSync/UI/Style/MainStyle.cs

@@ -0,0 +1,169 @@
+// inspiration: brio because it's style is fucking amazing
+
+using Dalamud.Bindings.ImGui;
+using LightlessSync.LightlessConfiguration;
+using System.Numerics;
+
+namespace LightlessSync.UI.Style
+{
+    internal static class MainStyle
+    {
+        private static LightlessConfigService? _config;
+        public static void Init(LightlessConfigService config) => _config = config;
+        public static bool ShouldUseTheme => _config?.Current.UseLightlessRedesign ?? false;
+
+        private static bool _hasPushed;
+        private static int _pushedColorCount;
+        private static int _pushedStyleVarCount;
+
+        public static void PushStyle()
+        {
+            if (_hasPushed)
+                PopStyle();
+
+            if (!ShouldUseTheme)
+            {
+                _hasPushed = false;
+                return;
+            }
+
+            _hasPushed = true;
+            _pushedColorCount = 0;
+            _pushedStyleVarCount = 0;
+
+            Push(ImGuiCol.Text, new Vector4(255, 255, 255, 255));
+            Push(ImGuiCol.TextDisabled, new Vector4(128, 128, 128, 255));
+
+            Push(ImGuiCol.WindowBg, new Vector4(23, 23, 23, 248));
+            Push(ImGuiCol.ChildBg, new Vector4(23, 23, 23, 66));
+            Push(ImGuiCol.PopupBg, new Vector4(23, 23, 23, 248));
+
+            Push(ImGuiCol.Border, new Vector4(65, 65, 65, 255));
+            Push(ImGuiCol.BorderShadow, new Vector4(0, 0, 0, 150));
+
+            Push(ImGuiCol.FrameBg, new Vector4(40, 40, 40, 255));
+            Push(ImGuiCol.FrameBgHovered, new Vector4(50, 50, 50, 255));
+            Push(ImGuiCol.FrameBgActive, new Vector4(30, 30, 30, 255));
+
+            Push(ImGuiCol.TitleBg, new Vector4(24, 24, 24, 232));
+            Push(ImGuiCol.TitleBgActive, new Vector4(30, 30, 30, 255));
+            Push(ImGuiCol.TitleBgCollapsed, new Vector4(27, 27, 27, 255));
+
+            Push(ImGuiCol.MenuBarBg, new Vector4(36, 36, 36, 255));
+            Push(ImGuiCol.ScrollbarBg, new Vector4(0, 0, 0, 0));
+            Push(ImGuiCol.ScrollbarGrab, new Vector4(62, 62, 62, 255));
+            Push(ImGuiCol.ScrollbarGrabHovered, new Vector4(70, 70, 70, 255));
+            Push(ImGuiCol.ScrollbarGrabActive, new Vector4(70, 70, 70, 255));
+
+            Push(ImGuiCol.CheckMark, UIColors.Get("LightlessPurple"));
+
+            Push(ImGuiCol.SliderGrab, new Vector4(101, 101, 101, 255));
+            Push(ImGuiCol.SliderGrabActive, new Vector4(123, 123, 123, 255));
+
+            Push(ImGuiCol.Button, UIColors.Get("ButtonDefault"));
+            Push(ImGuiCol.ButtonHovered, UIColors.Get("LightlessPurple"));
+            Push(ImGuiCol.ButtonActive, UIColors.Get("LightlessPurpleActive"));
+
+            Push(ImGuiCol.Header, new Vector4(0, 0, 0, 60));
+            Push(ImGuiCol.HeaderHovered, new Vector4(0, 0, 0, 90));
+            Push(ImGuiCol.HeaderActive, new Vector4(0, 0, 0, 120));
+
+            Push(ImGuiCol.Separator, new Vector4(75, 75, 75, 121));
+            Push(ImGuiCol.SeparatorHovered, UIColors.Get("LightlessPurple"));
+            Push(ImGuiCol.SeparatorActive, UIColors.Get("LightlessPurpleActive"));
+
+            Push(ImGuiCol.ResizeGrip, new Vector4(0, 0, 0, 0));
+            Push(ImGuiCol.ResizeGripHovered, new Vector4(0, 0, 0, 0));
+            Push(ImGuiCol.ResizeGripActive, UIColors.Get("LightlessPurpleActive"));
+
+            Push(ImGuiCol.Tab, new Vector4(40, 40, 40, 255));
+            Push(ImGuiCol.TabHovered, UIColors.Get("LightlessPurple"));
+            Push(ImGuiCol.TabActive, UIColors.Get("LightlessPurpleActive"));
+            Push(ImGuiCol.TabUnfocused, new Vector4(40, 40, 40, 255));
+            Push(ImGuiCol.TabUnfocusedActive, UIColors.Get("LightlessPurpleActive"));
+
+            Push(ImGuiCol.DockingPreview, UIColors.Get("LightlessPurpleActive"));
+            Push(ImGuiCol.DockingEmptyBg, new Vector4(50, 50, 50, 255));
+
+            Push(ImGuiCol.PlotLines, new Vector4(150, 150, 150, 255));
+
+            Push(ImGuiCol.TableHeaderBg, new Vector4(48, 48, 48, 255));
+            Push(ImGuiCol.TableBorderStrong, new Vector4(79, 79, 89, 255));
+            Push(ImGuiCol.TableBorderLight, new Vector4(59, 59, 64, 255));
+            Push(ImGuiCol.TableRowBg, new Vector4(0, 0, 0, 0));
+            Push(ImGuiCol.TableRowBgAlt, new Vector4(255, 255, 255, 15));
+
+            Push(ImGuiCol.TextSelectedBg, new Vector4(98, 75, 224, 255));
+            Push(ImGuiCol.DragDropTarget, new Vector4(98, 75, 224, 255));
+
+            Push(ImGuiCol.NavHighlight, new Vector4(98, 75, 224, 179));
+            Push(ImGuiCol.NavWindowingDimBg, new Vector4(204, 204, 204, 51));
+            Push(ImGuiCol.NavWindowingHighlight, new Vector4(204, 204, 204, 89));
+
+            PushStyleVar(ImGuiStyleVar.WindowPadding, new Vector2(6, 6));
+            PushStyleVar(ImGuiStyleVar.FramePadding, new Vector2(4, 3));
+            PushStyleVar(ImGuiStyleVar.CellPadding, new Vector2(4, 4));
+            PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(4, 4));
+            PushStyleVar(ImGuiStyleVar.ItemInnerSpacing, new Vector2(4, 4));
+
+            PushStyleVar(ImGuiStyleVar.IndentSpacing, 21.0f);
+            PushStyleVar(ImGuiStyleVar.ScrollbarSize, 10.0f);
+            PushStyleVar(ImGuiStyleVar.GrabMinSize, 20.0f);
+
+            PushStyleVar(ImGuiStyleVar.WindowBorderSize, 1.5f);
+            PushStyleVar(ImGuiStyleVar.ChildBorderSize, 1.5f);
+            PushStyleVar(ImGuiStyleVar.PopupBorderSize, 1.5f);
+            PushStyleVar(ImGuiStyleVar.FrameBorderSize, 0f);
+
+            PushStyleVar(ImGuiStyleVar.WindowRounding, 7f);
+            PushStyleVar(ImGuiStyleVar.ChildRounding, 4f);
+            PushStyleVar(ImGuiStyleVar.FrameRounding, 4f);
+            PushStyleVar(ImGuiStyleVar.PopupRounding, 4f);
+            PushStyleVar(ImGuiStyleVar.ScrollbarRounding, 4f);
+            PushStyleVar(ImGuiStyleVar.GrabRounding, 4f);
+            PushStyleVar(ImGuiStyleVar.TabRounding, 4f);
+        }
+
+        public static void PopStyle()
+        {
+            if (!_hasPushed)
+                return;
+
+            if (_pushedStyleVarCount > 0)
+                ImGui.PopStyleVar(_pushedStyleVarCount);
+            if (_pushedColorCount > 0)
+                ImGui.PopStyleColor(_pushedColorCount);
+
+            _hasPushed = false;
+            _pushedColorCount = 0;
+            _pushedStyleVarCount = 0;
+        }
+
+        private static void Push(ImGuiCol col, Vector4 rgba)
+        {
+            if (rgba.X > 1f || rgba.Y > 1f || rgba.Z > 1f || rgba.W > 1f)
+                rgba /= 255f;
+
+            ImGui.PushStyleColor(col, rgba);
+            _pushedColorCount++;
+        }
+
+        private static void Push(ImGuiCol col, uint packedRgba)
+        {
+            ImGui.PushStyleColor(col, packedRgba);
+            _pushedColorCount++;
+        }
+
+        private static void PushStyleVar(ImGuiStyleVar var, float value)
+        {
+            ImGui.PushStyleVar(var, value);
+            _pushedStyleVarCount++;
+        }
+
+        private static void PushStyleVar(ImGuiStyleVar var, Vector2 value)
+        {
+            ImGui.PushStyleVar(var, value);
+            _pushedStyleVarCount++;
+        }
+    }
+}

LightlessSync/UI/SyncshellAdminUI.cs

@@ -13,7 +13,7 @@ using LightlessSync.WebAPI;
 using Microsoft.Extensions.Logging;
 using System.Globalization;
 
-namespace LightlessSync.UI.Components.Popup;
+namespace LightlessSync.UI;
 
 public class SyncshellAdminUI : WindowMediatorSubscriberBase
 {
@@ -63,7 +63,7 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
         using var id = ImRaii.PushId("syncshell_admin_" + GroupFullInfo.GID);
 
         using (_uiSharedService.UidFont.Push())
-            ImGui.TextUnformatted(GroupFullInfo.GroupAliasOrGID + " Administrative Panel");
+            _uiSharedService.UnderlinedBigText(GroupFullInfo.GroupAliasOrGID + " Administrative Panel", UIColors.Get("LightlessBlue"));
 
         ImGui.Separator();
         var perm = GroupFullInfo.GroupPermissions;
@@ -72,119 +72,205 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
 
         if (tabbar)
         {
-            var inviteTab = ImRaii.TabItem("Invites");
+            DrawInvites(perm);
-            if (inviteTab)
-            {
-                bool isInvitesDisabled = perm.IsDisableInvites();
 
-                if (_uiSharedService.IconTextButton(isInvitesDisabled ? FontAwesomeIcon.Unlock : FontAwesomeIcon.Lock,
+            DrawManagement();
-                    isInvitesDisabled ? "Unlock Syncshell" : "Lock Syncshell"))
+
+            DrawPermission(perm);            
+        }
+    }
+
+    private void DrawPermission(GroupPermissions perm)
+    {
+        var permissionTab = ImRaii.TabItem("Permissions");
+        if (permissionTab)
+        {
+            bool isDisableAnimations = perm.IsPreferDisableAnimations();
+            bool isDisableSounds = perm.IsPreferDisableSounds();
+            bool isDisableVfx = perm.IsPreferDisableVFX();
+
+            ImGui.AlignTextToFramePadding();
+            ImGui.Text("Suggest Sound Sync");
+            _uiSharedService.BooleanToColoredIcon(!isDisableSounds);
+            ImGui.SameLine(230);
+            using (ImRaii.PushColor(ImGuiCol.Text, isDisableSounds ? UIColors.Get("PairBlue") : UIColors.Get("DimRed")))
+            {
+                if (_uiSharedService.IconTextButton(isDisableSounds ? FontAwesomeIcon.VolumeUp : FontAwesomeIcon.VolumeMute,
+                isDisableSounds ? "Suggest to enable sound sync" : "Suggest to disable sound sync"))
                 {
-                    perm.SetDisableInvites(!isInvitesDisabled);
+                    perm.SetPreferDisableSounds(!perm.IsPreferDisableSounds());
                     _ = _apiController.GroupChangeGroupPermissionState(new(GroupFullInfo.Group, perm));
                 }
+            }
 
-                ImGuiHelpers.ScaledDummy(2f);
+            ImGui.AlignTextToFramePadding();
-
+            ImGui.Text("Suggest Animation Sync");
-                UiSharedService.TextWrapped("One-time invites work as single-use passwords. Use those if you do not want to distribute your Syncshell password.");
+            _uiSharedService.BooleanToColoredIcon(!isDisableAnimations);
-                if (_uiSharedService.IconTextButton(FontAwesomeIcon.Envelope, "Single one-time invite"))
+            ImGui.SameLine(230);
+            using (ImRaii.PushColor(ImGuiCol.Text, isDisableAnimations ? UIColors.Get("PairBlue") : UIColors.Get("DimRed")))
+            {
+                if (_uiSharedService.IconTextButton(isDisableAnimations ? FontAwesomeIcon.Running : FontAwesomeIcon.Stop,
+                isDisableAnimations ? "Suggest to enable animation sync" : "Suggest to disable animation sync"))
                 {
-                    ImGui.SetClipboardText(_apiController.GroupCreateTempInvite(new(GroupFullInfo.Group), 1).Result.FirstOrDefault() ?? string.Empty);
+                    perm.SetPreferDisableAnimations(!perm.IsPreferDisableAnimations());
-                }
+                    _ = _apiController.GroupChangeGroupPermissionState(new(GroupFullInfo.Group, perm));
-                UiSharedService.AttachToolTip("Creates a single-use password for joining the syncshell which is valid for 24h and copies it to the clipboard.");
-                ImGui.InputInt("##amountofinvites", ref _multiInvites);
-                ImGui.SameLine();
-                using (ImRaii.Disabled(_multiInvites <= 1 || _multiInvites > 100))
-                {
-                    if (_uiSharedService.IconTextButton(FontAwesomeIcon.Envelope, "Generate " + _multiInvites + " one-time invites"))
-                    {
-                        _oneTimeInvites.AddRange(_apiController.GroupCreateTempInvite(new(GroupFullInfo.Group), _multiInvites).Result);
-                    }
-                }
-
-                if (_oneTimeInvites.Any())
-                {
-                    var invites = string.Join(Environment.NewLine, _oneTimeInvites);
-                    ImGui.InputTextMultiline("Generated Multi Invites", ref invites, 5000, new(0, 0), ImGuiInputTextFlags.ReadOnly);
-                    if (_uiSharedService.IconTextButton(FontAwesomeIcon.Copy, "Copy Invites to clipboard"))
-                    {
-                        ImGui.SetClipboardText(invites);
-                    }
                 }
             }
-            inviteTab.Dispose();
 
-            var mgmtTab = ImRaii.TabItem("User Management");
+            ImGui.AlignTextToFramePadding();
-            if (mgmtTab)
+            ImGui.Text("Suggest VFX Sync");
+            _uiSharedService.BooleanToColoredIcon(!isDisableVfx);
+            ImGui.SameLine(230);
+            using (ImRaii.PushColor(ImGuiCol.Text, isDisableVfx ? UIColors.Get("PairBlue") : UIColors.Get("DimRed")))
             {
-                var userNode = ImRaii.TreeNode("User List & Administration");
+                if (_uiSharedService.IconTextButton(isDisableVfx ? FontAwesomeIcon.Sun : FontAwesomeIcon.Circle,
-                if (userNode)
+                isDisableVfx ? "Suggest to enable vfx sync" : "Suggest to disable vfx sync"))
                 {
-                    if (!_pairManager.GroupPairs.TryGetValue(GroupFullInfo, out var pairs))
+                    perm.SetPreferDisableVFX(!perm.IsPreferDisableVFX());
+                    _ = _apiController.GroupChangeGroupPermissionState(new(GroupFullInfo.Group, perm));
+                }
+            }
+
+            UiSharedService.TextWrapped("Note: those suggested permissions will be shown to users on joining the Syncshell.");
+        }
+        permissionTab.Dispose();
+
+        if (_isOwner)
+        {
+            var ownerTab = ImRaii.TabItem("Owner Settings");
+            if (ownerTab)
+            {
+                ImGui.AlignTextToFramePadding();
+                ImGui.TextUnformatted("New Password");
+                var availableWidth = ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X;
+                var buttonSize = _uiSharedService.GetIconTextButtonSize(FontAwesomeIcon.Passport, "Change Password");
+                var textSize = ImGui.CalcTextSize("New Password").X;
+                var spacing = ImGui.GetStyle().ItemSpacing.X;
+
+                ImGui.SameLine();
+                ImGui.SetNextItemWidth(availableWidth - buttonSize - textSize - spacing * 2);
+                ImGui.InputTextWithHint("##changepw", "Min 10 characters", ref _newPassword, 50);
+                ImGui.SameLine();
+                using (ImRaii.Disabled(_newPassword.Length < 10))
+                {
+                    if (_uiSharedService.IconTextButton(FontAwesomeIcon.Passport, "Change Password"))
                     {
-                        UiSharedService.ColorTextWrapped("No users found in this Syncshell", ImGuiColors.DalamudYellow);
+                        _pwChangeSuccess = _apiController.GroupChangePassword(new GroupPasswordDto(GroupFullInfo.Group, _newPassword)).Result;
+                        _newPassword = string.Empty;
                     }
-                    else
+                }
+                UiSharedService.AttachToolTip("Password requires to be at least 10 characters long. This action is irreversible.");
+
+                if (!_pwChangeSuccess)
+                {
+                    UiSharedService.ColorTextWrapped("Failed to change the password. Password requires to be at least 10 characters long.", ImGuiColors.DalamudYellow);
+                }
+
+                if (_uiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Delete Syncshell") && UiSharedService.CtrlPressed() && UiSharedService.ShiftPressed())
+                {
+                    IsOpen = false;
+                    _ = _apiController.GroupDelete(new(GroupFullInfo.Group));
+                }
+                UiSharedService.AttachToolTip("Hold CTRL and Shift and click to delete this Syncshell." + Environment.NewLine + "WARNING: this action is irreversible.");
+            }
+            ownerTab.Dispose();
+        }
+    }
+
+    private void DrawManagement()
+    {
+        var mgmtTab = ImRaii.TabItem("User Management");
+        if (mgmtTab)
+        {
+            if (_uiSharedService.MediumTreeNode("User List & Administration", UIColors.Get("LightlessPurple")))
+            {
+                if (!_pairManager.GroupPairs.TryGetValue(GroupFullInfo, out var pairs))
+                {
+                    UiSharedService.ColorTextWrapped("No users found in this Syncshell", ImGuiColors.DalamudYellow);
+                }
+                else
+                {
+                    var tableFlags = ImGuiTableFlags.RowBg | ImGuiTableFlags.SizingStretchProp;
+                    if (pairs.Count > 10) tableFlags |= ImGuiTableFlags.ScrollY;
+                    using var table = ImRaii.Table("userList#" + GroupFullInfo.Group.GID, 3, tableFlags);
+                    if (table)
                     {
-                        using var table = ImRaii.Table("userList#" + GroupFullInfo.Group.GID, 4, ImGuiTableFlags.RowBg | ImGuiTableFlags.SizingStretchProp | ImGuiTableFlags.ScrollY);
+                        ImGui.TableSetupColumn("Alias/UID/Note", ImGuiTableColumnFlags.None, 4);
-                        if (table)
+                        ImGui.TableSetupColumn("Flags", ImGuiTableColumnFlags.None, 1);
+                        ImGui.TableSetupColumn("Actions", ImGuiTableColumnFlags.None, 3);
+                        ImGui.TableHeadersRow();
+
+                        var groupedPairs = new Dictionary<Pair, GroupPairUserInfo?>(pairs.Select(p => new KeyValuePair<Pair, GroupPairUserInfo?>(p,
+                            GroupFullInfo.GroupPairUserInfos.TryGetValue(p.UserData.UID, out GroupPairUserInfo value) ? value : null)));
+
+                        foreach (var pair in groupedPairs.OrderBy(p =>
                         {
-                            ImGui.TableSetupColumn("Alias/UID/Note", ImGuiTableColumnFlags.None, 3);
+                            if (p.Value == null) return 10;
-                            ImGui.TableSetupColumn("Online/Name", ImGuiTableColumnFlags.None, 2);
+                            if (string.Equals(p.Key.UserData.UID, GroupFullInfo.OwnerUID, StringComparison.Ordinal)) return 0;
-                            ImGui.TableSetupColumn("Flags", ImGuiTableColumnFlags.None, 1);
+                            if (p.Value.Value.IsModerator()) return 1;
-                            ImGui.TableSetupColumn("Actions", ImGuiTableColumnFlags.None, 2);
+                            if (p.Value.Value.IsPinned()) return 2;
-                            ImGui.TableHeadersRow();
+                            return 10;
+                        }).ThenBy(p => p.Key.GetNote() ?? p.Key.UserData.AliasOrUID, StringComparer.OrdinalIgnoreCase))
+                        {
+                            using var tableId = ImRaii.PushId("userTable_" + pair.Key.UserData.UID);
+                            var isUserOwner = string.Equals(pair.Key.UserData.UID, GroupFullInfo.OwnerUID, StringComparison.Ordinal);
 
-                            var groupedPairs = new Dictionary<Pair, GroupPairUserInfo?>(pairs.Select(p => new KeyValuePair<Pair, GroupPairUserInfo?>(p,
+                            ImGui.TableNextColumn(); // alias/uid/note
-                                GroupFullInfo.GroupPairUserInfos.TryGetValue(p.UserData.UID, out GroupPairUserInfo value) ? value : null)));
+                            var note = pair.Key.GetNote();
-
+                            var text = note == null ? pair.Key.UserData.AliasOrUID : note + " (" + pair.Key.UserData.AliasOrUID + ")";
-                            foreach (var pair in groupedPairs.OrderBy(p =>
+                            ImGui.AlignTextToFramePadding();
+                            var boolcolor = UiSharedService.GetBoolColor(pair.Key.IsOnline);
+                            UiSharedService.ColorText(text, boolcolor);
+                            if (!string.IsNullOrEmpty(pair.Key.PlayerName))
                             {
-                                if (p.Value == null) return 10;
+                                UiSharedService.AttachToolTip(pair.Key.PlayerName);
-                                if (p.Value.Value.IsModerator()) return 0;
+                                ImGui.SameLine();
-                                if (p.Value.Value.IsPinned()) return 1;
+                            }
-                                return 10;
+
-                            }).ThenBy(p => p.Key.GetNote() ?? p.Key.UserData.AliasOrUID, StringComparer.OrdinalIgnoreCase))
+                            ImGui.TableNextColumn(); // special flags
+                            if (pair.Value != null && (pair.Value.Value.IsModerator() || pair.Value.Value.IsPinned() || isUserOwner))
                             {
-                                using var tableId = ImRaii.PushId("userTable_" + pair.Key.UserData.UID);
+                                if (pair.Value.Value.IsModerator())
-
-                                ImGui.TableNextColumn(); // alias/uid/note
-                                var note = pair.Key.GetNote();
-                                var text = note == null ? pair.Key.UserData.AliasOrUID : note + " (" + pair.Key.UserData.AliasOrUID + ")";
-                                ImGui.AlignTextToFramePadding();
-                                ImGui.TextUnformatted(text);
-
-                                ImGui.TableNextColumn(); // online/name
-                                string onlineText = pair.Key.IsOnline ? "Online" : "Offline";
-                                if (!string.IsNullOrEmpty(pair.Key.PlayerName))
                                 {
-                                    onlineText += " (" + pair.Key.PlayerName + ")";
+                                    _uiSharedService.IconText(FontAwesomeIcon.UserShield, UIColors.Get("LightlessPurple"));
+                                    UiSharedService.AttachToolTip("Moderator");
                                 }
-                                var boolcolor = UiSharedService.GetBoolColor(pair.Key.IsOnline);
+                                if (pair.Value.Value.IsPinned() && !isUserOwner)
-                                ImGui.AlignTextToFramePadding();
-                                UiSharedService.ColorText(onlineText, boolcolor);
-
-                                ImGui.TableNextColumn(); // special flags
-                                if (pair.Value != null && (pair.Value.Value.IsModerator() || pair.Value.Value.IsPinned()))
                                 {
-                                    if (pair.Value.Value.IsModerator())
+                                    _uiSharedService.IconText(FontAwesomeIcon.Thumbtack);
+                                    UiSharedService.AttachToolTip("Pinned");
+                                }
+                                if (isUserOwner)
+                                {
+                                    _uiSharedService.IconText(FontAwesomeIcon.Crown, UIColors.Get("LightlessYellow"));
+                                    UiSharedService.AttachToolTip("Owner");
+                                }
+                            }
+                            else
+                            {
+                                _uiSharedService.IconText(FontAwesomeIcon.None);
+                            }
+
+                            ImGui.TableNextColumn(); // actions
+                            if (_isOwner)
+                            {
+                                using (ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("LightlessYellow")))
+                                {
+                                    using (ImRaii.Disabled(!UiSharedService.ShiftPressed()))
                                     {
-                                        _uiSharedService.IconText(FontAwesomeIcon.UserShield);
+                                        if (_uiSharedService.IconButton(FontAwesomeIcon.Crown))
-                                        UiSharedService.AttachToolTip("Moderator");
+                                        {
+                                            _ = _apiController.GroupChangeOwnership(new(GroupFullInfo.Group, pair.Key.UserData));
+                                            IsOpen = false;
+                                        }
                                     }
-                                    if (pair.Value.Value.IsPinned())
-                                    {
-                                        _uiSharedService.IconText(FontAwesomeIcon.Thumbtack);
-                                        UiSharedService.AttachToolTip("Pinned");
-                                    }
-                                }
-                                else
-                                {
-                                    _uiSharedService.IconText(FontAwesomeIcon.None);
-                                }
 
-                                ImGui.TableNextColumn(); // actions
+                                }
-                                if (_isOwner)
+                                UiSharedService.AttachToolTip("Hold SHIFT and click to transfer ownership of this Syncshell to "
+                                    + (pair.Key.UserData.AliasOrUID) + Environment.NewLine + "WARNING: This action is irreversible and will close screen.");
+                                ImGui.SameLine();
+
+                                using (ImRaii.PushColor(ImGuiCol.Text, pair.Value != null && pair.Value.Value.IsModerator() ? UIColors.Get("DimRed") : UIColors.Get("PairBlue")))
                                 {
                                     if (_uiSharedService.IconButton(FontAwesomeIcon.UserShield))
                                     {
@@ -194,11 +280,14 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
 
                                         _ = _apiController.GroupSetUserInfo(new GroupPairUserInfoDto(GroupFullInfo.Group, pair.Key.UserData, userInfo));
                                     }
-                                    UiSharedService.AttachToolTip(pair.Value != null && pair.Value.Value.IsModerator() ? "Demod user" : "Mod user");
-                                    ImGui.SameLine();
                                 }
+                                UiSharedService.AttachToolTip(pair.Value != null && pair.Value.Value.IsModerator() ? "Demod user" : "Mod user");
+                                ImGui.SameLine();
+                            }
 
-                                if (_isOwner || (pair.Value == null || (pair.Value != null && !pair.Value.Value.IsModerator())))
+                            if (pair.Value == null || pair.Value != null && !pair.Value.Value.IsModerator() && !isUserOwner)
+                            {
+                                using (ImRaii.PushColor(ImGuiCol.Text, pair.Value != null && pair.Value.Value.IsPinned() ? UIColors.Get("DimRed") : UIColors.Get("PairBlue")))
                                 {
                                     if (_uiSharedService.IconButton(FontAwesomeIcon.Thumbtack))
                                     {
@@ -208,9 +297,12 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
 
                                         _ = _apiController.GroupSetUserInfo(new GroupPairUserInfoDto(GroupFullInfo.Group, pair.Key.UserData, userInfo));
                                     }
-                                    UiSharedService.AttachToolTip(pair.Value != null && pair.Value.Value.IsPinned() ? "Unpin user" : "Pin user");
+                                }
-                                    ImGui.SameLine();
+                                UiSharedService.AttachToolTip(pair.Value != null && pair.Value.Value.IsPinned() ? "Unpin user" : "Pin user");
+                                ImGui.SameLine();
 
+                                using (ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("DimRed")))
+                                {
                                     using (ImRaii.Disabled(!UiSharedService.CtrlPressed()))
                                     {
                                         if (_uiSharedService.IconButton(FontAwesomeIcon.Trash))
@@ -218,10 +310,13 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
                                             _ = _apiController.GroupRemoveUser(new GroupPairDto(GroupFullInfo.Group, pair.Key.UserData));
                                         }
                                     }
-                                    UiSharedService.AttachToolTip("Remove user from Syncshell"
+                                }
-                                        + UiSharedService.TooltipSeparator + "Hold CTRL to enable this button");
+                                UiSharedService.AttachToolTip("Remove user from Syncshell"
+                                    + UiSharedService.TooltipSeparator + "Hold CTRL to enable this button");
+                                ImGui.SameLine();
 
-                                    ImGui.SameLine();
+                                using (ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("DimRed")))
+                                {
                                     using (ImRaii.Disabled(!UiSharedService.CtrlPressed()))
                                     {
                                         if (_uiSharedService.IconButton(FontAwesomeIcon.Ban))
@@ -229,224 +324,202 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
                                             Mediator.Publish(new OpenBanUserPopupMessage(pair.Key, GroupFullInfo));
                                         }
                                     }
-                                    UiSharedService.AttachToolTip("Ban user from Syncshell"
-                                        + UiSharedService.TooltipSeparator + "Hold CTRL to enable this button");
                                 }
-                            }
+                                UiSharedService.AttachToolTip("Ban user from Syncshell"
-                        }
-                    }
-                }
-                userNode.Dispose();
-                var clearNode = ImRaii.TreeNode("Mass Cleanup");
-                if (clearNode)
-                {
-                    using (ImRaii.Disabled(!UiSharedService.CtrlPressed()))
-                    {
-                        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Broom, "Clear Syncshell"))
-                        {
-                            _ = _apiController.GroupClear(new(GroupFullInfo.Group));
-                        }
-                    }
-                    UiSharedService.AttachToolTip("This will remove all non-pinned, non-moderator users from the Syncshell."
-                        + UiSharedService.TooltipSeparator + "Hold CTRL to enable this button");
-
-                    ImGuiHelpers.ScaledDummy(2f);
-                    ImGui.Separator();
-                    ImGuiHelpers.ScaledDummy(2f);
-
-                    if (_uiSharedService.IconTextButton(FontAwesomeIcon.Unlink, "Check for Inactive Users"))
-                    {
-                        _pruneTestTask = _apiController.GroupPrune(new(GroupFullInfo.Group), _pruneDays, execute: false);
-                        _pruneTask = null;
-                    }
-                    UiSharedService.AttachToolTip($"This will start the prune process for this Syncshell of inactive Lightless users that have not logged in in the past {_pruneDays} days."
-                        + Environment.NewLine + "You will be able to review the amount of inactive users before executing the prune."
-                        + UiSharedService.TooltipSeparator + "Note: this check excludes pinned users and moderators of this Syncshell.");
-                    ImGui.SameLine();
-                    ImGui.SetNextItemWidth(150);
-                    _uiSharedService.DrawCombo("Days of inactivity", [7, 14, 30, 90], (count) =>
-                    {
-                        return count + " days";
-                    },
-                    (selected) =>
-                    {
-                        _pruneDays = selected;
-                        _pruneTestTask = null;
-                        _pruneTask = null;
-                    },
-                    _pruneDays);
-
-                    if (_pruneTestTask != null)
-                    {
-                        if (!_pruneTestTask.IsCompleted)
-                        {
-                            UiSharedService.ColorTextWrapped("Calculating inactive users...", ImGuiColors.DalamudYellow);
-                        }
-                        else
-                        {
-                            ImGui.AlignTextToFramePadding();
-                            UiSharedService.TextWrapped($"Found {_pruneTestTask.Result} user(s) that have not logged into Lightless in the past {_pruneDays} days.");
-                            if (_pruneTestTask.Result > 0)
-                            {
-                                using (ImRaii.Disabled(!UiSharedService.CtrlPressed()))
-                                {
-                                    if (_uiSharedService.IconTextButton(FontAwesomeIcon.Broom, "Prune Inactive Users"))
-                                    {
-                                        _pruneTask = _apiController.GroupPrune(new(GroupFullInfo.Group), _pruneDays, execute: true);
-                                        _pruneTestTask = null;
-                                    }
-                                }
-                                UiSharedService.AttachToolTip($"Pruning will remove {_pruneTestTask?.Result ?? 0} inactive user(s)."
                                     + UiSharedService.TooltipSeparator + "Hold CTRL to enable this button");
                             }
                         }
                     }
-                    if (_pruneTask != null)
+                }
+                _uiSharedService.ColoredSeparator(UIColors.Get("LightlessPurple"), 1.5f);
+                ImGui.TreePop();
+            }
+            ImGui.Separator();
+
+            if (_uiSharedService.MediumTreeNode("Mass Cleanup", UIColors.Get("DimRed")))
+            {
+                using (ImRaii.Disabled(!UiSharedService.CtrlPressed()))
+                {
+                    if (_uiSharedService.IconTextButton(FontAwesomeIcon.Broom, "Clear Syncshell"))
                     {
-                        if (!_pruneTask.IsCompleted)
+                        _ = _apiController.GroupClear(new(GroupFullInfo.Group));
-                        {
-                            UiSharedService.ColorTextWrapped("Pruning Syncshell...", ImGuiColors.DalamudYellow);
-                        }
-                        else
-                        {
-                            UiSharedService.TextWrapped($"Syncshell was pruned and {_pruneTask.Result} inactive user(s) have been removed.");
-                        }
                     }
                 }
-                clearNode.Dispose();
+                UiSharedService.AttachToolTip("This will remove all non-pinned, non-moderator users from the Syncshell."
+                    + UiSharedService.TooltipSeparator + "Hold CTRL to enable this button");
 
-                var banNode = ImRaii.TreeNode("User Bans");
+                ImGui.SameLine();
-                if (banNode)
+
+                using (ImRaii.Disabled(!UiSharedService.CtrlPressed()))
                 {
-                    if (_uiSharedService.IconTextButton(FontAwesomeIcon.Retweet, "Refresh Banlist from Server"))
+                    if (_uiSharedService.IconTextButton(FontAwesomeIcon.Brush, "Clear Lightfinder Users"))
                     {
-                        _bannedUsers = _apiController.GroupGetBannedUsers(new GroupDto(GroupFullInfo.Group)).Result;
+                        _ = _apiController.GroupClearFinder(new(GroupFullInfo.Group));
                     }
+                }
+                UiSharedService.AttachToolTip("This will remove all users that joined through Lightfinder from the Syncshell."
+                    + UiSharedService.TooltipSeparator + "Hold CTRL to enable this button");
 
-                    if (ImGui.BeginTable("bannedusertable" + GroupFullInfo.GID, 6, ImGuiTableFlags.RowBg | ImGuiTableFlags.SizingStretchProp | ImGuiTableFlags.ScrollY))
+                ImGuiHelpers.ScaledDummy(2f);
+                ImGui.Separator();
+                ImGuiHelpers.ScaledDummy(2f);
+
+                if (_uiSharedService.IconTextButton(FontAwesomeIcon.Unlink, "Check for Inactive Users"))
+                {
+                    _pruneTestTask = _apiController.GroupPrune(new(GroupFullInfo.Group), _pruneDays, execute: false);
+                    _pruneTask = null;
+                }
+                UiSharedService.AttachToolTip($"This will start the prune process for this Syncshell of inactive Lightless users that have not logged in in the past {_pruneDays} day(s)."
+                    + Environment.NewLine + "You will be able to review the amount of inactive users before executing the prune."
+                    + UiSharedService.TooltipSeparator + "Note: this check excludes pinned users and moderators of this Syncshell.");
+                ImGui.SameLine();
+                ImGui.SetNextItemWidth(150);
+                _uiSharedService.DrawCombo("Day(s) of inactivity", [1, 3, 7, 14, 30, 90], (count) =>
+                {
+                    return count + " day(s)";
+                },
+                (selected) =>
+                {
+                    _pruneDays = selected;
+                    _pruneTestTask = null;
+                    _pruneTask = null;
+                },
+                _pruneDays);
+
+                if (_pruneTestTask != null)
+                {
+                    if (!_pruneTestTask.IsCompleted)
                     {
-                        ImGui.TableSetupColumn("UID", ImGuiTableColumnFlags.None, 1);
+                        UiSharedService.ColorTextWrapped("Calculating inactive users...", ImGuiColors.DalamudYellow);
-                        ImGui.TableSetupColumn("Alias", ImGuiTableColumnFlags.None, 1);
+                    }
-                        ImGui.TableSetupColumn("By", ImGuiTableColumnFlags.None, 1);
+                    else
-                        ImGui.TableSetupColumn("Date", ImGuiTableColumnFlags.None, 2);
+                    {
-                        ImGui.TableSetupColumn("Reason", ImGuiTableColumnFlags.None, 3);
+                        ImGui.AlignTextToFramePadding();
-                        ImGui.TableSetupColumn("Actions", ImGuiTableColumnFlags.None, 1);
+                        UiSharedService.TextWrapped($"Found {_pruneTestTask.Result} user(s) that have not logged into Lightless in the past {_pruneDays} day(s).");
-
+                        if (_pruneTestTask.Result > 0)
-                        ImGui.TableHeadersRow();
-
-                        foreach (var bannedUser in _bannedUsers.ToList())
                         {
-                            ImGui.TableNextColumn();
+                            using (ImRaii.Disabled(!UiSharedService.CtrlPressed()))
-                            ImGui.TextUnformatted(bannedUser.UID);
-                            ImGui.TableNextColumn();
-                            ImGui.TextUnformatted(bannedUser.UserAlias ?? string.Empty);
-                            ImGui.TableNextColumn();
-                            ImGui.TextUnformatted(bannedUser.BannedBy);
-                            ImGui.TableNextColumn();
-                            ImGui.TextUnformatted(bannedUser.BannedOn.ToLocalTime().ToString(CultureInfo.CurrentCulture));
-                            ImGui.TableNextColumn();
-                            UiSharedService.TextWrapped(bannedUser.Reason);
-                            ImGui.TableNextColumn();
-                            using var _ = ImRaii.PushId(bannedUser.UID);
-                            if (_uiSharedService.IconTextButton(FontAwesomeIcon.Check, "Unban"))
                             {
-                                _apiController.GroupUnbanUser(bannedUser);
+                                if (_uiSharedService.IconTextButton(FontAwesomeIcon.Broom, "Prune Inactive Users"))
-                                _bannedUsers.RemoveAll(b => string.Equals(b.UID, bannedUser.UID, StringComparison.Ordinal));
+                                {
+                                    _pruneTask = _apiController.GroupPrune(new(GroupFullInfo.Group), _pruneDays, execute: true);
+                                    _pruneTestTask = null;
+                                }
                             }
+                            UiSharedService.AttachToolTip($"Pruning will remove {_pruneTestTask?.Result ?? 0} inactive user(s)."
+                                + UiSharedService.TooltipSeparator + "Hold CTRL to enable this button");
                         }
-
-                        ImGui.EndTable();
                     }
                 }
-                banNode.Dispose();
+                if (_pruneTask != null)
-            }
-            mgmtTab.Dispose();
-
-            var permissionTab = ImRaii.TabItem("Permissions");
-            if (permissionTab)
-            {
-                bool isDisableAnimations = perm.IsPreferDisableAnimations();
-                bool isDisableSounds = perm.IsPreferDisableSounds();
-                bool isDisableVfx = perm.IsPreferDisableVFX();
-
-                ImGui.AlignTextToFramePadding();
-                ImGui.Text("Suggest Sound Sync");
-                _uiSharedService.BooleanToColoredIcon(!isDisableSounds);
-                ImGui.SameLine(230);
-                if (_uiSharedService.IconTextButton(isDisableSounds ? FontAwesomeIcon.VolumeUp : FontAwesomeIcon.VolumeMute,
-                    isDisableSounds ? "Suggest to enable sound sync" : "Suggest to disable sound sync"))
                 {
-                    perm.SetPreferDisableSounds(!perm.IsPreferDisableSounds());
+                    if (!_pruneTask.IsCompleted)
-                    _ = _apiController.GroupChangeGroupPermissionState(new(GroupFullInfo.Group, perm));
-                }
-
-                ImGui.AlignTextToFramePadding();
-                ImGui.Text("Suggest Animation Sync");
-                _uiSharedService.BooleanToColoredIcon(!isDisableAnimations);
-                ImGui.SameLine(230);
-                if (_uiSharedService.IconTextButton(isDisableAnimations ? FontAwesomeIcon.Running : FontAwesomeIcon.Stop,
-                    isDisableAnimations ? "Suggest to enable animation sync" : "Suggest to disable animation sync"))
-                {
-                    perm.SetPreferDisableAnimations(!perm.IsPreferDisableAnimations());
-                    _ = _apiController.GroupChangeGroupPermissionState(new(GroupFullInfo.Group, perm));
-                }
-
-                ImGui.AlignTextToFramePadding();
-                ImGui.Text("Suggest VFX Sync");
-                _uiSharedService.BooleanToColoredIcon(!isDisableVfx);
-                ImGui.SameLine(230);
-                if (_uiSharedService.IconTextButton(isDisableVfx ? FontAwesomeIcon.Sun : FontAwesomeIcon.Circle,
-                    isDisableVfx ? "Suggest to enable vfx sync" : "Suggest to disable vfx sync"))
-                {
-                    perm.SetPreferDisableVFX(!perm.IsPreferDisableVFX());
-                    _ = _apiController.GroupChangeGroupPermissionState(new(GroupFullInfo.Group, perm));
-                }
-
-                UiSharedService.TextWrapped("Note: those suggested permissions will be shown to users on joining the Syncshell.");
-            }
-            permissionTab.Dispose();
-
-            if (_isOwner)
-            {
-                var ownerTab = ImRaii.TabItem("Owner Settings");
-                if (ownerTab)
-                {
-                    ImGui.AlignTextToFramePadding();
-                    ImGui.TextUnformatted("New Password");
-                    var availableWidth = ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X;
-                    var buttonSize = _uiSharedService.GetIconTextButtonSize(FontAwesomeIcon.Passport, "Change Password");
-                    var textSize = ImGui.CalcTextSize("New Password").X;
-                    var spacing = ImGui.GetStyle().ItemSpacing.X;
-
-                    ImGui.SameLine();
-                    ImGui.SetNextItemWidth(availableWidth - buttonSize - textSize - spacing * 2);
-                    ImGui.InputTextWithHint("##changepw", "Min 10 characters", ref _newPassword, 50);
-                    ImGui.SameLine();
-                    using (ImRaii.Disabled(_newPassword.Length < 10))
                     {
-                        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Passport, "Change Password"))
+                        UiSharedService.ColorTextWrapped("Pruning Syncshell...", ImGuiColors.DalamudYellow);
+                    }
+                    else
+                    {
+                        UiSharedService.TextWrapped($"Syncshell was pruned and {_pruneTask.Result} inactive user(s) have been removed.");
+                    }
+                }
+                _uiSharedService.ColoredSeparator(UIColors.Get("DimRed"), 1.5f);
+                ImGui.TreePop();
+            }
+            ImGui.Separator();
+
+            if (_uiSharedService.MediumTreeNode("User Bans", UIColors.Get("LightlessYellow")))
+            {
+                if (_uiSharedService.IconTextButton(FontAwesomeIcon.Retweet, "Refresh Banlist from Server"))
+                {
+                    _bannedUsers = _apiController.GroupGetBannedUsers(new GroupDto(GroupFullInfo.Group)).Result;
+                }
+                var tableFlags = ImGuiTableFlags.RowBg | ImGuiTableFlags.SizingStretchProp;
+                if (_bannedUsers.Count > 10) tableFlags |= ImGuiTableFlags.ScrollY;
+                if (ImGui.BeginTable("bannedusertable" + GroupFullInfo.GID, 6, tableFlags))
+                {
+                    ImGui.TableSetupColumn("UID", ImGuiTableColumnFlags.None, 1);
+                    ImGui.TableSetupColumn("Alias", ImGuiTableColumnFlags.None, 1);
+                    ImGui.TableSetupColumn("By", ImGuiTableColumnFlags.None, 1);
+                    ImGui.TableSetupColumn("Date", ImGuiTableColumnFlags.None, 2);
+                    ImGui.TableSetupColumn("Reason", ImGuiTableColumnFlags.None, 3);
+                    ImGui.TableSetupColumn("Actions", ImGuiTableColumnFlags.None, 1);
+
+                    ImGui.TableHeadersRow();
+
+                    foreach (var bannedUser in _bannedUsers.ToList())
+                    {
+                        ImGui.TableNextColumn();
+                        ImGui.TextUnformatted(bannedUser.UID);
+                        ImGui.TableNextColumn();
+                        ImGui.TextUnformatted(bannedUser.UserAlias ?? string.Empty);
+                        ImGui.TableNextColumn();
+                        ImGui.TextUnformatted(bannedUser.BannedBy);
+                        ImGui.TableNextColumn();
+                        ImGui.TextUnformatted(bannedUser.BannedOn.ToLocalTime().ToString(CultureInfo.CurrentCulture));
+                        ImGui.TableNextColumn();
+                        UiSharedService.TextWrapped(bannedUser.Reason);
+                        ImGui.TableNextColumn();
+                        using var _ = ImRaii.PushId(bannedUser.UID);
+                        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Check, "Unban"))
                         {
-                            _pwChangeSuccess = _apiController.GroupChangePassword(new GroupPasswordDto(GroupFullInfo.Group, _newPassword)).Result;
+                            _apiController.GroupUnbanUser(bannedUser);
-                            _newPassword = string.Empty;
+                            _bannedUsers.RemoveAll(b => string.Equals(b.UID, bannedUser.UID, StringComparison.Ordinal));
                         }
                     }
-                    UiSharedService.AttachToolTip("Password requires to be at least 10 characters long. This action is irreversible.");
+                    ImGui.EndTable();
-
+                }
-                    if (!_pwChangeSuccess)
+                _uiSharedService.ColoredSeparator(UIColors.Get("LightlessYellow"), 1.5f);
-                    {
+                ImGui.TreePop();
-                        UiSharedService.ColorTextWrapped("Failed to change the password. Password requires to be at least 10 characters long.", ImGuiColors.DalamudYellow);
+            }
-                    }
+            ImGui.Separator();
-
+        }
-                    if (_uiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Delete Syncshell") && UiSharedService.CtrlPressed() && UiSharedService.ShiftPressed())
+        mgmtTab.Dispose();
-                    {
+
-                        IsOpen = false;
+    }
-                        _ = _apiController.GroupDelete(new(GroupFullInfo.Group));
+
-                    }
+    private void DrawInvites(GroupPermissions perm)
-                    UiSharedService.AttachToolTip("Hold CTRL and Shift and click to delete this Syncshell." + Environment.NewLine + "WARNING: this action is irreversible.");
+    {
+        var inviteTab = ImRaii.TabItem("Invites");
+        if (inviteTab)
+        {
+            bool isInvitesDisabled = perm.IsDisableInvites();
+
+            if (_uiSharedService.IconTextButton(isInvitesDisabled ? FontAwesomeIcon.Unlock : FontAwesomeIcon.Lock,
+                isInvitesDisabled ? "Unlock Syncshell" : "Lock Syncshell"))
+            {
+                perm.SetDisableInvites(!isInvitesDisabled);
+                _ = _apiController.GroupChangeGroupPermissionState(new(GroupFullInfo.Group, perm));
+            }
+
+            ImGuiHelpers.ScaledDummy(2f);
+
+            UiSharedService.TextWrapped("One-time invites work as single-use passwords. Use those if you do not want to distribute your Syncshell password.");
+            if (_uiSharedService.IconTextButton(FontAwesomeIcon.Envelope, "Single one-time invite"))
+            {
+                ImGui.SetClipboardText(_apiController.GroupCreateTempInvite(new(GroupFullInfo.Group), 1).Result.FirstOrDefault() ?? string.Empty);
+            }
+            UiSharedService.AttachToolTip("Creates a single-use password for joining the syncshell which is valid for 24h and copies it to the clipboard.");
+            ImGui.InputInt("##amountofinvites", ref _multiInvites);
+            ImGui.SameLine();
+            using (ImRaii.Disabled(_multiInvites <= 1 || _multiInvites > 100))
+            {
+                if (_uiSharedService.IconTextButton(FontAwesomeIcon.Envelope, "Generate " + _multiInvites + " one-time invites"))
+                {
+                    _oneTimeInvites.AddRange(_apiController.GroupCreateTempInvite(new(GroupFullInfo.Group), _multiInvites).Result);
+                }
+            }
+
+            if (_oneTimeInvites.Any())
+            {
+                var invites = string.Join(Environment.NewLine, _oneTimeInvites);
+                ImGui.InputTextMultiline("Generated Multi Invites", ref invites, 5000, new(0, 0), ImGuiInputTextFlags.ReadOnly);
+                if (_uiSharedService.IconTextButton(FontAwesomeIcon.Copy, "Copy Invites to clipboard"))
+                {
+                    ImGui.SetClipboardText(invites);
                 }
-                ownerTab.Dispose();
             }
         }
+        inviteTab.Dispose();
     }
 
     public override void OnClose()

LightlessSync/UI/SyncshellFinderUI.cs

@@ -0,0 +1,338 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface;
+using Dalamud.Interface.Colors;
+using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
+using LightlessSync.API.Data.Enum;
+using LightlessSync.API.Data.Extensions;
+using LightlessSync.API.Dto;
+using LightlessSync.API.Dto.Group;
+using LightlessSync.PlayerData.Pairs;
+using LightlessSync.Services;
+using LightlessSync.Services.Mediator;
+using LightlessSync.Utils;
+using LightlessSync.WebAPI;
+using Microsoft.Extensions.Logging;
+using System.Numerics;
+
+namespace LightlessSync.UI;
+
+public class SyncshellFinderUI : WindowMediatorSubscriberBase
+{
+    private readonly ApiController _apiController;
+    private readonly BroadcastService _broadcastService;
+    private readonly UiSharedService _uiSharedService;
+    private readonly BroadcastScannerService _broadcastScannerService;
+    private readonly PairManager _pairManager;
+    private readonly DalamudUtilService _dalamudUtilService;
+
+    private readonly List<GroupJoinDto> _nearbySyncshells = [];
+    private List<GroupFullInfoDto> _currentSyncshells = [];
+    private int _selectedNearbyIndex = -1;
+    private readonly HashSet<string> _recentlyJoined = new(StringComparer.Ordinal);
+
+    private GroupJoinDto? _joinDto;
+    private GroupJoinInfoDto? _joinInfo;
+    private DefaultPermissionsDto _ownPermissions = null!;
+
+    public SyncshellFinderUI(
+        ILogger<SyncshellFinderUI> logger,
+        LightlessMediator mediator,
+        PerformanceCollectorService performanceCollectorService,
+        BroadcastService broadcastService,
+        UiSharedService uiShared,
+        ApiController apiController,
+        BroadcastScannerService broadcastScannerService,
+        PairManager pairManager,
+        DalamudUtilService dalamudUtilService) : base(logger, mediator, "Shellfinder###LightlessSyncshellFinderUI", performanceCollectorService)
+    {
+        _broadcastService = broadcastService;
+        _uiSharedService = uiShared;
+        _apiController = apiController;
+        _broadcastScannerService = broadcastScannerService;
+        _pairManager = pairManager;
+        _dalamudUtilService = dalamudUtilService;
+
+        IsOpen = false;
+        SizeConstraints = new()
+        {
+            MinimumSize = new(600, 400),
+            MaximumSize = new(600, 550)
+        };
+
+        Mediator.Subscribe<SyncshellBroadcastsUpdatedMessage>(this, async _ => await RefreshSyncshellsAsync().ConfigureAwait(false));
+        Mediator.Subscribe<BroadcastStatusChangedMessage>(this, async _ => await RefreshSyncshellsAsync().ConfigureAwait(false));
+    }
+
+    public override async void OnOpen()
+    {
+        _ownPermissions = _apiController.DefaultPermissions.DeepClone()!;
+        await RefreshSyncshellsAsync().ConfigureAwait(false);
+    }
+
+    protected override void DrawInternal()
+    {
+        _uiSharedService.MediumText("Nearby Syncshells", UIColors.Get("PairBlue"));
+        _uiSharedService.ColoredSeparator(UIColors.Get("PairBlue"));
+
+        if (_nearbySyncshells.Count == 0)
+        {
+            ImGui.TextColored(ImGuiColors.DalamudGrey, "No nearby syncshells are being broadcasted.");
+
+            if (!_broadcastService.IsBroadcasting)
+            {
+
+                _uiSharedService.ColoredSeparator(UIColors.Get("LightlessYellow"));
+
+                ImGui.TextColored(UIColors.Get("LightlessYellow"), "Lightfinder is currently disabled, to locate nearby syncshells, Lightfinder must be active.");
+                ImGuiHelpers.ScaledDummy(0.5f);
+
+                ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 10.0f);
+                ImGui.PushStyleColor(ImGuiCol.Button, UIColors.Get("LightlessYellow2"));
+
+                if (ImGui.Button("Open Lightfinder", new Vector2(200 * ImGuiHelpers.GlobalScale, 0)))
+                {
+                    Mediator.Publish(new UiToggleMessage(typeof(BroadcastUI)));
+                }
+
+                ImGui.PopStyleColor();
+                ImGui.PopStyleVar();
+
+                return;
+            }
+
+            return;
+        }
+
+        DrawSyncshellTable();
+
+        if (_joinDto != null && _joinInfo != null && _joinInfo.Success)
+            DrawConfirmation();
+    }
+
+    private void DrawSyncshellTable()
+    {
+        if (ImGui.BeginTable("##NearbySyncshellsTable", 3, ImGuiTableFlags.Borders | ImGuiTableFlags.RowBg))
+        {
+            ImGui.TableSetupColumn("Syncshell", ImGuiTableColumnFlags.WidthStretch);
+            ImGui.TableSetupColumn("Broadcaster", ImGuiTableColumnFlags.WidthStretch);
+            ImGui.TableSetupColumn("Join", ImGuiTableColumnFlags.WidthFixed, 80f * ImGuiHelpers.GlobalScale);
+            ImGui.TableHeadersRow();
+
+            foreach (var shell in _nearbySyncshells)
+            {
+                // Check if there is an active broadcast for this syncshell, if not, skipping this syncshell
+                var broadcast = _broadcastScannerService.GetActiveSyncshellBroadcasts()
+                    .FirstOrDefault(b => string.Equals(b.GID, shell.Group.GID, StringComparison.Ordinal));
+
+                if (broadcast == null)
+                    continue; // no active broadcasts
+
+                var (Name, Address) = _dalamudUtilService.FindPlayerByNameHash(broadcast.HashedCID);
+                if (string.IsNullOrEmpty(Name))
+                    continue; // broadcaster not found in area, skipping
+
+                ImGui.TableNextRow();
+                ImGui.TableNextColumn();
+
+                var displayName = !string.IsNullOrEmpty(shell.Group.Alias) ? shell.Group.Alias : shell.Group.GID;
+                ImGui.TextUnformatted(displayName);
+
+                ImGui.TableNextColumn();
+                var worldName = _dalamudUtilService.GetWorldNameFromPlayerAddress(Address);
+                var broadcasterName = !string.IsNullOrEmpty(worldName) ? $"{Name} ({worldName})" : Name;
+                ImGui.TextUnformatted(broadcasterName);
+
+                ImGui.TableNextColumn();
+
+                var label = $"Join##{shell.Group.GID}";
+                ImGui.PushStyleColor(ImGuiCol.Button, UIColors.Get("LightlessGreen"));
+                ImGui.PushStyleColor(ImGuiCol.ButtonHovered, UIColors.Get("LightlessGreen").WithAlpha(0.85f));
+                ImGui.PushStyleColor(ImGuiCol.ButtonActive, UIColors.Get("LightlessGreen").WithAlpha(0.75f));
+
+                var isAlreadyMember = _currentSyncshells.Exists(g => string.Equals(g.GID, shell.GID, StringComparison.Ordinal));
+                var isRecentlyJoined = _recentlyJoined.Contains(shell.GID);
+                
+                if (!isAlreadyMember && !isRecentlyJoined)
+                {
+                    if (ImGui.Button(label))
+                    {
+                        _logger.LogInformation($"Join requested for Syncshell {shell.Group.GID} ({shell.Group.Alias})");
+
+                        _ = Task.Run(async () =>
+                        {
+                            try
+                            {
+                                var info = await _apiController.GroupJoinHashed(new GroupJoinHashedDto(
+                                    shell.Group,
+                                    shell.Password,
+                                    shell.GroupUserPreferredPermissions
+                                )).ConfigureAwait(false);
+
+                                if (info != null && info.Success)
+                                {
+                                    _joinDto = new GroupJoinDto(shell.Group, shell.Password, shell.GroupUserPreferredPermissions);
+                                    _joinInfo = info;
+                                    _ownPermissions = _apiController.DefaultPermissions.DeepClone()!;
+
+                                    _logger.LogInformation($"Fetched join info for {shell.Group.GID}");
+                                }
+                                else
+                                {
+                                    _logger.LogWarning($"Failed to join {shell.Group.GID}: info was null or unsuccessful");
+                                }
+                            }
+                            catch (Exception ex)
+                            {
+                                _logger.LogError(ex, $"Join failed for {shell.Group.GID}");
+                            }
+                        });
+                    }
+                }
+                else
+                {
+                    using (ImRaii.Disabled())
+                    {
+                        ImGui.Button(label);
+                    }
+                    UiSharedService.AttachToolTip("Already a member or owner of this Syncshell.");
+                }
+                ImGui.PopStyleColor(3);
+            }
+
+            ImGui.EndTable();
+        }
+    }
+
+    private void DrawConfirmation()
+    {
+        if (_joinDto != null && _joinInfo != null)
+        {
+            ImGui.Separator();
+            ImGui.TextUnformatted($"Join Syncshell: {_joinDto.Group.AliasOrGID} by {_joinInfo.OwnerAliasOrUID}");
+            ImGuiHelpers.ScaledDummy(2f);
+            ImGui.TextUnformatted("Suggested Syncshell Permissions:");
+
+            DrawPermissionRow("Sounds", _joinInfo.GroupPermissions.IsPreferDisableSounds(), _ownPermissions.DisableGroupSounds, v => _ownPermissions.DisableGroupSounds = v);
+            DrawPermissionRow("Animations", _joinInfo.GroupPermissions.IsPreferDisableAnimations(), _ownPermissions.DisableGroupAnimations, v => _ownPermissions.DisableGroupAnimations = v);
+            DrawPermissionRow("VFX", _joinInfo.GroupPermissions.IsPreferDisableVFX(), _ownPermissions.DisableGroupVFX, v => _ownPermissions.DisableGroupVFX = v);
+
+            ImGui.NewLine();
+            ImGui.NewLine();
+
+            if (_uiSharedService.IconTextButton(Dalamud.Interface.FontAwesomeIcon.Plus, $"Finalize and join {_joinDto.Group.AliasOrGID}"))
+            {
+                var finalPermissions = GroupUserPreferredPermissions.NoneSet;
+                finalPermissions.SetDisableSounds(_ownPermissions.DisableGroupSounds);
+                finalPermissions.SetDisableAnimations(_ownPermissions.DisableGroupAnimations);
+                finalPermissions.SetDisableVFX(_ownPermissions.DisableGroupVFX);
+
+                _ = _apiController.GroupJoinFinalize(new GroupJoinDto(_joinDto.Group, _joinDto.Password, finalPermissions));
+                
+                _recentlyJoined.Add(_joinDto.Group.GID);
+                
+                _joinDto = null;
+                _joinInfo = null;
+            }
+        }
+    }
+
+    private void DrawPermissionRow(string label, bool suggested, bool current, Action<bool> apply)
+    {
+        ImGui.AlignTextToFramePadding();
+        ImGui.TextUnformatted($"- {label}");
+
+        ImGui.SameLine(150 * ImGuiHelpers.GlobalScale);
+        ImGui.TextUnformatted("Current:");
+        ImGui.SameLine();
+        _uiSharedService.BooleanToColoredIcon(!current);
+
+        ImGui.SameLine(300 * ImGuiHelpers.GlobalScale);
+        ImGui.TextUnformatted("Suggested:");
+        ImGui.SameLine();
+        _uiSharedService.BooleanToColoredIcon(!suggested);
+
+        ImGui.SameLine(450 * ImGuiHelpers.GlobalScale);
+        using var id = ImRaii.PushId(label);
+        if (current != suggested)
+        {
+            if (_uiSharedService.IconTextButton(FontAwesomeIcon.ArrowRight, "Apply"))
+                apply(suggested);
+        }
+
+        ImGui.NewLine();
+    }
+
+    private async Task RefreshSyncshellsAsync()
+    {
+        var syncshellBroadcasts = _broadcastScannerService.GetActiveSyncshellBroadcasts();
+        _currentSyncshells = [.. _pairManager.GroupPairs.Select(g => g.Key)];
+        
+        _recentlyJoined.RemoveWhere(gid => _currentSyncshells.Any(s => string.Equals(s.GID, gid, StringComparison.Ordinal)));
+
+        if (syncshellBroadcasts.Count == 0)
+        {
+            ClearSyncshells();
+            return;
+        }
+
+        List<GroupJoinDto>? updatedList = [];
+        try
+        {
+            var groups = await _apiController.GetBroadcastedGroups(syncshellBroadcasts).ConfigureAwait(false);
+            updatedList = groups?.ToList();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Failed to refresh broadcasted syncshells.");
+            return;
+        }
+
+        var currentGids = _nearbySyncshells.Select(s => s.Group.GID).ToHashSet(StringComparer.Ordinal);
+
+        if (updatedList != null)
+        {
+            var previousGid = GetSelectedGid();
+
+            _nearbySyncshells.Clear();
+            _nearbySyncshells.AddRange(updatedList);
+
+            if (previousGid != null)
+            {
+                var newIndex = _nearbySyncshells.FindIndex(s => string.Equals(s.Group.GID, previousGid, StringComparison.Ordinal));
+                if (newIndex >= 0)
+                {
+                    _selectedNearbyIndex = newIndex;
+                    return;
+                }
+            }
+        }
+
+        ClearSelection();
+    }
+
+    private void ClearSyncshells()
+    {
+        if (_nearbySyncshells.Count == 0)
+            return;
+
+        _nearbySyncshells.Clear();
+        ClearSelection();
+    }
+
+    private void ClearSelection()
+    {
+        _selectedNearbyIndex = -1;
+        _joinDto = null;
+        _joinInfo = null;
+    }
+
+    private string? GetSelectedGid()
+    {
+        if (_selectedNearbyIndex < 0 || _selectedNearbyIndex >= _nearbySyncshells.Count)
+            return null;
+
+        return _nearbySyncshells[_selectedNearbyIndex].Group.GID;
+    }
+
+}

LightlessSync/UI/TopTabMenu.cs

@@ -5,10 +5,18 @@ using Dalamud.Interface.Utility.Raii;
 using Dalamud.Utility;
 using LightlessSync.API.Data.Enum;
 using LightlessSync.API.Data.Extensions;
+using LightlessSync.LightlessConfiguration.Models;
 using LightlessSync.PlayerData.Pairs;
+using LightlessSync.Services;
 using LightlessSync.Services.Mediator;
+using LightlessSync.Utils;
 using LightlessSync.WebAPI;
+using Serilog;
+using System;
+using System.Collections.Generic;
 using System.Numerics;
+using System.Reflection.Emit;
+using System.Threading.Tasks;
 
 namespace LightlessSync.UI;
 
@@ -19,18 +27,25 @@ public class TopTabMenu
     private readonly LightlessMediator _lightlessMediator;
 
     private readonly PairManager _pairManager;
+    private readonly PairRequestService _pairRequestService;
+    private readonly DalamudUtilService _dalamudUtilService;
+    private readonly HashSet<string> _pendingPairRequestActions = new(StringComparer.Ordinal);
+    private bool _pairRequestsExpanded; // useless for now
+    private int _lastRequestCount;
     private readonly UiSharedService _uiSharedService;
     private string _filter = string.Empty;
     private int _globalControlCountdown = 0;
-
+    private float _pairRequestsHeight = 150f;
     private string _pairToAdd = string.Empty;
 
     private SelectedTab _selectedTab = SelectedTab.None;
-    public TopTabMenu(LightlessMediator lightlessMediator, ApiController apiController, PairManager pairManager, UiSharedService uiSharedService)
+    public TopTabMenu(LightlessMediator lightlessMediator, ApiController apiController, PairManager pairManager, UiSharedService uiSharedService, PairRequestService pairRequestService, DalamudUtilService dalamudUtilService)
     {
         _lightlessMediator = lightlessMediator;
         _apiController = apiController;
         _pairManager = pairManager;
+        _pairRequestService = pairRequestService;
+        _dalamudUtilService = dalamudUtilService;
         _uiSharedService = uiSharedService;
     }
 
@@ -39,8 +54,9 @@ public class TopTabMenu
         None,
         Individual,
         Syncshell,
-        Filter,
+        Lightfinder,
-        UserConfig
+        UserConfig,
+        Settings
     }
 
     public string Filter
@@ -60,11 +76,6 @@ public class TopTabMenu
     {
         get => _selectedTab; set
         {
-            if (_selectedTab == SelectedTab.Filter && value != SelectedTab.Filter)
-            {
-                Filter = string.Empty;
-            }
-
             _selectedTab = value;
         }
     }
@@ -72,11 +83,11 @@ public class TopTabMenu
     {
         var availableWidth = ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X;
         var spacing = ImGui.GetStyle().ItemSpacing;
-        var buttonX = (availableWidth - (spacing.X * 3)) / 4f;
+        var buttonX = (availableWidth - (spacing.X * 4)) / 5f;
         var buttonY = _uiSharedService.GetIconButtonSize(FontAwesomeIcon.Pause).Y;
         var buttonSize = new Vector2(buttonX, buttonY);
         var drawList = ImGui.GetWindowDrawList();
-        var underlineColor = ImGui.GetColorU32(ImGuiCol.Separator);
+        var underlineColor = ImGui.GetColorU32(UIColors.Get("LightlessPurpleActive")); // ImGui.GetColorU32(ImGuiCol.Separator);
         var btncolor = ImRaii.PushColor(ImGuiCol.Button, ImGui.ColorConvertFloat4ToU32(new(0, 0, 0, 0)));
 
         ImGuiHelpers.ScaledDummy(spacing.Y / 2f);
@@ -117,19 +128,19 @@ public class TopTabMenu
         using (ImRaii.PushFont(UiBuilder.IconFont))
         {
             var x = ImGui.GetCursorScreenPos();
-            if (ImGui.Button(FontAwesomeIcon.Filter.ToIconString(), buttonSize))
+            if (ImGui.Button(FontAwesomeIcon.Compass.ToIconString(), buttonSize))
             {
-                TabSelection = TabSelection == SelectedTab.Filter ? SelectedTab.None : SelectedTab.Filter;
+                TabSelection = TabSelection == SelectedTab.Lightfinder ? SelectedTab.None : SelectedTab.Lightfinder;
             }
 
             ImGui.SameLine();
             var xAfter = ImGui.GetCursorScreenPos();
-            if (TabSelection == SelectedTab.Filter)
+            if (TabSelection == SelectedTab.Lightfinder)
                 drawList.AddLine(x with { Y = x.Y + buttonSize.Y + spacing.Y },
                     xAfter with { Y = xAfter.Y + buttonSize.Y + spacing.Y, X = xAfter.X - spacing.X },
                     underlineColor, 2);
         }
-        UiSharedService.AttachToolTip("Filter");
+        UiSharedService.AttachToolTip("Lightfinder");
 
         ImGui.SameLine();
         using (ImRaii.PushFont(UiBuilder.IconFont))
@@ -149,6 +160,18 @@ public class TopTabMenu
         }
         UiSharedService.AttachToolTip("Your User Menu");
 
+        ImGui.SameLine();
+        using (ImRaii.PushFont(UiBuilder.IconFont))
+        {
+            var x = ImGui.GetCursorScreenPos();
+            if (ImGui.Button(FontAwesomeIcon.Cog.ToIconString(), buttonSize))
+            {
+                _lightlessMediator.Publish(new UiToggleMessage(typeof(SettingsUi)));
+            }
+            ImGui.SameLine();
+        }
+        UiSharedService.AttachToolTip("Open Lightless Settings");
+
         ImGui.NewLine();
         btncolor.Dispose();
 
@@ -164,9 +187,9 @@ public class TopTabMenu
             DrawSyncshellMenu(availableWidth, spacing.X);
             DrawGlobalSyncshellButtons(availableWidth, spacing.X);
         }
-        else if (TabSelection == SelectedTab.Filter)
+        else if (TabSelection == SelectedTab.Lightfinder)
         {
-            DrawFilter(availableWidth, spacing.X);
+            DrawLightfinderMenu(availableWidth, spacing.X);
         }
         else if (TabSelection == SelectedTab.UserConfig)
         {
@@ -174,7 +197,25 @@ public class TopTabMenu
         }
 
         if (TabSelection != SelectedTab.None) ImGuiHelpers.ScaledDummy(3f);
+
+        #if DEBUG
+        if (ImGui.Button("Add Test Pair Request"))
+        {
+            var fakeCid = Guid.NewGuid().ToString("N");
+            var display = _pairRequestService.RegisterIncomingRequest(fakeCid, "Debug pair request");
+            _lightlessMediator.Publish(new NotificationMessage(
+                "Pair request received (debug)",
+                display.Message,
+                NotificationType.Info,
+                TimeSpan.FromSeconds(5)));
+        }
+        #endif
+
+        DrawIncomingPairRequests(availableWidth);
+
         ImGui.Separator();
+
+        DrawFilter(availableWidth, spacing.X);
     }
 
     private void DrawAddPair(float availableXWidth, float spacingX)
@@ -195,6 +236,207 @@ public class TopTabMenu
         UiSharedService.AttachToolTip("Pair with " + (_pairToAdd.IsNullOrEmpty() ? "other user" : _pairToAdd));
     }
 
+    private void DrawIncomingPairRequests(float availableWidth)
+    {
+        var requests = _pairRequestService.GetActiveRequests();
+        var count = requests.Count;
+        if (count == 0)
+        {
+            _pairRequestsExpanded = false;
+            _lastRequestCount = 0;
+            return;
+        }
+
+        if (count > _lastRequestCount)
+        {
+            _pairRequestsExpanded = true;
+        }
+        _lastRequestCount = count;
+
+        var label = $"Incoming Pair Requests - {count}##IncomingPairRequestsHeader";
+
+        using (ImRaii.PushColor(ImGuiCol.Header, UIColors.Get("LightlessPurple")))
+        using (ImRaii.PushColor(ImGuiCol.HeaderHovered, UIColors.Get("LightlessPurpleActive")))
+        using (ImRaii.PushColor(ImGuiCol.HeaderActive, UIColors.Get("LightlessPurple")))
+        {
+            bool open = ImGui.CollapsingHeader(label, ImGuiTreeNodeFlags.DefaultOpen);
+            _pairRequestsExpanded = open;
+
+            if (ImGui.IsItemHovered())
+                UiSharedService.AttachToolTip("Expand to view incoming pair requests.");
+
+            if (open)
+            {
+                var lineHeight = ImGui.GetTextLineHeightWithSpacing();
+                //var desiredHeight = Math.Clamp(count * lineHeight * 2f, 130f * ImGuiHelpers.GlobalScale, 185f * ImGuiHelpers.GlobalScale); we use resize bar instead
+
+                ImGui.SetCursorPosX(ImGui.GetCursorPosX() - 2f);
+
+                using (ImRaii.PushColor(ImGuiCol.ChildBg, UIColors.Get("LightlessPurple")))
+                using (ImRaii.PushStyle(ImGuiStyleVar.ChildRounding, 6f))
+                {
+                    if (ImGui.BeginChild("##IncomingPairRequestsOuter", new Vector2(availableWidth + 5f, _pairRequestsHeight), true))
+                    {
+                        var defaultChildBg = ImGui.GetStyle().Colors[(int)ImGuiCol.WindowBg];
+                        using (ImRaii.PushColor(ImGuiCol.ChildBg, defaultChildBg))
+                        using (ImRaii.PushStyle(ImGuiStyleVar.ChildRounding, 5f))
+                        using (ImRaii.PushStyle(ImGuiStyleVar.WindowPadding, new Vector2(6, 6)))
+                        {
+                            if (ImGui.BeginChild("##IncomingPairRequestsInner", new Vector2(0, 0), true))
+                            {
+                                using (ImRaii.PushColor(ImGuiCol.TableBorderStrong, ImGui.GetStyle().Colors[(int)ImGuiCol.Border]))
+                                using (ImRaii.PushColor(ImGuiCol.TableBorderLight, ImGui.GetStyle().Colors[(int)ImGuiCol.Border]))
+                                {
+                                    DrawPairRequestList(requests);
+                                }
+                            }
+                            ImGui.EndChild();
+                        }
+                    }
+                    ImGui.EndChild();
+
+                    ImGui.PushStyleColor(ImGuiCol.Button, UIColors.Get("ButtonDefault"));
+                    ImGui.PushStyleColor(ImGuiCol.ButtonHovered, UIColors.Get("LightlessPurple"));
+                    ImGui.PushStyleColor(ImGuiCol.ButtonActive, UIColors.Get("LightlessPurpleActive"));
+                    ImGui.Button("##resizeHandle", new Vector2(availableWidth, 4f));
+                    ImGui.PopStyleColor(3);
+
+                    if (ImGui.IsItemActive())
+                    {
+                        _pairRequestsHeight += ImGui.GetIO().MouseDelta.Y;
+                        _pairRequestsHeight = Math.Clamp(_pairRequestsHeight, 100f, 300f);
+                    }
+                }
+            }
+        }
+    }
+
+    private void DrawPairRequestList(IReadOnlyList<PairRequestService.PairRequestDisplay> requests)
+    {
+        float playerColWidth = 207f * ImGuiHelpers.GlobalScale;
+        float receivedColWidth = 73f * ImGuiHelpers.GlobalScale;
+        float actionsColWidth = 50f * ImGuiHelpers.GlobalScale;
+
+        ImGui.Separator();
+        ImGui.TextUnformatted("Player");
+        ImGui.SameLine(playerColWidth + 2f);
+        ImGui.TextUnformatted("Received");
+        ImGui.SameLine(playerColWidth + receivedColWidth + 12f);
+        ImGui.TextUnformatted("Actions");
+        ImGui.Separator();
+
+        foreach (var request in requests)
+        {
+            ImGui.BeginGroup();
+
+            var label = string.IsNullOrEmpty(request.DisplayName) ? request.HashedCid : request.DisplayName;
+
+            ImGui.TextUnformatted(label.Truncate(26));
+            if (ImGui.IsItemHovered())
+            {
+                ImGui.BeginTooltip();
+                ImGui.TextUnformatted(label);
+                ImGui.EndTooltip();
+            }
+
+            ImGui.SameLine(playerColWidth);
+
+            ImGui.TextUnformatted(GetRelativeTime(request.ReceivedAt));
+            ImGui.SameLine(playerColWidth + receivedColWidth);
+
+            DrawPairRequestActions(request);
+
+            ImGui.EndGroup();
+        }
+    }
+
+    private void DrawPairRequestActions(PairRequestService.PairRequestDisplay request)
+    {
+        using var id = ImRaii.PushId(request.HashedCid);
+        var label = string.IsNullOrEmpty(request.DisplayName) ? request.HashedCid : request.DisplayName;
+        var inFlight = _pendingPairRequestActions.Contains(request.HashedCid);
+        using (ImRaii.Disabled(inFlight))
+        {
+            if (_uiSharedService.IconButton(FontAwesomeIcon.Check))
+            {
+                _ = AcceptPairRequestAsync(request);
+            }
+            if (ImGui.IsItemHovered())
+                ImGui.SetTooltip("Accept request");
+
+            ImGui.SameLine();
+
+            if (_uiSharedService.IconButton(FontAwesomeIcon.Times))
+            {
+                RejectPairRequest(request.HashedCid, label);
+            }
+            if (ImGui.IsItemHovered())
+                ImGui.SetTooltip("Decline request");
+        }
+    }
+
+    private static string GetRelativeTime(DateTime receivedAt)
+    {
+        var delta = DateTime.UtcNow - receivedAt;
+        if (delta <= TimeSpan.FromSeconds(10))
+        {
+            return "Just now";
+        }
+
+        if (delta.TotalMinutes >= 1)
+        {
+            return $"{Math.Floor(delta.TotalMinutes)}m {delta.Seconds:D2}s ago";
+        }
+
+        return $"{delta.Seconds}s ago";
+    }
+
+    private async Task AcceptPairRequestAsync(PairRequestService.PairRequestDisplay request)
+    {
+        if (!_pendingPairRequestActions.Add(request.HashedCid))
+        {
+            return;
+        }
+
+        try
+        {
+            var myCidHash = (await _dalamudUtilService.GetCIDAsync().ConfigureAwait(false)).ToString().GetHash256();
+            await _apiController.TryPairWithContentId(request.HashedCid, myCidHash).ConfigureAwait(false);
+            _pairRequestService.RemoveRequest(request.HashedCid);
+
+            var display = string.IsNullOrEmpty(request.DisplayName) ? request.HashedCid : request.DisplayName;
+            _lightlessMediator.Publish(new NotificationMessage(
+                "Pair request accepted",
+                $"Sent a pair request back to {display}.",
+                NotificationType.Info,
+                TimeSpan.FromSeconds(3)));
+        }
+        catch (Exception ex)
+        {
+            _lightlessMediator.Publish(new NotificationMessage(
+                "Failed to accept pair request",
+                ex.Message,
+                NotificationType.Error,
+                TimeSpan.FromSeconds(5)));
+        }
+        finally
+        {
+            _pendingPairRequestActions.Remove(request.HashedCid);
+        }
+    }
+
+    private void RejectPairRequest(string hashedCid, string playerName)
+    {
+        if (!_pairRequestService.RemoveRequest(hashedCid))
+        {
+            return;
+        }
+
+        _lightlessMediator.Publish(new NotificationMessage("Pair request declined", "Declined " + playerName + "'s pending pair request.",
+            NotificationType.Info,
+            TimeSpan.FromSeconds(3)));
+    }
+
     private void DrawFilter(float availableWidth, float spacingX)
     {
         var buttonSize = _uiSharedService.GetIconTextButtonSize(FontAwesomeIcon.Ban, "Clear");
@@ -483,6 +725,23 @@ public class TopTabMenu
         }
     }
 
+    private void DrawLightfinderMenu(float availableWidth, float spacingX)
+    {
+        var buttonX = (availableWidth - (spacingX)) / 2f;
+
+        if (_uiSharedService.IconTextButton(FontAwesomeIcon.PersonCirclePlus, "Lightfinder", buttonX, center: true))
+        {
+            _lightlessMediator.Publish(new UiToggleMessage(typeof(BroadcastUI)));
+        }
+
+        ImGui.SameLine();
+
+        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Globe, "Syncshell Finder", buttonX, center: true))
+        {
+            _lightlessMediator.Publish(new UiToggleMessage(typeof(SyncshellFinderUI)));
+        }
+    }
+
     private void DrawUserConfig(float availableWidth, float spacingX)
     {
         var buttonX = (availableWidth - spacingX) / 2f;

LightlessSync/UI/UIColors.cs

@@ -1,26 +1,99 @@
-using System.Globalization;
+using System.Globalization;
 using System.Numerics;
+using LightlessSync.LightlessConfiguration;
 
 namespace LightlessSync.UI
 {
     internal static class UIColors
     {
-        private static readonly Dictionary<string, string> HexColors = new(StringComparer.OrdinalIgnoreCase)
+        private static readonly Dictionary<string, string> DefaultHexColors = new(StringComparer.OrdinalIgnoreCase)
         {
             { "LightlessPurple", "#ad8af5" },
-            { "LightlessBlue", "#64c7e8" },
+            { "LightlessPurpleActive", "#be9eff" },
-            { "PairBlue", "#4e98b1" },
+            { "LightlessPurpleDefault", "#9375d1" },
-            { "DimRed", "#bd0000" },
+
+            { "ButtonDefault", "#323232" },
+            { "FullBlack", "#000000" },
+
+            { "LightlessBlue", "#a6c2ff" },
+            { "LightlessYellow", "#ffe97a" },
+            { "LightlessYellow2", "#cfbd63" },
+            { "LightlessGreen", "#7cd68a" },
+            { "PairBlue", "#88a2db" },
+            { "DimRed", "#d44444" },
+
+            { "LightlessAdminText", "#ffd663" },
+            { "LightlessAdminGlow", "#b09343" },
+            { "LightlessModeratorText", "#94ffda" },
+            { "LightlessModeratorGlow", "#599c84" },
         };
 
+        private static LightlessConfigService? _configService;
+
+        public static void Initialize(LightlessConfigService configService)
+        {
+            _configService = configService;
+        }
+
         public static Vector4 Get(string name)
         {
-            if (!HexColors.TryGetValue(name, out var hex))
+            if (_configService?.Current.CustomUIColors.TryGetValue(name, out var customColorHex) == true)
+                return HexToRgba(customColorHex);
+
+            if (!DefaultHexColors.TryGetValue(name, out var hex))
                 throw new ArgumentException($"Color '{name}' not found in UIColors.");
 
             return HexToRgba(hex);
         }
 
+        public static void Set(string name, Vector4 color)
+        {
+            if (!DefaultHexColors.ContainsKey(name))
+                throw new ArgumentException($"Color '{name}' not found in UIColors.");
+
+            if (_configService != null)
+            {
+                _configService.Current.CustomUIColors[name] = RgbaToHex(color);
+                _configService.Save();
+            }
+        }
+
+        public static void Reset(string name)
+        {
+            if (_configService != null)
+            {
+                _configService.Current.CustomUIColors.Remove(name);
+                _configService.Save();
+            }
+        }
+
+        public static void ResetAll()
+        {
+            if (_configService != null)
+            {
+                _configService.Current.CustomUIColors.Clear();
+                _configService.Save();
+            }
+        }
+
+        public static Vector4 GetDefault(string name)
+        {
+            if (!DefaultHexColors.TryGetValue(name, out var hex))
+                throw new ArgumentException($"Color '{name}' not found in UIColors.");
+
+            return HexToRgba(hex);
+        }
+
+        public static bool IsCustom(string name)
+        {
+            return _configService?.Current.CustomUIColors.ContainsKey(name) == true;
+        }
+
+        public static IEnumerable<string> GetColorNames()
+        {
+            return DefaultHexColors.Keys;
+        }
+
         public static Vector4 HexToRgba(string hexColor)
         {
             hexColor = hexColor.TrimStart('#');
@@ -30,5 +103,14 @@ namespace LightlessSync.UI
             int a = hexColor.Length == 8 ? int.Parse(hexColor.Substring(6, 2), NumberStyles.HexNumber) : 255;
             return new Vector4(r / 255f, g / 255f, b / 255f, a / 255f);
         }
+
+        public static string RgbaToHex(Vector4 color)
+        {
+            int r = (int)(color.X * 255);
+            int g = (int)(color.Y * 255);
+            int b = (int)(color.Z * 255);
+            int a = (int)(color.W * 255);
+            return $"#{r:X2}{g:X2}{b:X2}{(a != 255 ? a.ToString("X2") : "")}";
+        }
     }
-}
+}

LightlessSync/UI/UISharedService.cs

@@ -1,4 +1,4 @@
-using Dalamud.Bindings.ImGui;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.GameFonts;
@@ -7,6 +7,7 @@ using Dalamud.Interface.ManagedFontAtlas;
 using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
+using System;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using Dalamud.Utility;
@@ -114,6 +115,15 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
                 SizePx = 35
             }));
         });
+
+        MediumFont = _pluginInterface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
+        {
+            e.OnPreBuild(tk => tk.AddDalamudAssetFont(Dalamud.DalamudAsset.NotoSansJpMedium, new()
+            {
+                SizePx = 22,
+            }));
+        });
+
         GameFont = _pluginInterface.UiBuilder.FontAtlas.NewGameFontHandle(new(GameFontFamilyAndSize.Axis12));
         IconFont = _pluginInterface.UiBuilder.IconFontFixedWidthHandle;
     }
@@ -133,6 +143,8 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
     public string PlayerName => _dalamudUtil.GetPlayerName();
 
     public IFontHandle UidFont { get; init; }
+    public IFontHandle MediumFont { get; init; }
+
     public Dictionary<ushort, string> WorldData => _dalamudUtil.WorldData.Value;
     public uint WorldId => _dalamudUtil.GetHomeWorldId();
 
@@ -162,12 +174,14 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
 
     public static string ByteToString(long bytes, bool addSuffix = true)
     {
-        string[] suffix = ["B", "KiB", "MiB", "GiB", "TiB"];
+        string[] suffix = { "B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
-        int i;
+        int i = 0;
         double dblSByte = bytes;
-        for (i = 0; i < suffix.Length && bytes >= 1024; i++, bytes /= 1024)
+
+        while (dblSByte >= 1000 && i < suffix.Length - 1)
         {
-            dblSByte = bytes / 1024.0;
+            dblSByte /= 1000.0;
+            i++;
         }
 
         return addSuffix ? $"{dblSByte:0.00} {suffix[i]}" : $"{dblSByte:0.00}";
@@ -394,7 +408,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
     }
 
     public static Vector4 UploadColor((long, long) data) => data.Item1 == 0 ? ImGuiColors.DalamudGrey :
-        data.Item1 == data.Item2 ? UIColors.Get("LightlessBlue") : ImGuiColors.DalamudYellow;
+        data.Item1 == data.Item2 ? UIColors.Get("LightlessBlue") : UIColors.Get("LightlessYellow");
 
     public bool ApplyNotesFromClipboard(string notes, bool overwrite)
     {
@@ -434,6 +448,159 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         FontText(text, UidFont, color);
     }
 
+    public void UnderlinedBigText(
+        string text,
+        Vector4? textColor = null,
+        Vector4? underlineColor = null,
+        float underlineThickness = 2f)
+    {
+        using var font = UidFont.Push();
+
+        var drawList = ImGui.GetWindowDrawList();
+        var textSize = ImGui.CalcTextSize(text);
+        var pos = ImGui.GetCursorScreenPos();
+        var text_color = textColor ?? ImGuiColors.DalamudWhite;
+        var line_color = underlineColor ?? text_color;
+
+        ImGui.PushStyleColor(ImGuiCol.Text, text_color);
+        ImGui.TextUnformatted(text);
+        ImGui.PopStyleColor();
+
+        var lineY = pos.Y + textSize.Y + 2f;
+        drawList.AddLine(
+            new Vector2(pos.X, lineY),
+            new Vector2(pos.X + textSize.X, lineY),
+            ImGui.GetColorU32(line_color),
+            underlineThickness * ImGuiHelpers.GlobalScale
+        );
+    }
+
+    public void ColoredSeparator(Vector4? color = null, float thickness = 1f, float indent = 0f)
+    {
+        var drawList = ImGui.GetWindowDrawList();
+        var min = ImGui.GetCursorScreenPos();
+        var max = new Vector2(min.X + ImGui.GetContentRegionAvail().X, min.Y);
+
+        min.X += indent;
+        max.X -= indent;
+
+        drawList.AddLine(
+            min,
+            new Vector2(max.X, min.Y),
+            ImGui.GetColorU32(color ?? ImGuiColors.DalamudGrey),
+            thickness * ImGuiHelpers.GlobalScale
+        );
+
+        ImGui.Dummy(new Vector2(0, thickness * ImGuiHelpers.GlobalScale));
+    }
+
+    public void RoundedSeparator(Vector4? color = null, float thickness = 2f, float indent = 0f, float rounding = 4f)
+    {
+        float scale = ImGuiHelpers.GlobalScale;
+
+        var drawList = ImGui.GetWindowDrawList();
+        var min = ImGui.GetCursorScreenPos();
+        var contentWidth = ImGui.GetContentRegionAvail().X;
+
+        min.X += indent * scale;
+        var max = new Vector2(min.X + (contentWidth - indent * 2f) * scale, min.Y + thickness * scale);
+
+        var col = ImGui.GetColorU32(color ?? ImGuiColors.DalamudGrey);
+
+
+        drawList.AddRectFilled(min, max, col, rounding);
+
+        ImGui.Dummy(new Vector2(0, thickness * scale));
+    }
+
+    public static bool CheckboxWithBorder(string label, ref bool value, Vector4? borderColor = null, float borderThickness = 1.0f, float rounding = 3.0f)
+    {
+        var pos = ImGui.GetCursorScreenPos();
+
+        bool changed = ImGui.Checkbox(label, ref value);
+
+        var min = pos;
+        var max = ImGui.GetItemRectMax();
+
+        var col = ImGui.GetColorU32(borderColor ?? ImGuiColors.DalamudGrey);
+        ImGui.GetWindowDrawList().AddRect(min, max, col, rounding, ImDrawFlags.None, borderThickness);
+
+        return changed;
+    }
+
+    public void MediumText(string text, Vector4? color = null)
+    {
+        FontText(text, MediumFont, color);
+    }
+    public void DrawNoteLine(string icon, Vector4 color, string text)
+    {
+        MediumText(icon, color);
+        var iconHeight = ImGui.GetItemRectSize().Y;
+
+        ImGui.SameLine();
+
+        float textHeight = ImGui.GetTextLineHeight();
+        float offset = (iconHeight - textHeight) * 0.5f;
+        if (offset > 0)
+            ImGui.SetCursorPosY(ImGui.GetCursorPosY() + offset);
+
+        ImGui.BeginGroup();
+        ImGui.TextWrapped(text);
+        ImGui.EndGroup();
+    }
+
+    public void DrawNoteLine(string icon, Vector4 color, ReadOnlySpan<SeStringUtils.RichTextEntry> fragments)
+    {
+        if (fragments.Length == 0)
+        {
+            DrawNoteLine(icon, color, string.Empty);
+            return;
+        }
+
+        MediumText(icon, color);
+        var iconHeight = ImGui.GetItemRectSize().Y;
+
+        ImGui.SameLine();
+
+        float textHeight = ImGui.GetTextLineHeight();
+        float offset = (iconHeight - textHeight) * 0.5f;
+        if (offset > 0)
+            ImGui.SetCursorPosY(ImGui.GetCursorPosY() + offset);
+
+        var wrapWidth = ImGui.GetContentRegionAvail().X;
+        ImGui.BeginGroup();
+        var richText = SeStringUtils.BuildRichText(fragments);
+        SeStringUtils.RenderSeStringWrapped(richText, wrapWidth);
+        ImGui.EndGroup();
+    }
+
+    public void DrawNoteLine(string icon, Vector4 color, params SeStringUtils.RichTextEntry[] fragments)
+    {
+        DrawNoteLine(icon, color, fragments.AsSpan());
+    }
+
+    public bool MediumTreeNode(string label, Vector4? textColor = null, float lineWidth = 2f, ImGuiTreeNodeFlags flags = ImGuiTreeNodeFlags.SpanAvailWidth)
+    {
+        using var font = MediumFont.Push();
+        var lineColor = textColor ?? ImGuiColors.DalamudWhite;
+
+        var textSize = ImGui.CalcTextSize(label);
+        var cursorScreen = ImGui.GetCursorScreenPos();
+        var cursorLocal = ImGui.GetCursorPos();
+
+        ImGui.GetWindowDrawList().AddLine(
+            new Vector2(cursorScreen.X, cursorScreen.Y),
+            new Vector2(cursorScreen.X, cursorScreen.Y + textSize.Y),
+            ImGui.GetColorU32(lineColor),
+            lineWidth * ImGuiHelpers.GlobalScale
+        );
+
+        ImGui.SetCursorPosX(cursorLocal.X + 6f);
+        using var color = ImRaii.PushColor(ImGuiCol.Text, lineColor);
+
+        return ImGui.TreeNodeEx(label, flags);
+    }
+
     public void BooleanToColoredIcon(bool value, bool inline = true)
     {
         using var colorgreen = ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("LightlessBlue"), value);
@@ -453,7 +620,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
 
     public void DrawCacheDirectorySetting()
     {
-        ColorTextWrapped("Note: The storage folder should be somewhere close to root (i.e. C:\\LightlessStorage) in a new empty folder. DO NOT point this to your game folder. DO NOT point this to your Penumbra folder.", ImGuiColors.DalamudYellow);
+        ColorTextWrapped("Note: The storage folder should be somewhere close to root (i.e. C:\\LightlessStorage) in a new empty folder. DO NOT point this to your game folder. DO NOT point this to your Penumbra folder.", UIColors.Get("LightlessYellow"));
         var cacheDirectory = _configService.Current.CacheFolder;
         ImGui.InputText("Storage Folder##cache", ref cacheDirectory, 255, ImGuiInputTextFlags.ReadOnly);
 
@@ -639,7 +806,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
             {
                 if (!_discordOAuthCheck.IsCompleted)
                 {
-                    ColorTextWrapped($"Checking OAuth2 compatibility with {selectedServer.ServerUri}", ImGuiColors.DalamudYellow);
+                    ColorTextWrapped($"Checking OAuth2 compatibility with {selectedServer.ServerUri}", UIColors.Get("LightlessYellow"));
                 }
                 else
                 {
@@ -730,7 +897,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
                 {
                     if (!_discordOAuthUIDs.IsCompleted)
                     {
-                        ColorTextWrapped("Checking UIDs on Server", ImGuiColors.DalamudYellow);
+                        ColorTextWrapped("Checking UIDs on Server", UIColors.Get("LightlessYellow"));
                     }
                     else
                     {
@@ -1041,11 +1208,11 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         IconText(icon, color == null ? ImGui.GetColorU32(ImGuiCol.Text) : ImGui.GetColorU32(color.Value));
     }
 
-    public bool IconTextButton(FontAwesomeIcon icon, string text, float? width = null, bool isInPopup = false)
+    public bool IconTextButton(FontAwesomeIcon icon, string text, float? width = null, bool isInPopup = false, bool? center = null)
     {
         return IconTextButtonInternal(icon, text,
             isInPopup ? ColorHelpers.RgbaUintToVector4(ImGui.GetColorU32(ImGuiCol.PopupBg)) : null,
-            width <= 0 ? null : width);
+            width <= 0 ? null : width, center);
     }
 
     public IDalamudTextureWrap LoadImage(byte[] imageData)
@@ -1085,6 +1252,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
 
         UidFont.Dispose();
         GameFont.Dispose();
+        MediumFont.Dispose();
     }
 
     private static void CenterWindow(float width, float height, ImGuiCond cond = ImGuiCond.None)
@@ -1108,7 +1276,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         ImGui.TextUnformatted(text);
     }
 
-    private bool IconTextButtonInternal(FontAwesomeIcon icon, string text, Vector4? defaultColor = null, float? width = null)
+    private bool IconTextButtonInternal(FontAwesomeIcon icon, string text, Vector4? defaultColor = null, float? width = null, bool? center = null)
     {
         int num = 0;
         if (defaultColor.HasValue)
@@ -1118,19 +1286,35 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         }
 
         ImGui.PushID(text);
+
         Vector2 vector;
         using (IconFont.Push())
             vector = ImGui.CalcTextSize(icon.ToIconString());
+
         Vector2 vector2 = ImGui.CalcTextSize(text);
         ImDrawListPtr windowDrawList = ImGui.GetWindowDrawList();
         Vector2 cursorScreenPos = ImGui.GetCursorScreenPos();
         float num2 = 3f * ImGuiHelpers.GlobalScale;
-        float x = width ?? vector.X + vector2.X + ImGui.GetStyle().FramePadding.X * 2f + num2;
+
+        float totalTextWidth = vector.X + num2 + vector2.X;
+        float x = width ?? totalTextWidth + ImGui.GetStyle().FramePadding.X * 2f;
         float frameHeight = ImGui.GetFrameHeight();
+
         bool result = ImGui.Button(string.Empty, new Vector2(x, frameHeight));
-        Vector2 pos = new Vector2(cursorScreenPos.X + ImGui.GetStyle().FramePadding.X, cursorScreenPos.Y + ImGui.GetStyle().FramePadding.Y);
+
+        bool shouldCenter = center == true;
+
+        Vector2 pos = shouldCenter
+        ? new Vector2(
+            cursorScreenPos.X + (x - totalTextWidth) / 2f,
+            cursorScreenPos.Y + (frameHeight - vector.Y) / 2f)
+        : new Vector2(
+            cursorScreenPos.X + ImGui.GetStyle().FramePadding.X,
+            cursorScreenPos.Y + ImGui.GetStyle().FramePadding.Y);
+
         using (IconFont.Push())
             windowDrawList.AddText(pos, ImGui.GetColorU32(ImGuiCol.Text), icon.ToIconString());
+
         Vector2 pos2 = new Vector2(pos.X + vector.X + num2, cursorScreenPos.Y + ImGui.GetStyle().FramePadding.Y);
         windowDrawList.AddText(pos2, ImGui.GetColorU32(ImGuiCol.Text), text);
         ImGui.PopID();

LightlessSync/Utils/AtkNodeHelpers.cs

@@ -0,0 +1,99 @@
+using FFXIVClientStructs.FFXIV.Client.System.Memory;
+using FFXIVClientStructs.FFXIV.Component.GUI;
+
+namespace LightlessSync.Utils;
+
+internal static unsafe class AtkNodeHelpers
+{
+    internal const ushort DefaultTextNodeWidth = 200;
+    internal const ushort DefaultTextNodeHeight = 14;
+
+    internal static AtkTextNode* CreateNewTextNode(AtkUnitBase* pAddon, uint nodeID)
+    {
+        if (pAddon == null) return null;
+        var pNewNode = CreateOrphanTextNode(nodeID);
+        if (pNewNode != null) AttachTextNode(pAddon, pNewNode);
+        return pNewNode;
+    }
+
+    internal static void HideNode(AtkUnitBase* pAddon, uint nodeID)
+    {
+        var pNode = GetTextNodeByID(pAddon, nodeID);
+        if (pNode != null) ((AtkResNode*)pNode)->ToggleVisibility(false);
+    }
+
+    internal static AtkTextNode* GetTextNodeByID(AtkUnitBase* pAddon, uint nodeID)
+    {
+        if (pAddon == null) return null;
+        for (var i = 0; i < pAddon->UldManager.NodeListCount; ++i)
+        {
+            if (pAddon->UldManager.NodeList[i] == null) continue;
+            if (pAddon->UldManager.NodeList[i]->NodeId == nodeID)
+            {
+                return (AtkTextNode*)pAddon->UldManager.NodeList[i];
+            }
+        }
+        return null;
+    }
+
+    internal static void AttachTextNode(AtkUnitBase* pAddon, AtkTextNode* pNode)
+    {
+        if (pAddon == null) return;
+
+        if (pNode != null)
+        {
+            var lastNode = pAddon->RootNode;
+            if (lastNode->ChildNode != null)
+            {
+                lastNode = lastNode->ChildNode;
+                while (lastNode->PrevSiblingNode != null)
+                {
+                    lastNode = lastNode->PrevSiblingNode;
+                }
+
+                pNode->AtkResNode.NextSiblingNode = lastNode;
+                pNode->AtkResNode.ParentNode = pAddon->RootNode;
+                lastNode->PrevSiblingNode = (AtkResNode*)pNode;
+            }
+            else
+            {
+                lastNode->ChildNode = (AtkResNode*)pNode;
+                pNode->AtkResNode.ParentNode = lastNode;
+            }
+
+            pAddon->UldManager.UpdateDrawNodeList();
+        }
+    }
+
+    internal static AtkTextNode* CreateOrphanTextNode(uint nodeID, TextFlags textFlags = TextFlags.Edge)
+    {
+        var pNewNode = (AtkTextNode*)IMemorySpace.GetUISpace()->Malloc((ulong)sizeof(AtkTextNode), 8);
+        if (pNewNode != null)
+        {
+            IMemorySpace.Memset(pNewNode, 0, (ulong)sizeof(AtkTextNode));
+            pNewNode->Ctor();
+
+            pNewNode->AtkResNode.Type = NodeType.Text;
+            pNewNode->AtkResNode.NodeFlags = NodeFlags.AnchorLeft | NodeFlags.AnchorTop;
+            pNewNode->AtkResNode.DrawFlags = 0;
+            pNewNode->AtkResNode.SetPositionShort(0, 0);
+            pNewNode->AtkResNode.SetWidth(DefaultTextNodeWidth);
+            pNewNode->AtkResNode.SetHeight(DefaultTextNodeHeight);
+
+            pNewNode->LineSpacing = 24;
+            pNewNode->CharSpacing = 1;
+            pNewNode->AlignmentFontType = (byte)AlignmentType.BottomLeft;
+            pNewNode->FontSize = 12;
+            pNewNode->TextFlags = textFlags;
+
+            pNewNode->AtkResNode.NodeId = nodeID;
+
+            pNewNode->AtkResNode.Color.A = 0xFF;
+            pNewNode->AtkResNode.Color.R = 0xFF;
+            pNewNode->AtkResNode.Color.G = 0xFF;
+            pNewNode->AtkResNode.Color.B = 0xFF;
+        }
+
+        return pNewNode;
+    }
+}

LightlessSync/Utils/SeStringUtils.cs

@@ -0,0 +1,239 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
+using Dalamud.Interface;
+using Dalamud.Interface.ImGuiSeStringRenderer;
+using Dalamud.Interface.Utility;
+using Lumina.Text;
+using System;
+using System.Numerics;
+using DalamudSeString = Dalamud.Game.Text.SeStringHandling.SeString;
+using DalamudSeStringBuilder = Dalamud.Game.Text.SeStringHandling.SeStringBuilder;
+using LuminaSeStringBuilder = Lumina.Text.SeStringBuilder;
+
+namespace LightlessSync.Utils;
+
+public static class SeStringUtils
+{
+    public static DalamudSeString BuildFormattedPlayerName(string text, Vector4? textColor, Vector4? glowColor)
+    {
+        var b = new DalamudSeStringBuilder();
+
+        if (glowColor is Vector4 glow)
+            b.Add(new GlowPayload(glow));
+
+        if (textColor is Vector4 color)
+            b.Add(new ColorPayload(color));
+
+        b.AddText(text ?? string.Empty);
+
+        if (textColor is not null)
+            b.Add(new ColorEndPayload());
+
+        if (glowColor is not null)
+            b.Add(new GlowEndPayload());
+
+        return b.Build();
+    }
+
+    public static DalamudSeString BuildPlain(string text)
+    {
+        var b = new DalamudSeStringBuilder();
+        b.AddText(text ?? string.Empty);
+        return b.Build();
+    }
+
+    public static DalamudSeString BuildRichText(ReadOnlySpan<RichTextEntry> fragments)
+    {
+        var builder = new LuminaSeStringBuilder();
+
+        foreach (var fragment in fragments)
+        {
+            if (string.IsNullOrEmpty(fragment.Text))
+                continue;
+
+            var hasColor = fragment.Color.HasValue;
+            Vector4 color = default;
+            if (hasColor)
+            {
+                color = fragment.Color!.Value;
+                builder.PushColorRgba(color);
+            }
+
+            if (fragment.Bold)
+                builder.AppendSetBold(true);
+
+            builder.Append(fragment.Text.AsSpan());
+
+            if (fragment.Bold)
+                builder.AppendSetBold(false);
+
+            if (hasColor)
+                builder.PopColor();
+        }
+
+        return DalamudSeString.Parse(builder.ToArray());
+    }
+
+    public static DalamudSeString BuildRichText(params RichTextEntry[] fragments) => BuildRichText(fragments.AsSpan());
+    public static void RenderSeString(DalamudSeString seString, Vector2 position, ImFontPtr? font = null, ImDrawListPtr? drawList = null)
+    {
+        drawList ??= ImGui.GetWindowDrawList();
+
+        var drawParams = new SeStringDrawParams
+        {
+            Font = font ?? UiBuilder.MonoFont,
+            Color = 0xFFFFFFFF,
+            WrapWidth = float.MaxValue,
+            TargetDrawList = drawList
+        };
+
+        ImGui.SetCursorScreenPos(position);
+        ImGuiHelpers.SeStringWrapped(seString.Encode(), drawParams);
+
+        var textSize = ImGui.CalcTextSize(seString.TextValue);
+        if (textSize.Y <= 0f)
+            textSize.Y = ImGui.GetTextLineHeight();
+
+        ImGui.Dummy(new Vector2(0f, textSize.Y));
+    }
+
+    public static void RenderSeStringWrapped(DalamudSeString seString, float wrapWidth, ImFontPtr? font = null, ImDrawListPtr? drawList = null)
+    {
+        drawList ??= ImGui.GetWindowDrawList();
+
+        var drawParams = new SeStringDrawParams
+        {
+            Font = font ?? ImGui.GetFont(),
+            Color = ImGui.GetColorU32(ImGuiCol.Text),
+            WrapWidth = wrapWidth,
+            TargetDrawList = drawList
+        };
+
+        ImGuiHelpers.SeStringWrapped(seString.Encode(), drawParams);
+
+        var calcWrapWidth = wrapWidth > 0f ? wrapWidth : -1f;
+        var textSize = ImGui.CalcTextSize(seString.TextValue, wrapWidth: calcWrapWidth);
+        if (textSize.Y <= 0f)
+            textSize.Y = ImGui.GetTextLineHeight();
+
+        ImGui.Dummy(new Vector2(0f, textSize.Y));
+    }
+    public static Vector2 RenderSeStringWithHitbox(DalamudSeString seString, Vector2 position, ImFontPtr? font = null)
+    {
+        var drawList = ImGui.GetWindowDrawList();
+
+        var drawParams = new SeStringDrawParams
+        {
+            Font = font ?? UiBuilder.MonoFont,
+            Color = 0xFFFFFFFF,
+            WrapWidth = float.MaxValue,
+            TargetDrawList = drawList
+        };
+
+        ImGui.SetCursorScreenPos(position);
+        ImGuiHelpers.SeStringWrapped(seString.Encode(), drawParams);
+
+        var textSize = ImGui.CalcTextSize(seString.TextValue);
+
+        ImGui.SetCursorScreenPos(position);
+        ImGui.InvisibleButton($"##hitbox_{Guid.NewGuid()}", textSize);
+
+        return textSize;
+    }
+
+    public static Vector2 RenderIconWithHitbox(int iconId, Vector2 position, ImFontPtr? font = null)
+    {
+        var drawList = ImGui.GetWindowDrawList();
+
+        var drawParams = new SeStringDrawParams
+        {
+            Font = font ?? UiBuilder.MonoFont,
+            Color = 0xFFFFFFFF,
+            WrapWidth = float.MaxValue,
+            TargetDrawList = drawList
+        };
+
+        var iconMacro = $"<icon({iconId})>";
+        var drawResult = ImGuiHelpers.CompileSeStringWrapped(iconMacro, drawParams);
+
+        ImGui.SetCursorScreenPos(position);
+        ImGui.InvisibleButton($"##iconHitbox_{Guid.NewGuid()}", drawResult.Size);
+
+        return drawResult.Size;
+    }
+
+    #region Internal Payloads
+
+    public readonly record struct RichTextEntry(string Text, Vector4? Color = null, bool Bold = false);
+
+    private abstract class AbstractColorPayload : Payload
+    {
+        protected byte Red { get; init; }
+        protected byte Green { get; init; }
+        protected byte Blue { get; init; }
+
+        protected override byte[] EncodeImpl()
+        {
+            return new byte[] { 0x02, ChunkType, 0x05, 0xF6, Red, Green, Blue, 0x03 };
+        }
+
+        protected override void DecodeImpl(BinaryReader reader, long endOfStream) { }
+
+        public override PayloadType Type => PayloadType.Unknown;
+        protected abstract byte ChunkType { get; }
+    }
+
+    private abstract class AbstractColorEndPayload : Payload
+    {
+        protected override byte[] EncodeImpl()
+        {
+            return new byte[] { 0x02, ChunkType, 0x02, 0xEC, 0x03 };
+        }
+
+        protected override void DecodeImpl(BinaryReader reader, long endOfStream) { }
+
+        public override PayloadType Type => PayloadType.Unknown;
+        protected abstract byte ChunkType { get; }
+    }
+
+    private class ColorPayload : AbstractColorPayload
+    {
+        protected override byte ChunkType => 0x13;
+
+        public ColorPayload(Vector3 color)
+        {
+            Red = Math.Max((byte)1, (byte)(color.X * 255f));
+            Green = Math.Max((byte)1, (byte)(color.Y * 255f));
+            Blue = Math.Max((byte)1, (byte)(color.Z * 255f));
+        }
+
+        public ColorPayload(Vector4 color) : this(new Vector3(color.X, color.Y, color.Z)) { }
+    }
+
+    private class ColorEndPayload : AbstractColorEndPayload
+    {
+        protected override byte ChunkType => 0x13;
+    }
+
+    private class GlowPayload : AbstractColorPayload
+    {
+        protected override byte ChunkType => 0x14;
+
+        public GlowPayload(Vector3 color)
+        {
+            Red = Math.Max((byte)1, (byte)(color.X * 255f));
+            Green = Math.Max((byte)1, (byte)(color.Y * 255f));
+            Blue = Math.Max((byte)1, (byte)(color.Z * 255f));
+        }
+
+        public GlowPayload(Vector4 color) : this(new Vector3(color.X, color.Y, color.Z)) { }
+    }
+
+    private class GlowEndPayload : AbstractColorEndPayload
+    {
+        protected override byte ChunkType => 0x14;
+    }
+
+    #endregion
+}

LightlessSync/Utils/UtilsEnum/LabelAlignment.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LightlessSync.UtilsEnum.Enum
+{
+    public enum LabelAlignment
+    {
+        Left,
+        Center,
+        Right,
+    }
+}

LightlessSync/WebAPI/Files/FileDownloadManager.cs

@@ -1,4 +1,4 @@
-using Dalamud.Utility;
+using Dalamud.Utility;
 using K4os.Compression.LZ4.Legacy;
 using LightlessSync.API.Data;
 using LightlessSync.API.Dto.Files;
@@ -8,6 +8,7 @@ using LightlessSync.PlayerData.Handlers;
 using LightlessSync.Services.Mediator;
 using LightlessSync.WebAPI.Files.Models;
 using Microsoft.Extensions.Logging;
+using System.Collections.Concurrent;
 using System.Net;
 using System.Net.Http.Json;
 
@@ -19,7 +20,7 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
     private readonly FileCompactor _fileCompactor;
     private readonly FileCacheManager _fileDbManager;
     private readonly FileTransferOrchestrator _orchestrator;
-    private readonly List<ThrottledStream> _activeDownloadStreams;
+    private readonly ConcurrentDictionary<ThrottledStream, byte> _activeDownloadStreams;
 
     public FileDownloadManager(ILogger<FileDownloadManager> logger, LightlessMediator mediator,
         FileTransferOrchestrator orchestrator,
@@ -29,14 +30,14 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
         _orchestrator = orchestrator;
         _fileDbManager = fileCacheManager;
         _fileCompactor = fileCompactor;
-        _activeDownloadStreams = [];
+        _activeDownloadStreams = new();
 
         Mediator.Subscribe<DownloadLimitChangedMessage>(this, (msg) =>
         {
-            if (!_activeDownloadStreams.Any()) return;
+            if (_activeDownloadStreams.IsEmpty) return;
             var newLimit = _orchestrator.DownloadLimitPerSlot();
             Logger.LogTrace("Setting new Download Speed Limit to {newLimit}", newLimit);
-            foreach (var stream in _activeDownloadStreams)
+            foreach (var stream in _activeDownloadStreams.Keys)
             {
                 stream.BandwidthLimit = newLimit;
             }
@@ -47,7 +48,7 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
 
     public List<FileTransfer> ForbiddenTransfers => _orchestrator.ForbiddenTransfers;
 
-    public bool IsDownloading => !CurrentDownloads.Any();
+    public bool IsDownloading => CurrentDownloads.Any();
 
     public static void MungeBuffer(Span<byte> buffer)
     {
@@ -84,7 +85,7 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
     protected override void Dispose(bool disposing)
     {
         ClearDownload();
-        foreach (var stream in _activeDownloadStreams.ToList())
+        foreach (var stream in _activeDownloadStreams.Keys.ToList())
         {
             try
             {
@@ -95,6 +96,10 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
                 // do nothing
                 //
             }
+            finally
+            {
+                _activeDownloadStreams.TryRemove(stream, out _);
+            }
         }
         base.Dispose(disposing);
     }
@@ -142,30 +147,64 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
 
         await WaitForDownloadReady(fileTransfer, requestId, ct).ConfigureAwait(false);
 
-        _downloadStatus[downloadGroup].DownloadStatus = DownloadStatus.Downloading;
+        if (_downloadStatus.TryGetValue(downloadGroup, out var downloadStatus))
+        {
+            downloadStatus.DownloadStatus = DownloadStatus.Downloading;
+        }
+        else
+        {
+            Logger.LogWarning("Download status missing for {group} when starting download", downloadGroup);
+        }
+
+        const int maxRetries = 3;
+        int retryCount = 0;
+        TimeSpan retryDelay = TimeSpan.FromSeconds(2);
 
         HttpResponseMessage response = null!;
         var requestUrl = LightlessFiles.CacheGetFullPath(fileTransfer[0].DownloadUri, requestId);
 
-        Logger.LogDebug("Downloading {requestUrl} for request {id}", requestUrl, requestId);
+        while (true)
-        try
         {
-            response = await _orchestrator.SendRequestAsync(HttpMethod.Get, requestUrl, ct, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
+            try
-            response.EnsureSuccessStatusCode();
-        }
-        catch (HttpRequestException ex)
-        {
-            Logger.LogWarning(ex, "Error during download of {requestUrl}, HttpStatusCode: {code}", requestUrl, ex.StatusCode);
-            if (ex.StatusCode is HttpStatusCode.NotFound or HttpStatusCode.Unauthorized)
             {
-                throw new InvalidDataException($"Http error {ex.StatusCode} (cancelled: {ct.IsCancellationRequested}): {requestUrl}", ex);
+                Logger.LogDebug("Attempt {attempt} - Downloading {requestUrl} for request {id}", retryCount + 1, requestUrl, requestId);
+
+                response = await _orchestrator.SendRequestAsync(HttpMethod.Get, requestUrl, ct, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
+                response.EnsureSuccessStatusCode();
+                break;
+            }
+            catch (HttpRequestException ex) when (ex.InnerException is TimeoutException || ex.StatusCode == null)
+            {
+                retryCount++;
+
+                Logger.LogWarning(ex, "Timeout during download of {requestUrl}. Attempt {attempt} of {maxRetries}", requestUrl, retryCount, maxRetries);
+
+                if (retryCount >= maxRetries || ct.IsCancellationRequested)
+                {
+                    Logger.LogError($"Max retries reached or cancelled. Failing download for {requestUrl}");
+                    throw;
+                }
+
+                await Task.Delay(retryDelay, ct).ConfigureAwait(false); // Wait before retrying
+            }
+            catch (HttpRequestException ex)
+            {
+                Logger.LogWarning(ex, "Error during download of {requestUrl}, HttpStatusCode: {code}", requestUrl, ex.StatusCode);
+
+                if (ex.StatusCode is HttpStatusCode.NotFound or HttpStatusCode.Unauthorized)
+                {
+                    throw new InvalidDataException($"Http error {ex.StatusCode} (cancelled: {ct.IsCancellationRequested}): {requestUrl}", ex);
+                }
+
+                throw; 
             }
         }
-
         ThrottledStream? stream = null;
+        FileStream? fileStream = null;
+
         try
         {
-            var fileStream = File.Create(tempPath);
+            fileStream = File.Create(tempPath);
             await using (fileStream.ConfigureAwait(false))
             {
                 var bufferSize = response.Content.Headers.ContentLength > 1024 * 1024 ? 65536 : 8196;
@@ -174,8 +213,11 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
                 var bytesRead = 0;
                 var limit = _orchestrator.DownloadLimitPerSlot();
                 Logger.LogTrace("Starting Download of {id} with a speed limit of {limit} to {tempPath}", requestId, limit, tempPath);
-                stream = new ThrottledStream(await response.Content.ReadAsStreamAsync(ct).ConfigureAwait(false), limit);
+
-                _activeDownloadStreams.Add(stream);
+                stream = new(await response.Content.ReadAsStreamAsync(ct).ConfigureAwait(false), limit);
+
+                _activeDownloadStreams.TryAdd(stream, 0);
+
                 while ((bytesRead = await stream.ReadAsync(buffer, ct).ConfigureAwait(false)) > 0)
                 {
                     ct.ThrowIfCancellationRequested();
@@ -194,24 +236,28 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
         {
             throw;
         }
-        catch (Exception ex)
+        catch (Exception)
         {
             try
             {
-                if (!tempPath.IsNullOrEmpty())
+                fileStream?.Close(); 
+
+                if (!string.IsNullOrEmpty(tempPath) && File.Exists(tempPath))
+                {
                     File.Delete(tempPath);
+                }
             }
             catch
             {
-                // ignore if file deletion fails
+                // Ignore errors during cleanup
             }
-            throw;
+            throw; 
         }
         finally
         {
             if (stream != null)
             {
-                _activeDownloadStreams.Remove(stream);
+                _activeDownloadStreams.TryRemove(stream, out _);
                 await stream.DisposeAsync().ConfigureAwait(false);
             }
         }
@@ -219,11 +265,28 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
 
     public async Task<List<DownloadFileTransfer>> InitiateDownloadList(GameObjectHandler gameObjectHandler, List<FileReplacementData> fileReplacement, CancellationToken ct)
     {
-        Logger.LogDebug("Download start: {id}", gameObjectHandler.Name);
+        var objectName = gameObjectHandler?.Name ?? "Unknown";
+        Logger.LogDebug("Download start: {id}", objectName);
+
+        if (fileReplacement == null || fileReplacement.Count == 0)
+        {
+            Logger.LogDebug("{dlName}: No file replacements provided", objectName);
+            CurrentDownloads = [];
+            return CurrentDownloads;
+        }
+
+        var hashes = fileReplacement.Where(f => f != null && !string.IsNullOrWhiteSpace(f.Hash)).Select(f => f.Hash).Distinct(StringComparer.Ordinal).ToList();
+
+        if (hashes.Count == 0)
+        {
+            Logger.LogDebug("{dlName}: No valid hashes to download", objectName);
+            CurrentDownloads = [];
+            return CurrentDownloads;
+        }
 
         List<DownloadFileDto> downloadFileInfoFromService =
         [
-            .. await FilesGetSizes(fileReplacement.Select(f => f.Hash).Distinct(StringComparer.Ordinal).ToList(), ct).ConfigureAwait(false),
+            .. await FilesGetSizes(hashes, ct).ConfigureAwait(false),
         ];
 
         Logger.LogDebug("Files with size 0 or less: {files}", string.Join(", ", downloadFileInfoFromService.Where(f => f.Size <= 0).Select(f => f.Hash)));
@@ -281,15 +344,23 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
             FileInfo fi = new(blockFile);
             try
             {
-                _downloadStatus[fileGroup.Key].DownloadStatus = DownloadStatus.WaitingForSlot;
+                if (!_downloadStatus.TryGetValue(fileGroup.Key, out var downloadStatus))
+                {
+                    Logger.LogWarning("Download status missing for {group}, aborting", fileGroup.Key);
+                    return;
+                }
+
+                downloadStatus.DownloadStatus = DownloadStatus.WaitingForSlot;
                 await _orchestrator.WaitForDownloadSlotAsync(token).ConfigureAwait(false);
-                _downloadStatus[fileGroup.Key].DownloadStatus = DownloadStatus.WaitingForQueue;
+                downloadStatus.DownloadStatus = DownloadStatus.WaitingForQueue;
                 Progress<long> progress = new((bytesDownloaded) =>
                 {
                     try
                     {
-                        if (!_downloadStatus.TryGetValue(fileGroup.Key, out FileDownloadStatus? value)) return;
+                        if (_downloadStatus.TryGetValue(fileGroup.Key, out FileDownloadStatus? value))
-                        value.TransferredBytes += bytesDownloaded;
+                        {
+                            value.TransferredBytes += bytesDownloaded;
+                        }
                     }
                     catch (Exception ex)
                     {
@@ -319,6 +390,12 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
                     status.TransferredFiles = 1;
                     status.DownloadStatus = DownloadStatus.Decompressing;
                 }
+                if (!File.Exists(blockFile))
+                {
+                    Logger.LogWarning("{dlName}: Block file missing before extraction, skipping", fi.Name);
+                    return;
+                }
+
                 fileBlockStream = File.OpenRead(blockFile);
                 while (fileBlockStream.Position < fileBlockStream.Length)
                 {

LightlessSync/WebAPI/Files/FileUploadManager.cs

@@ -1,4 +1,4 @@
-using LightlessSync.API.Data;
+using LightlessSync.API.Data;
 using LightlessSync.API.Dto.Files;
 using LightlessSync.API.Routes;
 using LightlessSync.FileCache;
@@ -10,6 +10,8 @@ using LightlessSync.WebAPI.Files.Models;
 using Microsoft.Extensions.Logging;
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
+using System.Collections.Concurrent;
+using System.Threading;
 
 namespace LightlessSync.WebAPI.Files;
 
@@ -19,7 +21,9 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
     private readonly LightlessConfigService _lightlessConfigService;
     private readonly FileTransferOrchestrator _orchestrator;
     private readonly ServerConfigurationManager _serverManager;
-    private readonly Dictionary<string, DateTime> _verifiedUploadedHashes = new(StringComparer.Ordinal);
+    private readonly ConcurrentDictionary<string, DateTime> _verifiedUploadedHashes = new(StringComparer.Ordinal);
+    private readonly object _currentUploadsLock = new();
+    private readonly Dictionary<string, FileTransfer> _currentUploadsByHash = new(StringComparer.Ordinal);
     private CancellationTokenSource? _uploadCancellationTokenSource = new();
 
     public FileUploadManager(ILogger<FileUploadManager> logger, LightlessMediator mediator,
@@ -40,17 +44,38 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
     }
 
     public List<FileTransfer> CurrentUploads { get; } = [];
-    public bool IsUploading => CurrentUploads.Count > 0;
+    public bool IsUploading
+    {
+        get
+        {
+            lock (_currentUploadsLock)
+            {
+                return CurrentUploads.Count > 0;
+            }
+        }
+    }
+
+    public List<FileTransfer> GetCurrentUploadsSnapshot()
+    {
+        lock (_currentUploadsLock)
+        {
+            return CurrentUploads.ToList();
+        }
+    }
 
     public bool CancelUpload()
     {
-        if (CurrentUploads.Any())
+        if (IsUploading)
         {
             Logger.LogDebug("Cancelling current upload");
             _uploadCancellationTokenSource?.Cancel();
             _uploadCancellationTokenSource?.Dispose();
             _uploadCancellationTokenSource = null;
-            CurrentUploads.Clear();
+            lock (_currentUploadsLock)
+            {
+                CurrentUploads.Clear();
+                _currentUploadsByHash.Clear();
+            }
             return true;
         }
 
@@ -69,7 +94,7 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
         Logger.LogDebug("Trying to upload files");
         var filesPresentLocally = hashesToUpload.Where(h => _fileDbManager.GetFileCacheByHash(h) != null).ToHashSet(StringComparer.Ordinal);
         var locallyMissingFiles = hashesToUpload.Except(filesPresentLocally, StringComparer.Ordinal).ToList();
-        if (locallyMissingFiles.Any())
+        if (locallyMissingFiles.Count != 0)
         {
             return locallyMissingFiles;
         }
@@ -83,22 +108,44 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
             return [.. filesToUpload.Where(f => f.IsForbidden).Select(f => f.Hash)];
         }
 
-        Task uploadTask = Task.CompletedTask;
+        var cancellationToken = ct ?? CancellationToken.None;
+        var parallelUploads = Math.Clamp(_lightlessConfigService.Current.ParallelUploads, 1, 8);
+        using SemaphoreSlim uploadSlots = new(parallelUploads, parallelUploads);
+        List<Task> uploadTasks = new();
+
         int i = 1;
         foreach (var file in filesToUpload)
         {
             progress.Report($"Uploading file {i++}/{filesToUpload.Count}. Please wait until the upload is completed.");
-            Logger.LogDebug("[{hash}] Compressing", file);
+            uploadTasks.Add(UploadSingleFileAsync(file, uploadSlots, cancellationToken));
-            var data = await _fileDbManager.GetCompressedFileData(file.Hash, ct ?? CancellationToken.None).ConfigureAwait(false);
-            Logger.LogDebug("[{hash}] Starting upload for {filePath}", data.Item1, _fileDbManager.GetFileCacheByHash(data.Item1)!.ResolvedFilepath);
-            await uploadTask.ConfigureAwait(false);
-            uploadTask = UploadFile(data.Item2, file.Hash, false, ct ?? CancellationToken.None);
-            (ct ?? CancellationToken.None).ThrowIfCancellationRequested();
         }
 
-        await uploadTask.ConfigureAwait(false);
+        await Task.WhenAll(uploadTasks).ConfigureAwait(false);
 
         return [];
+
+        async Task UploadSingleFileAsync(UploadFileDto fileDto, SemaphoreSlim gate, CancellationToken token)
+        {
+            await gate.WaitAsync(token).ConfigureAwait(false);
+            try
+            {
+                token.ThrowIfCancellationRequested();
+                Logger.LogDebug("[{hash}] Compressing", fileDto.Hash);
+                var data = await _fileDbManager.GetCompressedFileData(fileDto.Hash, token).ConfigureAwait(false);
+
+                var cacheEntry = _fileDbManager.GetFileCacheByHash(data.Item1);
+                if (cacheEntry != null)
+                {
+                    Logger.LogDebug("[{hash}] Starting upload for {filePath}", data.Item1, cacheEntry.ResolvedFilepath);
+                }
+
+                await UploadFile(data.Item2, fileDto.Hash, postProgress: false, token).ConfigureAwait(false);
+            }
+            finally
+            {
+                gate.Release();
+            }
+        }
     }
 
     public async Task<CharacterData> UploadFiles(CharacterData data, List<UserData> visiblePlayers)
@@ -167,7 +214,11 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
         _uploadCancellationTokenSource?.Cancel();
         _uploadCancellationTokenSource?.Dispose();
         _uploadCancellationTokenSource = null;
-        CurrentUploads.Clear();
+        lock (_currentUploadsLock)
+        {
+            CurrentUploads.Clear();
+            _currentUploadsByHash.Clear();
+        }
         _verifiedUploadedHashes.Clear();
     }
 
@@ -211,7 +262,17 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
         {
             try
             {
-                CurrentUploads.Single(f => string.Equals(f.Hash, fileHash, StringComparison.Ordinal)).Transferred = prog.Uploaded;
+                lock (_currentUploadsLock)
+                {
+                    if (_currentUploadsByHash.TryGetValue(fileHash, out var transfer))
+                    {
+                        transfer.Transferred = prog.Uploaded;
+                    }
+                    else
+                    {
+                        Logger.LogDebug("[{hash}] Could not find upload transfer during progress update", fileHash);
+                    }
+                }
             }
             catch (Exception ex)
             {
@@ -240,10 +301,16 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
         {
             try
             {
-                CurrentUploads.Add(new UploadFileTransfer(file)
+                var uploadTransfer = new UploadFileTransfer(file)
                 {
                     Total = new FileInfo(_fileDbManager.GetFileCacheByHash(file.Hash)!.ResolvedFilepath).Length,
-                });
+                };
+
+                lock (_currentUploadsLock)
+                {
+                    CurrentUploads.Add(uploadTransfer);
+                    _currentUploadsByHash[file.Hash] = uploadTransfer;
+                }
             }
             catch (Exception ex)
             {
@@ -264,33 +331,75 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
             _verifiedUploadedHashes[file.Hash] = DateTime.UtcNow;
         }
 
-        var totalSize = CurrentUploads.Sum(c => c.Total);
+        long totalSize;
+        List<FileTransfer> pendingUploads;
+        lock (_currentUploadsLock)
+        {
+            totalSize = CurrentUploads.Sum(c => c.Total);
+            pendingUploads = CurrentUploads.Where(f => f.CanBeTransferred && !f.IsTransferred).ToList();
+        }
+
+        var parallelUploads = Math.Clamp(_lightlessConfigService.Current.ParallelUploads, 1, 8);
+        using SemaphoreSlim uploadSlots = new(parallelUploads, parallelUploads);
         Logger.LogDebug("Compressing and uploading files");
-        Task uploadTask = Task.CompletedTask;
+        List<Task> uploadTasks = new();
-        foreach (var file in CurrentUploads.Where(f => f.CanBeTransferred && !f.IsTransferred).ToList())
+
+        foreach (var transfer in pendingUploads)
         {
-            Logger.LogDebug("[{hash}] Compressing", file);
+            uploadTasks.Add(UploadPendingFileAsync(transfer, uploadSlots, uploadToken));
-            var data = await _fileDbManager.GetCompressedFileData(file.Hash, uploadToken).ConfigureAwait(false);
-            CurrentUploads.Single(e => string.Equals(e.Hash, data.Item1, StringComparison.Ordinal)).Total = data.Item2.Length;
-            Logger.LogDebug("[{hash}] Starting upload for {filePath}", data.Item1, _fileDbManager.GetFileCacheByHash(data.Item1)!.ResolvedFilepath);
-            await uploadTask.ConfigureAwait(false);
-            uploadTask = UploadFile(data.Item2, file.Hash, true, uploadToken);
-            uploadToken.ThrowIfCancellationRequested();
         }
 
-        if (CurrentUploads.Any())
+        await Task.WhenAll(uploadTasks).ConfigureAwait(false);
-        {
-            await uploadTask.ConfigureAwait(false);
 
-            var compressedSize = CurrentUploads.Sum(c => c.Total);
+        long compressedSize;
-            Logger.LogDebug("Upload complete, compressed {size} to {compressed}", UiSharedService.ByteToString(totalSize), UiSharedService.ByteToString(compressedSize));
+        HashSet<string> uploadedHashes;
+        lock (_currentUploadsLock)
+        {
+            compressedSize = CurrentUploads.Sum(c => c.Total);
+            uploadedHashes = CurrentUploads.Select(u => u.Hash).ToHashSet(StringComparer.Ordinal);
         }
 
-        foreach (var file in unverifiedUploadHashes.Where(c => !CurrentUploads.Exists(u => string.Equals(u.Hash, c, StringComparison.Ordinal))))
+        Logger.LogDebug("Upload complete, compressed {size} to {compressed}", UiSharedService.ByteToString(totalSize), UiSharedService.ByteToString(compressedSize));
+
+        foreach (var file in unverifiedUploadHashes.Where(c => !uploadedHashes.Contains(c)))
         {
             _verifiedUploadedHashes[file] = DateTime.UtcNow;
         }
 
-        CurrentUploads.Clear();
+        lock (_currentUploadsLock)
+        {
+            CurrentUploads.Clear();
+            _currentUploadsByHash.Clear();
+        }
+
+        async Task UploadPendingFileAsync(FileTransfer transfer, SemaphoreSlim gate, CancellationToken token)
+        {
+            await gate.WaitAsync(token).ConfigureAwait(false);
+            try
+            {
+                token.ThrowIfCancellationRequested();
+                Logger.LogDebug("[{hash}] Compressing", transfer.Hash);
+                var data = await _fileDbManager.GetCompressedFileData(transfer.Hash, token).ConfigureAwait(false);
+                lock (_currentUploadsLock)
+                {
+                    if (_currentUploadsByHash.TryGetValue(data.Item1, out var trackedUpload))
+                    {
+                        trackedUpload.Total = data.Item2.Length;
+                    }
+                }
+
+                var cacheEntry = _fileDbManager.GetFileCacheByHash(data.Item1);
+                if (cacheEntry != null)
+                {
+                    Logger.LogDebug("[{hash}] Starting upload for {filePath}", data.Item1, cacheEntry.ResolvedFilepath);
+                }
+
+                await UploadFile(data.Item2, transfer.Hash, true, token).ConfigureAwait(false);
+            }
+            finally
+            {
+                gate.Release();
+            }
+        }
     }
 }

LightlessSync/WebAPI/SignalR/ApIController.Functions.Users.cs

@@ -1,5 +1,6 @@
 using LightlessSync.API.Data;
 using LightlessSync.API.Dto;
+using LightlessSync.API.Dto.Group;
 using LightlessSync.API.Dto.User;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.Logging;
@@ -34,6 +35,36 @@ public partial class ApiController
         await _lightlessHub!.SendAsync(nameof(UserAddPair), user).ConfigureAwait(false);
     }
 
+    public async Task TryPairWithContentId(string otherCid, string myCid)
+    {
+        if (!IsConnected) return;
+        await _lightlessHub!.SendAsync(nameof(TryPairWithContentId), otherCid, myCid).ConfigureAwait(false);
+    }
+
+    public async Task SetBroadcastStatus(string hashedCid, bool enabled, GroupBroadcastRequestDto? groupDto = null)
+    {
+        CheckConnection();
+        await _lightlessHub!.InvokeAsync(nameof(SetBroadcastStatus), hashedCid, enabled, groupDto).ConfigureAwait(false);
+    }
+
+    public async Task<BroadcastStatusInfoDto?> IsUserBroadcasting(string hashedCid)
+    {
+        CheckConnection();
+        return await _lightlessHub!.InvokeAsync<BroadcastStatusInfoDto?>(nameof(IsUserBroadcasting), hashedCid).ConfigureAwait(false);
+    }
+
+    public async Task<BroadcastStatusBatchDto> AreUsersBroadcasting(List<string> hashedCids)
+    {
+        CheckConnection();
+        return await _lightlessHub!.InvokeAsync<BroadcastStatusBatchDto>(nameof(AreUsersBroadcasting), hashedCids).ConfigureAwait(false);
+    }
+
+    public async Task<TimeSpan?> GetBroadcastTtl(string hashedCid)
+    {
+        CheckConnection();
+        return await _lightlessHub!.InvokeAsync<TimeSpan?>(nameof(GetBroadcastTtl), hashedCid).ConfigureAwait(false);
+    }
+
     public async Task UserDelete()
     {
         CheckConnection();
@@ -103,6 +134,12 @@ public partial class ApiController
         await _lightlessHub!.InvokeAsync(nameof(UserSetProfile), userDescription).ConfigureAwait(false);
     }
 
+    public async Task UserUpdateVanityColors(UserVanityColorsDto dto)
+    {
+        if (!IsConnected) return;
+        await _lightlessHub!.InvokeAsync(nameof(UserUpdateVanityColors), dto).ConfigureAwait(false);
+    }
+
     public async Task UserUpdateDefaultPermissions(DefaultPermissionsDto defaultPermissionsDto)
     {
         CheckConnection();

LightlessSync/WebAPI/SignalR/ApiController.Functions.Callbacks.cs

@@ -105,6 +105,21 @@ public partial class ApiController
         return Task.CompletedTask;
     }
 
+    public Task Client_ReceiveBroadcastPairRequest(UserPairNotificationDto dto)
+    {
+        if (dto == null)
+            return Task.CompletedTask;
+
+        var request = _pairRequestService.RegisterIncomingRequest(dto.myHashedCid, dto.message ?? string.Empty);
+
+        Mediator.Publish(new NotificationMessage(
+            "Pair request received",
+            request.Message,
+            NotificationType.Info,
+            TimeSpan.FromSeconds(5)));
+
+        return Task.CompletedTask;
+    }
     public Task Client_UpdateSystemInfo(SystemInfoDto systemInfo)
     {
         SystemInfoDto = systemInfo;
@@ -277,12 +292,25 @@ public partial class ApiController
         _lightlessHub!.On(nameof(Client_GroupSendInfo), act);
     }
 
+
+    public void OnGroupUpdateProfile(Action<GroupProfileDto> act)
+    {
+        if (_initialized) return;
+        _lightlessHub!.On(nameof(Client_GroupSendProfile), act);
+    }
+
     public void OnReceiveServerMessage(Action<MessageSeverity, string> act)
     {
         if (_initialized) return;
         _lightlessHub!.On(nameof(Client_ReceiveServerMessage), act);
     }
 
+    public void OnReceiveBroadcastPairRequest(Action<UserPairNotificationDto> act)
+    {
+        if (_initialized) return;
+        _lightlessHub!.On(nameof(Client_ReceiveBroadcastPairRequest), act);
+    }
+
     public void OnUpdateSystemInfo(Action<SystemInfoDto> act)
     {
         if (_initialized) return;

LightlessSync/WebAPI/SignalR/ApiController.Functions.Groups.cs

@@ -1,4 +1,5 @@
 using LightlessSync.API.Dto.Group;
+using LightlessSync.API.Dto.User;
 using LightlessSync.WebAPI.SignalR.Utils;
 using Microsoft.AspNetCore.SignalR.Client;
 
@@ -44,6 +45,11 @@ public partial class ApiController
         CheckConnection();
         await _lightlessHub!.SendAsync(nameof(GroupClear), group).ConfigureAwait(false);
     }
+    public async Task GroupClearFinder(GroupDto group)
+    {
+        CheckConnection();
+        await _lightlessHub!.SendAsync(nameof(GroupClearFinder), group).ConfigureAwait(false);
+    }
 
     public async Task<GroupJoinDto> GroupCreate()
     {
@@ -80,6 +86,11 @@ public partial class ApiController
         CheckConnection();
         return await _lightlessHub!.InvokeAsync<bool>(nameof(GroupJoinFinalize), passwordedGroup).ConfigureAwait(false);
     }
+    public async Task<GroupJoinInfoDto> GroupJoinHashed(GroupJoinHashedDto dto)
+    {
+        CheckConnection();
+        return await _lightlessHub!.InvokeAsync<GroupJoinInfoDto>("GroupJoinHashed", dto).ConfigureAwait(false);
+    }
 
     public async Task GroupLeave(GroupDto group)
     {
@@ -116,6 +127,18 @@ public partial class ApiController
         CheckConnection();
         await _lightlessHub!.SendAsync(nameof(GroupUnbanUser), groupPair).ConfigureAwait(false);
     }
+    public async Task<bool> SetGroupBroadcastStatus(GroupBroadcastRequestDto dto)
+    {
+        CheckConnection();
+        return await _lightlessHub!.InvokeAsync<bool>(nameof(SetGroupBroadcastStatus), dto).ConfigureAwait(false);
+    }
+    public async Task<List<GroupJoinDto>> GetBroadcastedGroups(List<BroadcastStatusInfoDto> broadcastEntries)
+    {
+        CheckConnection();
+        return await _lightlessHub!.InvokeAsync<List<GroupJoinDto>>(nameof(GetBroadcastedGroups), broadcastEntries)
+            .ConfigureAwait(false);
+    }
+
 
     private void CheckConnection()
     {

LightlessSync/WebAPI/SignalR/ApiController.cs

@@ -2,6 +2,7 @@
 using LightlessSync.API.Data;
 using LightlessSync.API.Data.Extensions;
 using LightlessSync.API.Dto;
+using LightlessSync.API.Dto.Group;
 using LightlessSync.API.Dto.User;
 using LightlessSync.API.SignalR;
 using LightlessSync.LightlessConfiguration;
@@ -27,6 +28,7 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
     private readonly DalamudUtilService _dalamudUtil;
     private readonly HubFactory _hubFactory;
     private readonly PairManager _pairManager;
+    private readonly PairRequestService _pairRequestService;
     private readonly ServerConfigurationManager _serverManager;
     private readonly TokenProvider _tokenProvider;
     private readonly LightlessConfigService _lightlessConfigService;
@@ -41,12 +43,13 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
     private CensusUpdateMessage? _lastCensus;
 
     public ApiController(ILogger<ApiController> logger, HubFactory hubFactory, DalamudUtilService dalamudUtil,
-        PairManager pairManager, ServerConfigurationManager serverManager, LightlessMediator mediator,
+        PairManager pairManager, PairRequestService pairRequestService, ServerConfigurationManager serverManager, LightlessMediator mediator,
         TokenProvider tokenProvider, LightlessConfigService lightlessConfigService) : base(logger, mediator)
     {
         _hubFactory = hubFactory;
         _dalamudUtil = dalamudUtil;
         _pairManager = pairManager;
+        _pairRequestService = pairRequestService;
         _serverManager = serverManager;
         _tokenProvider = tokenProvider;
         _lightlessConfigService = lightlessConfigService;
@@ -76,6 +79,10 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
     public DefaultPermissionsDto? DefaultPermissions => _connectionDto?.DefaultPreferredPermissions ?? null;
     public string DisplayName => _connectionDto?.User.AliasOrUID ?? string.Empty;
 
+    public bool HasVanity => _connectionDto?.HasVanity ?? false;
+    public string TextColorHex => _connectionDto?.TextColorHex ?? string.Empty;
+    public string TextGlowColorHex => _connectionDto?.TextGlowColorHex ?? string.Empty;
+
     public bool IsConnected => ServerState == ServerState.Connected;
 
     public bool IsCurrentVersion => (Assembly.GetExecutingAssembly().GetName().Version ?? new Version(0, 0, 0, 0)) >= (_connectionDto?.CurrentClientVersion ?? new Version(0, 0, 0, 0));
@@ -100,6 +107,8 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
 
     public string UID => _connectionDto?.User.UID ?? string.Empty;
 
+    public event Action? OnConnected;
+
     public async Task<bool> CheckClientHealth()
     {
         return await _lightlessHub!.InvokeAsync<bool>(nameof(CheckClientHealth)).ConfigureAwait(false);
@@ -230,6 +239,7 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
                 _connectionDto = await GetConnectionDto().ConfigureAwait(false);
 
                 ServerState = ServerState.Connected;
+                OnConnected?.Invoke();
 
                 var currentClientVer = Assembly.GetExecutingAssembly().GetName().Version!;
 
@@ -420,6 +430,7 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
         Logger.LogDebug("Initializing data");
         OnDownloadReady((guid) => _ = Client_DownloadReady(guid));
         OnReceiveServerMessage((sev, msg) => _ = Client_ReceiveServerMessage(sev, msg));
+        OnReceiveBroadcastPairRequest(dto => _ = Client_ReceiveBroadcastPairRequest(dto));
         OnUpdateSystemInfo((dto) => _ = Client_UpdateSystemInfo(dto));
 
         OnUserSendOffline((dto) => _ = Client_UserSendOffline(dto));
@@ -441,6 +452,7 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
         OnGroupPairLeft((dto) => _ = Client_GroupPairLeft(dto));
         OnGroupSendFullInfo((dto) => _ = Client_GroupSendFullInfo(dto));
         OnGroupSendInfo((dto) => _ = Client_GroupSendInfo(dto));
+        OnGroupUpdateProfile((dto) => _ = Client_GroupSendProfile(dto));
         OnGroupChangeUserPairPermissions((dto) => _ = Client_GroupChangeUserPairPermissions(dto));
 
         OnGposeLobbyJoin((dto) => _ = Client_GposeLobbyJoin(dto));
@@ -517,6 +529,7 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
                 return;
             }
             ServerState = ServerState.Connected;
+            OnConnected?.Invoke();
             await LoadIninitialPairsAsync().ConfigureAwait(false);
             await LoadOnlinePairsAsync().ConfigureAwait(false);
             Mediator.Publish(new ConnectedMessage(_connectionDto));
@@ -592,5 +605,20 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
 
         ServerState = state;
     }
+
+    public Task Client_GroupSendProfile(GroupProfileDto groupInfo)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<GroupProfileDto> GroupGetProfile(GroupDto dto)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task GroupSetProfile(GroupProfileDto dto)
+    {
+        throw new NotImplementedException();
+    }
 }
 #pragma warning restore MA0040

LightlessSync/packages.lock.json

@@ -4,9 +4,9 @@
     "net9.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[13.0.0, )",
+        "requested": "[13.1.0, )",
-        "resolved": "13.0.0",
+        "resolved": "13.1.0",
-        "contentHash": "Mb3cUDSK/vDPQ8gQIeuCw03EMYrej1B4J44a1AvIJ9C759p9XeqdU9Hg4WgOmlnlPe0G7ILTD32PKSUpkQNa8w=="
+        "contentHash": "XdoNhJGyFby5M/sdcRhnc5xTop9PHy+H50PTWpzLhJugjB19EDBiHD/AsiDF66RETM+0qKUdJBZrNuebn7qswQ=="
       },
       "DotNet.ReproducibleBuilds": {
         "type": "Direct",