diff --git a/app/Livewire/Modals/UtmBuilder.php b/app/Livewire/Modals/UtmBuilder.php
index 140f34f..0380404 100644
--- a/app/Livewire/Modals/UtmBuilder.php
+++ b/app/Livewire/Modals/UtmBuilder.php
@@ -3,9 +3,9 @@
 namespace App\Livewire\Modals;
 
 use Illuminate\View\View;
+use Livewire\Attributes\Computed;
 use LivewireUI\Modal\ModalComponent;
 
-/** @property-read string $fullUrl */
 class UtmBuilder extends ModalComponent
 {
     public string $baseUrl = '';
@@ -22,7 +22,8 @@ class UtmBuilder extends ModalComponent
 
     public bool $copied = false;
 
-    public function getFullUrlProperty(): string
+    #[Computed]
+    public function fullUrl(): string
     {
         if (! $this->baseUrl) {
             return '';
diff --git a/app/Livewire/Pages/Dashboard/Overview.php b/app/Livewire/Pages/Dashboard/Overview.php
index d28340b..11a83c3 100644
--- a/app/Livewire/Pages/Dashboard/Overview.php
+++ b/app/Livewire/Pages/Dashboard/Overview.php
@@ -9,27 +9,38 @@ use Livewire\Component;
 
 class Overview extends Component
 {
-    public function render(): View
+    public int $workspaceId = 0;
+
+    public string $workspaceUlid = '';
+
+    public function mount(): void
     {
         $workspace = require_workspace();
+        $this->workspaceId = $workspace->id;
+        $this->workspaceUlid = $workspace->ulid;
+    }
+
+    public function render(): View
+    {
+        $wsId = $this->workspaceId;
 
         // Hero metrics
-        $today = Click::where('workspace_id', $workspace->id)
+        $today = Click::where('workspace_id', $wsId)
             ->whereDate('clicked_at', today())
             ->count();
 
-        $last7 = Click::where('workspace_id', $workspace->id)
+        $last7 = Click::where('workspace_id', $wsId)
             ->where('clicked_at', '>=', now()->subDays(7))
             ->count();
 
-        $last30 = Click::where('workspace_id', $workspace->id)
+        $last30 = Click::where('workspace_id', $wsId)
             ->where('clicked_at', '>=', now()->subDays(30))
             ->count();
 
-        $totalLinks = Link::where('workspace_id', $workspace->id)->count();
+        $totalLinks = Link::where('workspace_id', $wsId)->count();
 
         // Chart data: daily clicks for last 30 days
-        $chartData = Click::where('workspace_id', $workspace->id)
+        $chartData = Click::where('workspace_id', $wsId)
             ->where('clicked_at', '>=', now()->subDays(29)->startOfDay())
             ->selectRaw('DATE(clicked_at) as date, COUNT(*) as total')
             ->groupBy('date')
@@ -45,7 +56,7 @@ class Overview extends Component
         }
 
         // Top links by clicks
-        $topLinks = Link::where('workspace_id', $workspace->id)
+        $topLinks = Link::where('workspace_id', $wsId)
             ->withCount(['clicks as total_clicks'])
             ->orderByDesc('total_clicks')
             ->limit(5)
diff --git a/app/Livewire/Pages/Links/Index.php b/app/Livewire/Pages/Links/Index.php
index f7812cc..17b51d2 100644
--- a/app/Livewire/Pages/Links/Index.php
+++ b/app/Livewire/Pages/Links/Index.php
@@ -16,6 +16,13 @@ class Index extends Component
 
     public string $statusFilter = '';
 
+    public int $workspaceId = 0;
+
+    public function mount(): void
+    {
+        $this->workspaceId = require_workspace()->id;
+    }
+
     public function updatingSearch(): void
     {
         $this->resetPage();
@@ -36,9 +43,7 @@ class Index extends Component
 
     public function render(): View
     {
-        $workspace = require_workspace();
-
-        $links = Link::where('workspace_id', $workspace->id)
+        $links = Link::where('workspace_id', $this->workspaceId)
             ->when($this->search, fn ($q) => $q->where(function ($q) {
                 $q->where('title', 'like', "%{$this->search}%")
                     ->orWhere('slug', 'like', "%{$this->search}%")
diff --git a/app/Livewire/Pages/Profile/Preferences.php b/app/Livewire/Pages/Profile/Preferences.php
index 23058aa..411f675 100644
--- a/app/Livewire/Pages/Profile/Preferences.php
+++ b/app/Livewire/Pages/Profile/Preferences.php
@@ -29,6 +29,7 @@ class Preferences extends Component
             'theme' => $this->theme,
         ]);
 
+        $this->dispatch('theme-changed-server', theme: $this->theme);
         session()->flash('status', 'Preferences saved.');
     }
 
diff --git a/app/Livewire/Pages/Settings/Index.php b/app/Livewire/Pages/Settings/Index.php
index 2bbfca8..4f6fe87 100644
--- a/app/Livewire/Pages/Settings/Index.php
+++ b/app/Livewire/Pages/Settings/Index.php
@@ -11,9 +11,12 @@ class Index extends Component
 
     public string $workspaceSlug = '';
 
+    public int $workspaceId = 0;
+
     public function mount(): void
     {
-        $ws = current_workspace();
+        $ws = require_workspace();
+        $this->workspaceId = $ws->id;
         $this->workspaceName = $ws->name;
         $this->workspaceSlug = $ws->slug;
     }
@@ -25,9 +28,10 @@ class Index extends Component
             'workspaceSlug' => 'nullable|string|max:50|alpha_dash',
         ]);
 
-        require_workspace()->update([
+        $ws = \App\Domains\Workspace\Models\Workspace::findOrFail($this->workspaceId);
+        $ws->update([
             'name' => $this->workspaceName,
-            'slug' => $this->workspaceSlug ?: require_workspace()->slug,
+            'slug' => $this->workspaceSlug ?: $ws->slug,
         ]);
 
         session()->flash('status', 'Workspace settings saved.');
diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js
index 2918e7b..09554c9 100644
--- a/resources/js/bootstrap.js
+++ b/resources/js/bootstrap.js
@@ -46,9 +46,12 @@ document.addEventListener('alpine:init', () => {
         init() { this.apply(this.current); },
         apply(theme) {
             this.current = theme;
-            document.documentElement.dataset.theme = theme;
+            const actual = theme === 'system'
+                ? (matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light')
+                : theme;
+            document.documentElement.dataset.theme = actual;
             localStorage.setItem('nimuli_theme', theme);
-            document.cookie = 'nimuli_theme=' + theme + '; path=/; max-age=31536000; SameSite=Lax';
+            document.cookie = 'nimuli_theme=' + actual + '; path=/; max-age=31536000; SameSite=Lax';
         },
         cycle() {
             const order = ['dark', 'light', 'system'];
diff --git a/resources/views/components/sidebar.blade.php b/resources/views/components/sidebar.blade.php
index 1f189c4..30acf33 100644
--- a/resources/views/components/sidebar.blade.php
+++ b/resources/views/components/sidebar.blade.php
@@ -244,10 +244,13 @@
             :title="$store.sidebar.collapsed ? 'Expand sidebar' : 'Collapse sidebar'"
             class="flex items-center gap-3 w-full px-3 py-2 rounded-lg text-t3 hover:text-t1 hover:bg-s2 transition-colors"
         >
-            <span class="w-4 h-4 flex-shrink-0 transition-transform duration-200" :class="$store.sidebar.collapsed ? 'rotate-180' : ''">
-                <svg fill="none" viewBox="0 0 16 16" stroke="currentColor" stroke-width="1.5">
+            <span class="w-4 h-4 flex-shrink-0">
+                <svg x-show="!$store.sidebar.collapsed" fill="none" viewBox="0 0 16 16" stroke="currentColor" stroke-width="1.5">
                     <path stroke-linecap="round" stroke-linejoin="round" d="M10 3L5 8l5 5"/>
                 </svg>
+                <svg x-show="$store.sidebar.collapsed" x-cloak fill="none" viewBox="0 0 16 16" stroke="currentColor" stroke-width="1.5">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 3l5 5-5 5"/>
+                </svg>
             </span>
             <span x-show="!$store.sidebar.collapsed" class="text-xs">Collapse</span>
         </button>
diff --git a/resources/views/components/topbar.blade.php b/resources/views/components/topbar.blade.php
index 3068898..c3d687c 100644
--- a/resources/views/components/topbar.blade.php
+++ b/resources/views/components/topbar.blade.php
@@ -36,23 +36,17 @@
             :title="'Theme: ' + $store.theme.current"
             aria-label="Toggle theme"
         >
-            <template x-if="$store.theme.current === 'dark'">
-                <svg class="w-4 h-4" fill="none" viewBox="0 0 16 16" stroke="currentColor" stroke-width="1.5">
-                    <path stroke-linecap="round" stroke-linejoin="round" d="M8 1v1.5M8 13.5V15M1 8h1.5M13.5 8H15M3.5 3.5l1 1M11.5 11.5l1 1M11.5 4.5l1-1M3.5 12.5l1-1"/>
-                    <circle cx="8" cy="8" r="3"/>
-                </svg>
-            </template>
-            <template x-if="$store.theme.current === 'light'">
-                <svg class="w-4 h-4" fill="none" viewBox="0 0 16 16" stroke="currentColor" stroke-width="1.5">
-                    <path stroke-linecap="round" stroke-linejoin="round" d="M8 3a5 5 0 100 10A5 5 0 008 3z" clip-rule="evenodd"/>
-                    <path stroke-linecap="round" stroke-linejoin="round" d="M11.5 4.5a5 5 0 01-7 7A5 5 0 0111.5 4.5z"/>
-                </svg>
-            </template>
-            <template x-if="$store.theme.current === 'system'">
-                <svg class="w-4 h-4" fill="none" viewBox="0 0 16 16" stroke="currentColor" stroke-width="1.5">
-                    <rect x="2" y="2" width="12" height="9" rx="1.5"/><path stroke-linecap="round" stroke-linejoin="round" d="M5.5 14.5h5M8 11.5v3"/>
-                </svg>
-            </template>
+            <svg x-show="$store.theme.current === 'dark'" class="w-4 h-4" fill="none" viewBox="0 0 16 16" stroke="currentColor" stroke-width="1.5">
+                <path stroke-linecap="round" stroke-linejoin="round" d="M8 1v1.5M8 13.5V15M1 8h1.5M13.5 8H15M3.5 3.5l1 1M11.5 11.5l1 1M11.5 4.5l1-1M3.5 12.5l1-1"/>
+                <circle cx="8" cy="8" r="3"/>
+            </svg>
+            <svg x-show="$store.theme.current === 'light'" x-cloak class="w-4 h-4" fill="none" viewBox="0 0 16 16" stroke="currentColor" stroke-width="1.5">
+                <path stroke-linecap="round" stroke-linejoin="round" d="M8 3a5 5 0 100 10A5 5 0 008 3z" clip-rule="evenodd"/>
+                <path stroke-linecap="round" stroke-linejoin="round" d="M11.5 4.5a5 5 0 01-7 7A5 5 0 0111.5 4.5z"/>
+            </svg>
+            <svg x-show="$store.theme.current === 'system'" x-cloak class="w-4 h-4" fill="none" viewBox="0 0 16 16" stroke="currentColor" stroke-width="1.5">
+                <rect x="2" y="2" width="12" height="9" rx="1.5"/><path stroke-linecap="round" stroke-linejoin="round" d="M5.5 14.5h5M8 11.5v3"/>
+            </svg>
         </button>
 
         <!-- Notifications Bell -->
diff --git a/resources/views/layouts/nimuli-app.blade.php b/resources/views/layouts/nimuli-app.blade.php
index b1e2e59..3dee09d 100644
--- a/resources/views/layouts/nimuli-app.blade.php
+++ b/resources/views/layouts/nimuli-app.blade.php
@@ -165,6 +165,16 @@
             document.addEventListener('DOMContentLoaded', updateActiveNav);
             document.addEventListener('livewire:navigated', updateActiveNav);
 
+            // Sync server-saved theme to Alpine store + DOM
+            document.addEventListener('livewire:init', function () {
+                Livewire.on('theme-changed-server', function (event) {
+                    var theme = event.theme ?? (Array.isArray(event) ? event[0]?.theme : null);
+                    if (theme && window.Alpine && Alpine.store('theme')) {
+                        Alpine.store('theme').apply(theme);
+                    }
+                });
+            });
+
             // copy-to-clipboard Livewire event
             document.addEventListener('livewire:init', function () {
                 Livewire.on('copy-to-clipboard', function (event) {
diff --git a/resources/views/livewire/pages/bio/index.blade.php b/resources/views/livewire/pages/bio/index.blade.php
index af32b57..ebded00 100644
--- a/resources/views/livewire/pages/bio/index.blade.php
+++ b/resources/views/livewire/pages/bio/index.blade.php
@@ -36,6 +36,7 @@
             </span>
 
             <div class="flex items-center gap-3 opacity-0 group-hover:opacity-100 transition-all duration-150">
+                <x-ui.copy-button :value="'https://nimu.li/b/'.$page->slug" label="Copy" />
                 <button
                     @click="$dispatch('openModal', {component: 'modals.edit-bio-page', arguments: {bioUlid: '{{ $page->ulid }}'}})"
                     class="text-t2 text-xs hover:text-t1 transition-colors">Edit</button>
diff --git a/resources/views/livewire/pages/dashboard/overview.blade.php b/resources/views/livewire/pages/dashboard/overview.blade.php
index 5bec026..d27119c 100644
--- a/resources/views/livewire/pages/dashboard/overview.blade.php
+++ b/resources/views/livewire/pages/dashboard/overview.blade.php
@@ -6,18 +6,18 @@
             <p class="text-xs text-t3 mt-0.5">{{ now()->format('l, F j') }}</p>
         </div>
         <div class="flex items-center gap-2">
-            <a href="{{ route('w.analytics.index', request()->route('workspace')) }}"
+            <a href="{{ route('w.analytics.index', $workspaceUlid) }}"
                wire:navigate
                class="px-3 py-2 text-xs text-t2 hover:text-t1 transition-colors flex items-center gap-1.5">
                 <x-heroicon-o-arrow-trending-up class="w-3.5 h-3.5" />
                 Analytics
             </a>
-            <a href="{{ route('w.qr.index', request()->route('workspace')) }}"
+            <a href="{{ route('w.qr.index', $workspaceUlid) }}"
                wire:navigate
                class="px-3 py-2 bg-s2 border border-white/[.06] text-t1 rounded-lg text-xs font-medium hover:bg-s3 transition-colors">
                 + QR Code
             </a>
-            <a href="{{ route('w.links.index', request()->route('workspace')) }}"
+            <a href="{{ route('w.links.index', $workspaceUlid) }}"
                wire:navigate
                class="px-3 py-2 bg-accent-gradient text-white rounded-lg text-xs font-semibold hover:opacity-90 transition-opacity">
                 + New Link
@@ -129,7 +129,7 @@
     <div class="bg-s1 border border-white/[.06] rounded-xl overflow-hidden card-shadow nim-reveal nim-reveal-5">
         <div class="px-5 py-3.5 border-b border-white/[.06] flex items-center justify-between">
             <div class="text-xs font-semibold text-t1 tracking-wide uppercase">Top Links</div>
-            <a href="{{ route('w.links.index', request()->route('workspace')) }}" wire:navigate
+            <a href="{{ route('w.links.index', $workspaceUlid) }}" wire:navigate
                 class="text-xs text-t3 hover:text-t1 transition-colors">View all →</a>
         </div>
         <table class="w-full">
diff --git a/resources/views/livewire/pages/links/index.blade.php b/resources/views/livewire/pages/links/index.blade.php
index 60e9e21..864d84e 100644
--- a/resources/views/livewire/pages/links/index.blade.php
+++ b/resources/views/livewire/pages/links/index.blade.php
@@ -100,6 +100,7 @@
                     {{-- Actions --}}
                     <td class="px-4 py-3 text-right">
                         <div class="flex items-center justify-end gap-3 opacity-0 group-hover:opacity-100 transition-all duration-150">
+                            <x-ui.copy-button :value="'https://nimu.li/'.$link->slug" label="Copy" />
                             <button
                                 @click="$dispatch('openModal', {component: 'modals.link-variants', arguments: {linkUlid: '{{ $link->ulid }}'}})"
                                 class="text-t3 text-xs hover:text-blue transition-colors flex items-center gap-1">
diff --git a/resources/views/livewire/pages/qr-codes/index.blade.php b/resources/views/livewire/pages/qr-codes/index.blade.php
index f593c7c..ee1b056 100644
--- a/resources/views/livewire/pages/qr-codes/index.blade.php
+++ b/resources/views/livewire/pages/qr-codes/index.blade.php
@@ -48,6 +48,10 @@
             </div>
 
             <div class="flex items-center gap-3 opacity-0 group-hover:opacity-100 transition-all duration-150 flex-shrink-0">
+                @php $qrUrl = $qr->payload['data'] ?? ($qr->payload['url'] ?? null); @endphp
+                @if($qrUrl)
+                    <x-ui.copy-button :value="$qrUrl" label="Copy URL" />
+                @endif
                 <button
                     @click="$dispatch('openModal', {component: 'modals.edit-qr-code', arguments: {qrUlid: '{{ $qr->ulid }}'}})"
                     class="text-t2 text-xs hover:text-t1 transition-colors">Edit</button>
diff --git a/resources/views/livewire/pages/settings/api-tokens.blade.php b/resources/views/livewire/pages/settings/api-tokens.blade.php
index 999104c..bacaf74 100644
--- a/resources/views/livewire/pages/settings/api-tokens.blade.php
+++ b/resources/views/livewire/pages/settings/api-tokens.blade.php
@@ -18,6 +18,9 @@
             <div class="flex-1">
                 <p class="text-sm font-medium text-green mb-2">Token created — copy it now, it won't be shown again</p>
                 <code class="block font-mono text-xs text-t1 bg-s3 px-3 py-2 rounded-lg break-all">{{ $newToken }}</code>
+                <div class="mt-2">
+                    <x-ui.copy-button :value="$newToken" label="Copy Token" />
+                </div>
             </div>
             <button wire:click="dismissNewToken" class="text-t3 hover:text-t1 flex-shrink-0"><x-heroicon-o-x-mark class="w-4 h-4" /></button>
         </div>