add more functionality for future features.

LightlessSync/Interop/InteropModel/Enums/ResidentialAetheryteKind.cs

@@ -0,0 +1,11 @@
+namespace Lifestream.Enums;
+
+public enum ResidentialAetheryteKind
+{
+    None = -1,
+    Uldah = 9,
+    Gridania = 2,
+    Limsa = 8,
+    Foundation = 70,
+    Kugane = 111,
+}

LightlessSync/Interop/InteropModel/GlobalModels.cs

@@ -0,0 +1 @@
+global using AddressBookEntryTuple = (string Name, int World, int City, int Ward, int PropertyType, int Plot, int Apartment, bool ApartmentSubdivision, bool AliasEnabled, string Alias);

LightlessSync/Interop/Ipc/IpcCallerLifestream.cs

@@ -0,0 +1,129 @@
+using Dalamud.Plugin;
+using Dalamud.Plugin.Ipc;
+using Lifestream.Enums;
+using LightlessSync.Interop.Ipc.Framework;
+using LightlessSync.Services.Mediator;
+using Microsoft.Extensions.Logging;
+
+
+namespace LightlessSync.Interop.Ipc;
+
+public sealed class IpcCallerLifestream : IpcServiceBase
+{
+    private static readonly IpcServiceDescriptor LifestreamDescriptor = new("Lifestream", "Lifestream", new Version(0, 0, 0, 0));
+
+    private readonly ICallGateSubscriber<string, object> _executeLifestreamCommand;
+    private readonly ICallGateSubscriber<AddressBookEntryTuple, bool> _isHere;
+    private readonly ICallGateSubscriber<AddressBookEntryTuple, object> _goToHousingAddress;
+    private readonly ICallGateSubscriber<bool> _isBusy;
+    private readonly ICallGateSubscriber<object> _abort;
+    private readonly ICallGateSubscriber<string, bool> _changeWorld;
+    private readonly ICallGateSubscriber<uint, bool> _changeWorldById;
+    private readonly ICallGateSubscriber<string, bool> _aetheryteTeleport;
+    private readonly ICallGateSubscriber<uint, bool> _aetheryteTeleportById;
+    private readonly ICallGateSubscriber<bool> _canChangeInstance;
+    private readonly ICallGateSubscriber<int> _getCurrentInstance;
+    private readonly ICallGateSubscriber<int> _getNumberOfInstances;
+    private readonly ICallGateSubscriber<int, object> _changeInstance;
+    private readonly ICallGateSubscriber<(ResidentialAetheryteKind, int, int)> _getCurrentPlotInfo;
+
+    public IpcCallerLifestream(IDalamudPluginInterface pi, LightlessMediator lightlessMediator, ILogger<IpcCallerLifestream> logger)
+        : base(logger, lightlessMediator, pi, LifestreamDescriptor)
+    {
+        _executeLifestreamCommand = pi.GetIpcSubscriber<string, object>("Lifestream.ExecuteCommand");
+        _isHere = pi.GetIpcSubscriber<AddressBookEntryTuple, bool>("Lifestream.IsHere");
+        _goToHousingAddress = pi.GetIpcSubscriber<AddressBookEntryTuple, object>("Lifestream.GoToHousingAddress");
+        _isBusy = pi.GetIpcSubscriber<bool>("Lifestream.IsBusy");
+        _abort = pi.GetIpcSubscriber<object>("Lifestream.Abort");
+        _changeWorld = pi.GetIpcSubscriber<string, bool>("Lifestream.ChangeWorld");
+        _changeWorldById = pi.GetIpcSubscriber<uint, bool>("Lifestream.ChangeWorldById");
+        _aetheryteTeleport = pi.GetIpcSubscriber<string, bool>("Lifestream.AetheryteTeleport");
+        _aetheryteTeleportById = pi.GetIpcSubscriber<uint, bool>("Lifestream.AetheryteTeleportById");
+        _canChangeInstance = pi.GetIpcSubscriber<bool>("Lifestream.CanChangeInstance");
+        _getCurrentInstance = pi.GetIpcSubscriber<int>("Lifestream.GetCurrentInstance");
+        _getNumberOfInstances = pi.GetIpcSubscriber<int>("Lifestream.GetNumberOfInstances");
+        _changeInstance = pi.GetIpcSubscriber<int, object>("Lifestream.ChangeInstance");
+        _getCurrentPlotInfo = pi.GetIpcSubscriber<(ResidentialAetheryteKind, int, int)>("Lifestream.GetCurrentPlotInfo");
+        CheckAPI();
+    }
+
+    public void ExecuteLifestreamCommand(string command)
+    {
+        if (!APIAvailable) return;
+        _executeLifestreamCommand.InvokeAction(command);
+    }
+
+    public bool IsHere(AddressBookEntryTuple entry)
+    {
+        if (!APIAvailable) return false;
+        return _isHere.InvokeFunc(entry);
+    }
+
+    public void GoToHousingAddress(AddressBookEntryTuple entry)
+    {
+        if (!APIAvailable) return;
+        _goToHousingAddress.InvokeAction(entry);
+    }
+
+    public bool IsBusy()
+    {
+        if (!APIAvailable) return false;
+        return _isBusy.InvokeFunc();
+    }
+
+    public void Abort()
+    {
+        if (!APIAvailable) return;
+        _abort.InvokeAction();
+    }
+
+    public bool ChangeWorld(string worldName)
+    {
+        if (!APIAvailable) return false;
+        return _changeWorld.InvokeFunc(worldName);
+    }
+
+    public bool AetheryteTeleport(string aetheryteName)
+    {
+        if (!APIAvailable) return false;
+        return _aetheryteTeleport.InvokeFunc(aetheryteName);
+    }
+
+    public bool ChangeWorldById(uint worldId)
+    {
+        if (!APIAvailable) return false;
+        return _changeWorldById.InvokeFunc(worldId);
+    }
+
+    public bool AetheryteTeleportById(uint aetheryteId)
+    {
+        if (!APIAvailable) return false;
+        return _aetheryteTeleportById.InvokeFunc(aetheryteId);
+    }
+
+    public bool CanChangeInstance()
+    {
+        if (!APIAvailable) return false;
+        return _canChangeInstance.InvokeFunc();
+    }
+    public int GetCurrentInstance()
+    {
+        if (!APIAvailable) return -1;
+        return _getCurrentInstance.InvokeFunc();
+    }
+    public int GetNumberOfInstances()
+    {
+        if (!APIAvailable) return -1;
+        return _getNumberOfInstances.InvokeFunc();
+    }
+    public void ChangeInstance(int instanceNumber)
+    {
+        if (!APIAvailable) return;
+        _changeInstance.InvokeAction(instanceNumber);
+    }
+    public (ResidentialAetheryteKind, int, int)? GetCurrentPlotInfo()
+    {
+        if (!APIAvailable) return (ResidentialAetheryteKind.None, -1, -1);
+        return _getCurrentPlotInfo.InvokeFunc();
+    }
+}

LightlessSync/Interop/Ipc/IpcManager.cs

@@ -7,7 +7,8 @@ public sealed partial class IpcManager : DisposableMediatorSubscriberBase
 {
     public IpcManager(ILogger<IpcManager> logger, LightlessMediator mediator,
         IpcCallerPenumbra penumbraIpc, IpcCallerGlamourer glamourerIpc, IpcCallerCustomize customizeIpc, IpcCallerHeels heelsIpc,
-        IpcCallerHonorific honorificIpc, IpcCallerMoodles moodlesIpc, IpcCallerPetNames ipcCallerPetNames, IpcCallerBrio ipcCallerBrio) : base(logger, mediator)
+        IpcCallerHonorific honorificIpc, IpcCallerMoodles moodlesIpc, IpcCallerPetNames ipcCallerPetNames, IpcCallerBrio ipcCallerBrio,
+        IpcCallerLifestream ipcCallerLifestream) : base(logger, mediator)
     {
         CustomizePlus = customizeIpc;
         Heels = heelsIpc;
@@ -17,6 +18,7 @@ public sealed partial class IpcManager : DisposableMediatorSubscriberBase
         Moodles = moodlesIpc;
         PetNames = ipcCallerPetNames;
         Brio = ipcCallerBrio;
+        Lifestream = ipcCallerLifestream;
 
         if (Initialized)
         {
@@ -44,8 +46,8 @@ public sealed partial class IpcManager : DisposableMediatorSubscriberBase
     public IpcCallerPenumbra Penumbra { get; }
     public IpcCallerMoodles Moodles { get; }
     public IpcCallerPetNames PetNames { get; }
-
     public IpcCallerBrio Brio { get; }
+    public IpcCallerLifestream Lifestream { get; }
 
     private void PeriodicApiStateCheck()
     {
@@ -58,5 +60,6 @@ public sealed partial class IpcManager : DisposableMediatorSubscriberBase
         Moodles.CheckAPI();
         PetNames.CheckAPI();
         Brio.CheckAPI();
+        Lifestream.CheckAPI();
     }
 }

LightlessSync/LightlessConfiguration/Configurations/LightlessConfig.cs

@@ -155,6 +155,5 @@ public class LightlessConfig : ILightlessConfiguration
     public bool SyncshellFinderEnabled { get; set; } = false;
     public string? SelectedFinderSyncshell { get; set; } = null;
     public string LastSeenVersion { get; set; } = string.Empty;
-    public bool EnableParticleEffects { get; set; } = true;
     public HashSet<Guid> OrphanableTempCollections { get; set; } = [];
 }

LightlessSync/Plugin.cs

@@ -373,6 +373,11 @@ public sealed class Plugin : IDalamudPlugin
             sp.GetRequiredService<DalamudUtilService>(),
             sp.GetRequiredService<LightlessMediator>()));
 
+        services.AddSingleton(sp => new IpcCallerLifestream(
+            pluginInterface,
+            sp.GetRequiredService<LightlessMediator>(),
+            sp.GetRequiredService<ILogger<IpcCallerLifestream>>()));
+
         services.AddSingleton(sp => new IpcManager(
             sp.GetRequiredService<ILogger<IpcManager>>(),
             sp.GetRequiredService<LightlessMediator>(),
@@ -383,7 +388,9 @@ public sealed class Plugin : IDalamudPlugin
             sp.GetRequiredService<IpcCallerHonorific>(),
             sp.GetRequiredService<IpcCallerMoodles>(),
             sp.GetRequiredService<IpcCallerPetNames>(),
-            sp.GetRequiredService<IpcCallerBrio>()));
+            sp.GetRequiredService<IpcCallerBrio>(),
+            sp.GetRequiredService<IpcCallerLifestream>()
+            ));
 
         // Notifications / HTTP
         services.AddSingleton(sp => new NotificationService(
@@ -481,11 +488,19 @@ public sealed class Plugin : IDalamudPlugin
             sp.GetRequiredService<UiSharedService>(),
             sp.GetRequiredService<ApiController>(),
             sp.GetRequiredService<LightFinderScannerService>(),
+            sp.GetRequiredService<LightFinderPlateHandler>()));
+
+        services.AddScoped<WindowMediatorSubscriberBase, SyncshellFinderUI>(sp => new SyncshellFinderUI(
+            sp.GetRequiredService<ILogger<SyncshellFinderUI>>(),
+            sp.GetRequiredService<LightlessMediator>(),
+            sp.GetRequiredService<PerformanceCollectorService>(),
+            sp.GetRequiredService<LightFinderService>(),
+            sp.GetRequiredService<UiSharedService>(),
+            sp.GetRequiredService<ApiController>(),
+            sp.GetRequiredService<LightFinderScannerService>(),
             sp.GetRequiredService<PairUiService>(),
             sp.GetRequiredService<DalamudUtilService>(),
-            sp.GetRequiredService<LightlessProfileManager>(),
-            sp.GetRequiredService<ActorObjectService>(),
-            sp.GetRequiredService<LightFinderPlateHandler>()));
+            sp.GetRequiredService<LightlessProfileManager>()));
 
         services.AddScoped<IPopupHandler, BanUserPopupHandler>();
         services.AddScoped<IPopupHandler, CensusPopupHandler>();
@@ -571,6 +586,7 @@ public sealed class Plugin : IDalamudPlugin
 
     public void Dispose()
     {
-        _host.StopAsync().ContinueWith(_ => _host.Dispose()).Wait(TimeSpan.FromSeconds(5));
+        _host.StopAsync().GetAwaiter().GetResult();
+        _host.Dispose();
     }
 }

LightlessSync/Services/DalamudUtilService.cs

@@ -919,28 +919,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         return WorldData.Value.TryGetValue(worldId, out var worldName) ? worldName : null;
     }
 
-    public void TargetPlayerByAddress(nint address)
-    {
-        if (address == nint.Zero) return;
-        if (_clientState.IsPvP) return;
-
-        _ = RunOnFrameworkThread(() =>
-        {
-            var gameObject = CreateGameObject(address);
-            if (gameObject is null) return;
-
-            var useFocusTarget = _configService.Current.UseFocusTarget;
-            if (useFocusTarget)
-            {
-                _targetManager.FocusTarget = gameObject;
-            }
-            else
-            {
-                _targetManager.Target = gameObject;
-            }
-        });
-    }
-
     private unsafe void CheckCharacterForDrawing(nint address, string characterName)
     {
         var gameObj = (GameObject*)address;

LightlessSync/Services/LightFinder/LightFinderScannerService.cs

@@ -1,4 +1,4 @@
-using Dalamud.Plugin.Services;
+using Dalamud.Plugin.Services;
 using LightlessSync.API.Dto.User;
 using LightlessSync.Services.ActorTracking;
 using LightlessSync.Services.Mediator;
@@ -23,7 +23,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
     private readonly HashSet<string> _syncshellCids = [];
     private volatile bool _pendingLocalBroadcast;
     private TimeSpan? _pendingLocalTtl;
-    private string? _pendingLocalGid;
 
     private static readonly TimeSpan _maxAllowedTtl = TimeSpan.FromMinutes(4);
     private static readonly TimeSpan _retryDelay = TimeSpan.FromMinutes(1);
@@ -37,7 +36,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
     private const int _maxQueueSize = 100;
 
     private volatile bool _batchRunning = false;
-    private volatile bool _disposed = false;
 
     public IReadOnlyDictionary<string, BroadcastEntry> BroadcastCache => _broadcastCache;
     public readonly record struct BroadcastEntry(bool IsBroadcasting, DateTime ExpiryTime, string? GID);
@@ -70,9 +68,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
 
     public void Update()
     {
-        if (_disposed)
-            return;
-
         _frameCounter++;
         var lookupsThisFrame = 0;
 
@@ -116,14 +111,7 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
 
     private async Task BatchUpdateBroadcastCacheAsync(List<string> cids)
     {
-        if (_disposed)
-            return;
-
         var results = await _broadcastService.AreUsersBroadcastingAsync(cids).ConfigureAwait(false);
-        
-        if (_disposed)
-            return;
-
         var now = DateTime.UtcNow;
 
         foreach (var (cid, info) in results)
@@ -142,9 +130,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
                 (_, old) => new BroadcastEntry(info.IsBroadcasting, expiry, info.GID));
         }
 
-        if (_disposed)
-            return;
-
         var activeCids = _broadcastCache
             .Where(e => e.Value.IsBroadcasting && e.Value.ExpiryTime > now)
             .Select(e => e.Key)
@@ -157,9 +142,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
 
     private void OnBroadcastStatusChanged(BroadcastStatusChangedMessage msg)
     {
-        if (_disposed)
-            return;
-
         if (!msg.Enabled)
         {
             _broadcastCache.Clear();
@@ -176,7 +158,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
 
         _pendingLocalBroadcast = true;
         _pendingLocalTtl = msg.Ttl;
-        _pendingLocalGid = msg.Gid;
         TryPrimeLocalBroadcastCache();
     }
 
@@ -192,12 +173,11 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
         var expiry = DateTime.UtcNow + ttl;
 
         _broadcastCache.AddOrUpdate(localCid,
-            new BroadcastEntry(true, expiry, _pendingLocalGid),
-            (_, old) => new BroadcastEntry(true, expiry, _pendingLocalGid ?? old.GID));
+            new BroadcastEntry(true, expiry, null),
+            (_, old) => new BroadcastEntry(true, expiry, old.GID));
 
         _pendingLocalBroadcast = false;
         _pendingLocalTtl = null;
-        _pendingLocalGid = null;
 
         var now = DateTime.UtcNow;
         var activeCids = _broadcastCache
@@ -207,14 +187,10 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
 
         _lightFinderPlateHandler.UpdateBroadcastingCids(activeCids);
         _lightFinderNativePlateHandler.UpdateBroadcastingCids(activeCids);
-        UpdateSyncshellBroadcasts();
     }
 
     private void UpdateSyncshellBroadcasts()
     {
-        if (_disposed)
-            return;
-
         var now = DateTime.UtcNow;
         var nearbyCids = GetNearbyHashedCids(out _);
         var newSet = nearbyCids.Count == 0
@@ -348,35 +324,17 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
 
     protected override void Dispose(bool disposing)
     {
-        _disposed = true;
         base.Dispose(disposing);
         _framework.Update -= OnFrameworkUpdate;
-        
-        try
+        if (_cleanupTask != null)
         {
-            _cleanupCts.Cancel();
-        }
-        catch (ObjectDisposedException)
-        {
-            // Already disposed, can be ignored :)
+            _cleanupTask?.Wait(100, _cleanupCts.Token);
         }
 
-        try
-        {
-            _cleanupTask?.Wait(100);
-        }
-        catch (Exception)
-        {
-            // Task may have already completed or been cancelled?
-        }
+        _cleanupCts.Cancel();
+        _cleanupCts.Dispose();
 
-        try
-        {
-            _cleanupCts.Dispose();
-        }
-        catch (ObjectDisposedException)
-        {
-            // Already disposed, ignore
-        }
+        _cleanupTask?.Wait(100);
+        _cleanupCts.Dispose();
     }
 }

LightlessSync/Services/LightFinder/LightFinderService.cs

@@ -1,4 +1,4 @@
-using Dalamud.Interface;
+using Dalamud.Interface;
 using LightlessSync.API.Dto.Group;
 using LightlessSync.API.Dto.User;
 using LightlessSync.LightlessConfiguration;
@@ -121,10 +121,7 @@ public class LightFinderService : IHostedService, IMediatorSubscriber
         _waitingForTtlFetch = false;
 
         if (!wasEnabled || previousRemaining != validTtl)
-        {
-            var gid = _config.Current.SyncshellFinderEnabled ? _config.Current.SelectedFinderSyncshell : null;
-            _mediator.Publish(new BroadcastStatusChangedMessage(true, validTtl, gid));
-        }
+            _mediator.Publish(new BroadcastStatusChangedMessage(true, validTtl));
 
         _logger.LogInformation("Lightfinder broadcast enabled ({Context}), TTL: {TTL}", context, validTtl);
         return true;

LightlessSync/Services/Mediator/LightlessMediator.cs

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

LightlessSync/Services/Mediator/Messages.cs

@@ -123,7 +123,7 @@ public record GPoseLobbyReceivePoseData(UserData UserData, PoseData PoseData) :
 public record GPoseLobbyReceiveWorldData(UserData UserData, WorldData WorldData) : MessageBase;
 public record OpenCharaDataHubWithFilterMessage(UserData UserData) : MessageBase;
 public record EnableBroadcastMessage(string HashedCid, bool Enabled) : MessageBase;
-public record BroadcastStatusChangedMessage(bool Enabled, TimeSpan? Ttl, string? Gid = null) : MessageBase;
+public record BroadcastStatusChangedMessage(bool Enabled, TimeSpan? Ttl) : MessageBase;
 public record UserLeftSyncshell(string gid) : MessageBase;
 public record UserJoinedSyncshell(string gid) : MessageBase;
 public record SyncshellBroadcastsUpdatedMessage : MessageBase;

LightlessSync/UI/CompactUI.cs

@@ -34,65 +34,44 @@ namespace LightlessSync.UI;
 
 public class CompactUi : WindowMediatorSubscriberBase
 {
-    #region Constants
-    
-    private const float ConnectButtonHighlightThickness = 14f;
-    
-    #endregion
-    
-    #region Services
-    
-    private readonly ApiController _apiController;
     private readonly CharacterAnalyzer _characterAnalyzer;
-    private readonly DalamudUtilService _dalamudUtilService;
-    private readonly DrawEntityFactory _drawEntityFactory;
-    private readonly FileUploadManager _fileTransferManager;
-    private readonly IpcManager _ipcManager;
-    private readonly LightFinderService _broadcastService;
+    private readonly ApiController _apiController;
     private readonly LightlessConfigService _configService;
     private readonly LightlessMediator _lightlessMediator;
     private readonly PairLedger _pairLedger;
-    private readonly PairUiService _pairUiService;
+    private readonly ConcurrentDictionary<GameObjectHandler, Dictionary<string, FileDownloadStatus>> _currentDownloads = new();
+    private readonly DrawEntityFactory _drawEntityFactory;
+    private readonly FileUploadManager _fileTransferManager;
     private readonly PlayerPerformanceConfigService _playerPerformanceConfig;
-    private readonly ServerConfigurationManager _serverManager;
-    private readonly TagHandler _tagHandler;
-    private readonly UiSharedService _uiSharedService;
-    
-    #endregion
-    
-    #region UI Components
-    
-    private readonly AnimatedHeader _animatedHeader = new();
-    private readonly RenamePairTagUi _renamePairTagUi;
-    private readonly RenameSyncshellTagUi _renameSyncshellTagUi;
-    private readonly SelectPairForTagUi _selectPairsForGroupUi;
-    private readonly SelectSyncshellForTagUi _selectSyncshellForTagUi;
+    private readonly PairUiService _pairUiService;
     private readonly SelectTagForPairUi _selectTagForPairUi;
     private readonly SelectTagForSyncshellUi _selectTagForSyncshellUi;
-    private readonly SeluneBrush _seluneBrush = new();
+    private readonly SelectSyncshellForTagUi _selectSyncshellForTagUi;
+    private readonly RenameSyncshellTagUi _renameSyncshellTagUi;
+    private readonly SelectPairForTagUi _selectPairsForGroupUi;
+    private readonly RenamePairTagUi _renamePairTagUi;
+    private readonly IpcManager _ipcManager;
+    private readonly ServerConfigurationManager _serverManager;
     private readonly TopTabMenu _tabMenu;
-    
-    #endregion
-    
-    #region State
-    
-    private readonly ConcurrentDictionary<GameObjectHandler, Dictionary<string, FileDownloadStatus>> _currentDownloads = new();
+    private readonly TagHandler _tagHandler;
+    private readonly UiSharedService _uiSharedService;
+    private readonly LightFinderService _broadcastService;
+    private readonly DalamudUtilService _dalamudUtilService;
+
     private List<IDrawFolder> _drawFolders;
-    private Pair? _focusedPair;
     private Pair? _lastAddedUser;
     private string _lastAddedUserComment = string.Empty;
     private Vector2 _lastPosition = Vector2.One;
     private Vector2 _lastSize = Vector2.One;
-    private int _pendingFocusFrame = -1;
-    private Pair? _pendingFocusPair;
     private bool _showModalForUserAddition;
     private float _transferPartHeight;
     private bool _wasOpen;
     private float _windowContentWidth;
-    
-    #endregion
-
-    #region Constructor
+    private readonly SeluneBrush _seluneBrush = new();
+    private const float _connectButtonHighlightThickness = 14f;
+    private Pair? _focusedPair;
+    private Pair? _pendingFocusPair;
+    private int _pendingFocusFrame = -1;
 
     public CompactUi(
         ILogger<CompactUi> logger,
@@ -148,11 +127,6 @@ public class CompactUi : WindowMediatorSubscriberBase
             .Apply();
 
         _drawFolders = [.. DrawFolders];
-        
-        _animatedHeader.Height = 120f;
-        _animatedHeader.EnableBottomGradient = true;
-        _animatedHeader.GradientHeight = 250f;
-        _animatedHeader.EnableParticles = _configService.Current.EnableParticleEffects;
 
 #if DEBUG
         string dev = "Dev Build";
@@ -176,14 +150,9 @@ public class CompactUi : WindowMediatorSubscriberBase
         _lightlessMediator = mediator;
     }
 
-    #endregion
-
-    #region Lifecycle
-
     public override void OnClose()
     {
         ForceReleaseFocus();
-        _animatedHeader.ClearParticles();
         base.OnClose();
     }
 
@@ -195,13 +164,6 @@ public class CompactUi : WindowMediatorSubscriberBase
         using var selune = Selune.Begin(_seluneBrush, drawList, windowPos, windowSize);
 
         _windowContentWidth = UiSharedService.GetWindowContentRegionWidth();
-        
-        // Draw animated header background (just the gradient/particles, content drawn by existing methods)
-        var startCursorY = ImGui.GetCursorPosY();
-        _animatedHeader.Draw(_windowContentWidth, (_, _) => { });
-        // Reset cursor to draw content on top of the header background
-        ImGui.SetCursorPosY(startCursorY);
-        
         if (!_apiController.IsCurrentVersion)
         {
             var ver = _apiController.CurrentClientVersion;
@@ -247,11 +209,17 @@ public class CompactUi : WindowMediatorSubscriberBase
         }
 
         using (ImRaii.PushId("header")) DrawUIDHeader();
+        _uiSharedService.RoundedSeparator(UIColors.Get("LightlessPurple"), 2.5f, 1f, 12f);
+        using (ImRaii.PushId("serverstatus"))
+        {
+            DrawServerStatus();
+        }
         selune.DrawHighlightOnly(ImGui.GetIO().DeltaTime);
         var style = ImGui.GetStyle();
         var contentMinY = windowPos.Y + ImGui.GetWindowContentRegionMin().Y;
         var gradientInset = 4f * ImGuiHelpers.GlobalScale;
         var gradientTop = MathF.Max(contentMinY, ImGui.GetCursorScreenPos().Y - style.ItemSpacing.Y + gradientInset);
+        ImGui.Separator();
 
         if (_apiController.ServerState is ServerState.Connected)
         {
@@ -259,6 +227,7 @@ public class CompactUi : WindowMediatorSubscriberBase
 
             using (ImRaii.PushId("global-topmenu")) _tabMenu.Draw(pairSnapshot);
             using (ImRaii.PushId("pairlist")) DrawPairs();
+            ImGui.Separator();
             var transfersTop = ImGui.GetCursorScreenPos().Y;
             var gradientBottom = MathF.Max(gradientTop, transfersTop - style.ItemSpacing.Y - gradientInset);
             selune.DrawGradient(gradientTop, gradientBottom, ImGui.GetIO().DeltaTime);
@@ -321,10 +290,6 @@ public class CompactUi : WindowMediatorSubscriberBase
         }
     }
 
-    #endregion
-
-    #region Content Drawing
-
     private void DrawPairs()
     {
         float ySize = Math.Abs(_transferPartHeight) < 0.0001f
@@ -343,6 +308,95 @@ public class CompactUi : WindowMediatorSubscriberBase
         ImGui.EndChild();
     }
 
+    private void DrawServerStatus()
+    {
+        var buttonSize = _uiSharedService.GetIconButtonSize(FontAwesomeIcon.Link);
+        var userCount = _apiController.OnlineUsers.ToString(CultureInfo.InvariantCulture);
+        var userSize = ImGui.CalcTextSize(userCount);
+        var textSize = ImGui.CalcTextSize("Users Online");
+#if DEBUG
+        string shardConnection = $"Shard: {_apiController.ServerInfo.ShardName}";
+#else
+        string shardConnection = string.Equals(_apiController.ServerInfo.ShardName, "Main", StringComparison.OrdinalIgnoreCase) ? string.Empty : $"Shard: {_apiController.ServerInfo.ShardName}";
+#endif
+        var shardTextSize = ImGui.CalcTextSize(shardConnection);
+        var printShard = !string.IsNullOrEmpty(_apiController.ServerInfo.ShardName) && shardConnection != string.Empty;
+
+        if (_apiController.ServerState is ServerState.Connected)
+        {
+            ImGui.SetCursorPosX((ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth()) / 2 - (userSize.X + textSize.X) / 2 - ImGui.GetStyle().ItemSpacing.X / 2);
+            if (!printShard) ImGui.AlignTextToFramePadding();
+            ImGui.TextColored(UIColors.Get("LightlessPurple"), userCount);
+            ImGui.SameLine();
+            if (!printShard) ImGui.AlignTextToFramePadding();
+            ImGui.TextUnformatted("Users Online");
+        }
+        else
+        {
+            ImGui.AlignTextToFramePadding();
+            ImGui.TextColored(UIColors.Get("DimRed"), "Not connected to any server");
+        }
+
+        if (printShard)
+        {
+            ImGui.SetCursorPosY(ImGui.GetCursorPosY() - ImGui.GetStyle().ItemSpacing.Y);
+            ImGui.SetCursorPosX((ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth()) / 2 - shardTextSize.X / 2);
+            ImGui.TextUnformatted(shardConnection);
+        }
+
+        ImGui.SameLine();
+        if (printShard)
+        {
+            ImGui.SetCursorPosY(ImGui.GetCursorPosY() - ((userSize.Y + textSize.Y) / 2 + shardTextSize.Y) / 2 - ImGui.GetStyle().ItemSpacing.Y + buttonSize.Y / 2);
+        }
+        bool isConnectingOrConnected = _apiController.ServerState is ServerState.Connected or ServerState.Connecting or ServerState.Reconnecting;
+        var color = UiSharedService.GetBoolColor(!isConnectingOrConnected);
+        var connectedIcon = isConnectingOrConnected ? FontAwesomeIcon.Unlink : FontAwesomeIcon.Link;
+
+        ImGui.SameLine(ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth() - buttonSize.X);
+        if (printShard)
+        {
+            ImGui.SetCursorPosY(ImGui.GetCursorPosY() - ((userSize.Y + textSize.Y) / 2 + shardTextSize.Y) / 2 - ImGui.GetStyle().ItemSpacing.Y + buttonSize.Y / 2);
+        }
+
+        if (_apiController.ServerState is not (ServerState.Reconnecting or ServerState.Disconnecting))
+        {
+            using (ImRaii.PushColor(ImGuiCol.Text, color))
+            {
+                if (_uiSharedService.IconButton(connectedIcon))
+                {
+                    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();
+                }
+            }
+
+            if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenBlockedByActiveItem) || ImGui.IsItemActive())
+            {
+                Selune.RegisterHighlight(
+                    ImGui.GetItemRectMin(),
+                    ImGui.GetItemRectMax(),
+                    SeluneHighlightMode.Both,
+                    borderOnly: true,
+                    borderThicknessOverride: _connectButtonHighlightThickness,
+                    exactSize: true,
+                    clipToElement: true,
+                    roundingOverride: ImGui.GetStyle().FrameRounding);
+            }
+
+            UiSharedService.AttachToolTip(isConnectingOrConnected ? "Disconnect from " + _serverManager.CurrentServer.ServerName : "Connect to " + _serverManager.CurrentServer.ServerName);
+        }
+    }
+
     private void DrawTransfers()
     {
         var currentUploads = _fileTransferManager.GetCurrentUploadsSnapshot();
@@ -438,9 +492,11 @@ public class CompactUi : WindowMediatorSubscriberBase
         return new DownloadSummary(totalFiles, transferredFiles, transferredBytes, totalBytes);
     }
 
-    #endregion
-
-    #region Header Drawing
+    [StructLayout(LayoutKind.Auto)]
+    private readonly record struct DownloadSummary(int TotalFiles, int TransferredFiles, long TransferredBytes, long TotalBytes)
+    {
+        public bool HasDownloads => TotalFiles > 0 || TotalBytes > 0;
+    }
 
     private void DrawUIDHeader()
     {
@@ -476,52 +532,21 @@ public class CompactUi : WindowMediatorSubscriberBase
         using (_uiSharedService.IconFont.Push())
             iconSize = ImGui.CalcTextSize(FontAwesomeIcon.PersonCirclePlus.ToIconString());
 
-        float uidStartX = 25f;
+        float contentWidth = ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X;
+        float uidStartX = (contentWidth - uidTextSize.X) / 2f;
         float cursorY = ImGui.GetCursorPosY();
 
-        ImGui.SetCursorPosY(cursorY);
-        ImGui.SetCursorPosX(uidStartX);
-
-        bool headerItemClicked;
-        using (_uiSharedService.UidFont.Push())
-        {
-            if (useVanityColors)
-            {
-                var seString = SeStringUtils.BuildFormattedPlayerName(uidText, vanityTextColor, vanityGlowColor);
-                var cursorPos = ImGui.GetCursorScreenPos();
-                var targetFontSize = ImGui.GetFontSize();
-                var font = ImGui.GetFont();
-                SeStringUtils.RenderSeStringWithHitbox(seString, cursorPos, targetFontSize ,font , "uid-header");
-            }
-            else
-            {
-                ImGui.TextColored(uidColor, uidText);
-            }
-        }
-        
-        // Get the actual rendered text rect for proper icon alignment
-        var uidTextRect = ImGui.GetItemRectMax() - ImGui.GetItemRectMin();
-        var uidTextRectMin = ImGui.GetItemRectMin();
-        var uidTextHovered = ImGui.IsItemHovered();
-        headerItemClicked = ImGui.IsItemClicked();
-        
-        // Track position for icons next to UID text
-        // Use uidTextSize.Y (actual font height) for vertical centering, not hitbox height
-        float nextIconX = uidTextRectMin.X + uidTextRect.X + 10f;
-        float iconYOffset = (uidTextSize.Y - iconSize.Y) * 0.5f;
-        float textVerticalOffset = (uidTextRect.Y - uidTextSize.Y) * 0.5f;
-        var buttonSize = new Vector2(iconSize.X, uidTextSize.Y);
-
         if (_configService.Current.BroadcastEnabled && _apiController.IsConnected)
         {
-            ImGui.SetCursorScreenPos(new Vector2(nextIconX, uidTextRectMin.Y + textVerticalOffset));
-            
+            float iconYOffset = (uidTextSize.Y - iconSize.Y) * 0.5f;
+            var buttonSize = new Vector2(iconSize.X, uidTextSize.Y);
+
+            ImGui.SetCursorPos(new Vector2(ImGui.GetStyle().ItemSpacing.X + 5f, cursorY));
             ImGui.InvisibleButton("BroadcastIcon", buttonSize);
+
             var iconPos = ImGui.GetItemRectMin() + new Vector2(0f, iconYOffset);
             using (_uiSharedService.IconFont.Push())
-                ImGui.GetWindowDrawList().AddText(iconPos, ImGui.GetColorU32(UIColors.Get("LightlessGreen")), FontAwesomeIcon.Wifi.ToIconString());
-            
-            nextIconX = ImGui.GetItemRectMax().X + 6f;
+                ImGui.GetWindowDrawList().AddText(iconPos, ImGui.GetColorU32(UIColors.Get("LightlessGreen")), FontAwesomeIcon.PersonCirclePlus.ToIconString());
 
 
             if (ImGui.IsItemHovered())
@@ -593,8 +618,50 @@ public class CompactUi : WindowMediatorSubscriberBase
             if (ImGui.IsItemClicked())
                 _lightlessMediator.Publish(new UiToggleMessage(typeof(LightFinderUI)));
         }
-        
-        // Warning threshold icon (next to lightfinder or UID text)
+
+        ImGui.SetCursorPosY(cursorY);
+        ImGui.SetCursorPosX(uidStartX);
+
+        bool headerItemClicked;
+        using (_uiSharedService.UidFont.Push())
+        {
+            if (useVanityColors)
+            {
+                var seString = SeStringUtils.BuildFormattedPlayerName(uidText, vanityTextColor, vanityGlowColor);
+                var cursorPos = ImGui.GetCursorScreenPos();
+                var targetFontSize = ImGui.GetFontSize();
+                var font = ImGui.GetFont();
+                SeStringUtils.RenderSeStringWithHitbox(seString, cursorPos, targetFontSize ,font , "uid-header");
+            }
+            else
+            {
+                ImGui.TextColored(uidColor, uidText);
+            }
+        }
+
+        if (ImGui.IsItemHovered())
+        {
+            var padding = new Vector2(35f * ImGuiHelpers.GlobalScale);
+            Selune.RegisterHighlight(
+                ImGui.GetItemRectMin() - padding,
+                ImGui.GetItemRectMax() + padding,
+                SeluneHighlightMode.Point,
+                exactSize: true,
+                clipToElement: true,
+                clipPadding: padding,
+                highlightColorOverride: vanityGlowColor,
+                highlightAlphaOverride: 0.05f);
+        }
+
+        headerItemClicked = ImGui.IsItemClicked();
+
+        if (headerItemClicked)
+        {
+            ImGui.SetClipboardText(uidText);
+        }
+
+        UiSharedService.AttachToolTip("Click to copy");
+
         if (_apiController.ServerState is ServerState.Connected && analysisSummary.HasData)
         {
             var objectSummary = analysisSummary.Objects.Values.FirstOrDefault(summary => summary.HasEntries);
@@ -608,30 +675,24 @@ public class CompactUi : WindowMediatorSubscriberBase
 
                 if ((isOverTriHold || isOverVRAMUsage) && _playerPerformanceConfig.Current.WarnOnExceedingThresholds)
                 {
-                    ImGui.SetCursorScreenPos(new Vector2(nextIconX, uidTextRectMin.Y + textVerticalOffset));
-                    
-                    ImGui.InvisibleButton("WarningThresholdIcon", buttonSize);
-                    var warningIconPos = ImGui.GetItemRectMin() + new Vector2(0f, iconYOffset);
-                    using (_uiSharedService.IconFont.Push())
-                        ImGui.GetWindowDrawList().AddText(warningIconPos, ImGui.GetColorU32(UIColors.Get("LightlessYellow")), FontAwesomeIcon.ExclamationTriangle.ToIconString());
+                    ImGui.SameLine();
+                    ImGui.SetCursorPosY(cursorY + 15f);
+                    _uiSharedService.IconText(FontAwesomeIcon.ExclamationTriangle, UIColors.Get("LightlessYellow"));
 
-                    if (ImGui.IsItemHovered())
+                    string warningMessage = "";
+                    if (isOverTriHold)
                     {
-                        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);
+                        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)));
@@ -640,34 +701,6 @@ public class CompactUi : WindowMediatorSubscriberBase
             }
         }
 
-
-        if (uidTextHovered)
-        {
-            var padding = new Vector2(35f * ImGuiHelpers.GlobalScale);
-            Selune.RegisterHighlight(
-                uidTextRectMin - padding,
-                uidTextRectMin + uidTextRect + padding,
-                SeluneHighlightMode.Point,
-                exactSize: true,
-                clipToElement: true,
-                clipPadding: padding,
-                highlightColorOverride: vanityGlowColor,
-                highlightAlphaOverride: 0.05f);
-            
-            ImGui.SetTooltip("Click to copy");
-        }
-
-        if (headerItemClicked)
-        {
-            ImGui.SetClipboardText(uidText);
-        }
-
-        // Connect/Disconnect button next to big UID (use screen pos to avoid affecting layout)
-        DrawConnectButton(uidTextRectMin.Y + textVerticalOffset, uidTextSize.Y);
-
-        // Add spacing below the big UID
-        ImGuiHelpers.ScaledDummy(5f);
-
         if (_apiController.ServerState is ServerState.Connected)
         {
             if (headerItemClicked)
@@ -675,12 +708,10 @@ public class CompactUi : WindowMediatorSubscriberBase
                 ImGui.SetClipboardText(_apiController.DisplayName);
             }
 
-            // Only show smaller UID line if DisplayName differs from UID (custom vanity name)
-            bool hasCustomName = !string.Equals(_apiController.DisplayName, _apiController.UID, StringComparison.OrdinalIgnoreCase);
-            
-            if (hasCustomName)
+            if (!string.Equals(_apiController.DisplayName, _apiController.UID, StringComparison.Ordinal))
             {
-                ImGui.SetCursorPosX(uidStartX);
+                var origTextSize = ImGui.CalcTextSize(_apiController.UID);
+                ImGui.SetCursorPosX((ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X) / 2 - (origTextSize.X / 2));
 
                 if (useVanityColors)
                 {
@@ -715,88 +746,14 @@ public class CompactUi : WindowMediatorSubscriberBase
                 {
                     ImGui.SetClipboardText(_apiController.UID);
                 }
-
-                // Users Online on same line as smaller UID (with separator)
-                ImGui.SameLine();
-                ImGui.AlignTextToFramePadding();
-                ImGui.TextUnformatted("|");
-                ImGui.SameLine();
-                ImGui.TextColored(UIColors.Get("LightlessGreen"), _apiController.OnlineUsers.ToString(CultureInfo.InvariantCulture));
-                ImGui.SameLine();
-                ImGui.TextUnformatted("Users Online");
-            }
-            else
-            {
-                // No custom name - just show Users Online aligned to uidStartX
-                ImGui.SetCursorPosX(uidStartX);
-                ImGui.TextColored(UIColors.Get("LightlessGreen"), _apiController.OnlineUsers.ToString(CultureInfo.InvariantCulture));
-                ImGui.SameLine();
-                ImGui.TextUnformatted("Users Online");
             }
         }
         else
         {
-            ImGui.SetCursorPosX(uidStartX);
             UiSharedService.ColorTextWrapped(_apiController.ServerState.GetServerError(_apiController.AuthFailureMessage), uidColor);
         }
     }
 
-    private void DrawConnectButton(float screenY, float textHeight)
-    {
-        var buttonSize = _uiSharedService.GetIconButtonSize(FontAwesomeIcon.Link);
-        bool isConnectingOrConnected = _apiController.ServerState is ServerState.Connected or ServerState.Connecting or ServerState.Reconnecting;
-        var color = UiSharedService.GetBoolColor(!isConnectingOrConnected);
-        var connectedIcon = isConnectingOrConnected ? FontAwesomeIcon.Unlink : FontAwesomeIcon.Link;
-
-        // Position on right side, vertically centered with text
-        if (_apiController.ServerState is not (ServerState.Reconnecting or ServerState.Disconnecting))
-        {
-            var windowPos = ImGui.GetWindowPos();
-            var screenX = windowPos.X + UiSharedService.GetWindowContentRegionWidth() - buttonSize.X - 13f;
-            var yOffset = (textHeight - buttonSize.Y) * 0.5f;
-            ImGui.SetCursorScreenPos(new Vector2(screenX, screenY + yOffset));
-
-            using (ImRaii.PushColor(ImGuiCol.Text, color))
-            using (ImRaii.PushColor(ImGuiCol.Button, ImGui.ColorConvertFloat4ToU32(new(0, 0, 0, 0))))
-            {
-                if (_uiSharedService.IconButton(connectedIcon, buttonSize.Y))
-                {
-                    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();
-                }
-            }
-
-            if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenBlockedByActiveItem) || ImGui.IsItemActive())
-            {
-                Selune.RegisterHighlight(
-                    ImGui.GetItemRectMin(),
-                    ImGui.GetItemRectMax(),
-                    SeluneHighlightMode.Both,
-                    borderOnly: true,
-                    borderThicknessOverride: ConnectButtonHighlightThickness,
-                    exactSize: true,
-                    clipToElement: true,
-                    roundingOverride: ImGui.GetStyle().FrameRounding);
-            }
-
-            UiSharedService.AttachToolTip(isConnectingOrConnected ? "Disconnect from " + _serverManager.CurrentServer.ServerName : "Connect to " + _serverManager.CurrentServer.ServerName);
-        }
-    }
-
-    #endregion
-
-    #region Folder Building
-
     private IEnumerable<IDrawFolder> DrawFolders
     {
         get
@@ -932,10 +889,6 @@ public class CompactUi : WindowMediatorSubscriberBase
         }
     }
 
-    #endregion
-
-    #region Filtering & Sorting
-
     private static bool PassesFilter(PairUiEntry entry, string filter)
     {
         if (string.IsNullOrEmpty(filter)) return true;
@@ -1079,11 +1032,10 @@ public class CompactUi : WindowMediatorSubscriberBase
         return SortGroupEntries(entries, group);
     }
 
-    #endregion
-
-    #region GPose Handlers
-
-    private void UiSharedService_GposeEnd() => IsOpen = _wasOpen;
+    private void UiSharedService_GposeEnd()
+    {
+        IsOpen = _wasOpen;
+    }
 
     private void UiSharedService_GposeStart()
     {
@@ -1091,10 +1043,6 @@ public class CompactUi : WindowMediatorSubscriberBase
         IsOpen = false;
     }
 
-    #endregion
-
-    #region Focus Tracking
-
     private void RegisterFocusCharacter(Pair pair)
     {
         _pendingFocusPair = pair;
@@ -1140,16 +1088,4 @@ public class CompactUi : WindowMediatorSubscriberBase
         _pendingFocusPair = null;
         _pendingFocusFrame = -1;
     }
-
-    #endregion
-
-    #region Helper Types
-
-    [StructLayout(LayoutKind.Auto)]
-    private readonly record struct DownloadSummary(int TotalFiles, int TransferredFiles, long TransferredBytes, long TotalBytes)
-    {
-        public bool HasDownloads => TotalFiles > 0 || TotalBytes > 0;
-    }
-
-    #endregion
 }

LightlessSync/UI/SettingsUi.cs

@@ -5,6 +5,7 @@ using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Utility;
+using Lifestream.Enums;
 using LightlessSync.API.Data;
 using LightlessSync.API.Data.Comparer;
 using LightlessSync.API.Data.Enum;
@@ -69,8 +70,6 @@ public class SettingsUi : WindowMediatorSubscriberBase
     private readonly UiSharedService _uiShared;
     private readonly IProgress<(int, int, FileCacheEntity)> _validationProgress;
     private readonly NameplateService _nameplateService;
-    private readonly AnimatedHeader _animatedHeader = new();
-
     private (int, int, FileCacheEntity) _currentProgress;
     private bool _deleteAccountPopupModalShown = false;
     private bool _deleteFilesPopupModalShown = false;
@@ -207,10 +206,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         _nameplateService = nameplateService;
         _actorObjectService = actorObjectService;
         _validationProgress = new Progress<(int, int, FileCacheEntity)>(v => _currentProgress = v);
-        _animatedHeader.Height = 120f;
-        _animatedHeader.EnableBottomGradient = true;
-        _animatedHeader.GradientHeight = 250f;
-        _animatedHeader.EnableParticles = _configService.Current.EnableParticleEffects;
+
         WindowBuilder.For(this)
             .AllowPinning(true)
             .AllowClickthrough(false)
@@ -246,7 +242,6 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
     public override void OnClose()
     {
-        _animatedHeader.ClearParticles();
         _uiShared.EditTrackerPosition = false;
         _uidToAddForIgnore = string.Empty;
         _secretKeysConversionCts = _secretKeysConversionCts.CancelRecreate();
@@ -261,8 +256,8 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
     protected override void DrawInternal()
     {
-        _animatedHeader.Draw(ImGui.GetContentRegionAvail().X, (_, _) => { });
         _ = _uiShared.DrawOtherPluginState();
+
         DrawSettingsContent();
     }
     private static Vector3 PackedColorToVector3(uint color)
@@ -1249,7 +1244,6 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
             ImGui.TreePop();
         }
-#endif
         if (_uiShared.IconTextButton(FontAwesomeIcon.Copy, "[DEBUG] Copy Last created Character Data to clipboard"))
         {
             if (LastCreatedCharacterData != null)
@@ -1265,6 +1259,39 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
         UiSharedService.AttachToolTip("Use this when reporting mods being rejected from the server.");
 
+        if (_uiShared.IconTextButton(FontAwesomeIcon.Home, "Teleport to Limsa [LIFESTREAM TEST]") && _ipcManager.Lifestream.APIAvailable)
+        {
+            _ipcManager.Lifestream.ExecuteLifestreamCommand("limsa");
+        }
+
+        if (_uiShared.IconTextButton(FontAwesomeIcon.Home, "Teleport to JoyHouse [LIFESTREAM TEST]") && _ipcManager.Lifestream.APIAvailable)
+        {
+            var twintania = _dalamudUtilService.WorldData.Value
+               .FirstOrDefault(kvp => kvp.Value.Equals("Twintania", StringComparison.OrdinalIgnoreCase));
+
+            int ward = 29;
+            int plot = 7;
+
+            AddressBookEntryTuple addressEntry = (
+                Name: "",
+                World: (int)twintania.Key,
+                City: (int)ResidentialAetheryteKind.Kugane,
+                Ward: ward,
+                PropertyType: 0,
+                Plot: plot,
+                Apartment: 1,
+                ApartmentSubdivision: false,
+                AliasEnabled: false,
+                Alias: ""
+            );
+
+            _logger.LogInformation("going to: {address}", addressEntry);
+
+            _ipcManager.Lifestream.GoToHousingAddress(addressEntry);
+        }
+#endif
+
+
         _uiShared.DrawCombo("Log Level", Enum.GetValues<LogLevel>(), (l) => l.ToString(), (l) =>
         {
             _configService.Current.LogLevel = l;
@@ -2095,7 +2122,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
         ImGui.Separator();
         var openPopupOnAddition = _configService.Current.OpenPopupOnAdd;
-        
+
         using (var popupTree = BeginGeneralTree("Popup & Auto Fill", UIColors.Get("LightlessPurple")))
         {
             if (popupTree.Visible)
@@ -2152,20 +2179,11 @@ public class SettingsUi : WindowMediatorSubscriberBase
         var groupInVisible = _configService.Current.ShowSyncshellUsersInVisible;
         var syncshellOfflineSeparate = _configService.Current.ShowSyncshellOfflineUsersSeparately;
         var greenVisiblePair = _configService.Current.ShowVisiblePairsGreenEye;
-        var enableParticleEffects = _configService.Current.EnableParticleEffects;
 
         using (var behaviorTree = BeginGeneralTree("Behavior", UIColors.Get("LightlessPurple")))
         {
             if (behaviorTree.Visible)
             {
-                if (ImGui.Checkbox("Enable Particle Effects", ref enableParticleEffects))
-                {
-                    _configService.Current.EnableParticleEffects = enableParticleEffects; 
-                    _configService.Save();
-                }
-                
-                _uiShared.DrawHelpText("This will enable particle effects in the UI.");
-                
                 if (ImGui.Checkbox("Enable Game Right Click Menu Entries", ref enableRightClickMenu))
                 {
                     _configService.Current.EnableRightClickMenus = enableRightClickMenu;
@@ -2874,21 +2892,16 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
                     var colorNames = new[]
                     {
-                        ("LightlessPurple", "Primary Purple", "Section titles and dividers"),
-                        ("LightlessPurpleActive", "Primary Purple (Active)", "Active tabs and hover highlights"),
-                        ("LightlessPurpleDefault", "Primary Purple (Inactive)", "Inactive tabs and default dividers"),
-                        ("LightlessBlue", "Secondary Blue", "Secondary title colors, visable pairs"),
-                        ("LightlessGreen", "Success Green", "Join buttons and success messages"),
-                        ("LightlessYellow", "Warning Yellow", "Warning colors"),
-                        ("LightlessOrange", "Performance Orange", "Performance notifications and warnings"),
-                        ("PairBlue", "Syncshell Blue", "Syncshell headers, toggle highlights, and moderator actions"),
-                        ("DimRed", "Error Red", "Error and offline colors"),    
-                        ("HeaderGradientTop", "Header Gradient (Top)", "Top color of the animated header background"),
-                        ("HeaderGradientBottom", "Header Gradient (Bottom)", "Bottom color of the animated header background"),
-                        ("HeaderStaticStar", "Header Stars", "Tint color for the static background stars in the header"),
-                        ("HeaderShootingStar", "Header Shooting Star", "Tint color for the shooting star effect"),
-                    };
-
+                    ("LightlessPurple", "Primary Purple", "Section titles and dividers"),
+                    ("LightlessPurpleActive", "Primary Purple (Active)", "Active tabs and hover highlights"),
+                    ("LightlessPurpleDefault", "Primary Purple (Inactive)", "Inactive tabs and default dividers"),
+                    ("LightlessBlue", "Secondary Blue", "Secondary title colors, visable pairs"),
+                    ("LightlessGreen", "Success Green", "Join buttons and success messages"),
+                    ("LightlessYellow", "Warning Yellow", "Warning colors"),
+                    ("LightlessOrange", "Performance Orange", "Performance notifications and warnings"),
+                    ("PairBlue", "Syncshell Blue", "Syncshell headers, toggle highlights, and moderator actions"),
+                    ("DimRed", "Error Red", "Error and offline colors")
+                };
                     if (ImGui.BeginTable("##ColorTable", 3,
                             ImGuiTableFlags.Borders | ImGuiTableFlags.RowBg | ImGuiTableFlags.SizingFixedFit))
                     {

LightlessSync/UI/Style/AnimatedHeader.cs

@@ -43,23 +43,10 @@ public class AnimatedHeader
     private const float _extendedParticleHeight = 40f;
 
     public float Height { get; set; } = 150f;
-
-    // Color keys for theming
-    public string? TopColorKey { get; set; } = "HeaderGradientTop";
-    public string? BottomColorKey { get; set; } = "HeaderGradientBottom";
-    public string? StaticStarColorKey { get; set; } = "HeaderStaticStar";
-    public string? ShootingStarColorKey { get; set; } = "HeaderShootingStar";
-
-    // Fallbacks if the color keys are not found
     public Vector4 TopColor { get; set; } = new(0.08f, 0.05f, 0.15f, 1.0f);
     public Vector4 BottomColor { get; set; } = new(0.12f, 0.08f, 0.20f, 1.0f);
-    public Vector4 StaticStarColor { get; set; } = new(1f, 1f, 1f, 1f);
-    public Vector4 ShootingStarColor { get; set; } = new(0.4f, 0.8f, 1.0f, 1.0f);
-
     public bool EnableParticles { get; set; } = true;
     public bool EnableBottomGradient { get; set; } = true;
-    
-    public float GradientHeight { get; set; } = 60f;
 
     /// <summary>
     /// Draws the animated header with some customizable content
@@ -159,21 +146,16 @@ public class AnimatedHeader
     {
         var drawList = ImGui.GetWindowDrawList();
 
-        var top = ResolveColor(TopColorKey, TopColor);
-        var bottom = ResolveColor(BottomColorKey, BottomColor);
-
         drawList.AddRectFilledMultiColor(
             headerStart,
             headerEnd,
-            ImGui.GetColorU32(top),
-            ImGui.GetColorU32(top),
-            ImGui.GetColorU32(bottom),
-            ImGui.GetColorU32(bottom)
+            ImGui.GetColorU32(TopColor),
+            ImGui.GetColorU32(TopColor),
+            ImGui.GetColorU32(BottomColor),
+            ImGui.GetColorU32(BottomColor)
         );
 
         // Draw static background stars
-        var starBase = ResolveColor(StaticStarColorKey, StaticStarColor);
-
         var random = new Random(42);
         for (int i = 0; i < 50; i++)
         {
@@ -182,28 +164,23 @@ public class AnimatedHeader
                 (float)random.NextDouble() * (headerEnd.Y - headerStart.Y)
             );
             var brightness = 0.3f + (float)random.NextDouble() * 0.4f;
-            var starColor = starBase with { W = starBase.W * brightness };
-
-            drawList.AddCircleFilled(starPos, 1f, ImGui.GetColorU32(starColor));
+            drawList.AddCircleFilled(starPos, 1f, ImGui.GetColorU32(new Vector4(1f, 1f, 1f, brightness)));
         }
     }
 
     private void DrawBottomGradient(Vector2 headerStart, Vector2 headerEnd, float width)
     {
         var drawList = ImGui.GetWindowDrawList();
-        var gradientHeight = GradientHeight;
-        var bottom = ResolveColor(BottomColorKey, BottomColor);
+        var gradientHeight = 60f;
 
         for (int i = 0; i < gradientHeight; i++)
         {
             var progress = i / gradientHeight;
             var smoothProgress = progress * progress;
-
-            var r = bottom.X + (0.0f - bottom.X) * smoothProgress;
-            var g = bottom.Y + (0.0f - bottom.Y) * smoothProgress;
-            var b = bottom.Z + (0.0f - bottom.Z) * smoothProgress;
+            var r = BottomColor.X + (0.0f - BottomColor.X) * smoothProgress;
+            var g = BottomColor.Y + (0.0f - BottomColor.Y) * smoothProgress;
+            var b = BottomColor.Z + (0.0f - BottomColor.Z) * smoothProgress;
             var alpha = 1f - smoothProgress;
-
             var gradientColor = new Vector4(r, g, b, alpha);
             drawList.AddLine(
                 new Vector2(headerStart.X, headerEnd.Y + i),
@@ -331,11 +308,9 @@ public class AnimatedHeader
                 ? baseAlpha * (0.6f + 0.4f * MathF.Sin(particle.Twinkle))
                 : baseAlpha;
 
-            var shootingBase = ResolveColor(ShootingStarColorKey, ShootingStarColor);
-
             if (particle.Type == ParticleType.ShootingStar && particle.Trail != null && particle.Trail.Count > 1)
             {
-                var baseColor = shootingBase;
+                var cyanColor = new Vector4(0.4f, 0.8f, 1.0f, 1.0f);
 
                 for (int t = 1; t < particle.Trail.Count; t++)
                 {
@@ -344,18 +319,17 @@ public class AnimatedHeader
                     var trailWidth = (1f - trailProgress) * 3f + 1f;
 
                     var glowAlpha = trailAlpha * 0.4f;
-
                     drawList.AddLine(
                         bannerStart + particle.Trail[t - 1],
                         bannerStart + particle.Trail[t],
-                        ImGui.GetColorU32(baseColor with { W = glowAlpha }),
+                        ImGui.GetColorU32(cyanColor with { W = glowAlpha }),
                         trailWidth + 4f
                     );
 
                     drawList.AddLine(
                         bannerStart + particle.Trail[t - 1],
                         bannerStart + particle.Trail[t],
-                        ImGui.GetColorU32(baseColor with { W = trailAlpha }),
+                        ImGui.GetColorU32(cyanColor with { W = trailAlpha }),
                         trailWidth
                     );
                 }
@@ -474,13 +448,6 @@ public class AnimatedHeader
             Hue = 270f
         });
     }
-    private static Vector4 ResolveColor(string? key, Vector4 fallback)
-    {
-        if (string.IsNullOrWhiteSpace(key))
-            return fallback;
-
-        return UIColors.Get(key);
-    }
 
     /// <summary>
     /// Clears all active particles. Useful when closing or hiding a window with an animated header.

LightlessSync/UI/Style/MainStyle.cs

@@ -40,10 +40,9 @@ internal static class MainStyle
         new("color.frameBg", "Frame Background", () => Rgba(40, 40, 40, 255), ImGuiCol.FrameBg),
         new("color.frameBgHovered", "Frame Background (Hover)", () => Rgba(50, 50, 50, 100), ImGuiCol.FrameBgHovered),
         new("color.frameBgActive", "Frame Background (Active)", () => Rgba(30, 30, 30, 255), ImGuiCol.FrameBgActive),
-        new("color.titleBg", "Title Background", () => Rgba(22, 14, 41, 255), ImGuiCol.TitleBg),
-        new("color.titleBgActive", "Title Background (Active)", () => Rgba(22, 14, 41, 255), ImGuiCol.TitleBgActive),
-        new("color.titleBgCollapsed", "Title Background (Collapsed)", () => Rgba(22, 14, 41, 255), ImGuiCol.TitleBgCollapsed),
-        
+        new("color.titleBg", "Title Background", () => Rgba(24, 24, 24, 232), ImGuiCol.TitleBg),
+        new("color.titleBgActive", "Title Background (Active)", () => Rgba(30, 30, 30, 255), ImGuiCol.TitleBgActive),
+        new("color.titleBgCollapsed", "Title Background (Collapsed)", () => Rgba(27, 27, 27, 255), ImGuiCol.TitleBgCollapsed),
         new("color.menuBarBg", "Menu Bar Background", () => Rgba(36, 36, 36, 255), ImGuiCol.MenuBarBg),
         new("color.scrollbarBg", "Scrollbar Background", () => Rgba(0, 0, 0, 0), ImGuiCol.ScrollbarBg),
         new("color.scrollbarGrab", "Scrollbar Grab", () => Rgba(62, 62, 62, 255), ImGuiCol.ScrollbarGrab),

LightlessSync/UI/SyncshellFinderUI.cs

@@ -0,0 +1,855 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface;
+using Dalamud.Interface.Colors;
+using Dalamud.Interface.Textures.TextureWraps;
+using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
+using Dalamud.Plugin.Services;
+using LightlessSync.API.Data;
+using LightlessSync.API.Data.Enum;
+using LightlessSync.API.Data.Extensions;
+using LightlessSync.API.Dto;
+using LightlessSync.API.Dto.Group;
+using LightlessSync.Services;
+using LightlessSync.Services.LightFinder;
+using LightlessSync.Services.Mediator;
+using LightlessSync.UI.Services;
+using LightlessSync.UI.Tags;
+using LightlessSync.Utils;
+using LightlessSync.WebAPI;
+using Microsoft.Extensions.Logging;
+using System.Numerics;
+
+namespace LightlessSync.UI;
+
+public class SyncshellFinderUI : WindowMediatorSubscriberBase
+{
+    private readonly ApiController _apiController;
+    private readonly LightFinderService _broadcastService;
+    private readonly UiSharedService _uiSharedService;
+    private readonly LightFinderScannerService _broadcastScannerService;
+    private readonly PairUiService _pairUiService;
+    private readonly DalamudUtilService _dalamudUtilService;
+
+    private Vector4 _tagBackgroundColor = new(0.18f, 0.18f, 0.18f, 0.95f);
+    private Vector4 _tagBorderColor = new(0.35f, 0.35f, 0.35f, 0.4f);
+
+    private readonly List<SeStringUtils.SeStringSegment> _seResolvedSegments = new();
+    private readonly List<GroupJoinDto> _nearbySyncshells = [];
+    private List<GroupFullInfoDto> _currentSyncshells = [];
+    private int _selectedNearbyIndex = -1;
+    private int _syncshellPageIndex = 0;
+    private readonly HashSet<string> _recentlyJoined = new(StringComparer.Ordinal);
+
+    private GroupJoinDto? _joinDto;
+    private GroupJoinInfoDto? _joinInfo;
+    private DefaultPermissionsDto _ownPermissions = null!;
+    private bool _useTestSyncshells = false;
+
+    private bool _compactView = false;
+    private readonly LightlessProfileManager _lightlessProfileManager;
+
+    public SyncshellFinderUI(
+        ILogger<SyncshellFinderUI> logger,
+        LightlessMediator mediator,
+        PerformanceCollectorService performanceCollectorService,
+        LightFinderService broadcastService,
+        UiSharedService uiShared,
+        ApiController apiController,
+        LightFinderScannerService broadcastScannerService,
+        PairUiService pairUiService,
+        DalamudUtilService dalamudUtilService,
+        LightlessProfileManager lightlessProfileManager) : base(logger, mediator, "Shellfinder###LightlessSyncshellFinderUI", performanceCollectorService)
+    {
+        _broadcastService = broadcastService;
+        _uiSharedService = uiShared;
+        _apiController = apiController;
+        _broadcastScannerService = broadcastScannerService;
+        _pairUiService = pairUiService;
+        _dalamudUtilService = dalamudUtilService;
+        _lightlessProfileManager = lightlessProfileManager;
+
+        IsOpen = false;
+        WindowBuilder.For(this)
+                   .SetSizeConstraints(new Vector2(600, 400), new Vector2(600, 550))
+                   .Apply();
+
+        Mediator.Subscribe<SyncshellBroadcastsUpdatedMessage>(this, async _ => await RefreshSyncshellsAsync().ConfigureAwait(false));
+        Mediator.Subscribe<BroadcastStatusChangedMessage>(this, async _ => await RefreshSyncshellsAsync().ConfigureAwait(false));
+        Mediator.Subscribe<UserLeftSyncshell>(this, async _ => await RefreshSyncshellsAsync(_.gid).ConfigureAwait(false));
+        Mediator.Subscribe<UserJoinedSyncshell>(this, async _ => await RefreshSyncshellsAsync(_.gid).ConfigureAwait(false));
+    }
+
+    public override async void OnOpen()
+    {
+        _ownPermissions = _apiController.DefaultPermissions.DeepClone()!;
+        await RefreshSyncshellsAsync().ConfigureAwait(false);
+    }
+
+    protected override void DrawInternal()
+    {
+        ImGui.BeginGroup();
+        _uiSharedService.MediumText("Nearby Syncshells", UIColors.Get("LightlessPurple"));
+
+#if DEBUG
+        if (ImGui.SmallButton("Show test syncshells"))
+        {
+            _useTestSyncshells = !_useTestSyncshells;
+            _ = Task.Run(async () => await RefreshSyncshellsAsync().ConfigureAwait(false));
+        }
+        ImGui.SameLine();
+#endif
+
+        string checkboxLabel = "Compact view";
+        float availWidth = ImGui.GetContentRegionAvail().X;
+        float checkboxWidth = ImGui.CalcTextSize(checkboxLabel).X + ImGui.GetFrameHeight();
+
+        float rightX = ImGui.GetCursorPosX() + availWidth - checkboxWidth - 4.0f;
+        ImGui.SetCursorPosX(rightX);
+        ImGui.Checkbox(checkboxLabel, ref _compactView);
+        ImGui.EndGroup();
+
+        UiSharedService.ColoredSeparator(UIColors.Get("LightlessPurpleDefault"));
+        ImGui.Dummy(new Vector2(0, 2 * ImGuiHelpers.GlobalScale));
+        if (_nearbySyncshells.Count == 0)
+        {
+            ImGui.TextColored(ImGuiColors.DalamudGrey, "No nearby syncshells are being broadcasted.");
+
+            if (!_broadcastService.IsBroadcasting)
+            {
+
+                UiSharedService.ColoredSeparator(UIColors.Get("LightlessYellow"));
+
+                ImGui.TextColored(UIColors.Get("LightlessYellow"), "Lightfinder is currently disabled, to locate nearby syncshells, Lightfinder must be active.");
+                ImGuiHelpers.ScaledDummy(0.5f);
+
+                ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 10.0f);
+                ImGui.PushStyleColor(ImGuiCol.Button, UIColors.Get("LightlessPurple"));
+
+                if (ImGui.Button("Open Lightfinder", new Vector2(200 * ImGuiHelpers.GlobalScale, 0)))
+                {
+                    Mediator.Publish(new UiToggleMessage(typeof(LightFinderUI)));
+                }
+
+                ImGui.PopStyleColor();
+                ImGui.PopStyleVar();
+
+                return;
+            }
+
+            return;
+        }
+
+        var broadcasts = _broadcastScannerService.GetActiveSyncshellBroadcasts().ToList() ?? [];
+        _broadcastScannerService.TryGetLocalHashedCid(out var localHashedCid);
+
+        var cardData = new List<(GroupJoinDto Shell, string BroadcasterName, bool IsSelfBroadcast)>();
+
+        foreach (var shell in _nearbySyncshells)
+        {
+            string broadcasterName;
+
+            if (shell?.Group == null || string.IsNullOrEmpty(shell.Group.GID))
+                continue;
+
+            if (_useTestSyncshells)
+            {
+                var displayName = !string.IsNullOrEmpty(shell.Group.Alias)
+                    ? shell.Group.Alias
+                    : shell.Group.GID;
+
+                broadcasterName = $"{displayName} (Tester of TestWorld)";
+            }
+            else
+            {
+                var broadcast = broadcasts
+                    .FirstOrDefault(b => string.Equals(b.GID, shell.Group.GID, StringComparison.Ordinal));
+
+                if (broadcast == null)
+                    continue;
+
+                var (name, address) = _dalamudUtilService.FindPlayerByNameHash(broadcast.HashedCID);
+                if (string.IsNullOrEmpty(name))
+                    continue;
+
+                var worldName = _dalamudUtilService.GetWorldNameFromPlayerAddress(address);
+                broadcasterName = !string.IsNullOrEmpty(worldName)
+                    ? $"{name} ({worldName})"
+                    : name;
+
+                var isSelfBroadcast = !string.IsNullOrEmpty(localHashedCid)
+                    && string.Equals(broadcast.HashedCID, localHashedCid, StringComparison.Ordinal);
+
+                cardData.Add((shell, broadcasterName, isSelfBroadcast));
+                continue;
+            }
+
+            cardData.Add((shell, broadcasterName, false));
+        }
+
+        if (cardData.Count == 0)
+        {
+            ImGui.TextColored(ImGuiColors.DalamudGrey, "No nearby syncshells are being broadcasted.");
+            return;
+        }
+
+        if (_compactView)
+        {
+            DrawSyncshellGrid(cardData);
+        }
+        else
+        {
+            DrawSyncshellList(cardData);
+        }
+
+
+        if (_joinDto != null && _joinInfo != null && _joinInfo.Success)
+            DrawConfirmation();
+    }
+
+    private void DrawSyncshellList(List<(GroupJoinDto Shell, string BroadcasterName, bool IsSelfBroadcast)> listData)
+    {
+        const int shellsPerPage = 3;
+        var totalPages = (int)Math.Ceiling(listData.Count / (float)shellsPerPage);
+        if (totalPages <= 0)
+            totalPages = 1;
+
+        _syncshellPageIndex = Math.Clamp(_syncshellPageIndex, 0, totalPages - 1);
+
+        var firstIndex = _syncshellPageIndex * shellsPerPage;
+        var lastExclusive = Math.Min(firstIndex + shellsPerPage, listData.Count);
+
+        ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 8.0f);
+        ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 1.0f);
+
+        for (int index = firstIndex; index < lastExclusive; index++)
+        {
+            var (shell, broadcasterName, isSelfBroadcast) = listData[index];
+            var broadcasterLabel = string.IsNullOrEmpty(broadcasterName)
+                ? (isSelfBroadcast ? "You" : string.Empty)
+                : (isSelfBroadcast ? $"{broadcasterName} (You)" : broadcasterName);
+
+            ImGui.PushID(shell.Group.GID);
+            float rowHeight = 74f * ImGuiHelpers.GlobalScale;
+
+            ImGui.BeginChild($"ShellRow##{shell.Group.GID}", new Vector2(-1, rowHeight), border: true);
+
+            var displayName = !string.IsNullOrEmpty(shell.Group.Alias) ? shell.Group.Alias : shell.Group.GID;
+
+            var style = ImGui.GetStyle();
+            float startX = ImGui.GetCursorPosX();
+            float regionW = ImGui.GetContentRegionAvail().X;
+            float rightTxtW = ImGui.CalcTextSize(broadcasterLabel).X;
+
+            _uiSharedService.MediumText(displayName, UIColors.Get("LightlessPurple"));
+            if (ImGui.IsItemHovered())
+                ImGui.SetTooltip("Click to open profile.");
+            if (ImGui.IsItemClicked())
+            {
+                Mediator.Publish(new GroupProfileOpenStandaloneMessage(shell.Group));
+            }
+
+            float rightX = startX + regionW - rightTxtW - style.ItemSpacing.X;
+            ImGui.SameLine();
+            ImGui.SetCursorPosX(rightX);
+            ImGui.TextUnformatted(broadcasterLabel);
+            if (ImGui.IsItemHovered())
+                ImGui.SetTooltip("Broadcaster of the syncshell.");
+
+            UiSharedService.ColoredSeparator(UIColors.Get("LightlessPurpleDefault"));
+
+            var groupProfile = _lightlessProfileManager.GetLightlessGroupProfile(shell.Group);
+
+            IReadOnlyList<ProfileTagDefinition> groupTags =
+                groupProfile != null && groupProfile.Tags.Count > 0
+                    ? ProfileTagService.ResolveTags(groupProfile.Tags)
+                    : [];
+
+            var limitedTags = groupTags.Count > 3
+                ? [.. groupTags.Take(3)]
+                : groupTags;
+
+            float tagScale = ImGuiHelpers.GlobalScale * 0.9f;
+
+            Vector2 rowStartLocal = ImGui.GetCursorPos();
+
+            float tagsWidth = 0f;
+            float tagsHeight = 0f;
+
+            if (limitedTags.Count > 0)
+            {
+                (tagsWidth, tagsHeight) = RenderProfileTagsSingleRow(limitedTags, tagScale);
+            }
+            else
+            {
+                ImGui.SetCursorPosX(startX);
+                ImGui.TextDisabled("-- No tags set --");
+                ImGui.Dummy(new Vector2(0, 4 * ImGuiHelpers.GlobalScale));
+            }
+
+            float btnBaselineY = rowStartLocal.Y;
+            float joinX = rowStartLocal.X + (tagsWidth > 0 ? tagsWidth + style.ItemSpacing.X : 0f);
+
+            ImGui.SetCursorPos(new Vector2(joinX, btnBaselineY));
+            DrawJoinButton(shell, isSelfBroadcast);
+
+            float btnHeight = ImGui.GetFrameHeightWithSpacing();
+            float rowHeightUsed = MathF.Max(tagsHeight, btnHeight);
+
+            ImGui.SetCursorPos(new Vector2(
+                rowStartLocal.X,
+                rowStartLocal.Y + rowHeightUsed));
+
+            ImGui.EndChild();
+            ImGui.PopID();
+
+            ImGui.Dummy(new Vector2(0, 2 * ImGuiHelpers.GlobalScale));
+        }
+
+        ImGui.PopStyleVar(2);
+
+        DrawPagination(totalPages);
+    }
+
+    private void DrawSyncshellGrid(List<(GroupJoinDto Shell, string BroadcasterName, bool IsSelfBroadcast)> cardData)
+    {
+        const int shellsPerPage = 4;
+        var totalPages = (int)Math.Ceiling(cardData.Count / (float)shellsPerPage);
+        if (totalPages <= 0)
+            totalPages = 1;
+
+        _syncshellPageIndex = Math.Clamp(_syncshellPageIndex, 0, totalPages - 1);
+
+        var firstIndex = _syncshellPageIndex * shellsPerPage;
+        var lastExclusive = Math.Min(firstIndex + shellsPerPage, cardData.Count);
+
+        var avail = ImGui.GetContentRegionAvail();
+        var spacing = ImGui.GetStyle().ItemSpacing;
+
+        var cardWidth = (avail.X - spacing.X) / 2.0f;
+        var cardHeight = (avail.Y - spacing.Y - (ImGui.GetFrameHeightWithSpacing() * 2.0f)) / 2.0f;
+        cardHeight = MathF.Max(110f * ImGuiHelpers.GlobalScale, cardHeight);
+
+        ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 8.0f);
+        ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 1.0f);
+
+        for (int index = firstIndex; index < lastExclusive; index++)
+        {
+            var localIndex = index - firstIndex;
+            var (shell, broadcasterName, isSelfBroadcast) = cardData[index];
+            var broadcasterLabel = string.IsNullOrEmpty(broadcasterName)
+                ? (isSelfBroadcast ? "You" : string.Empty)
+                : (isSelfBroadcast ? $"{broadcasterName} (You)" : broadcasterName);
+
+            if (localIndex % 2 != 0)
+                ImGui.SameLine();
+
+            ImGui.PushID(shell.Group.GID);
+
+            ImGui.BeginGroup();
+            _ = ImGui.BeginChild("ShellCard##" + shell.Group.GID, new Vector2(cardWidth, cardHeight), border: true);
+
+            var displayName = !string.IsNullOrEmpty(shell.Group.Alias)
+                ? shell.Group.Alias
+                : shell.Group.GID;
+
+            var style = ImGui.GetStyle();
+            float startX = ImGui.GetCursorPosX();
+            float availW = ImGui.GetContentRegionAvail().X;
+
+            ImGui.BeginGroup();
+
+            _uiSharedService.MediumText(displayName, UIColors.Get("LightlessPurple"));
+            if (ImGui.IsItemHovered())
+                ImGui.SetTooltip("Click to open profile.");
+            if (ImGui.IsItemClicked())
+            {
+                Mediator.Publish(new GroupProfileOpenStandaloneMessage(shell.Group));
+            }
+
+            float nameRightX = ImGui.GetItemRectMax().X;
+
+            var regionMinScreen = ImGui.GetCursorScreenPos();
+            float regionRightX = regionMinScreen.X + availW;
+
+            float minBroadcasterX = nameRightX + style.ItemSpacing.X;
+
+            float maxBroadcasterWidth = regionRightX - minBroadcasterX;
+
+            string broadcasterToShow = broadcasterLabel;
+
+            if (!string.IsNullOrEmpty(broadcasterLabel) && maxBroadcasterWidth > 0f)
+            {
+                float bcFullWidth = ImGui.CalcTextSize(broadcasterLabel).X;
+                string toolTip;
+
+                if (bcFullWidth > maxBroadcasterWidth)
+                {
+                    broadcasterToShow = TruncateTextToWidth(broadcasterLabel, maxBroadcasterWidth);
+                    toolTip = broadcasterLabel + Environment.NewLine + Environment.NewLine + "Broadcaster of the syncshell.";
+                } 
+                else
+                {
+                    toolTip = "Broadcaster of the syncshell.";
+                }
+
+                float bcWidth = ImGui.CalcTextSize(broadcasterToShow).X;
+
+                float broadX = regionRightX - bcWidth;
+
+                broadX = MathF.Max(broadX, minBroadcasterX);
+
+                ImGui.SameLine();
+                var curPos = ImGui.GetCursorPos();
+                ImGui.SetCursorPos(new Vector2(broadX - regionMinScreen.X + startX, curPos.Y + 3f * ImGuiHelpers.GlobalScale));
+                ImGui.TextUnformatted(broadcasterToShow);
+                if (ImGui.IsItemHovered())
+                    ImGui.SetTooltip(toolTip);
+            }
+
+            ImGui.EndGroup();
+
+            UiSharedService.ColoredSeparator(UIColors.Get("LightlessPurpleDefault"));
+
+            ImGui.Dummy(new Vector2(0, 6 * ImGuiHelpers.GlobalScale));
+
+            var groupProfile = _lightlessProfileManager.GetLightlessGroupProfile(shell.Group);
+
+            IReadOnlyList<ProfileTagDefinition> groupTags =
+                groupProfile != null && groupProfile.Tags.Count > 0
+                    ? ProfileTagService.ResolveTags(groupProfile.Tags)
+                    : [];
+
+            float tagScale = ImGuiHelpers.GlobalScale * 0.9f;
+
+            if (groupTags.Count > 0)
+            {
+                var limitedTags = groupTags.Count > 2
+                    ? [.. groupTags.Take(2)]
+                    : groupTags;
+
+                ImGui.SetCursorPosX(startX);
+
+                var (_, tagsHeight) = RenderProfileTagsSingleRow(limitedTags, tagScale);
+
+                ImGui.Dummy(new Vector2(0, 4 * ImGuiHelpers.GlobalScale));
+            }
+            else
+            {
+                ImGui.SetCursorPosX(startX);
+                ImGui.TextDisabled("-- No tags set --");
+                ImGui.Dummy(new Vector2(0, 4 * ImGuiHelpers.GlobalScale));
+            }
+
+            var buttonHeight = ImGui.GetFrameHeightWithSpacing();
+            var remainingY = ImGui.GetContentRegionAvail().Y - buttonHeight;
+            if (remainingY > 0)
+                ImGui.Dummy(new Vector2(0, remainingY));
+
+            DrawJoinButton(shell, isSelfBroadcast);
+
+            ImGui.EndChild();
+            ImGui.EndGroup();
+
+            ImGui.PopID();
+        }
+
+        ImGui.Dummy(new Vector2(0, 2 * ImGuiHelpers.GlobalScale));
+        ImGui.PopStyleVar(2);
+
+        DrawPagination(totalPages);
+    }
+
+    private void DrawPagination(int totalPages)
+    {
+        if (totalPages > 1)
+        {
+            UiSharedService.ColoredSeparator(UIColors.Get("LightlessPurpleDefault"));
+
+            var style = ImGui.GetStyle();
+            string pageLabel = $"Page {_syncshellPageIndex + 1}/{totalPages}";
+
+            float prevWidth = ImGui.CalcTextSize("<").X + style.FramePadding.X * 2;
+            float nextWidth = ImGui.CalcTextSize(">").X + style.FramePadding.X * 2;
+            float textWidth = ImGui.CalcTextSize(pageLabel).X;
+
+            float totalWidth = prevWidth + textWidth + nextWidth + style.ItemSpacing.X * 2;
+
+            float availWidth = ImGui.GetContentRegionAvail().X;
+            float offsetX = (availWidth - totalWidth) * 0.5f;
+
+            ImGui.SetCursorPosX(ImGui.GetCursorPosX() + offsetX);
+
+            if (ImGui.Button("<##PrevSyncshellPage") && _syncshellPageIndex > 0)
+                _syncshellPageIndex--;
+
+            ImGui.SameLine();
+            ImGui.Text(pageLabel);
+
+            ImGui.SameLine();
+            if (ImGui.Button(">##NextSyncshellPage") && _syncshellPageIndex < totalPages - 1)
+                _syncshellPageIndex++;
+        }
+    }
+
+    private void DrawJoinButton(GroupJoinDto shell, bool isSelfBroadcast)
+    {
+        const string visibleLabel = "Join";
+        var label = $"{visibleLabel}##{shell.Group.GID}";
+
+        var isAlreadyMember = _currentSyncshells.Exists(g => string.Equals(g.GID, shell.GID, StringComparison.Ordinal));
+        var isRecentlyJoined = _recentlyJoined.Contains(shell.GID);
+
+        Vector2 buttonSize;
+
+        if (!_compactView)
+        {
+            var style = ImGui.GetStyle();
+            var textSize = ImGui.CalcTextSize(visibleLabel);
+
+            var width = textSize.X + style.FramePadding.X * 20f;
+            buttonSize = new Vector2(width, 30f);
+
+            float availX = ImGui.GetContentRegionAvail().X;
+            float curX = ImGui.GetCursorPosX();
+            float newX = curX + (availX - buttonSize.X);
+            ImGui.SetCursorPosX(newX);
+        }
+        else
+        {
+            buttonSize = new Vector2(-1, 0);
+        }
+
+        if (!isAlreadyMember && !isRecentlyJoined && !isSelfBroadcast)
+        {
+            ImGui.PushStyleColor(ImGuiCol.Button, UIColors.Get("LightlessGreen"));
+            ImGui.PushStyleColor(ImGuiCol.ButtonHovered, UIColors.Get("LightlessGreen").WithAlpha(0.85f));
+            ImGui.PushStyleColor(ImGuiCol.ButtonActive, UIColors.Get("LightlessGreen").WithAlpha(0.75f));
+            if (ImGui.Button(label, buttonSize))
+            {
+                _logger.LogInformation($"Join requested for Syncshell {shell.Group.GID} ({shell.Group.Alias})");
+
+                _ = Task.Run(async () =>
+                {
+                    try
+                    {
+                        var info = await _apiController.GroupJoinHashed(new GroupJoinHashedDto(
+                            shell.Group,
+                            shell.Password,
+                            shell.GroupUserPreferredPermissions
+                        )).ConfigureAwait(false);
+
+                        if (info != null && info.Success)
+                        {
+                            _joinDto = new GroupJoinDto(shell.Group, shell.Password, shell.GroupUserPreferredPermissions);
+                            _joinInfo = info;
+                            _ownPermissions = _apiController.DefaultPermissions.DeepClone()!;
+
+                            _logger.LogInformation($"Fetched join info for {shell.Group.GID}");
+                        }
+                        else
+                        {
+                            _logger.LogWarning($"Failed to join {shell.Group.GID}: info was null or unsuccessful");
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, $"Join failed for {shell.Group.GID}");
+                    }
+                });
+            }
+        }
+        else
+        {
+            ImGui.PushStyleColor(ImGuiCol.Button, UIColors.Get("DimRed"));
+            ImGui.PushStyleColor(ImGuiCol.ButtonHovered, UIColors.Get("DimRed").WithAlpha(0.85f));
+            ImGui.PushStyleColor(ImGuiCol.ButtonActive, UIColors.Get("DimRed").WithAlpha(0.75f));
+
+            using (ImRaii.Disabled())
+            {
+                ImGui.Button(label, buttonSize);
+            }
+
+            UiSharedService.AttachToolTip(isSelfBroadcast
+                ? "This is your own Syncshell."
+                : "Already a member or owner of this Syncshell.");
+        }
+
+        ImGui.PopStyleColor(3);
+    }
+
+    private (float widthUsed, float rowHeight) RenderProfileTagsSingleRow(IReadOnlyList<ProfileTagDefinition> tags, float scale)
+    {
+        if (tags == null || tags.Count == 0)
+            return (0f, 0f);
+
+        var drawList = ImGui.GetWindowDrawList();
+        var style = ImGui.GetStyle();
+        var defaultTextColorU32 = ImGui.GetColorU32(ImGuiCol.Text);
+
+        var baseLocal = ImGui.GetCursorPos();
+        var baseScreen = ImGui.GetCursorScreenPos();
+        float availableWidth = ImGui.GetContentRegionAvail().X;
+        if (availableWidth <= 0f)
+            availableWidth = 1f;
+
+        float cursorLocalX = baseLocal.X;
+        float cursorScreenX = baseScreen.X;
+        float rowHeight = 0f;
+
+        for (int i = 0; i < tags.Count; i++)
+        {
+            var tag = tags[i];
+            if (!tag.HasContent)
+                continue;
+
+            var tagSize = ProfileTagRenderer.MeasureTag(tag, scale, style, _tagBackgroundColor, _tagBorderColor, defaultTextColorU32, _seResolvedSegments, GetIconWrap, _logger);
+
+            float tagWidth = tagSize.X;
+            float tagHeight = tagSize.Y;
+
+            if (cursorLocalX > baseLocal.X && cursorLocalX + tagWidth > baseLocal.X + availableWidth)
+                break;
+
+            var tagScreenPos = new Vector2(cursorScreenX, baseScreen.Y);
+            ImGui.SetCursorScreenPos(tagScreenPos);
+            ImGui.InvisibleButton($"##profileTagInline_{i}", tagSize);
+
+            ProfileTagRenderer.RenderTag(tag, tagScreenPos, scale, drawList, style, _tagBackgroundColor, _tagBorderColor, defaultTextColorU32, _seResolvedSegments, GetIconWrap, _logger);
+
+            cursorLocalX += tagWidth + style.ItemSpacing.X;
+            cursorScreenX += tagWidth + style.ItemSpacing.X;
+            rowHeight = MathF.Max(rowHeight, tagHeight);
+        }
+
+        ImGui.SetCursorPos(new Vector2(baseLocal.X, baseLocal.Y + rowHeight));
+
+        float widthUsed = cursorLocalX - baseLocal.X;
+        return (widthUsed, rowHeight);
+    }
+    private static string TruncateTextToWidth(string text, float maxWidth)
+    {
+        if (string.IsNullOrEmpty(text))
+            return text;
+
+        const string ellipsis = "...";
+        float ellipsisWidth = ImGui.CalcTextSize(ellipsis).X;
+
+        if (maxWidth <= ellipsisWidth)
+            return ellipsis;
+
+        int low = 0;
+        int high = text.Length;
+        string best = ellipsis;
+
+        while (low <= high)
+        {
+            int mid = (low + high) / 2;
+            string candidate = string.Concat(text.AsSpan(0, mid), ellipsis);
+            float width = ImGui.CalcTextSize(candidate).X;
+
+            if (width <= maxWidth)
+            {
+                best = candidate;
+                low = mid + 1;
+            }
+            else
+            {
+                high = mid - 1;
+            }
+        }
+
+        return best;
+    }
+
+    private IDalamudTextureWrap? GetIconWrap(uint iconId)
+    {
+        try
+        {
+            if (_uiSharedService.TryGetIcon(iconId, out var wrap) && wrap != null)
+                return wrap;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogDebug(ex, "Failed to resolve icon {IconId} for profile tags", iconId);
+        }
+
+        return null;
+    }
+
+    private void DrawConfirmation()
+    {
+        if (_joinDto != null && _joinInfo != null)
+        {
+            ImGui.Separator();
+            ImGui.TextUnformatted($"Join Syncshell: {_joinDto.Group.AliasOrGID} by {_joinInfo.OwnerAliasOrUID}");
+            ImGuiHelpers.ScaledDummy(2f);
+            ImGui.TextUnformatted("Suggested Syncshell Permissions:");
+
+            DrawPermissionRow("Sounds", _joinInfo.GroupPermissions.IsPreferDisableSounds(), _ownPermissions.DisableGroupSounds, v => _ownPermissions.DisableGroupSounds = v);
+            DrawPermissionRow("Animations", _joinInfo.GroupPermissions.IsPreferDisableAnimations(), _ownPermissions.DisableGroupAnimations, v => _ownPermissions.DisableGroupAnimations = v);
+            DrawPermissionRow("VFX", _joinInfo.GroupPermissions.IsPreferDisableVFX(), _ownPermissions.DisableGroupVFX, v => _ownPermissions.DisableGroupVFX = v);
+
+            ImGui.NewLine();
+            ImGui.NewLine();
+
+            if (_uiSharedService.IconTextButton(Dalamud.Interface.FontAwesomeIcon.Plus, $"Finalize and join {_joinDto.Group.AliasOrGID}"))
+            {
+                var finalPermissions = GroupUserPreferredPermissions.NoneSet;
+                finalPermissions.SetDisableSounds(_ownPermissions.DisableGroupSounds);
+                finalPermissions.SetDisableAnimations(_ownPermissions.DisableGroupAnimations);
+                finalPermissions.SetDisableVFX(_ownPermissions.DisableGroupVFX);
+
+                _ = _apiController.GroupJoinFinalize(new GroupJoinDto(_joinDto.Group, _joinDto.Password, finalPermissions));
+
+                _recentlyJoined.Add(_joinDto.Group.GID);
+
+                _joinDto = null;
+                _joinInfo = null;
+            }
+        }
+    }
+
+    private void DrawPermissionRow(string label, bool suggested, bool current, Action<bool> apply)
+    {
+        ImGui.AlignTextToFramePadding();
+        ImGui.TextUnformatted($"- {label}");
+
+        ImGui.SameLine(150 * ImGuiHelpers.GlobalScale);
+        ImGui.TextUnformatted("Current:");
+        ImGui.SameLine();
+        _uiSharedService.BooleanToColoredIcon(!current);
+
+        ImGui.SameLine(300 * ImGuiHelpers.GlobalScale);
+        ImGui.TextUnformatted("Suggested:");
+        ImGui.SameLine();
+        _uiSharedService.BooleanToColoredIcon(!suggested);
+
+        ImGui.SameLine(450 * ImGuiHelpers.GlobalScale);
+        using var id = ImRaii.PushId(label);
+        if (current != suggested)
+        {
+            if (_uiSharedService.IconTextButton(FontAwesomeIcon.ArrowRight, "Apply"))
+                apply(suggested);
+        }
+
+        ImGui.NewLine();
+    }
+
+    private async Task RefreshSyncshellsAsync(string? gid = null)
+    {
+        var syncshellBroadcasts = _broadcastScannerService.GetActiveSyncshellBroadcasts();
+        var snapshot = _pairUiService.GetSnapshot();
+        _currentSyncshells = [.. snapshot.GroupPairs.Keys];
+
+        _recentlyJoined.RemoveWhere(gid =>
+            _currentSyncshells.Exists(s => string.Equals(s.GID, gid, StringComparison.Ordinal)));
+
+        List<GroupJoinDto>? updatedList = [];
+
+        if (_useTestSyncshells)
+        {
+            updatedList = BuildTestSyncshells();
+        }
+        else
+        {
+            if (syncshellBroadcasts.Count == 0)
+            {
+                ClearSyncshells();
+                return;
+            }
+
+            try
+            {
+                var groups = await _apiController.GetBroadcastedGroups(syncshellBroadcasts)
+                    .ConfigureAwait(false);
+                updatedList = groups?.DistinctBy(g => g.Group.GID).ToList();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Failed to refresh broadcasted syncshells.");
+                return;
+            }
+        }
+
+        if (updatedList == null || updatedList.Count == 0)
+        {
+            ClearSyncshells();
+            return;
+        }
+
+        if (gid != null && _recentlyJoined.Contains(gid))
+        {
+            _recentlyJoined.Clear();
+        }
+
+        var previousGid = GetSelectedGid();
+
+        _nearbySyncshells.Clear();
+        _nearbySyncshells.AddRange(updatedList);
+
+        if (previousGid != null)
+        {
+            var newIndex = _nearbySyncshells.FindIndex(s =>
+                string.Equals(s.Group.GID, previousGid, StringComparison.Ordinal));
+
+            if (newIndex >= 0)
+            {
+                _selectedNearbyIndex = newIndex;
+                return;
+            }
+        }
+
+        ClearSelection();
+    }
+
+    private static List<GroupJoinDto> BuildTestSyncshells()
+    {
+        var testGroup1 = new GroupData("TEST-ALPHA", "Alpha Shell");
+        var testGroup2 = new GroupData("TEST-BETA", "Beta Shell");
+        var testGroup3 = new GroupData("TEST-GAMMA", "Gamma Shell");
+        var testGroup4 = new GroupData("TEST-DELTA", "Delta Shell");
+        var testGroup5 = new GroupData("TEST-CHARLIE", "Charlie Shell");
+        var testGroup6 = new GroupData("TEST-OMEGA", "Omega Shell");
+        var testGroup7 = new GroupData("TEST-POINT", "Point Shell");
+        var testGroup8 = new GroupData("TEST-HOTEL", "Hotel Shell");
+
+        return
+        [
+            new(testGroup1, "", GroupUserPreferredPermissions.NoneSet),
+            new(testGroup2, "", GroupUserPreferredPermissions.NoneSet),
+            new(testGroup3, "", GroupUserPreferredPermissions.NoneSet),
+            new(testGroup4, "", GroupUserPreferredPermissions.NoneSet),
+            new(testGroup5, "", GroupUserPreferredPermissions.NoneSet),
+            new(testGroup6, "", GroupUserPreferredPermissions.NoneSet),
+            new(testGroup7, "", GroupUserPreferredPermissions.NoneSet),
+            new(testGroup8, "", GroupUserPreferredPermissions.NoneSet),
+        ];
+    }
+
+    private void ClearSyncshells()
+    {
+        if (_nearbySyncshells.Count == 0)
+            return;
+
+        _nearbySyncshells.Clear();
+        ClearSelection();
+    }
+
+    private void ClearSelection()
+    {
+        _selectedNearbyIndex = -1;
+        _syncshellPageIndex = 0;
+        _joinDto = null;
+        _joinInfo = null;
+    }
+
+    private string? GetSelectedGid()
+    {
+        if (_selectedNearbyIndex < 0 || _selectedNearbyIndex >= _nearbySyncshells.Count)
+            return null;
+
+        return _nearbySyncshells[_selectedNearbyIndex].Group.GID;
+    }
+
+}

LightlessSync/UI/TopTabMenu.cs

@@ -162,32 +162,24 @@ public class TopTabMenu
             ImGui.SameLine();
             using (ImRaii.PushFont(UiBuilder.IconFont))
             {
+                var x = ImGui.GetCursorScreenPos();
                 if (ImGui.Button(FontAwesomeIcon.Compass.ToIconString(), buttonSize))
                 {
-                    _lightlessMediator.Publish(new UiToggleMessage(typeof(LightFinderUI)));
+                    TabSelection = TabSelection == SelectedTab.Lightfinder ? SelectedTab.None : SelectedTab.Lightfinder;
                 }
                 if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenBlockedByActiveItem) || ImGui.IsItemActive())
                 {
                     Selune.RegisterHighlight(ImGui.GetItemRectMin(), ImGui.GetItemRectMax(), SeluneHighlightMode.Both, true, buttonBorderThickness, exactSize: true, clipToElement: true, roundingOverride: buttonRounding);
                 }
+
+                ImGui.SameLine();
+                var xAfter = ImGui.GetCursorScreenPos();
+                if (TabSelection == SelectedTab.Lightfinder)
+                    drawList.AddLine(x with { Y = x.Y + buttonSize.Y + spacing.Y },
+                        xAfter with { Y = xAfter.Y + buttonSize.Y + spacing.Y, X = xAfter.X - spacing.X },
+                        underlineColor, 2);
             }
-
-            var nearbyCount = GetNearbySyncshellCount();
-            if (nearbyCount > 0)
-            {
-                var buttonMax = ImGui.GetItemRectMax();
-                var badgeRadius = 8f * ImGuiHelpers.GlobalScale;
-                var badgeCenter = new Vector2(buttonMax.X - badgeRadius * 1.3f, buttonMax.Y - buttonSize.Y + badgeRadius * 0.5f);
-                var badgeText = nearbyCount > 99 ? "99+" : nearbyCount.ToString();
-                var textSize = ImGui.CalcTextSize(badgeText);
-
-                drawList.AddCircleFilled(badgeCenter, badgeRadius + 1f, ImGui.GetColorU32(new Vector4(0, 0, 0, 0.6f)));
-                drawList.AddCircleFilled(badgeCenter, badgeRadius, ImGui.GetColorU32(UIColors.Get("LightlessPurple")));
-
-                var textPos = new Vector2(badgeCenter.X - textSize.X * 0.45f, badgeCenter.Y - textSize.Y * 0.55f);
-                drawList.AddText(textPos, ImGui.GetColorU32(new Vector4(1, 1, 1, 1)), badgeText);
-            }
-            UiSharedService.AttachToolTip(nearbyCount > 0 ? $"Lightfinder ({nearbyCount} nearby)" : "Open Lightfinder");
+            UiSharedService.AttachToolTip("Lightfinder");
 
             ImGui.SameLine();
             using (ImRaii.PushFont(UiBuilder.IconFont))
@@ -242,7 +234,10 @@ public class TopTabMenu
                 DrawSyncshellMenu(availableWidth, spacing.X);
                 DrawGlobalSyncshellButtons(availableWidth, spacing.X);
             }
-            
+            else if (TabSelection == SelectedTab.Lightfinder)
+            {
+                DrawLightfinderMenu(availableWidth, spacing.X);
+            }
             else if (TabSelection == SelectedTab.UserConfig)
             {
                 DrawUserConfig(availableWidth, spacing.X);
@@ -781,22 +776,53 @@ public class TopTabMenu
             }
         }
     }
-    
-    private int GetNearbySyncshellCount()
+
+    private void DrawLightfinderMenu(float availableWidth, float spacingX)
+    {
+        var buttonX = (availableWidth - (spacingX)) / 2f;
+
+        var lightFinderLabel = GetLightfinderFinderLabel();
+        if (_uiSharedService.IconTextButton(FontAwesomeIcon.PersonCirclePlus, lightFinderLabel, buttonX, center: true))
+        {
+            _lightlessMediator.Publish(new UiToggleMessage(typeof(LightFinderUI)));
+        }
+
+        ImGui.SameLine();
+
+        var syncshellFinderLabel = GetSyncshellFinderLabel();
+        if (_uiSharedService.IconTextButton(FontAwesomeIcon.Globe, syncshellFinderLabel, buttonX, center: true))
+        {
+            _lightlessMediator.Publish(new UiToggleMessage(typeof(SyncshellFinderUI)));
+        }
+    }
+
+    private string GetLightfinderFinderLabel()
+    {
+        string label = "Lightfinder";
+
+        if (_lightFinderService.IsBroadcasting)
+        {
+            var hashExclude = _dalamudUtilService.GetCID().ToString().GetHash256();
+            var nearbyCount = _lightFinderScannerService.GetActiveBroadcasts(hashExclude).Count;
+            return $"{label} ({nearbyCount})";
+        }    
+
+        return label;
+    }
+
+    private string GetSyncshellFinderLabel()
     {
         if (!_lightFinderService.IsBroadcasting)
-            return 0;
+            return "Syncshell Finder";
 
-        var myHashedCid = _dalamudUtilService.GetCID().ToString().GetHash256();
-
-        return _lightFinderScannerService
-            .GetActiveSyncshellBroadcasts()
-            .Where(b =>
-                !string.IsNullOrEmpty(b.GID) &&
-                !string.Equals(b.HashedCID, myHashedCid, StringComparison.Ordinal))
+        var nearbyCount = _lightFinderScannerService
+            .GetActiveSyncshellBroadcasts(excludeLocal: true)
+            .Where(b => !string.IsNullOrEmpty(b.GID))
             .Select(b => b.GID!)
             .Distinct(StringComparer.Ordinal)
             .Count();
+
+        return nearbyCount > 0 ? $"Syncshell Finder ({nearbyCount})" : "Syncshell Finder";
     }
 
     private void DrawUserConfig(float availableWidth, float spacingX)

LightlessSync/UI/UIColors.cs

@@ -6,7 +6,7 @@ namespace LightlessSync.UI
 {
     internal static class UIColors
     {
-        private static readonly Dictionary<string, string> _defaultHexColors = new(StringComparer.OrdinalIgnoreCase)
+        private static readonly Dictionary<string, string> DefaultHexColors = new(StringComparer.OrdinalIgnoreCase)
         {
             { "LightlessPurple", "#ad8af5" },
             { "LightlessPurpleActive", "#be9eff" },
@@ -31,12 +31,6 @@ namespace LightlessSync.UI
 
             { "ProfileBodyGradientTop", "#2f283fff" },
             { "ProfileBodyGradientBottom", "#372d4d00" },
-
-            { "HeaderGradientTop", "#140D26FF" },
-            { "HeaderGradientBottom", "#1F1433FF" },
-
-            { "HeaderStaticStar", "#FFFFFFFF" },
-            { "HeaderShootingStar", "#66CCFFFF" },
         };
 
         private static LightlessConfigService? _configService;
@@ -51,7 +45,7 @@ namespace LightlessSync.UI
             if (_configService?.Current.CustomUIColors.TryGetValue(name, out var customColorHex) == true)
                 return HexToRgba(customColorHex);
 
-            if (!_defaultHexColors.TryGetValue(name, out var hex))
+            if (!DefaultHexColors.TryGetValue(name, out var hex))
                 throw new ArgumentException($"Color '{name}' not found in UIColors.", nameof(name));
 
             return HexToRgba(hex);
@@ -59,7 +53,7 @@ namespace LightlessSync.UI
 
         public static void Set(string name, Vector4 color)
         {
-            if (!_defaultHexColors.ContainsKey(name))
+            if (!DefaultHexColors.ContainsKey(name))
                 throw new ArgumentException($"Color '{name}' not found in UIColors.", nameof(name));
 
             if (_configService != null)
@@ -89,7 +83,7 @@ namespace LightlessSync.UI
 
         public static Vector4 GetDefault(string name)
         {
-            if (!_defaultHexColors.TryGetValue(name, out var hex))
+            if (!DefaultHexColors.TryGetValue(name, out var hex))
                 throw new ArgumentException($"Color '{name}' not found in UIColors.", nameof(name));
 
             return HexToRgba(hex);
@@ -102,7 +96,7 @@ namespace LightlessSync.UI
 
         public static IEnumerable<string> GetColorNames()
         {
-            return _defaultHexColors.Keys;
+            return DefaultHexColors.Keys;
         }
 
         public static Vector4 HexToRgba(string hexColor)

LightlessSync/UI/UISharedService.cs

@@ -79,6 +79,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
     private readonly Dictionary<string, DateTime> _oauthTokenExpiry = [];
     private bool _penumbraExists = false;
     private bool _petNamesExists = false;
+    private bool _lifestreamExists = false;
     private int _serverSelectionIndex = -1;
     public UiSharedService(ILogger<UiSharedService> logger, IpcManager ipcManager, ApiController apiController,
         CacheMonitor cacheMonitor, FileDialogManager fileDialogManager,
@@ -112,6 +113,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
             _moodlesExists = _ipcManager.Moodles.APIAvailable;
             _petNamesExists = _ipcManager.PetNames.APIAvailable;
             _brioExists = _ipcManager.Brio.APIAvailable;
+            _lifestreamExists = _ipcManager.Lifestream.APIAvailable;
         });
 
         UidFont = _pluginInterface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
@@ -1105,6 +1107,10 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         ColorText("Brio", GetBoolColor(_brioExists));
         AttachToolTip(BuildPluginTooltip("Brio", _brioExists, _ipcManager.Brio.State));
 
+        ImGui.SameLine();
+        ColorText("Lifestream", GetBoolColor(_lifestreamExists));
+        AttachToolTip(BuildPluginTooltip("Lifestream", _lifestreamExists, _ipcManager.Lifestream.State));
+
         if (!_penumbraExists || !_glamourerExists)
         {
             ImGui.TextColored(ImGuiColors.DalamudRed, "You need to install both Penumbra and Glamourer and keep them up to date to use Lightless Sync.");

LightlessSync/UI/UpdateNotesUi.cs

@@ -40,7 +40,6 @@ public class UpdateNotesUi : WindowMediatorSubscriberBase
         logger.LogInformation("UpdateNotesUi constructor called");
         _uiShared = uiShared;
         _configService = configService;
-        _animatedHeader.EnableParticles = _configService.Current.EnableParticleEffects;
 
         RespectCloseHotkey = true;
         ShowCloseButton = true;
@@ -49,8 +48,7 @@ public class UpdateNotesUi : WindowMediatorSubscriberBase
                 ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoMove;
 
         PositionCondition = ImGuiCond.Always;
-        
-        
+
         WindowBuilder.For(this)
             .AllowPinning(false)
             .AllowClickthrough(false)

LightlessSync/packages.lock.json

@@ -76,6 +76,19 @@
           "Microsoft.AspNetCore.SignalR.Common": "10.0.1"
         }
       },
+      "Microsoft.Extensions.Caching.Memory": {
+        "type": "Direct",
+        "requested": "[10.0.1, )",
+        "resolved": "10.0.1",
+        "contentHash": "NxqSP0Ky4dZ5ybszdZCqs1X2C70s+dXflqhYBUh/vhcQVTIooNCXIYnLVbafoAFGZMs51d9+rHxveXs0ZC3SQQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Caching.Abstractions": "10.0.1",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.1",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.1",
+          "Microsoft.Extensions.Options": "10.0.1",
+          "Microsoft.Extensions.Primitives": "10.0.1"
+        }
+      },
       "Microsoft.Extensions.Hosting": {
         "type": "Direct",
         "requested": "[10.0.1, )",
@@ -233,6 +246,14 @@
           "Microsoft.AspNetCore.SignalR.Common": "10.0.1"
         }
       },
+      "Microsoft.Extensions.Caching.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.1",
+        "contentHash": "Vb1vVAQDxHpXVdL9fpOX2BzeV7bbhzG4pAcIKRauRl0/VfkE8mq0f+fYC+gWICh3dlzTZInJ/cTeBS2MgU/XvQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "10.0.1"
+        }
+      },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
         "resolved": "10.0.1",
@@ -618,7 +639,7 @@
           "FlatSharp.Compiler": "[7.9.0, )",
           "FlatSharp.Runtime": "[7.9.0, )",
           "OtterGui": "[1.0.0, )",
-          "Penumbra.Api": "[5.13.0, )",
+          "Penumbra.Api": "[5.13.1, )",
           "Penumbra.String": "[1.0.7, )"
         }
       },