Version bump

* Updated logos in Profile screen.

* Updated IPC calls for Petrenamer and bumped API version.

* IPC calls updated, APIVersion pushed for Moodles

* Updated version 1.11.4 in csproj

* Added Rename Tag UI for renaming of groups

.gitmodules

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

LightlessSync/FileCache/CacheMonitor.cs

@@ -383,7 +383,7 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
             scanThread.Start();
             while (scanThread.IsAlive)
             {
-                await Task.Delay(250, token).ConfigureAwait(false);
+                await Task.Delay(250).ConfigureAwait(false);
             }
             TotalFiles = 0;
             _currentFileProgress = 0;
@@ -583,14 +583,7 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
                     }
                     catch (Exception ex)
                     {
-                        if (workload != null)
-                        {
-                            Logger.LogWarning(ex, "Failed validating {path}", workload.ResolvedFilepath);
-                        }
-                        else
-                        {
-                            Logger.LogWarning(ex, "Failed validating unknown workload");
-                        }
+                        Logger.LogWarning(ex, "Failed validating {path}", workload.ResolvedFilepath);
                     }
                     Interlocked.Increment(ref _currentFileProgress);
                 }
@@ -619,7 +612,7 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
             return;
         }
 
-        if (entitiesToUpdate.Count != 0 || entitiesToRemove.Count != 0)
+        if (entitiesToUpdate.Any() || entitiesToRemove.Any())
         {
             foreach (var entity in entitiesToUpdate)
             {
@@ -654,12 +647,6 @@ 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

@@ -21,7 +21,7 @@ public sealed class FileCacheManager : IHostedService
     private readonly string _csvPath;
     private readonly ConcurrentDictionary<string, List<FileCacheEntity>> _fileCaches = new(StringComparer.Ordinal);
     private readonly SemaphoreSlim _getCachesByPathsSemaphore = new(1, 1);
-    private readonly Lock _fileWriteLock = new();
+    private readonly object _fileWriteLock = new();
     private readonly IpcManager _ipcManager;
     private readonly ILogger<FileCacheManager> _logger;
     public string CacheFolder => _configService.Current.CacheFolder;
@@ -42,7 +42,10 @@ public sealed class FileCacheManager : IHostedService
         FileInfo fi = new(path);
         if (!fi.Exists) return null;
         _logger.LogTrace("Creating cache entry for {path}", path);
-        return CreateFileEntity(_configService.Current.CacheFolder.ToLowerInvariant(), CachePrefix, fi);
+        var fullName = fi.FullName.ToLowerInvariant();
+        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)
@@ -50,14 +53,9 @@ 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(_configService.Current.CacheFolder.ToLowerInvariant(), StringComparison.Ordinal)) return null;
-        string prefixedPath = fullName.Replace(directory, prefix + "\\", StringComparison.Ordinal).Replace("\\\\", "\\", StringComparison.Ordinal);
+        if (!fullName.Contains(_ipcManager.Penumbra.ModDirectory!.ToLowerInvariant(), StringComparison.Ordinal)) return null;
+        string prefixedPath = fullName.Replace(_ipcManager.Penumbra.ModDirectory!.ToLowerInvariant(), PenumbraPrefix + "\\", StringComparison.Ordinal).Replace("\\\\", "\\", StringComparison.Ordinal);
         return CreateFileCacheEntity(fi, prefixedPath);
     }
 
@@ -68,7 +66,7 @@ public sealed class FileCacheManager : IHostedService
         List<FileCacheEntity> output = [];
         if (_fileCaches.TryGetValue(hash, out var fileCacheEntities))
         {
-            foreach (var fileCache in fileCacheEntities.Where(c => !ignoreCacheEntries || !c.IsCacheEntry).ToList())
+            foreach (var fileCache in fileCacheEntities.Where(c => ignoreCacheEntries ? !c.IsCacheEntry : true).ToList())
             {
                 if (!validate) output.Add(fileCache);
                 else
@@ -108,7 +106,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 {computedHash}, expected hash {hash}", fileCache.ResolvedFilepath, computedHash, fileCache.Hash);
+                    _logger.LogInformation("Failed to validate {file}, got hash {hash}, expected hash {hash}", fileCache.ResolvedFilepath, computedHash, fileCache.Hash);
                     brokenEntities.Add(fileCache);
                 }
             }
@@ -153,7 +151,7 @@ public sealed class FileCacheManager : IHostedService
     {
         if (_fileCaches.TryGetValue(hash, out var hashes))
         {
-            var item = hashes.OrderBy(p => p.PrefixedFilePath.Contains(PenumbraPrefix, StringComparison.Ordinal) ? 0 : 1).FirstOrDefault();
+            var item = hashes.OrderBy(p => p.PrefixedFilePath.Contains(PenumbraPrefix) ? 0 : 1).FirstOrDefault();
             if (item != null) return GetValidatedFileCache(item);
         }
         return null;
@@ -182,66 +180,37 @@ public sealed class FileCacheManager : IHostedService
 
         try
         {
-            var allEntities = _fileCaches.SelectMany(f => f.Value).ToArray();
-
-            var cacheDict = new ConcurrentDictionary<string, FileCacheEntity>(
+            var cleanedPaths = paths.Distinct(StringComparer.OrdinalIgnoreCase).ToDictionary(p => p,
+                p => p.Replace("/", "\\", StringComparison.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);
 
-            Parallel.ForEach(allEntities, entity =>
+            Dictionary<string, FileCacheEntity?> result = new(StringComparer.OrdinalIgnoreCase);
+
+            var dict = _fileCaches.SelectMany(f => f.Value)
+                .ToDictionary(d => d.PrefixedFilePath, d => d, StringComparer.OrdinalIgnoreCase);
+
+            foreach (var entry in cleanedPaths)
             {
-                cacheDict[entity.PrefixedFilePath] = entity;
-            });
+                //_logger.LogDebug("Checking {path}", entry.Value);
 
-            var cleanedPaths = new ConcurrentDictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-            var seenCleaned = new ConcurrentDictionary<string, byte>(StringComparer.OrdinalIgnoreCase);
-
-            Parallel.ForEach(paths, p =>
-            {
-                var cleaned = p.Replace("/", "\\", StringComparison.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);
-
-                if (seenCleaned.TryAdd(cleaned, 0))
-                {
-                    _logger.LogDebug("Adding to cleanedPaths: {cleaned}", cleaned);
-                    cleanedPaths[p] = cleaned;
-                }
-                else
-                {
-                    _logger.LogWarning("Duplicate found: {cleaned}", cleaned);
-                }
-            });
-
-            var result = new ConcurrentDictionary<string, FileCacheEntity?>(StringComparer.OrdinalIgnoreCase);
-
-            Parallel.ForEach(cleanedPaths, entry =>
-            {
-                _logger.LogDebug("Checking if in cache: {path}", entry.Value);
-
-                if (cacheDict.TryGetValue(entry.Value, out var entity))
+                if (dict.TryGetValue(entry.Value, out var entity))
                 {
                     var validatedCache = GetValidatedFileCache(entity);
-                    result[entry.Key] = validatedCache;
+                    result.Add(entry.Key, validatedCache);
                 }
                 else
                 {
                     if (!entry.Value.Contains(CachePrefix, StringComparison.Ordinal))
-                        result[entry.Key] = CreateFileEntry(entry.Key);
+                        result.Add(entry.Key, CreateFileEntry(entry.Key));
                     else
-                        result[entry.Key] = CreateCacheEntry(entry.Key);
+                        result.Add(entry.Key, CreateCacheEntry(entry.Key));
                 }
-            });
+            }
 
-            return new Dictionary<string, FileCacheEntity?>(result, StringComparer.OrdinalIgnoreCase);
+            return result;
         }
         finally
         {
@@ -470,7 +439,7 @@ public sealed class FileCacheManager : IHostedService
                 {
                     attempts++;
                     _logger.LogWarning(ex, "Could not open {file}, trying again", _csvPath);
-                    Task.Delay(100, cancellationToken);
+                    Thread.Sleep(100);
                 }
             }
 

LightlessSync/LightlessConfiguration/Configurations/LightlessConfig.cs

@@ -1,4 +1,4 @@
-using LightlessSync.LightlessConfiguration.Models;
+using LightlessSync.LightlessConfiguration.Models;
 using LightlessSync.UI;
 using Microsoft.Extensions.Logging;
 
@@ -15,7 +15,6 @@ 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);
@@ -43,7 +42,6 @@ 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;

LightlessSync/LightlessConfiguration/Configurations/PairTagStorage.cs

@@ -1,7 +0,0 @@
-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,7 +13,4 @@ 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/ServerTagConfig.cs

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

LightlessSync/LightlessConfiguration/Configurations/SyncshellTagStorage.cs

@@ -1,7 +0,0 @@
-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/ServerTagStorage.cs

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

LightlessSync/LightlessConfiguration/Models/SyncshellTagStorage.cs

@@ -1,8 +0,0 @@
-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/ServerTagConfigService.cs

@@ -2,11 +2,11 @@
 
 namespace LightlessSync.LightlessConfiguration;
 
-public class PairTagConfigService : ConfigurationServiceBase<PairTagStorage>
+public class ServerTagConfigService : ConfigurationServiceBase<ServerTagConfig>
 {
     public const string ConfigName = "servertags.json";
 
-    public PairTagConfigService(string configDir) : base(configDir)
+    public ServerTagConfigService(string configDir) : base(configDir)
     {
     }
 

LightlessSync/LightlessConfiguration/SyncshellTagConfigService.cs

@@ -1,14 +0,0 @@
-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,11 +1,10 @@
-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;
@@ -99,7 +98,6 @@ 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.1.0">
+<Project Sdk="Dalamud.NET.Sdk/13.0.0">
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>1.11.10</Version>
+    <Version>1.11.5</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Light-Public-Syncshells/LightlessClient</PackageProjectUrl>

LightlessSync/PlayerData/Handlers/PairHandler.cs

@@ -88,30 +88,20 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
                 _redrawOnNextApplication = true;
             }
         });
-        Mediator.Subscribe<CombatEndMessage>(this, (msg) =>
+        Mediator.Subscribe<CombatOrPerformanceEndMessage>(this, (msg) =>
         {
-            EnableSync();
+            if (IsVisible && _dataReceivedInDowntime != null)
+            {
+                ApplyCharacterData(_dataReceivedInDowntime.ApplicationId,
+                    _dataReceivedInDowntime.CharacterData, _dataReceivedInDowntime.Forced);
+                _dataReceivedInDowntime = null;
+            }
         });
-        Mediator.Subscribe<CombatStartMessage>(this, _ =>
+        Mediator.Subscribe<CombatOrPerformanceStartMessage>(this, _ =>
         {
-            DisableSync();
-        });
-        Mediator.Subscribe<PerformanceEndMessage>(this, (msg) =>
-        {
-            EnableSync();
-        });
-        Mediator.Subscribe<PerformanceStartMessage>(this, _ =>
-        {
-            DisableSync();
-        });
-        Mediator.Subscribe<InstanceOrDutyStartMessage>(this, _ =>
-        {
-           DisableSync();
-        });
-        Mediator.Subscribe<InstanceOrDutyEndMessage>(this, (msg) =>
-        {
-           EnableSync();
-
+            _dataReceivedInDowntime = null;
+            _downloadCancellationTokenSource = _downloadCancellationTokenSource?.CancelRecreate();
+            _applicationCancellationTokenSource = _applicationCancellationTokenSource?.CancelRecreate();
         });
 
         LastAppliedDataBytes = -1;
@@ -145,31 +135,11 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
 
     public void ApplyCharacterData(Guid applicationBase, CharacterData characterData, bool forceApplyCustomization = false)
     {
-        if (_dalamudUtil.IsInCombat)
+        if (_dalamudUtil.IsInCombatOrPerforming)
         {
             Mediator.Publish(new EventMessage(new Event(PlayerName, Pair.UserData, nameof(PairHandler), EventSeverity.Warning,
-                "Cannot apply character data: you are in combat, deferring application")));
-            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);
+                "Cannot apply character data: you are in combat or performing music, deferring application")));
+            Logger.LogDebug("[BASE-{appBase}] Received data but player is in combat or performing", applicationBase);
             _dataReceivedInDowntime = new(applicationBase, characterData, forceApplyCustomization);
             SetUploading(isUploading: false);
             return;
@@ -746,21 +716,4 @@ 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/Plugin.cs

@@ -130,17 +130,15 @@ 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<RenameTagUi>();
             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<PlayerPerformanceConfigService>()));
+                s.GetRequiredService<LightlessConfigService>()));
             collection.AddSingleton((s) => new DtrEntry(s.GetRequiredService<ILogger<DtrEntry>>(), dtrBar, s.GetRequiredService<LightlessConfigService>(),
-                s.GetRequiredService<LightlessMediator>(), s.GetRequiredService<PairManager>(), s.GetRequiredService<ApiController>(), s.GetRequiredService<ServerConfigurationManager>()));
+                s.GetRequiredService<LightlessMediator>(), s.GetRequiredService<PairManager>(), s.GetRequiredService<ApiController>()));
             collection.AddSingleton(s => new PairManager(s.GetRequiredService<ILogger<PairManager>>(), s.GetRequiredService<PairFactory>(),
                 s.GetRequiredService<LightlessConfigService>(), s.GetRequiredService<LightlessMediator>(), contextMenu));
             collection.AddSingleton<RedrawManager>();
@@ -177,8 +175,7 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddSingleton((s) => new LightlessConfigService(pluginInterface.ConfigDirectory.FullName));
             collection.AddSingleton((s) => new ServerConfigService(pluginInterface.ConfigDirectory.FullName));
             collection.AddSingleton((s) => new NotesConfigService(pluginInterface.ConfigDirectory.FullName));
-            collection.AddSingleton((s) => new PairTagConfigService(pluginInterface.ConfigDirectory.FullName));
-            collection.AddSingleton((s) => new SyncshellTagConfigService(pluginInterface.ConfigDirectory.FullName));
+            collection.AddSingleton((s) => new ServerTagConfigService(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));
@@ -186,8 +183,7 @@ 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<PairTagConfigService>());
-            collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<SyncshellTagConfigService>());
+            collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<ServerTagConfigService>());
             collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<TransientConfigService>());
             collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<XivDataStorageService>());
             collection.AddSingleton<IConfigService<ILightlessConfiguration>>(s => s.GetRequiredService<PlayerPerformanceConfigService>());
@@ -202,7 +198,6 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddScoped<CacheMonitor>();
             collection.AddScoped<UiFactory>();
             collection.AddScoped<SelectTagForPairUi>();
-            collection.AddScoped<SelectTagForSyncshellUi>();
             collection.AddScoped<WindowMediatorSubscriberBase, SettingsUi>();
             collection.AddScoped<WindowMediatorSubscriberBase, CompactUi>();
             collection.AddScoped<WindowMediatorSubscriberBase, IntroUi>();

LightlessSync/Services/CharaData/CharaDataManager.cs

@@ -944,7 +944,9 @@ public sealed partial class CharaDataManager : DisposableMediatorSubscriberBase
 
         Logger.LogTrace("[{appId}] Computing local missing files", applicationId);
 
-        _fileHandler.ComputeMissingFiles(charaDataDownloadDto, out Dictionary<string, string> modPaths, out List<FileReplacementData> missingFiles);
+        Dictionary<string, string> modPaths;
+        List<FileReplacementData> missingFiles;
+        _fileHandler.ComputeMissingFiles(charaDataDownloadDto, out modPaths, out missingFiles);
 
         Logger.LogTrace("[{appId}] Computing local missing files", applicationId);
 
@@ -988,7 +990,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.Count != 0)
+            if (missingFiles.Any())
             {
                 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.IsInCombat && !_dalamudUtilService.IsPerforming && !_dalamudUtilService.IsInInstance)
+        if (_charaDataConfigService.Current.NearbyDrawWisps && !_dalamudUtilService.IsInGpose && !_dalamudUtilService.IsInCombatOrPerforming)
             await _dalamudUtilService.RunOnFrameworkThread(() => ManageWispsNearby(previousPoses)).ConfigureAwait(false);
     }
 
@@ -253,7 +253,7 @@ public sealed class CharaDataNearbyManager : DisposableMediatorSubscriberBase
             return;
         }
 
-        if (!_charaDataConfigService.Current.NearbyDrawWisps || _dalamudUtilService.IsInGpose || _dalamudUtilService.IsInCombat || _dalamudUtilService.IsPerforming || _dalamudUtilService.IsInInstance)
+        if (!_charaDataConfigService.Current.NearbyDrawWisps || _dalamudUtilService.IsInGpose || _dalamudUtilService.IsInCombatOrPerforming)
             ClearAllVfx();
 
         var camera = CameraManager.Instance()->CurrentCamera;

LightlessSync/Services/DalamudUtilService.cs

@@ -39,7 +39,6 @@ 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;
@@ -53,7 +52,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, PlayerPerformanceConfigService playerPerformanceConfigService)
+        LightlessConfigService configService)
     {
         _logger = logger;
         _clientState = clientState;
@@ -67,7 +66,6 @@ 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)!
@@ -162,9 +160,7 @@ 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 IsInCombat { get; private set; } = false;
-    public bool IsPerforming { get; private set; } = false;
-    public bool IsInInstance { get; private set; } = false;
+    public bool IsInCombatOrPerforming { get; private set; } = false;
     public bool HasModifiedGameFiles => _gameData.HasModifiedGameDataFiles;
     public uint ClassJobId => _classJobId!.Value;
     public Lazy<Dictionary<uint, string>> JobData { get; private set; }
@@ -671,47 +667,19 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 Mediator.Publish(new GposeEndMessage());
             }
 
-            if ((_condition[ConditionFlag.InCombat]) && !IsInCombat && !IsInInstance && _playerPerformanceConfigService.Current.PauseInCombat)
-            { 
-                _logger.LogDebug("Combat start");
-                IsInCombat = true;
-                Mediator.Publish(new CombatStartMessage());
-                Mediator.Publish(new HaltScanMessage(nameof(IsInCombat)));
-            }
-            else if ((!_condition[ConditionFlag.InCombat]) && IsInCombat && !IsInInstance && _playerPerformanceConfigService.Current.PauseInCombat)
+            if ((_condition[ConditionFlag.Performing] || _condition[ConditionFlag.InCombat]) && !IsInCombatOrPerforming)
             {
-                _logger.LogDebug("Combat end");
-                IsInCombat = false;
-                Mediator.Publish(new CombatEndMessage());
-                Mediator.Publish(new ResumeScanMessage(nameof(IsInCombat)));
+                _logger.LogDebug("Combat/Performance start");
+                IsInCombatOrPerforming = true;
+                Mediator.Publish(new CombatOrPerformanceStartMessage());
+                Mediator.Publish(new HaltScanMessage(nameof(IsInCombatOrPerforming)));
             }
-            if (_condition[ConditionFlag.Performing] && !IsPerforming && _playerPerformanceConfigService.Current.PauseWhilePerforming)
+            else if ((!_condition[ConditionFlag.Performing] && !_condition[ConditionFlag.InCombat]) && IsInCombatOrPerforming)
             {
-                _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)));
+                _logger.LogDebug("Combat/Performance end");
+                IsInCombatOrPerforming = false;
+                Mediator.Publish(new CombatOrPerformanceEndMessage());
+                Mediator.Publish(new ResumeScanMessage(nameof(IsInCombatOrPerforming)));
             }
 
             if (_condition[ConditionFlag.WatchingCutscene] && !IsInCutscene)
@@ -767,7 +735,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 _classJobId = localPlayer.ClassJob.RowId;
             }
 
-            if (!IsInCombat || !IsPerforming || !IsInInstance)
+            if (!IsInCombatOrPerforming)
                 Mediator.Publish(new FrameworkUpdateMessage());
 
             Mediator.Publish(new PriorityFrameworkUpdateMessage());
@@ -796,7 +764,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 IsLodEnabled = lodEnabled;
             }
 
-            if (IsInCombat || IsPerforming || IsInInstance)
+            if (IsInCombatOrPerforming)
                 Mediator.Publish(new FrameworkUpdateMessage());
 
             Mediator.Publish(new DelayedFrameworkUpdateMessage());

LightlessSync/Services/Mediator/Messages.cs

@@ -79,12 +79,8 @@ public record OpenPermissionWindow(Pair Pair) : MessageBase;
 public record DownloadLimitChangedMessage() : SameThreadMessage;
 public record CensusUpdateMessage(byte Gender, byte RaceId, byte TribeId) : MessageBase;
 public record TargetPairMessage(Pair Pair) : MessageBase;
-public record CombatStartMessage : MessageBase;
-public record CombatEndMessage : MessageBase;
-public record PerformanceStartMessage : MessageBase;
-public record PerformanceEndMessage : MessageBase;
-public record InstanceOrDutyStartMessage : MessageBase;
-public record InstanceOrDutyEndMessage : MessageBase;
+public record CombatOrPerformanceStartMessage : MessageBase;
+public record CombatOrPerformanceEndMessage : MessageBase;
 public record EventMessage(Event Event) : MessageBase;
 public record PenumbraDirectoryChangedMessage(string? ModDirectory) : MessageBase;
 public record PenumbraRedrawCharacterMessage(ICharacter Character) : SameThreadMessage;

LightlessSync/Services/NameplateService.cs

@@ -17,7 +17,6 @@ public class NameplateService : DisposableMediatorSubscriberBase
     private readonly INamePlateGui _namePlateGui;
     private readonly PairManager _pairManager;
 
-
     public NameplateService(ILogger<NameplateService> logger,
         LightlessConfigService configService,
         INamePlateGui namePlateGui,
@@ -37,9 +36,11 @@ public class NameplateService : DisposableMediatorSubscriberBase
 
     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().Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue).Select(u => (ulong)u.PlayerCharacterId).ToHashSet();
         var colors = _configService.Current.NameplateColors;
+
         foreach (var handler in handlers)
         {
             var playerCharacter = handler.PlayerCharacter;
@@ -62,7 +63,6 @@ public class NameplateService : DisposableMediatorSubscriberBase
 
     public void RequestRedraw()
     {
-
         _namePlateGui.RequestRedraw();
     }
 

LightlessSync/Services/ServerConfiguration/ServerConfigurationManager.cs

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

LightlessSync/Services/UiFactory.cs

@@ -3,6 +3,7 @@ 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,6 +4,7 @@ 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/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.", UIColors.Get("LightlessYellow"), 300);
+                UiSharedService.DrawGroupedCenteredColorText("Assigning users to characters is only available in GPose.", ImGuiColors.DalamudYellow, 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", UIColors.Get("LightlessYellow"));
+                    UiSharedService.DrawGroupedCenteredColorText("No other users in current GPose lobby", ImGuiColors.DalamudYellow);
                 }
                 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.", UIColors.Get("LightlessYellow"));
+            UiSharedService.DrawGroupedCenteredColorText("Select an entry above to edit its data.", ImGuiColors.DalamudYellow);
             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.", UIColors.Get("LightlessYellow"));
+            UiSharedService.DrawGroupedCenteredColorText("Something went awfully wrong and there's no update DTO. Try updating Character Data via the button above.", ImGuiColors.DalamudYellow);
             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.", UIColors.Get("LightlessYellow"));
+                        UiSharedService.ColorTextWrapped("Updating data on server, please wait.", ImGuiColors.DalamudYellow);
                     }
                 }
 
@@ -85,7 +85,7 @@ internal sealed partial class CharaDataHubUi
                     {
                         if (_charaDataManager.UploadProgress != null)
                         {
-                            UiSharedService.ColorTextWrapped(_charaDataManager.UploadProgress.Value ?? string.Empty, UIColors.Get("LightlessYellow"));
+                            UiSharedService.ColorTextWrapped(_charaDataManager.UploadProgress.Value ?? string.Empty, ImGuiColors.DalamudYellow);
                         }
                         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.", UIColors.Get("LightlessYellow"));
+                UiSharedService.ColorTextWrapped($"You have {otherUpdates} other entries with unsaved changes.", ImGuiColors.DalamudYellow);
                 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)", UIColors.Get("LightlessYellow"));
+            UiSharedService.ColorTextWrapped("New data was set. It may contain files that require to be uploaded (will happen on Saving to server)", ImGuiColors.DalamudYellow);
         }
 
         ImGui.TextUnformatted("Contains Manipulation Data");
@@ -414,7 +414,7 @@ internal sealed partial class CharaDataHubUi
             }
         }
         ImGui.SameLine();
-        using (ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("LightlessYellow"), poseCount == maxPoses))
+        using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudYellow, 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.", UIColors.Get("LightlessYellow"));
+            UiSharedService.DrawGroupedCenteredColorText("To attach pose and world data you need to be in GPose.", ImGuiColors.DalamudYellow);
             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, UIColors.Get("LightlessYellow"));
+                _uiSharedService.IconText(FontAwesomeIcon.Plus, ImGuiColors.DalamudYellow);
                 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, UIColors.Get("LightlessYellow"));
+                _uiSharedService.IconText(FontAwesomeIcon.ExclamationTriangle, ImGuiColors.DalamudYellow);
                 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", UIColors.Get("LightlessYellow"));
+                UiSharedService.ColorText("Pose scheduled for deletion", ImGuiColors.DalamudYellow);
             }
             else
             {
@@ -669,7 +669,7 @@ internal sealed partial class CharaDataHubUi
                     var idText = entry.FullId;
                     if (uDto?.HasChanges ?? false)
                     {
-                        UiSharedService.ColorText(idText, UIColors.Get("LightlessYellow"));
+                        UiSharedService.ColorText(idText, ImGuiColors.DalamudYellow);
                         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, UIColors.Get("LightlessYellow"));
+                    _uiSharedService.IconText(eIcon, ImGuiColors.DalamudYellow);
                     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.", UIColors.Get("LightlessYellow"));
+                UiSharedService.ColorTextWrapped("You have reached the maximum Character Data entries and cannot create more.", ImGuiColors.DalamudYellow);
             }
         }
 
         if (_charaDataManager.DataCreationTask != null && !_charaDataManager.DataCreationTask.IsCompleted)
         {
-            UiSharedService.ColorTextWrapped("Creating new character data entry on server...", UIColors.Get("LightlessYellow"));
+            UiSharedService.ColorTextWrapped("Creating new character data entry on server...", ImGuiColors.DalamudYellow);
         }
         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.", UIColors.Get("LightlessYellow"));
+            UiSharedService.DrawGroupedCenteredColorText("Spawning and applying pose data is only available in GPose.", ImGuiColors.DalamudYellow);
             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.", UIColors.Get("LightlessYellow"));
+            UiSharedService.DrawGroupedCenteredColorText("No Shared World Poses found nearby.", ImGuiColors.DalamudYellow);
         }
 
         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, UIColors.Get("LightlessYellow"));
+                UiSharedService.ColorTextWrapped(_charaDataManager.DataApplicationProgress, ImGuiColors.DalamudYellow);
             }
             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.", UIColors.Get("LightlessYellow"), 350);
+            UiSharedService.DrawGroupedCenteredColorText("Applying data is only available in GPose with a valid selected GPose target.", ImGuiColors.DalamudYellow, 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.", UIColors.Get("LightlessYellow"));
+                    UiSharedService.ColorTextWrapped("You have no favorites added. Add Favorites through the other tabs before you can use this tab.", ImGuiColors.DalamudYellow);
                 }
             }
         }
@@ -644,7 +644,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase
                 ImGui.NewLine();
                 if (!_charaDataManager.DownloadMetaInfoTask?.IsCompleted ?? false)
                 {
-                    UiSharedService.ColorTextWrapped("Downloading meta info. Please wait.", UIColors.Get("LightlessYellow"));
+                    UiSharedService.ColorTextWrapped("Downloading meta info. Please wait.", ImGuiColors.DalamudYellow);
                 }
                 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.", UIColors.Get("LightlessYellow"));
+                            "If you received it from someone else have them do the same.", ImGuiColors.DalamudYellow);
                     }
                 }
                 else
                 {
-                    UiSharedService.ColorTextWrapped("Loading Character...", UIColors.Get("LightlessYellow"));
+                    UiSharedService.ColorTextWrapped("Loading Character...", ImGuiColors.DalamudYellow);
                 }
             }
         }
@@ -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.", UIColors.Get("LightlessYellow"));
+                " equipped and redraw your character before exporting.", ImGuiColors.DalamudYellow);
 
             ImGui.Unindent();
         }

LightlessSync/UI/CompactUI.cs

@@ -1,9 +1,9 @@
 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,7 +15,6 @@ 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;
@@ -31,32 +30,26 @@ 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 _selectTagForPairUi;
-    private readonly SelectTagForSyncshellUi _selectTagForSyncshellUi;
-    private readonly SelectSyncshellForTagUi _selectSyncshellForTagUi;
-    private readonly RenameSyncshellTagUi _renameSyncshellTagUi;
+    private readonly SelectTagForPairUi _selectGroupForPairUi;
     private readonly SelectPairForTagUi _selectPairsForGroupUi;
-    private readonly RenamePairTagUi _renamePairTagUi;
+    private readonly RenameTagUi _renameTagUi;
     private readonly IpcManager _ipcManager;
     private readonly ServerConfigurationManager _serverManager;
     private readonly TopTabMenu _tabMenu;
     private readonly TagHandler _tagHandler;
     private readonly UiSharedService _uiSharedService;
     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;
@@ -64,10 +57,8 @@ public class CompactUi : WindowMediatorSubscriberBase
 
     public CompactUi(ILogger<CompactUi> logger, UiSharedService uiShared, LightlessConfigService configService, 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, CharacterAnalyzer characterAnalyzer, PlayerPerformanceConfigService playerPerformanceConfig, LightlessMediator lightlessMediator)
+        TagHandler tagHandler, DrawEntityFactory drawEntityFactory, SelectTagForPairUi selectTagForPairUi, SelectPairForTagUi selectPairForTagUi, RenameTagUi renameTagUi,
+        PerformanceCollectorService performanceCollectorService, IpcManager ipcManager)
         : base(logger, mediator, "###LightlessSyncMainUI", performanceCollectorService)
     {
         _uiSharedService = uiShared;
@@ -78,16 +69,13 @@ public class CompactUi : WindowMediatorSubscriberBase
         _fileTransferManager = fileTransferManager;
         _tagHandler = tagHandler;
         _drawEntityFactory = drawEntityFactory;
-        _selectTagForPairUi = selectTagForPairUi;
-        _selectTagForSyncshellUi = selectTagForSyncshellUi;
-        _selectSyncshellForTagUi = selectSyncshellForTagUi;
-        _renameSyncshellTagUi = renameSyncshellTagUi;
+        _selectGroupForPairUi = selectTagForPairUi;
         _selectPairsForGroupUi = selectPairForTagUi;
-        _renamePairTagUi = renameTagUi;
+        _renameTagUi = renameTagUi;
         _ipcManager = ipcManager;
         _tabMenu = new TopTabMenu(Mediator, _apiController, _pairManager, _uiSharedService);
 
-        AllowPinning = true;
+        AllowPinning = false;
         AllowClickthrough = false;
         TitleBarButtons = new()
         {
@@ -123,7 +111,7 @@ public class CompactUi : WindowMediatorSubscriberBase
             }
         };
 
-        _drawFolders = [.. GetDrawFolders()];
+        _drawFolders = GetDrawFolders().ToList();
 
 #if DEBUG
         string dev = "Dev Build";
@@ -149,9 +137,6 @@ public class CompactUi : WindowMediatorSubscriberBase
             MinimumSize = new Vector2(375, 400),
             MaximumSize = new Vector2(375, 2000),
         };
-        _characterAnalyzer = characterAnalyzer;
-        _playerPerformanceConfig = playerPerformanceConfig;
-        _lightlessMediator = lightlessMediator;
     }
 
     protected override void DrawInternal()
@@ -214,12 +199,9 @@ public class CompactUi : WindowMediatorSubscriberBase
             float pairlistEnd = ImGui.GetCursorPosY();
             using (ImRaii.PushId("transfers")) DrawTransfers();
             _transferPartHeight = ImGui.GetCursorPosY() - pairlistEnd - ImGui.GetTextLineHeight();
-            using (ImRaii.PushId("group-pair-popup")) _selectPairsForGroupUi.Draw(_pairManager.DirectPairs);
-            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();
+            using (ImRaii.PushId("group-user-popup")) _selectPairsForGroupUi.Draw(_pairManager.DirectPairs);
+            using (ImRaii.PushId("group-user-edit")) _renameTagUi.Draw(_pairManager.DirectPairs);
+            using (ImRaii.PushId("grouping-popup")) _selectGroupForPairUi.Draw();
         }
 
         if (_configService.Current.OpenPopupOnAdd && _pairManager.LastAddedUser != null)
@@ -414,9 +396,6 @@ public class CompactUi : WindowMediatorSubscriberBase
     {
         var uidText = GetUidText();
 
-        //Getting information of character and triangles threshold to show overlimit status in UID bar.
-        _cachedAnalysis = _characterAnalyzer.LastAnalysis.DeepClone();
-
         using (_uiSharedService.UidFont.Push())
         {
             var uidTextSize = ImGui.CalcTextSize(uidText);
@@ -424,83 +403,24 @@ public class CompactUi : WindowMediatorSubscriberBase
             ImGui.TextColored(GetUidColor(), uidText);
         }
 
-        UiSharedService.AttachToolTip("Click to copy");
-        if (ImGui.IsItemClicked())
-        {
-            ImGui.SetClipboardText(uidText);
-        }
-
-        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();
-                        _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())
             {
                 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);
-                UiSharedService.AttachToolTip("Click to copy");
                 if (ImGui.IsItemClicked())
                 {
-                    _lightlessMediator.Publish(new UiToggleMessage(typeof(DataAnalysisUi)));
+                    ImGui.SetClipboardText(_apiController.UID);
                 }
+                UiSharedService.AttachToolTip("Click to copy");
             }
         }
         else
@@ -542,14 +462,12 @@ public class CompactUi : WindowMediatorSubscriberBase
         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.HasPairTag(u.Key.UserData.UID, tag);
+        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.HasAnyPairTag(u.Key.UserData.UID);
-        bool FilterNotTaggedSyncshells(GroupFullInfoDto group)
-            => (!_tagHandler.HasAnySyncshellTag(group.GID) && !_configService.Current.ShowGroupedSyncshellsInAll) || _configService.Current.ShowGroupedSyncshellsInAll;
+            => 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)
@@ -569,51 +487,46 @@ public class CompactUi : WindowMediatorSubscriberBase
         }
 
         List<IDrawFolder> groupFolders = new();
-
         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));
-            }
+            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, _selectSyncshellForTagUi, _renameSyncshellTagUi, ""));
+            drawFolders.Add(new DrawGroupedGroupFolder(groupFolders, _tagHandler, _uiSharedService));
         else
             drawFolders.AddRange(groupFolders);
 
-        var tags = _tagHandler.GetAllPairTagsSorted();
+        var tags = _tagHandler.GetAllTagsSorted();
         foreach (var tag in tags)
         {
             var allTagPairs = ImmutablePairList(allPairs
-                .Where(u => FilterTagUsers(u, tag)));
+                .Where(u => FilterTagusers(u, tag)));
             var filteredTagPairs = BasicSortedDictionary(filteredPairs
-                .Where(u => FilterTagUsers(u, tag) && FilterOnlineOrPausedSelf(u)));
+                .Where(u => FilterTagusers(u, tag) && FilterOnlineOrPausedSelf(u)));
 
             drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(tag, filteredTagPairs, allTagPairs));
         }
 
-        var syncshellTags = _tagHandler.GetAllSyncshellTagsSorted();
-        foreach (var syncshelltag in syncshellTags)
-        {
-            List<IDrawFolder> syncshellFolderTags = [];
-            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));
-                }
-            }
-
-            if (syncshellFolderTags.Count > 0)
-            {
-                drawFolders.Add(new DrawGroupedGroupFolder(syncshellFolderTags, _tagHandler, _uiSharedService, _selectSyncshellForTagUi, _renameSyncshellTagUi, syncshelltag));
-            }
-        }
-
         var allOnlineNotTaggedPairs = ImmutablePairList(allPairs
             .Where(FilterNotTaggedUsers));
         var onlineNotTaggedPairs = BasicSortedDictionary(filteredPairs
@@ -648,27 +561,6 @@ public class CompactUi : WindowMediatorSubscriberBase
             ImmutablePairList(allPairs.Where(u => u.Key.IsOneSidedPair))));
 
         return drawFolders;
-
-        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, group)));
-            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);
-        }
     }
 
     private string GetServerError()

LightlessSync/UI/Components/DrawFolderGroup.cs

@@ -19,18 +19,16 @@ 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, SelectTagForSyncshellUi selectTagForSyncshellUi) :
+        LightlessMediator lightlessMediator, UiSharedService uiSharedService) :
         base(id, drawPairs, allPairs, tagHandler, uiSharedService)
     {
         _groupFullInfoDto = groupFullInfoDto;
         _apiController = apiController;
         _idDisplayHandler = idDisplayHandler;
         _lightlessMediator = lightlessMediator;
-        _selectTagForSyncshellUi = selectTagForSyncshellUi;
     }
 
     protected override bool RenderIfEmpty => true;
@@ -101,13 +99,6 @@ 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);
@@ -194,7 +185,7 @@ public class DrawFolderGroup : DrawFolderBase
 
         _uiSharedService.IconText(FontAwesomeIcon.UsersCog, (_groupFullInfoDto.GroupPermissions.IsPreferDisableAnimations() != individualAnimDisabled
             || _groupFullInfoDto.GroupPermissions.IsPreferDisableSounds() != individualSoundsDisabled
-            || _groupFullInfoDto.GroupPermissions.IsPreferDisableVFX() != individualVFXDisabled) ? UIColors.Get("LightlessYellow") : null);
+            || _groupFullInfoDto.GroupPermissions.IsPreferDisableVFX() != individualVFXDisabled) ? ImGuiColors.DalamudYellow : null);
         if (ImGui.IsItemHovered())
         {
             ImGui.BeginTooltip();

LightlessSync/UI/Components/DrawFolderTag.cs

@@ -13,10 +13,10 @@ public class DrawFolderTag : DrawFolderBase
 {
     private readonly ApiController _apiController;
     private readonly SelectPairForTagUi _selectPairForTagUi;
-    private readonly RenamePairTagUi _renameTagUi;
+    private readonly RenameTagUi _renameTagUi;
 
     public DrawFolderTag(string id, IImmutableList<DrawUserPair> drawPairs, IImmutableList<Pair> allPairs,
-        TagHandler tagHandler, ApiController apiController, SelectPairForTagUi selectPairForTagUi, RenamePairTagUi renameTagUi, UiSharedService uiSharedService)
+        TagHandler tagHandler, ApiController apiController, SelectPairForTagUi selectPairForTagUi, RenameTagUi renameTagUi, UiSharedService uiSharedService)
         : base(id, drawPairs, allPairs, tagHandler, uiSharedService)
     {
         _apiController = apiController;
@@ -112,7 +112,7 @@ public class DrawFolderTag : DrawFolderBase
         }
         if (_uiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Delete Pair Group", menuWidth, isInPopup: true) && UiSharedService.CtrlPressed())
         {
-            _tagHandler.RemovePairTag(_id);
+            _tagHandler.RemoveTag(_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,20 @@ 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, SelectSyncshellForTagUi selectSyncshellForTagUi, RenameSyncshellTagUi renameSyncshellTagUi, string tag)
+    public DrawGroupedGroupFolder(IEnumerable<IDrawFolder> groups, TagHandler tagHandler, UiSharedService uiSharedService)
     {
         _groups = groups;
         _tagHandler = tagHandler;
         _uiSharedService = uiSharedService;
-        _selectSyncshellForTagUi = selectSyncshellForTagUi;
-        _renameSyncshellTagUi = renameSyncshellTagUi;
-        _tag = tag;
     }
 
     public void Draw()
@@ -37,11 +30,6 @@ public class DrawGroupedGroupFolder : IDrawFolder
         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())))
@@ -61,36 +49,18 @@ public class DrawGroupedGroupFolder : IDrawFolder
 
             ImGui.SameLine();
             ImGui.AlignTextToFramePadding();
-
-            if (_tag != "")
-            {
-                _uiSharedService.IconText(FontAwesomeIcon.FolderPlus);
-            } 
-            else
-            {
-                _uiSharedService.IconText(FontAwesomeIcon.UsersRectangle);
-            }
-
+            _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() + "]");
-                }
+            {
+                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();
-            if (_tag != "")
-            {
-                ImGui.TextUnformatted(_tag);
-
-                ImGui.SameLine();
-                DrawMenu();
-            } else
-            {
-                ImGui.TextUnformatted("All Syncshells");
-            }
+            ImGui.TextUnformatted("All Syncshells");
         }
         color.Dispose();
         _wasHovered = ImGui.IsItemHovered();
@@ -106,40 +76,4 @@ 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

@@ -196,7 +196,7 @@ public class DrawUserPair
 
         if (_pair.IsPaused)
         {
-            using var _ = ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("LightlessYellow"));
+            using var _ = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudYellow);
             _uiSharedService.IconText(FontAwesomeIcon.PauseCircle);
             userPairText = _pair.UserData.AliasOrUID + " is paused";
         }
@@ -274,7 +274,7 @@ public class DrawUserPair
         {
             ImGui.SameLine();
 
-            _uiSharedService.IconText(FontAwesomeIcon.ExclamationTriangle, UIColors.Get("LightlessYellow"));
+            _uiSharedService.IconText(FontAwesomeIcon.ExclamationTriangle, ImGuiColors.DalamudYellow);
 
             string userWarningText = "WARNING: This user exceeds one or more of your defined thresholds:" + UiSharedService.TooltipSeparator;
             bool shownVram = false;
@@ -376,7 +376,7 @@ public class DrawUserPair
                 currentRightSide -= (_uiSharedService.GetIconSize(individualIcon).X + spacingX);
 
                 ImGui.SameLine(currentRightSide);
-                using (ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("LightlessYellow"), individualAnimDisabled || individualSoundsDisabled || individualVFXDisabled))
+                using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudYellow, individualAnimDisabled || individualSoundsDisabled || individualVFXDisabled))
                     _uiSharedService.IconText(individualIcon);
                 if (ImGui.IsItemHovered())
                 {

LightlessSync/UI/Components/RenameSyncshellTagUi.cs

@@ -1,79 +0,0 @@
-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/RenameTagUi.cs

@@ -1,34 +1,36 @@
 using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
+using LightlessSync.PlayerData.Pairs;
 using LightlessSync.UI.Handlers;
 
 using System.Numerics;
 
 namespace LightlessSync.UI.Components;
 
-public class RenamePairTagUi
+public class RenameTagUi
 {
     private readonly TagHandler _tagHandler;
     private readonly UiSharedService _uiSharedService;
     private string _desiredName = string.Empty;
     private bool _opened = false;
+    private HashSet<string> _peopleInGroup = new(StringComparer.Ordinal);
     private bool _show = false;
     private string _tag = string.Empty;
 
-    public RenamePairTagUi(TagHandler tagHandler, UiSharedService uiSharedService)
+    public RenameTagUi(TagHandler tagHandler, UiSharedService uiSharedService)
     {
         _tagHandler = tagHandler;
         _uiSharedService = uiSharedService;
     }
 
-    public void Draw()
+    public void Draw(List<Pair> pairs)
     {
         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}";
+        var popupName = $"Renaming Group {_tag}";
 
         if (!_show)
         {
@@ -48,12 +50,12 @@ public class RenamePairTagUi
         {
             ImGui.TextUnformatted($"Renaming {_tag}");
 
-            ImGui.InputTextWithHint("##desiredname", "Enter new group name", ref _desiredName, 20, ImGuiInputTextFlags.None);
+            ImGui.InputTextWithHint("##desiredname", "Enter new group name", ref _desiredName, 255, ImGuiInputTextFlags.None);
             using (ImRaii.Disabled(string.IsNullOrEmpty(_desiredName)))
             {
                 if (_uiSharedService.IconTextButton(Dalamud.Interface.FontAwesomeIcon.Plus, "Rename Group"))
                 {
-                    RenameTag(_tag, _desiredName);
+                    RenameTag(pairs, _tag, _desiredName);
                     _show = false;
                 }
             }
@@ -67,13 +69,25 @@ public class RenamePairTagUi
 
     public void Open(string tag)
     {
+        _peopleInGroup = _tagHandler.GetOtherUidsForTag(tag);
         _tag = tag;
         _desiredName = "";
         _show = true;
     }
-
-    public void RenameTag(string oldTag, string newTag)
+    public void RenameTag(List<Pair> pairs, string oldTag, string newTag)
     {
-        _tagHandler.RenamePairTag(oldTag, newTag);
+        //Removal of old tag
+        _tagHandler.RemoveTag(oldTag);
+
+        //Creation of new tag and adding of old group pairs in new one.
+        _tagHandler.AddTag(newTag);
+        foreach (Pair pair in pairs)
+        {
+            var isInTag = _peopleInGroup.Contains(pair.UserData.UID);
+            if (isInTag)
+            {
+                _tagHandler.AddTagToPairedUid(pair.UserData.UID, newTag);
+            }
+        }
     }
 }

LightlessSync/UI/Components/SelectPairForTagUi.cs

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

LightlessSync/UI/Components/SelectSyncshellForTagUi.cs

@@ -1,86 +0,0 @@
-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.GetAllPairTagsSorted();
+            var tags = _tagHandler.GetAllTagsSorted();
             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, 20);
+            ImGui.InputTextWithHint("##category_name", "New Group", ref _tagNameToAdd, 40);
             if (ImGui.IsKeyDown(ImGuiKey.Enter))
             {
                 HandleAddTag();
@@ -101,13 +101,13 @@ public class SelectTagForPairUi
 
     private void DrawGroupName(Pair pair, string name)
     {
-        var hasTagBefore = _tagHandler.HasPairTag(pair.UserData.UID, name);
+        var hasTagBefore = _tagHandler.HasTag(pair.UserData.UID, name);
         var hasTag = hasTagBefore;
         if (ImGui.Checkbox(name, ref hasTag))
         {
             if (hasTag)
             {
-                _tagHandler.AddPairTagToPairedUid(pair.UserData.UID, name);
+                _tagHandler.AddTagToPairedUid(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.AddPairTag(_tagNameToAdd);
+            _tagHandler.AddTag(_tagNameToAdd);
             if (_pair != null)
             {
-                _tagHandler.AddPairTagToPairedUid(_pair.UserData.UID, _tagNameToAdd);
+                _tagHandler.AddTagToPairedUid(_pair.UserData.UID, _tagNameToAdd);
             }
             _tagNameToAdd = string.Empty;
         }

LightlessSync/UI/Components/SelectTagForSyncshellUi.cs

@@ -1,132 +0,0 @@
-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.",
-                UIColors.Get("LightlessYellow"), 800);
+                ImGuiColors.DalamudYellow, 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}", UIColors.Get("LightlessYellow"));
+            UiSharedService.ColorText($"RECORDING - Time Remaining: {_transientResourceManager.RecordTimeRemaining.Value}", ImGuiColors.DalamudYellow);
             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.", UIColors.Get("LightlessYellow"));
+            UiSharedService.DrawGroupedCenteredColorText("Please review the recorded mod files before saving and deselect files that got into the recording on accident.", ImGuiColors.DalamudYellow);
             ImGuiHelpers.ScaledDummy(5);
         }
 
@@ -485,7 +485,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
         if (isAnalyzing)
         {
             UiSharedService.ColorTextWrapped($"Analyzing {_characterAnalyzer.CurrentFile}/{_characterAnalyzer.TotalFiles}",
-                UIColors.Get("LightlessYellow"));
+                ImGuiColors.DalamudYellow);
             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",
-                    UIColors.Get("LightlessYellow"));
+                    ImGuiColors.DalamudYellow);
                 if (_uiSharedService.IconTextButton(FontAwesomeIcon.PlayCircle, "Start analysis (missing entries)"))
                 {
                     _ = _characterAnalyzer.ComputeAnalysis(print: false);
@@ -592,7 +592,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
                         {
                             UiSharedService.ColorText($"You exceed your own threshold by " +
                                 $"{UiSharedService.ByteToString(actualVramUsage - (currentVramWarning * 1024 * 1024))}.",
-                                UIColors.Get("LightlessYellow"));
+                                ImGuiColors.DalamudYellow);
                         }
                     }
                 }
@@ -609,7 +609,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
                     {
                         UiSharedService.ColorText($"You exceed your own threshold by " +
                             $"{actualTriCount - (currentTriWarning * 1000)} triangles.",
-                            UIColors.Get("LightlessYellow"));
+                            ImGuiColors.DalamudYellow);
                     }
                 }
 
@@ -629,7 +629,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(UIColors.Get("LightlessYellow")), requiresCompute);
+                    using var tabcol = ImRaii.PushColor(ImGuiCol.Tab, UiSharedService.Color(ImGuiColors.DalamudYellow), requiresCompute);
                     if (requiresCompute)
                     {
                         fileGroupText += " (!)";
@@ -668,7 +668,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
                         ImGui.Checkbox("Enable BC7 Conversion Mode", ref _enableBc7ConversionMode);
                         if (_enableBc7ConversionMode)
                         {
-                            UiSharedService.ColorText("WARNING BC7 CONVERSION:", UIColors.Get("LightlessYellow"));
+                            UiSharedService.ColorText("WARNING BC7 CONVERSION:", ImGuiColors.DalamudYellow);
                             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 +676,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."
-                                , UIColors.Get("LightlessYellow"));
+                                , ImGuiColors.DalamudYellow);
                             if (_texturesToConvert.Count > 0 && _uiSharedService.IconTextButton(FontAwesomeIcon.PlayCircle, "Start conversion of " + _texturesToConvert.Count + " texture(s)"))
                             {
                                 _conversionCancellationTokenSource = _conversionCancellationTokenSource.CancelRecreate();
@@ -697,7 +697,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
 
         ImGui.TextUnformatted("Selected file:");
         ImGui.SameLine();
-        UiSharedService.ColorText(_selectedHash, UIColors.Get("LightlessYellow"));
+        UiSharedService.ColorText(_selectedHash, ImGuiColors.DalamudYellow);
 
         if (_cachedAnalysis[_selectedObjectTab].TryGetValue(_selectedHash, out CharacterAnalyzer.FileDataEntry? item))
         {
@@ -823,8 +823,8 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
             }
             if (string.Equals(_selectedHash, item.Hash, StringComparison.Ordinal))
             {
-                ImGui.TableSetBgColor(ImGuiTableBgTarget.RowBg1, UiSharedService.Color(UIColors.Get("LightlessYellow")));
-                ImGui.TableSetBgColor(ImGuiTableBgTarget.RowBg0, UiSharedService.Color(UIColors.Get("LightlessYellow")));
+                ImGui.TableSetBgColor(ImGuiTableBgTarget.RowBg1, UiSharedService.Color(ImGuiColors.DalamudYellow));
+                ImGui.TableSetBgColor(ImGuiTableBgTarget.RowBg0, UiSharedService.Color(ImGuiColors.DalamudYellow));
             }
             ImGui.TextUnformatted(item.Hash);
             if (ImGui.IsItemClicked()) _selectedHash = item.Hash;

LightlessSync/UI/DownloadUi.cs

@@ -169,7 +169,7 @@ public class DownloadUi : WindowMediatorSubscriberBase
                 var dlProgressPercent = transferredBytes / (double)totalBytes;
                 drawList.AddRectFilled(dlBarStart,
                     dlBarEnd with { X = dlBarStart.X + (float)(dlProgressPercent * dlBarWidth) },
-                    UiSharedService.Color(UIColors.Get("LightlessPurple")));
+                    UiSharedService.Color(173, 138, 245, transparency), 1);
 
                 if (_configService.Current.TransferBarsShowText)
                 {

LightlessSync/UI/DrawEntityFactory.cs

@@ -23,25 +23,21 @@ 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 RenameTagUi _renameTagUi;
     private readonly TagHandler _tagHandler;
     private readonly IdDisplayHandler _uidDisplayHandler;
 
     public DrawEntityFactory(ILogger<DrawEntityFactory> logger, ApiController apiController, IdDisplayHandler uidDisplayHandler,
-        SelectTagForPairUi selectTagForPairUi, RenamePairTagUi renamePairTagUi, LightlessMediator mediator,
+        SelectTagForPairUi selectTagForPairUi, RenameTagUi renameTagUi, LightlessMediator mediator,
         TagHandler tagHandler, SelectPairForTagUi selectPairForTagUi,
         ServerConfigurationManager serverConfigurationManager, UiSharedService uiSharedService,
-        PlayerPerformanceConfigService playerPerformanceConfigService, CharaDataManager charaDataManager, 
-        SelectTagForSyncshellUi selectTagForSyncshellUi, RenameSyncshellTagUi renameSyncshellTagUi, SelectSyncshellForTagUi selectSyncshellForTagUi)
+        PlayerPerformanceConfigService playerPerformanceConfigService, CharaDataManager charaDataManager)
     {
         _logger = logger;
         _apiController = apiController;
         _uidDisplayHandler = uidDisplayHandler;
         _selectTagForPairUi = selectTagForPairUi;
-        _renamePairTagUi = renamePairTagUi;
+        _renameTagUi = renameTagUi;
         _mediator = mediator;
         _tagHandler = tagHandler;
         _selectPairForTagUi = selectPairForTagUi;
@@ -49,9 +45,6 @@ public class DrawEntityFactory
         _uiSharedService = uiSharedService;
         _playerPerformanceConfigService = playerPerformanceConfigService;
         _charaDataManager = charaDataManager;
-        _selectTagForSyncshellUi = selectTagForSyncshellUi;
-        _renameSyncshellTagUi = renameSyncshellTagUi;
-        _selectSyncshellForTagUi = selectSyncshellForTagUi;
     }
 
     public DrawFolderGroup CreateDrawGroupFolder(GroupFullInfoDto groupFullInfoDto,
@@ -60,16 +53,7 @@ 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, _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);
+            allPairs, _tagHandler, _uidDisplayHandler, _mediator, _uiSharedService);
     }
 
     public DrawFolderTag CreateDrawTagFolder(string tag,
@@ -77,7 +61,7 @@ public class DrawEntityFactory
         IImmutableList<Pair> allPairs)
     {
         return new(tag, filteredPairs.Select(u => CreateDrawPair(tag, u.Key, u.Value, currentGroup: null)).ToImmutableList(),
-            allPairs, _tagHandler, _apiController, _selectPairForTagUi, _renamePairTagUi, _uiSharedService);
+            allPairs, _tagHandler, _apiController, _selectPairForTagUi, _renameTagUi, _uiSharedService);
     }
 
     public DrawUserPair CreateDrawPair(string id, Pair user, List<GroupFullInfoDto> groups, GroupFullInfoDto? currentGroup)

LightlessSync/UI/DtrEntry.cs

@@ -6,9 +6,7 @@ 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;
@@ -18,7 +16,6 @@ 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;
@@ -31,7 +28,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, ServerConfigurationManager serverManager)
+    public DtrEntry(ILogger<DtrEntry> logger, IDtrBar dtrBar, ConfigurationServiceBase<LightlessConfig> configService, LightlessMediator lightlessMediator, PairManager pairManager, ApiController apiController)
     {
         _logger = logger;
         _dtrBar = dtrBar;
@@ -40,7 +37,6 @@ public sealed class DtrEntry : IDisposable, IHostedService
         _lightlessMediator = lightlessMediator;
         _pairManager = pairManager;
         _apiController = apiController;
-        _serverManager = serverManager;
     }
 
     public void Dispose()
@@ -63,7 +59,7 @@ public sealed class DtrEntry : IDisposable, IHostedService
 
     public async Task StopAsync(CancellationToken cancellationToken)
     {
-        await _cancellationTokenSource.CancelAsync().ConfigureAwait(false);
+        _cancellationTokenSource.Cancel();
         try
         {
             await _runTask!.ConfigureAwait(false);
@@ -93,43 +89,10 @@ public sealed class DtrEntry : IDisposable, IHostedService
     {
         _logger.LogTrace("Creating new DtrBar entry");
         var entry = _dtrBar.Get("Lightless Sync");
-        entry.OnClick = interactionEvent => OnClickEvent(interactionEvent);
+        entry.OnClick = _ => _lightlessMediator.Publish(new UiToggleMessage(typeof(CompactUi)));
 
         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/EventViewerUI.cs

@@ -110,7 +110,7 @@ internal class EventViewerUI : WindowMediatorSubscriberBase
         {
             ImGui.SameLine();
             ImGui.AlignTextToFramePadding();
-            UiSharedService.ColorTextWrapped("New events are available, press refresh to update", UIColors.Get("LightlessYellow"));
+            UiSharedService.ColorTextWrapped("New events are available, press refresh to update", ImGuiColors.DalamudYellow);
         }
 
         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 => UIColors.Get("LightlessYellow"),
+                    EventSeverity.Warning => ImGuiColors.DalamudYellow,
                     EventSeverity.Error => ImGuiColors.DalamudRed,
                     _ => new Vector4()
                 };

LightlessSync/UI/Handlers/IdDisplayHandler.cs

@@ -43,9 +43,9 @@ public class IdDisplayHandler
             if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
             {
                 var prevState = textIsUid;
-                if (_showIdForEntry.TryGetValue(group.GID, out bool value))
+                if (_showIdForEntry.ContainsKey(group.GID))
                 {
-                    prevState = value;
+                    prevState = _showIdForEntry[group.GID];
                 }
                 _showIdForEntry[group.GID] = !prevState;
             }

LightlessSync/UI/Handlers/TagHandler.cs

@@ -17,146 +17,61 @@ public class TagHandler
         _serverConfigurationManager = serverConfigurationManager;
     }
 
-    /// <summary>
-    /// Creation of an pair tag
-    /// </summary>
-    /// <param name="tag">Name of the tag</param>
-    public void AddPairTag(string tag) => _serverConfigurationManager.AddPairTag(tag);
+    public void AddTag(string tag)
+    {
+        _serverConfigurationManager.AddTag(tag);
+    }
 
-    /// <summary>
-    /// Creation of an syncshell tag
-    /// </summary>
-    /// <param name="tag">Name of the tag</param>
-    public void AddSyncshellTag(string tag) => _serverConfigurationManager.AddSyncshellTag(tag);
+    public void AddTagToPairedUid(string uid, string tagName)
+    {
+        _serverConfigurationManager.AddTagForUid(uid, tagName);
+    }
 
-    /// <summary>
-    /// Add pair to tag
-    /// </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() => [
+    public List<string> GetAllTagsSorted()
+    {
+        return
+        [
             .. _serverConfigurationManager.GetServerAvailablePairTags()
-                        .Order(StringComparer.OrdinalIgnoreCase)
+                        .OrderBy(s => s, StringComparer.OrdinalIgnoreCase)
 ,
         ];
+    }
 
-    /// <summary>
-    /// Get all syncshell tags
-    /// </summary>
-    public List<string> GetAllSyncshellTagsSorted() => [
-            .. _serverConfigurationManager.GetServerAvailableSyncshellTags()
-                        .Order(StringComparer.OrdinalIgnoreCase)
-,
-        ];
+    public HashSet<string> GetOtherUidsForTag(string tag)
+    {
+        return _serverConfigurationManager.GetUidsForTag(tag);
+    }
 
-    /// <summary>
-    /// Get all UIDs bound to an given tag
-    /// </summary>
-    /// <param name="name">Name of the tag</param>
-    public HashSet<string> GetOtherUidsForTag(string tag) => _serverConfigurationManager.GetUidsForPairTag(tag);
+    public bool HasAnyTag(string uid)
+    {
+        return _serverConfigurationManager.HasTags(uid);
+    }
 
-    /// <summary>
-    /// Get all syncshells bound to an given tag
-    /// </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);
+    public bool HasTag(string uid, string tagName)
+    {
+        return _serverConfigurationManager.ContainsTag(uid, 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) => _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)
+    public bool IsTagOpen(string tag)
     {
-        _serverConfigurationManager.RenamePairTag(oldName, newName);
+        return _serverConfigurationManager.ContainsOpenPairTag(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)
+    public void RemoveTag(string tag)
     {
-        _serverConfigurationManager.RenameSyncshellTag(oldName, newName);
+        _serverConfigurationManager.RemoveTag(tag);
+    }
+
+    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.", UIColors.Get("LightlessYellow"));
+                                 "If you want to use this plugin you will have to move your mods to Penumbra.", ImGuiColors.DalamudYellow);
             if (!_uiShared.DrawOtherPluginState()) return;
             ImGui.Separator();
             if (ImGui.Button("Next##toAgreement"))
@@ -172,8 +172,8 @@ public partial class IntroUi : WindowMediatorSubscriberBase
                                      "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.", 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.", UIColors.Get("LightlessYellow"));
+                                          "Otherwise on the next launch a full re-scan of the file cache database will be initiated.", 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.", ImGuiColors.DalamudYellow);
                 _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.", UIColors.Get("LightlessYellow"));
+                    "loading of other characters. It is recommended to keep it enabled. You can change this setting later anytime in the Lightless settings.", ImGuiColors.DalamudYellow);
             }
         }
         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.", UIColors.Get("LightlessYellow"), 500);
+                    "You already implicitly register using Discord, so the OAuth2 method will be cleaner and more straight-forward to use.", ImGuiColors.DalamudYellow, 500);
                 ImGuiHelpers.ScaledDummy(5);
 
                 ImGui.AlignTextToFramePadding();

LightlessSync/UI/JoinSyncshellUI.cs

@@ -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, UIColors.Get("LightlessYellow"));
+                    "- The Syncshell is at capacity or has invites disabled" + Environment.NewLine, ImGuiColors.DalamudYellow);
             }
         }
         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:", UIColors.Get("LightlessYellow"));
+                UiSharedService.ColorText("Your current preferred default Syncshell permissions deviate from the suggested permissions:", ImGuiColors.DalamudYellow);
                 if (_groupJoinInfo.GroupPermissions.IsPreferDisableSounds() != _ownPermissions.DisableGroupSounds)
                 {
                     ImGui.AlignTextToFramePadding();

LightlessSync/UI/PopoutProfileUi.cs

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

LightlessSync/UI/SettingsUi.cs

@@ -98,7 +98,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         _uiShared = uiShared;
         _nameplateService = nameplateService;
         AllowClickthrough = false;
-        AllowPinning = true;
+        AllowPinning = false;
         _validationProgress = new Progress<(int, int, FileCacheEntity)>(v => _currentProgress = v);
 
         SizeConstraints = new WindowSizeConstraints()
@@ -373,8 +373,8 @@ public class SettingsUi : WindowMediatorSubscriberBase
                     }
                     else if (!_speedTestTask.IsCompleted)
                     {
-                        UiSharedService.ColorTextWrapped("Running Speedtest to File Servers...", UIColors.Get("LightlessYellow"));
-                        UiSharedService.ColorTextWrapped("Please be patient, depending on usage and load this can take a while.", UIColors.Get("LightlessYellow"));
+                        UiSharedService.ColorTextWrapped("Running Speedtest to File Servers...", ImGuiColors.DalamudYellow);
+                        UiSharedService.ColorTextWrapped("Please be patient, depending on usage and load this can take a while.", ImGuiColors.DalamudYellow);
                         if (_uiShared.IconTextButton(FontAwesomeIcon.Ban, "Cancel speedtest"))
                         {
                             _speedTestCts?.Cancel();
@@ -393,7 +393,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                         }
                         else
                         {
-                            UiSharedService.ColorTextWrapped("Speedtest completed with no results", UIColors.Get("LightlessYellow"));
+                            UiSharedService.ColorTextWrapped("Speedtest completed with no results", ImGuiColors.DalamudYellow);
                         }
                     }
                 }
@@ -633,6 +633,25 @@ public class SettingsUi : WindowMediatorSubscriberBase
     {
         _lastTab = "FileCache";
 
+        _uiShared.UnderlinedBigText("Export MCDF", UIColors.Get("LightlessBlue"));
+
+        ImGuiHelpers.ScaledDummy(10);
+
+        UiSharedService.ColorTextWrapped("Exporting MCDF has moved.", ImGuiColors.DalamudYellow);
+        ImGuiHelpers.ScaledDummy(5);
+        UiSharedService.TextWrapped("It is now found in the Main UI under \"Your User Menu\" (");
+        ImGui.SameLine();
+        _uiShared.IconText(FontAwesomeIcon.UserCog);
+        ImGui.SameLine();
+        UiSharedService.TextWrapped(") -> \"Character Data Hub\".");
+        if (_uiShared.IconTextButton(FontAwesomeIcon.Running, "Open Lightless Character Data Hub"))
+        {
+            Mediator.Publish(new UiToggleMessage(typeof(CharaDataHubUi)));
+        }
+        UiSharedService.TextWrapped("Note: this entry will be removed in the near future. Please use the Main UI to open the Character Data Hub.");
+        ImGuiHelpers.ScaledDummy(5);
+        ImGui.Separator();
+
         _uiShared.UnderlinedBigText("Storage", UIColors.Get("LightlessBlue"));
         ImGuiHelpers.ScaledDummy(5);
 
@@ -701,7 +720,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         bool isLinux = _dalamudUtilService.IsWine;
         if (!useFileCompactor && !isLinux)
         {
-            UiSharedService.ColorTextWrapped("Hint: To free up space when using Lightless consider enabling the File Compactor", UIColors.Get("LightlessYellow"));
+            UiSharedService.ColorTextWrapped("Hint: To free up space when using Lightless consider enabling the File Compactor", ImGuiColors.DalamudYellow);
         }
         if (isLinux || !_cacheMonitor.StorageisNTFS) ImGui.BeginDisabled();
         if (ImGui.Checkbox("Use file compactor", ref useFileCompactor))
@@ -737,7 +756,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         }
         else
         {
-            UiSharedService.ColorText($"File compactor currently running ({_fileCompactor.Progress})", UIColors.Get("LightlessYellow"));
+            UiSharedService.ColorText($"File compactor currently running ({_fileCompactor.Progress})", ImGuiColors.DalamudYellow);
         }
         if (isLinux || !_cacheMonitor.StorageisNTFS)
         {
@@ -813,14 +832,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 {
                     foreach (var file in Directory.GetFiles(_configService.Current.CacheFolder))
                     {
-                        try
-                        {
-                            File.Delete(file);
-                        }
-                        catch (IOException ex)
-                        {
-                            _logger.LogWarning(ex, $"Could not delete file {file} because it is in use.");
-                        }
+                        File.Delete(file);
                     }
                 });
             }
@@ -927,7 +939,6 @@ public class SettingsUi : WindowMediatorSubscriberBase
         var preferNotesInsteadOfName = _configService.Current.PreferNotesOverNamesForVisible;
         var useFocusTarget = _configService.Current.UseFocusTarget;
         var groupUpSyncshells = _configService.Current.GroupUpSyncshells;
-        var groupedSyncshells = _configService.Current.ShowGroupedSyncshellsInAll;
         var groupInVisible = _configService.Current.ShowSyncshellUsersInVisible;
         var syncshellOfflineSeparate = _configService.Current.ShowSyncshellOfflineUsersSeparately;
 
@@ -963,98 +974,37 @@ public class SettingsUi : WindowMediatorSubscriberBase
                     _configService.Save();
                 }
 
-            }
-
-            _uiShared.ColoredSeparator(UIColors.Get("LightlessPurple"), 1.5f);
-            ImGui.TreePop();
-        }
-
-        ImGui.Separator();
-
-        if (_uiShared.MediumTreeNode("Colors", UIColors.Get("LightlessPurple")))
-        {
-            ImGui.TextUnformatted("UI Theme Colors");
-
-            var colorNames = new[]
-            {
-                ("LightlessPurple", "Lightless Purple", "Primary colors"),
-                ("LightlessBlue", "Lightless Blue", "Secondary colors"),
-                ("LightlessYellow", "Lightless Yellow", "Warning colors"),
-                ("PairBlue", "Pair Blue", "Pair UI elements"),
-                ("DimRed", "Dim Red", "Error and offline")
-            };
-
-            foreach (var (colorKey, displayName, description) in colorNames)
-            {
-                var currentColor = UIColors.Get(colorKey);
-                var colorToEdit = currentColor;
-
-                ImGui.AlignTextToFramePadding();
-
-                if (ImGui.ColorEdit4($"##color_{colorKey}", ref colorToEdit, ImGuiColorEditFlags.NoInputs | ImGuiColorEditFlags.AlphaPreviewHalf))
+                if (ImGui.Checkbox("Color-code the Server Info Bar entry according to status", ref useColorsInDtr))
                 {
-                    UIColors.Set(colorKey, colorToEdit);
+                    _configService.Current.UseColorsInDtr = useColorsInDtr;
+                    _configService.Save();
                 }
 
-                ImGui.SameLine();
-                ImGui.TextUnformatted($"{displayName} - {description}");
-
-                if (UIColors.IsCustom(colorKey))
+                using (ImRaii.Disabled(!useColorsInDtr))
                 {
-                    ImGui.SameLine();
-                    if (_uiShared.IconTextButton(FontAwesomeIcon.Undo, $"Reset {colorKey}"))
+                    using var indent2 = ImRaii.PushIndent();
+                    if (InputDtrColors("Default", ref dtrColorsDefault))
                     {
-                        UIColors.Reset(colorKey);
+                        _configService.Current.DtrColorsDefault = dtrColorsDefault;
+                        _configService.Save();
+                    }
+
+                    ImGui.SameLine();
+                    if (InputDtrColors("Not Connected", ref dtrColorsNotConnected))
+                    {
+                        _configService.Current.DtrColorsNotConnected = dtrColorsNotConnected;
+                        _configService.Save();
+                    }
+
+                    ImGui.SameLine();
+                    if (InputDtrColors("Pairs in Range", ref dtrColorsPairsInRange))
+                    {
+                        _configService.Current.DtrColorsPairsInRange = dtrColorsPairsInRange;
+                        _configService.Save();
                     }
-                    UiSharedService.AttachToolTip("Reset this color to default");
                 }
             }
 
-            ImGui.Spacing();
-            if (_uiShared.IconTextButton(FontAwesomeIcon.Undo, "Reset All Theme Colors"))
-            {
-                UIColors.ResetAll();
-            }
-            _uiShared.DrawHelpText("This will reset all theme colors to their default values");
-
-            ImGui.Spacing();
-
-            ImGui.TextUnformatted("Server Info Bar Colors");
-
-            if (ImGui.Checkbox("Color-code the Server Info Bar entry according to status", ref useColorsInDtr))
-            {
-                _configService.Current.UseColorsInDtr = useColorsInDtr;
-                _configService.Save();
-            }
-            _uiShared.DrawHelpText("This will color the Server Info Bar entry based on connection status and visible pairs.");
-
-            using (ImRaii.Disabled(!useColorsInDtr))
-            {
-                using var indent = ImRaii.PushIndent();
-                if (InputDtrColors("Default", ref dtrColorsDefault))
-                {
-                    _configService.Current.DtrColorsDefault = dtrColorsDefault;
-                    _configService.Save();
-                }
-
-                ImGui.SameLine();
-                if (InputDtrColors("Not Connected", ref dtrColorsNotConnected))
-                {
-                    _configService.Current.DtrColorsNotConnected = dtrColorsNotConnected;
-                    _configService.Save();
-                }
-
-                ImGui.SameLine();
-                if (InputDtrColors("Pairs in Range", ref dtrColorsPairsInRange))
-                {
-                    _configService.Current.DtrColorsPairsInRange = dtrColorsPairsInRange;
-                    _configService.Save();
-                }
-            }
-
-            ImGui.Spacing();
-            ImGui.TextUnformatted("Nameplate Colors");
-
             var nameColorsEnabled = _configService.Current.IsNameplateColorsEnabled;
             var nameColors = _configService.Current.NameplateColors;
             var isFriendOverride = _configService.Current.overrideFriendColor;
@@ -1066,7 +1016,6 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 _configService.Save();
                 _nameplateService.RequestRedraw();
             }
-            _uiShared.DrawHelpText("This will override the nameplate colors for visible paired players in-game.");
 
             using (ImRaii.Disabled(!nameColorsEnabled))
             {
@@ -1145,14 +1094,6 @@ public class SettingsUi : WindowMediatorSubscriberBase
             }
             _uiShared.DrawHelpText("This will group up all Syncshells in a special 'All Syncshells' folder in the main UI.");
 
-            if (ImGui.Checkbox("Show grouped syncshells in main screen/all syncshells", ref groupedSyncshells))
-            {
-                _configService.Current.ShowGroupedSyncshellsInAll = groupedSyncshells;
-                _configService.Save();
-                Mediator.Publish(new RefreshUiMessage());
-            }
-            _uiShared.DrawHelpText("This will show grouped syncshells in main screen or group 'All Syncshells'.");
-
             if (ImGui.Checkbox("Show player name for visible players", ref showNameInsteadOfNotes))
             {
                 _configService.Current.ShowCharacterNameInsteadOfNotesForVisible = showNameInsteadOfNotes;
@@ -1178,6 +1119,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 _configService.Current.UseFocusTarget = useFocusTarget;
                 _configService.Save();
             }
+
             _uiShared.ColoredSeparator(UIColors.Get("LightlessPurple"), 1.5f);
             ImGui.TreePop();
         }
@@ -1376,34 +1318,9 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
         bool autoPause = _playerPerformanceConfigService.Current.AutoPausePlayersExceedingThresholds;
         bool autoPauseEveryone = _playerPerformanceConfigService.Current.AutoPausePlayersWithPreferredPermissionsExceedingThresholds;
-        bool autoPauseInDuty = _playerPerformanceConfigService.Current.PauseInInstanceDuty;
-        bool autoPauseInCombat = _playerPerformanceConfigService.Current.PauseInCombat;
-        bool autoPauseWhilePerforming = _playerPerformanceConfigService.Current.PauseWhilePerforming;
 
         if (_uiShared.MediumTreeNode("Auto Pause", UIColors.Get("LightlessPurple")))
         {
-            if (ImGui.Checkbox("Auto pause sync while combat", ref autoPauseInCombat))
-            {
-                _playerPerformanceConfigService.Current.PauseInCombat = autoPauseInCombat;
-                _playerPerformanceConfigService.Save();
-            }
-            _uiShared.DrawHelpText("AUTO-ENABLED: Your risk of crashing during a fight increases when this is disabled. For example: VFX mods Loading mid fight can cause a crash." + Environment.NewLine
-                + UiSharedService.TooltipSeparator + "WARNING: DISABLE AT YOUR OWN RISK.");
-            if (ImGui.Checkbox("Auto pause sync while in Perfomance as Bard", ref autoPauseWhilePerforming))
-            {
-                _playerPerformanceConfigService.Current.PauseWhilePerforming = autoPauseWhilePerforming;
-                _playerPerformanceConfigService.Save();
-            }
-            _uiShared.DrawHelpText("AUTO-ENABLED: Your risk of crashing during a performance increases when this is disabled. For example: Some mods can crash you mid performance" + Environment.NewLine
-                + UiSharedService.TooltipSeparator + "WARNING: DISABLE AT YOUR OWN RISK.");
-            if (ImGui.Checkbox("Auto pause sync while in instances and duties", ref autoPauseInDuty))
-            {
-                _playerPerformanceConfigService.Current.PauseInInstanceDuty = autoPauseInDuty;
-                _playerPerformanceConfigService.Save();
-            }
-            _uiShared.DrawHelpText("When enabled, it will automatically pause all players while you are in an instance, such as a dungeon or raid." + Environment.NewLine
-                + UiSharedService.TooltipSeparator + "Warning: You may have to leave the dungeon to resync with people again");
-
             if (ImGui.Checkbox("Automatically pause players exceeding thresholds", ref autoPause))
             {
                 _playerPerformanceConfigService.Current.AutoPausePlayersExceedingThresholds = autoPause;
@@ -1627,7 +1544,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         var selectedServer = _serverConfigurationManager.GetServerByIndex(idx);
         if (selectedServer == _serverConfigurationManager.CurrentServer)
         {
-            UiSharedService.ColorTextWrapped("For any changes to be applied to the current service you need to reconnect to the service.", UIColors.Get("LightlessYellow"));
+            UiSharedService.ColorTextWrapped("For any changes to be applied to the current service you need to reconnect to the service.", ImGuiColors.DalamudYellow);
         }
 
         bool useOauth = selectedServer.UseOAuth2;
@@ -1639,7 +1556,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 if (selectedServer.SecretKeys.Any() || useOauth)
                 {
                     UiSharedService.ColorTextWrapped("Characters listed here will automatically connect to the selected Lightless service with the settings as provided below." +
-                        " Make sure to enter the character names correctly or use the 'Add current character' button at the bottom.", UIColors.Get("LightlessYellow"));
+                        " Make sure to enter the character names correctly or use the 'Add current character' button at the bottom.", ImGuiColors.DalamudYellow);
                     int i = 0;
                     _uiShared.DrawUpdateOAuthUIDsButton(selectedServer);
 
@@ -1660,14 +1577,14 @@ public class SettingsUi : WindowMediatorSubscriberBase
                             }
                             if (_secretKeysConversionTask != null && !_secretKeysConversionTask.IsCompleted)
                             {
-                                UiSharedService.ColorTextWrapped("Converting Secret Keys to UIDs", UIColors.Get("LightlessYellow"));
+                                UiSharedService.ColorTextWrapped("Converting Secret Keys to UIDs", ImGuiColors.DalamudYellow);
                             }
                             if (_secretKeysConversionTask != null && _secretKeysConversionTask.IsCompletedSuccessfully)
                             {
                                 Vector4? textColor = null;
                                 if (_secretKeysConversionTask.Result.PartialSuccess)
                                 {
-                                    textColor = UIColors.Get("LightlessYellow");
+                                    textColor = ImGuiColors.DalamudYellow;
                                 }
                                 if (!_secretKeysConversionTask.Result.Success)
                                 {
@@ -1701,10 +1618,10 @@ public class SettingsUi : WindowMediatorSubscriberBase
                         if (authWithCid != null)
                         {
                             ImGuiHelpers.ScaledDummy(5);
-                            UiSharedService.ColorText("A potential rename/world change from this character was detected:", UIColors.Get("LightlessYellow"));
+                            UiSharedService.ColorText("A potential rename/world change from this character was detected:", ImGuiColors.DalamudYellow);
                             using (ImRaii.PushIndent(10f))
                                 UiSharedService.ColorText("Entry: " + authWithCid.CharacterName + " - " + _dalamudUtilService.WorldData.Value[(ushort)authWithCid.WorldId], UIColors.Get("LightlessBlue"));
-                            UiSharedService.ColorText("Press the button below to adjust that entry to your current character:", UIColors.Get("LightlessYellow"));
+                            UiSharedService.ColorText("Press the button below to adjust that entry to your current character:", ImGuiColors.DalamudYellow);
                             using (ImRaii.PushIndent(10f))
                                 UiSharedService.ColorText("Current: " + youName + " - " + _dalamudUtilService.WorldData.Value[(ushort)youWorld], UIColors.Get("LightlessBlue"));
                             ImGuiHelpers.ScaledDummy(5);
@@ -1850,7 +1767,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 }
                 else
                 {
-                    UiSharedService.ColorTextWrapped("You need to add a Secret Key first before adding Characters.", UIColors.Get("LightlessYellow"));
+                    UiSharedService.ColorTextWrapped("You need to add a Secret Key first before adding Characters.", ImGuiColors.DalamudYellow);
                 }
 
                 ImGui.EndTabItem();
@@ -1884,7 +1801,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                     }
                     else
                     {
-                        UiSharedService.ColorTextWrapped("This key is in use and cannot be deleted", UIColors.Get("LightlessYellow"));
+                        UiSharedService.ColorTextWrapped("This key is in use and cannot be deleted", ImGuiColors.DalamudYellow);
                     }
 
                     if (item.Key != selectedServer.SecretKeys.Keys.LastOrDefault())
@@ -2064,7 +1981,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 else
                 {
                     UiSharedService.ColorTextWrapped("Default Permission Settings unavailable for this service. " +
-                        "You need to connect to this service to change the default permissions since they are stored on the service.", UIColors.Get("LightlessYellow"));
+                        "You need to connect to this service to change the default permissions since they are stored on the service.", ImGuiColors.DalamudYellow);
                 }
 
                 ImGui.EndTabItem();

LightlessSync/UI/StandaloneProfileUi.cs

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

LightlessSync/UI/SyncshellAdminUI.cs

@@ -13,7 +13,7 @@ using LightlessSync.WebAPI;
 using Microsoft.Extensions.Logging;
 using System.Globalization;
 
-namespace LightlessSync.UI;
+namespace LightlessSync.UI.Components.Popup;
 
 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())
-            _uiSharedService.UnderlinedBigText(GroupFullInfo.GroupAliasOrGID + " Administrative Panel", UIColors.Get("LightlessBlue"));
+            ImGui.TextUnformatted(GroupFullInfo.GroupAliasOrGID + " Administrative Panel");
 
         ImGui.Separator();
         var perm = GroupFullInfo.GroupPermissions;
@@ -72,205 +72,119 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
 
         if (tabbar)
         {
-            DrawInvites(perm);
-
-            DrawManagement();
-
-            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")))
+            var inviteTab = ImRaii.TabItem("Invites");
+            if (inviteTab)
             {
-                if (_uiSharedService.IconTextButton(isDisableSounds ? FontAwesomeIcon.VolumeUp : FontAwesomeIcon.VolumeMute,
-                isDisableSounds ? "Suggest to enable sound sync" : "Suggest to disable sound sync"))
+                bool isInvitesDisabled = perm.IsDisableInvites();
+
+                if (_uiSharedService.IconTextButton(isInvitesDisabled ? FontAwesomeIcon.Unlock : FontAwesomeIcon.Lock,
+                    isInvitesDisabled ? "Unlock Syncshell" : "Lock Syncshell"))
                 {
-                    perm.SetPreferDisableSounds(!perm.IsPreferDisableSounds());
+                    perm.SetDisableInvites(!isInvitesDisabled);
                     _ = _apiController.GroupChangeGroupPermissionState(new(GroupFullInfo.Group, perm));
                 }
-            }
 
-            ImGui.AlignTextToFramePadding();
-            ImGui.Text("Suggest Animation Sync");
-            _uiSharedService.BooleanToColoredIcon(!isDisableAnimations);
-            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"))
+                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"))
                 {
-                    perm.SetPreferDisableAnimations(!perm.IsPreferDisableAnimations());
-                    _ = _apiController.GroupChangeGroupPermissionState(new(GroupFullInfo.Group, perm));
+                    ImGui.SetClipboardText(_apiController.GroupCreateTempInvite(new(GroupFullInfo.Group), 1).Result.FirstOrDefault() ?? string.Empty);
                 }
-            }
-
-            ImGui.AlignTextToFramePadding();
-            ImGui.Text("Suggest VFX Sync");
-            _uiSharedService.BooleanToColoredIcon(!isDisableVfx);
-            ImGui.SameLine(230);
-            using (ImRaii.PushColor(ImGuiCol.Text, isDisableVfx ? UIColors.Get("PairBlue") : UIColors.Get("DimRed")))
-            {
-                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;
-
+                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();
-                ImGui.SetNextItemWidth(availableWidth - buttonSize - textSize - spacing * 2);
-                ImGui.InputTextWithHint("##changepw", "Min 10 characters", ref _newPassword, 50);
-                ImGui.SameLine();
-                using (ImRaii.Disabled(_newPassword.Length < 10))
+                using (ImRaii.Disabled(_multiInvites <= 1 || _multiInvites > 100))
                 {
-                    if (_uiSharedService.IconTextButton(FontAwesomeIcon.Passport, "Change Password"))
+                    if (_uiSharedService.IconTextButton(FontAwesomeIcon.Envelope, "Generate " + _multiInvites + " one-time invites"))
                     {
-                        _pwChangeSuccess = _apiController.GroupChangePassword(new GroupPasswordDto(GroupFullInfo.Group, _newPassword)).Result;
-                        _newPassword = string.Empty;
+                        _oneTimeInvites.AddRange(_apiController.GroupCreateTempInvite(new(GroupFullInfo.Group), _multiInvites).Result);
                     }
                 }
-                UiSharedService.AttachToolTip("Password requires to be at least 10 characters long. This action is irreversible.");
 
-                if (!_pwChangeSuccess)
+                if (_oneTimeInvites.Any())
                 {
-                    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)
+                    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.TableSetupColumn("Alias/UID/Note", ImGuiTableColumnFlags.None, 4);
-                        ImGui.TableSetupColumn("Flags", ImGuiTableColumnFlags.None, 1);
-                        ImGui.TableSetupColumn("Actions", ImGuiTableColumnFlags.None, 3);
-                        ImGui.TableHeadersRow();
+                        ImGui.SetClipboardText(invites);
+                    }
+                }
+            }
+            inviteTab.Dispose();
 
-                        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 =>
+            var mgmtTab = ImRaii.TabItem("User Management");
+            if (mgmtTab)
+            {
+                var userNode = ImRaii.TreeNode("User List & Administration");
+                if (userNode)
+                {
+                    if (!_pairManager.GroupPairs.TryGetValue(GroupFullInfo, out var pairs))
+                    {
+                        UiSharedService.ColorTextWrapped("No users found in this Syncshell", ImGuiColors.DalamudYellow);
+                    }
+                    else
+                    {
+                        using var table = ImRaii.Table("userList#" + GroupFullInfo.Group.GID, 4, ImGuiTableFlags.RowBg | ImGuiTableFlags.SizingStretchProp | ImGuiTableFlags.ScrollY);
+                        if (table)
                         {
-                            if (p.Value == null) return 10;
-                            if (string.Equals(p.Key.UserData.UID, GroupFullInfo.OwnerUID, StringComparison.Ordinal)) return 0;
-                            if (p.Value.Value.IsModerator()) return 1;
-                            if (p.Value.Value.IsPinned()) return 2;
-                            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);
+                            ImGui.TableSetupColumn("Alias/UID/Note", ImGuiTableColumnFlags.None, 3);
+                            ImGui.TableSetupColumn("Online/Name", ImGuiTableColumnFlags.None, 2);
+                            ImGui.TableSetupColumn("Flags", ImGuiTableColumnFlags.None, 1);
+                            ImGui.TableSetupColumn("Actions", ImGuiTableColumnFlags.None, 2);
+                            ImGui.TableHeadersRow();
 
-                            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();
-                            var boolcolor = UiSharedService.GetBoolColor(pair.Key.IsOnline);
-                            UiSharedService.ColorText(text, boolcolor);
-                            if (!string.IsNullOrEmpty(pair.Key.PlayerName))
-                            {
-                                UiSharedService.AttachToolTip(pair.Key.PlayerName);
-                                ImGui.SameLine();
-                            }
+                            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)));
 
-                            ImGui.TableNextColumn(); // special flags
-                            if (pair.Value != null && (pair.Value.Value.IsModerator() || pair.Value.Value.IsPinned() || isUserOwner))
+                            foreach (var pair in groupedPairs.OrderBy(p =>
                             {
-                                if (pair.Value.Value.IsModerator())
-                                {
-                                    _uiSharedService.IconText(FontAwesomeIcon.UserShield, UIColors.Get("LightlessPurple"));
-                                    UiSharedService.AttachToolTip("Moderator");
-                                }
-                                if (pair.Value.Value.IsPinned() && !isUserOwner)
-                                {
-                                    _uiSharedService.IconText(FontAwesomeIcon.Thumbtack);
-                                    UiSharedService.AttachToolTip("Pinned");
-                                }
-                                if (isUserOwner)
-                                {
-                                    _uiSharedService.IconText(FontAwesomeIcon.Crown, UIColors.Get("LightlessYellow"));
-                                    UiSharedService.AttachToolTip("Owner");
-                                }
-                            }
-                            else
+                                if (p.Value == null) return 10;
+                                if (p.Value.Value.IsModerator()) return 0;
+                                if (p.Value.Value.IsPinned()) return 1;
+                                return 10;
+                            }).ThenBy(p => p.Key.GetNote() ?? p.Key.UserData.AliasOrUID, StringComparer.OrdinalIgnoreCase))
                             {
-                                _uiSharedService.IconText(FontAwesomeIcon.None);
-                            }
+                                using var tableId = ImRaii.PushId("userTable_" + pair.Key.UserData.UID);
 
-                            ImGui.TableNextColumn(); // actions
-                            if (_isOwner)
-                            {
-                                using (ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("LightlessYellow")))
+                                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))
                                 {
-                                    using (ImRaii.Disabled(!UiSharedService.ShiftPressed()))
+                                    onlineText += " (" + pair.Key.PlayerName + ")";
+                                }
+                                var boolcolor = UiSharedService.GetBoolColor(pair.Key.IsOnline);
+                                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())
                                     {
-                                        if (_uiSharedService.IconButton(FontAwesomeIcon.Crown))
-                                        {
-                                            _ = _apiController.GroupChangeOwnership(new(GroupFullInfo.Group, pair.Key.UserData));
-                                            IsOpen = false;
-                                        }
+                                        _uiSharedService.IconText(FontAwesomeIcon.UserShield);
+                                        UiSharedService.AttachToolTip("Moderator");
+                                    }
+                                    if (pair.Value.Value.IsPinned())
+                                    {
+                                        _uiSharedService.IconText(FontAwesomeIcon.Thumbtack);
+                                        UiSharedService.AttachToolTip("Pinned");
                                     }
-
                                 }
-                                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();
+                                else
+                                {
+                                    _uiSharedService.IconText(FontAwesomeIcon.None);
+                                }
 
-                                using (ImRaii.PushColor(ImGuiCol.Text, pair.Value != null && pair.Value.Value.IsModerator() ? UIColors.Get("DimRed") : UIColors.Get("PairBlue")))
+                                ImGui.TableNextColumn(); // actions
+                                if (_isOwner)
                                 {
                                     if (_uiSharedService.IconButton(FontAwesomeIcon.UserShield))
                                     {
@@ -280,14 +194,11 @@ 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 (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 (_isOwner || (pair.Value == null || (pair.Value != null && !pair.Value.Value.IsModerator())))
                                 {
                                     if (_uiSharedService.IconButton(FontAwesomeIcon.Thumbtack))
                                     {
@@ -297,12 +208,9 @@ 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))
@@ -310,13 +218,10 @@ 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");
-                                ImGui.SameLine();
+                                    UiSharedService.AttachToolTip("Remove user from Syncshell"
+                                        + UiSharedService.TooltipSeparator + "Hold CTRL to enable this button");
 
-                                using (ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("DimRed")))
-                                {
+                                    ImGui.SameLine();
                                     using (ImRaii.Disabled(!UiSharedService.CtrlPressed()))
                                     {
                                         if (_uiSharedService.IconButton(FontAwesomeIcon.Ban))
@@ -324,190 +229,224 @@ 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");
                             }
                         }
                     }
-                }
-                _uiSharedService.ColoredSeparator(UIColors.Get("LightlessPurple"), 1.5f);
-                ImGui.TreePop();
-            }
-            ImGui.Separator();
-
-            if (_uiSharedService.MediumTreeNode("Mass Cleanup", UIColors.Get("LightlessPurple")))
-            {
-                using (ImRaii.Disabled(!UiSharedService.CtrlPressed()))
-                {
-                    if (_uiSharedService.IconTextButton(FontAwesomeIcon.Broom, "Clear Syncshell"))
+                    if (_pruneTask != null)
                     {
-                        _ = _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} 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)
-                    {
-                        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} day(s).");
-                        if (_pruneTestTask.Result > 0)
+                        if (!_pruneTask.IsCompleted)
                         {
-                            using (ImRaii.Disabled(!UiSharedService.CtrlPressed()))
+                            UiSharedService.ColorTextWrapped("Pruning Syncshell...", ImGuiColors.DalamudYellow);
+                        }
+                        else
+                        {
+                            UiSharedService.TextWrapped($"Syncshell was pruned and {_pruneTask.Result} inactive user(s) have been removed.");
+                        }
+                    }
+                }
+                clearNode.Dispose();
+
+                var banNode = ImRaii.TreeNode("User Bans");
+                if (banNode)
+                {
+                    if (_uiSharedService.IconTextButton(FontAwesomeIcon.Retweet, "Refresh Banlist from Server"))
+                    {
+                        _bannedUsers = _apiController.GroupGetBannedUsers(new GroupDto(GroupFullInfo.Group)).Result;
+                    }
+
+                    if (ImGui.BeginTable("bannedusertable" + GroupFullInfo.GID, 6, ImGuiTableFlags.RowBg | ImGuiTableFlags.SizingStretchProp | ImGuiTableFlags.ScrollY))
+                    {
+                        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"))
                             {
-                                if (_uiSharedService.IconTextButton(FontAwesomeIcon.Broom, "Prune Inactive Users"))
-                                {
-                                    _pruneTask = _apiController.GroupPrune(new(GroupFullInfo.Group), _pruneDays, execute: true);
-                                    _pruneTestTask = null;
-                                }
+                                _apiController.GroupUnbanUser(bannedUser);
+                                _bannedUsers.RemoveAll(b => string.Equals(b.UID, bannedUser.UID, StringComparison.Ordinal));
                             }
-                            UiSharedService.AttachToolTip($"Pruning will remove {_pruneTestTask?.Result ?? 0} inactive user(s)."
-                                + UiSharedService.TooltipSeparator + "Hold CTRL to enable this button");
                         }
+
+                        ImGui.EndTable();
                     }
                 }
-                if (_pruneTask != null)
-                {
-                    if (!_pruneTask.IsCompleted)
-                    {
-                        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("LightlessPurple"), 1.5f);
-                ImGui.TreePop();
+                banNode.Dispose();
             }
-            ImGui.Separator();
+            mgmtTab.Dispose();
 
-            if (_uiSharedService.MediumTreeNode("User Bans", UIColors.Get("LightlessPurple")))
+            var permissionTab = ImRaii.TabItem("Permissions");
+            if (permissionTab)
             {
-                if (_uiSharedService.IconTextButton(FontAwesomeIcon.Retweet, "Refresh Banlist from Server"))
+                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"))
                 {
-                    _bannedUsers = _apiController.GroupGetBannedUsers(new GroupDto(GroupFullInfo.Group)).Result;
+                    perm.SetPreferDisableSounds(!perm.IsPreferDisableSounds());
+                    _ = _apiController.GroupChangeGroupPermissionState(new(GroupFullInfo.Group, perm));
                 }
-                var tableFlags = ImGuiTableFlags.RowBg | ImGuiTableFlags.SizingStretchProp;
-                if (_bannedUsers.Count > 10) tableFlags |= ImGuiTableFlags.ScrollY;
-                if (ImGui.BeginTable("bannedusertable" + GroupFullInfo.GID, 6, tableFlags))
+
+                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"))
                 {
-                    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);
+                    perm.SetPreferDisableAnimations(!perm.IsPreferDisableAnimations());
+                    _ = _apiController.GroupChangeGroupPermissionState(new(GroupFullInfo.Group, perm));
+                }
 
-                    ImGui.TableHeadersRow();
+                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));
+                }
 
-                    foreach (var bannedUser in _bannedUsers.ToList())
+                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))
                     {
-                        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"))
+                        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Passport, "Change Password"))
                         {
-                            _apiController.GroupUnbanUser(bannedUser);
-                            _bannedUsers.RemoveAll(b => string.Equals(b.UID, bannedUser.UID, StringComparison.Ordinal));
+                            _pwChangeSuccess = _apiController.GroupChangePassword(new GroupPasswordDto(GroupFullInfo.Group, _newPassword)).Result;
+                            _newPassword = string.Empty;
                         }
                     }
-                    ImGui.EndTable();
-                }
-                _uiSharedService.ColoredSeparator(UIColors.Get("LightlessPurple"), 1.5f);
-                ImGui.TreePop();
-            }
-            ImGui.Separator();
-        }
-        mgmtTab.Dispose();
-
-    }
-
-    private void DrawInvites(GroupPermissions perm)
-    {
-        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);
+                    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();
             }
         }
-        inviteTab.Dispose();
     }
 
     public override void OnClose()

LightlessSync/UI/UIColors.cs

@@ -1,12 +1,11 @@
-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> DefaultHexColors = new(StringComparer.OrdinalIgnoreCase)
+        private static readonly Dictionary<string, string> HexColors = new(StringComparer.OrdinalIgnoreCase)
         {
             { "LightlessPurple", "#ad8af5" },
             { "LightlessBlue", "#a6c2ff" },
@@ -15,72 +14,14 @@ namespace LightlessSync.UI
             { "DimRed", "#d44444" },
         };
 
-        private static LightlessConfigService? _configService;
-
-        public static void Initialize(LightlessConfigService configService)
-        {
-            _configService = configService;
-        }
-
         public static Vector4 Get(string name)
         {
-            if (_configService?.Current.CustomUIColors.TryGetValue(name, out var customColorHex) == true)
-                return HexToRgba(customColorHex);
-
-            if (!DefaultHexColors.TryGetValue(name, out var hex))
+            if (!HexColors.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('#');
@@ -90,14 +31,5 @@ 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

@@ -405,7 +405,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") : UIColors.Get("LightlessYellow");
+        data.Item1 == data.Item2 ? UIColors.Get("LightlessBlue") : ImGuiColors.DalamudYellow;
 
     public bool ApplyNotesFromClipboard(string notes, bool overwrite)
     {
@@ -537,7 +537,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.", UIColors.Get("LightlessYellow"));
+        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);
         var cacheDirectory = _configService.Current.CacheFolder;
         ImGui.InputText("Storage Folder##cache", ref cacheDirectory, 255, ImGuiInputTextFlags.ReadOnly);
 
@@ -723,7 +723,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
             {
                 if (!_discordOAuthCheck.IsCompleted)
                 {
-                    ColorTextWrapped($"Checking OAuth2 compatibility with {selectedServer.ServerUri}", UIColors.Get("LightlessYellow"));
+                    ColorTextWrapped($"Checking OAuth2 compatibility with {selectedServer.ServerUri}", ImGuiColors.DalamudYellow);
                 }
                 else
                 {
@@ -814,7 +814,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
                 {
                     if (!_discordOAuthUIDs.IsCompleted)
                     {
-                        ColorTextWrapped("Checking UIDs on Server", UIColors.Get("LightlessYellow"));
+                        ColorTextWrapped("Checking UIDs on Server", ImGuiColors.DalamudYellow);
                     }
                     else
                     {

LightlessSync/WebAPI/Files/FileDownloadManager.cs

@@ -144,55 +144,28 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
 
         _downloadStatus[downloadGroup].DownloadStatus = DownloadStatus.Downloading;
 
-        const int maxRetries = 3;
-        int retryCount = 0;
-        TimeSpan retryDelay = TimeSpan.FromSeconds(2);
-
         HttpResponseMessage response = null!;
         var requestUrl = LightlessFiles.CacheGetFullPath(fileTransfer[0].DownloadUri, requestId);
 
-        while (true)
-        {
-            try
-            {
-                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;
-
+        Logger.LogDebug("Downloading {requestUrl} for request {id}", requestUrl, requestId);
         try
         {
-            fileStream = File.Create(tempPath);
+            response = await _orchestrator.SendRequestAsync(HttpMethod.Get, requestUrl, ct, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
+            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);
+            }
+        }
+
+        ThrottledStream? stream = null;
+        try
+        {
+            var fileStream = File.Create(tempPath);
             await using (fileStream.ConfigureAwait(false))
             {
                 var bufferSize = response.Content.Headers.ContentLength > 1024 * 1024 ? 65536 : 8196;
@@ -201,11 +174,8 @@ 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(await response.Content.ReadAsStreamAsync(ct).ConfigureAwait(false), limit);
-
+                stream = new ThrottledStream(await response.Content.ReadAsStreamAsync(ct).ConfigureAwait(false), limit);
                 _activeDownloadStreams.Add(stream);
-
                 while ((bytesRead = await stream.ReadAsync(buffer, ct).ConfigureAwait(false)) > 0)
                 {
                     ct.ThrowIfCancellationRequested();
@@ -224,22 +194,18 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
         {
             throw;
         }
-        catch (Exception)
+        catch (Exception ex)
         {
             try
             {
-                fileStream?.Close(); 
-
-                if (!string.IsNullOrEmpty(tempPath) && File.Exists(tempPath))
-                {
+                if (!tempPath.IsNullOrEmpty())
                     File.Delete(tempPath);
-                }
             }
             catch
             {
-                // Ignore errors during cleanup
+                // ignore if file deletion fails
             }
-            throw; 
+            throw;
         }
         finally
         {

LightlessSync/WebAPI/Files/FileUploadManager.cs

@@ -69,7 +69,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.Count != 0)
+        if (locallyMissingFiles.Any())
         {
             return locallyMissingFiles;
         }
@@ -92,7 +92,7 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
             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, postProgress: false, ct ?? CancellationToken.None);
+            uploadTask = UploadFile(data.Item2, file.Hash, false, ct ?? CancellationToken.None);
             (ct ?? CancellationToken.None).ThrowIfCancellationRequested();
         }
 

LightlessSync/packages.lock.json

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