diff --git a/.gitattributes b/.gitattributes
index 1ff0c42..6c89470 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,6 +3,12 @@
 ###############################################################################
 * text=auto
 
+###############################################################################
+# Set language detection and syntax highlighting.
+###############################################################################
+*.razor linguist-language=C#
+*.cshtml linguist-language=C#
+
 ###############################################################################
 # Set default behavior for command prompt diff.
 #
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..907da0e
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "nuget" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    target-branch: "dev"
diff --git a/MW-GC.EventManager.Shared/MW-GC.EventManager.Shared.csproj b/MW-GC.EventManager.Shared/MW-GC.EventManager.Shared.csproj
index 2105fea..5426630 100644
--- a/MW-GC.EventManager.Shared/MW-GC.EventManager.Shared.csproj
+++ b/MW-GC.EventManager.Shared/MW-GC.EventManager.Shared.csproj
@@ -9,7 +9,6 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Data.Tables" Version="12.11.0" />
-    <PackageReference Include="System.Text.Json" Version="10.0.9" />
   </ItemGroup>
 
 </Project>
diff --git a/MW-GC.EventManager.Web/MW-GC.EventManager.Web.csproj b/MW-GC.EventManager.Web/MW-GC.EventManager.Web.csproj
index 75efa81..24c5844 100644
--- a/MW-GC.EventManager.Web/MW-GC.EventManager.Web.csproj
+++ b/MW-GC.EventManager.Web/MW-GC.EventManager.Web.csproj
@@ -11,8 +11,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.9" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.9" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.14.2" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.14.2" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.14.3" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.14.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MW-GC.EventManager.Web/Pages/Activities.razor b/MW-GC.EventManager.Web/Pages/Activities.razor
index 0d212eb..01019bf 100644
--- a/MW-GC.EventManager.Web/Pages/Activities.razor
+++ b/MW-GC.EventManager.Web/Pages/Activities.razor
@@ -10,7 +10,7 @@
 <FluentStack Orientation="Orientation.Vertical" VerticalGap="24">
     @if (_activities is null)
     {
-        <FluentCard>
+        <FluentCard AreaRestricted="false">
             <div style="align-items: center; display: flex; gap: 12px; justify-content: center; min-height: 200px;">
                 <FluentProgressRing />
                 <FluentLabel>Loading activities...</FluentLabel>
@@ -19,7 +19,7 @@
     }
     else
     {
-        <FluentCard Style="overflow: visible;">
+        <FluentCard Style="overflow: visible;" AreaRestricted="false">
             <FluentStack Orientation="Orientation.Horizontal"
                          HorizontalAlignment="HorizontalAlignment.SpaceBetween"
                          VerticalAlignment="VerticalAlignment.Center"
@@ -43,9 +43,10 @@
 
             <FluentDataGrid Items="@Filtered" TGridItem="ActivityEntity" Virtualize="true" ItemSize="44">
                 <PropertyColumn Property="@(a => a.Name)" Title="Name" Sortable="true" />
-                <TemplateColumn Title="Game" Sortable="true">
-                    @{ var game = _games?.FirstOrDefault(g => g.Id == context.GameId); }
-                    @(game?.Name ?? "—")
+                <TemplateColumn Title="Game"
+                                Sortable="true"
+                                SortBy="@(GridSort<ActivityEntity>.ByAscending(a => GameName(a.GameId)).ThenAscending(a => a.Name))">
+                    @GameName(context.GameId)
                 </TemplateColumn>
                 <TemplateColumn Title="Tags">
                     <FluentStack Orientation="Orientation.Horizontal" HorizontalGap="4" Wrap="true">
@@ -93,7 +94,7 @@
             </FluentStack>
             <FluentStack Orientation="Orientation.Horizontal" VerticalAlignment="VerticalAlignment.Center" HorizontalGap="6" Style="margin-bottom: 16px;">
                 <FluentIcon Value="@(new Size16.XboxController())" Color="Color.Neutral" />
-                <FluentLabel Style="color: var(--neutral-foreground-hint);">@(_games?.FirstOrDefault(g => g.Id == _detailActivity.GameId)?.Name ?? "—")</FluentLabel>
+                <FluentLabel Style="color: var(--neutral-foreground-hint);">@GameName(_detailActivity.GameId)</FluentLabel>
             </FluentStack>
 
             @if (_detailActivity.ThemeIds.Count > 0 || _detailActivity.HolidayIds.Count > 0)
@@ -195,7 +196,7 @@
                     @* Side-by-side theme/holiday multi-select *@
                     <FluentGrid Spacing="3">
                         <FluentGridItem xs="12" sm="6">
-                            <FluentCard Style="padding: 12px;">
+                            <FluentCard Style="padding: 12px;" AreaRestricted="false">
                                 <FluentLabel Weight="FontWeight.Bold" Style="margin-bottom: 4px;">Themes</FluentLabel>
                                 <FluentLabel Typo="Typography.Body" Style="color: var(--neutral-foreground-hint); margin-bottom: 8px; font-size: 0.8rem;">Select applicable themes</FluentLabel>
                                 @if (_themes is not null)
@@ -210,7 +211,7 @@
                             </FluentCard>
                         </FluentGridItem>
                         <FluentGridItem xs="12" sm="6">
-                            <FluentCard Style="padding: 12px;">
+                            <FluentCard Style="padding: 12px;" AreaRestricted="false">
                                 <FluentLabel Weight="FontWeight.Bold" Style="margin-bottom: 4px;">Holidays</FluentLabel>
                                 <FluentLabel Typo="Typography.Body" Style="color: var(--neutral-foreground-hint); margin-bottom: 8px; font-size: 0.8rem;">Select applicable holidays</FluentLabel>
                                 @if (_holidays is not null)
@@ -274,6 +275,9 @@
             ? ((dynamic)match).Name
             : id.ToString()[..8];
 
+    private string GameName(Guid gameId) =>
+        _games?.FirstOrDefault(g => g.Id == gameId)?.Name ?? "—";
+
     private static void ToggleId(List<Guid> list, Guid id, bool add)
     {
         if (add && !list.Contains(id)) list.Add(id);
diff --git a/MW-GC.EventManager.Web/Pages/Events.razor b/MW-GC.EventManager.Web/Pages/Events.razor
index 2453108..7f00517 100644
--- a/MW-GC.EventManager.Web/Pages/Events.razor
+++ b/MW-GC.EventManager.Web/Pages/Events.razor
@@ -12,7 +12,7 @@
 <FluentStack Orientation="Orientation.Vertical" VerticalGap="24">
     @if (_events is null)
     {
-        <FluentCard>
+        <FluentCard AreaRestricted="false">
             <div style="align-items: center; display: flex; gap: 12px; justify-content: center; min-height: 200px;">
                 <FluentProgressRing />
                 <FluentLabel>Loading events...</FluentLabel>
@@ -21,7 +21,7 @@
     }
     else
     {
-        <FluentCard Style="overflow: visible;">
+        <FluentCard Style="overflow: visible;" AreaRestricted="false">
             <FluentStack Orientation="Orientation.Horizontal"
                          HorizontalAlignment="HorizontalAlignment.SpaceBetween"
                          VerticalAlignment="VerticalAlignment.Center"
@@ -106,14 +106,14 @@
                 </FluentGrid>
 
                 @* Themed-only toggle *@
-                <FluentCard Style="padding: 12px;">
+                <FluentCard Style="padding: 12px;" AreaRestricted="false">
                     <FluentSwitch @bind-Value="_custThemedOnly" Label="Themed Activities Only" />
                 </FluentCard>
 
                 @* Theme / Holiday filters *@
                 <FluentGrid Spacing="3">
                     <FluentGridItem xs="12" sm="6">
-                        <FluentCard Style="padding: 12px;">
+                        <FluentCard Style="padding: 12px;" AreaRestricted="false">
                             <FluentLabel Weight="FontWeight.Bold" Style="margin-bottom: 4px;">Filter by Themes</FluentLabel>
                             <FluentLabel Typo="Typography.Body" Style="color: var(--neutral-foreground-hint); margin-bottom: 8px; font-size: 0.8rem;">Select specific themes</FluentLabel>
                             @if (_themes is not null)
@@ -128,7 +128,7 @@
                         </FluentCard>
                     </FluentGridItem>
                     <FluentGridItem xs="12" sm="6">
-                        <FluentCard Style="padding: 12px;">
+                        <FluentCard Style="padding: 12px;" AreaRestricted="false">
                             <FluentLabel Weight="FontWeight.Bold" Style="margin-bottom: 4px;">Filter by Holidays</FluentLabel>
                             <FluentLabel Typo="Typography.Body" Style="color: var(--neutral-foreground-hint); margin-bottom: 8px; font-size: 0.8rem;">Select specific holidays</FluentLabel>
                             @if (_holidays is not null)
@@ -170,7 +170,7 @@
                     {
                         var idx = i;
                         var sel = _custSelections[idx];
-                        <FluentCard Style="padding: 12px;">
+                        <FluentCard Style="padding: 12px;" AreaRestricted="false">
                             <FluentGrid Spacing="3">
                                 <FluentGridItem xs="12" sm="5">
                                     <FluentLabel Typo="Typography.Body" Style="color: var(--neutral-foreground-hint); font-size: 0.75rem; margin-bottom: 4px;">
@@ -258,7 +258,7 @@
                 @foreach (var selection in _detailEvent.Selections)
                 {
                     var isWinner = _detailEvent.WinnerActivityId.HasValue && _detailEvent.WinnerActivityId.Value == selection.Activity.Id;
-                    <FluentCard Style="@(isWinner ? "border: 2px solid var(--accent-fill-rest); background: color-mix(in srgb, var(--accent-fill-rest) 5%, transparent);" : "")">
+                    <FluentCard Style="@(isWinner ? "border: 2px solid var(--accent-fill-rest); background: color-mix(in srgb, var(--accent-fill-rest) 5%, transparent);" : "")" AreaRestricted="false">
                         <FluentStack Orientation="Orientation.Vertical" VerticalGap="12" Style="padding: 8px;">
                             @* Header: game + activity + winner *@
                             <FluentStack Orientation="Orientation.Horizontal"
diff --git a/MW-GC.EventManager.Web/Pages/Games.razor b/MW-GC.EventManager.Web/Pages/Games.razor
index b27aae3..9d5136a 100644
--- a/MW-GC.EventManager.Web/Pages/Games.razor
+++ b/MW-GC.EventManager.Web/Pages/Games.razor
@@ -10,7 +10,7 @@
 <FluentStack Orientation="Orientation.Vertical" VerticalGap="24">
     @if (_games is null)
     {
-        <FluentCard>
+        <FluentCard AreaRestricted="false">
             <div style="align-items: center; display: flex; gap: 12px; justify-content: center; min-height: 200px;">
                 <FluentProgressRing />
                 <FluentLabel>Loading games...</FluentLabel>
@@ -19,7 +19,7 @@
     }
     else
     {
-        <FluentCard Style="overflow: visible;">
+        <FluentCard Style="overflow: visible;" AreaRestricted="false">
             <FluentStack Orientation="Orientation.Horizontal"
                          HorizontalAlignment="HorizontalAlignment.SpaceBetween"
                          VerticalAlignment="VerticalAlignment.Center"
@@ -88,7 +88,7 @@
                     @foreach (var game in Filtered)
                     {
                         <FluentGridItem xs="12" sm="6" md="4" lg="3">
-                            <FluentCard Style="height: 100%;">
+                            <FluentCard Style="height: 100%;" AreaRestricted="false">
                                 <FluentStack Orientation="Orientation.Vertical" VerticalGap="12" Style="height: 100%;">
                                     <FluentStack Orientation="Orientation.Horizontal" VerticalAlignment="VerticalAlignment.Center" HorizontalGap="10">
                                         @if (!string.IsNullOrWhiteSpace(game.IconUrl))
diff --git a/MW-GC.EventManager.Web/Pages/Holidays.razor b/MW-GC.EventManager.Web/Pages/Holidays.razor
index 44fad25..2337d6f 100644
--- a/MW-GC.EventManager.Web/Pages/Holidays.razor
+++ b/MW-GC.EventManager.Web/Pages/Holidays.razor
@@ -7,7 +7,7 @@
 <FluentStack Orientation="Orientation.Vertical" VerticalGap="24">
     @if (_holidays is null)
     {
-        <FluentCard>
+        <FluentCard AreaRestricted="false">
             <div style="align-items: center; display: flex; gap: 12px; justify-content: center; min-height: 200px;">
                 <FluentProgressRing />
                 <FluentLabel>Loading holidays...</FluentLabel>
@@ -16,7 +16,7 @@
     }
     else
     {
-        <FluentCard Style="overflow: visible;">
+        <FluentCard Style="overflow: visible;" AreaRestricted="false">
             <FluentStack Orientation="Orientation.Horizontal"
                          HorizontalAlignment="HorizontalAlignment.SpaceBetween"
                          VerticalAlignment="VerticalAlignment.Center"
@@ -56,7 +56,7 @@
                     @foreach (var holiday in Filtered)
                     {
                         <FluentGridItem xs="6" sm="4" md="3" lg="2">
-                            <FluentCard Style="text-align: center; padding: 16px;">
+                            <FluentCard Style="text-align: center; padding: 16px;" AreaRestricted="false">
                                 <FluentIcon Value="@(new Size24.CalendarStar())" Color="Color.Accent" Style="margin-bottom: 8px;" />
                                 <FluentLabel Weight="FontWeight.Bold">@holiday.Name</FluentLabel>
                                 <FluentStack Orientation="Orientation.Horizontal" HorizontalAlignment="HorizontalAlignment.Center" HorizontalGap="4" Style="margin-top: 8px;">
diff --git a/MW-GC.EventManager.Web/Pages/Import.razor b/MW-GC.EventManager.Web/Pages/Import.razor
index bd10142..4e8089a 100644
--- a/MW-GC.EventManager.Web/Pages/Import.razor
+++ b/MW-GC.EventManager.Web/Pages/Import.razor
@@ -14,7 +14,7 @@
         </FluentMessageBar>
     }
 
-    <FluentCard>
+    <FluentCard AreaRestricted="false">
         <FluentStack Orientation="Orientation.Vertical" VerticalGap="16">
             @foreach (var box in _boxes)
             {
@@ -45,7 +45,7 @@
 
     @if (_lastSummary is not null)
     {
-        <FluentCard>
+        <FluentCard AreaRestricted="false">
             <FluentLabel Weight="FontWeight.Bold" Style="margin-bottom: 8px;">Last import</FluentLabel>
             <FluentStack Orientation="Orientation.Horizontal" HorizontalGap="8" Wrap="true">
                 <FluentBadge Appearance="Appearance.Neutral">Games: @_lastSummary.Games</FluentBadge>
diff --git a/MW-GC.EventManager.Web/Pages/Themes.razor b/MW-GC.EventManager.Web/Pages/Themes.razor
index d7dcddb..31efb01 100644
--- a/MW-GC.EventManager.Web/Pages/Themes.razor
+++ b/MW-GC.EventManager.Web/Pages/Themes.razor
@@ -7,7 +7,7 @@
 <FluentStack Orientation="Orientation.Vertical" VerticalGap="24">
     @if (_themes is null)
     {
-        <FluentCard>
+        <FluentCard AreaRestricted="false">
             <div style="align-items: center; display: flex; gap: 12px; justify-content: center; min-height: 200px;">
                 <FluentProgressRing />
                 <FluentLabel>Loading themes...</FluentLabel>
@@ -16,7 +16,7 @@
     }
     else
     {
-        <FluentCard Style="overflow: visible;">
+        <FluentCard Style="overflow: visible;" AreaRestricted="false">
             <FluentStack Orientation="Orientation.Horizontal"
                          HorizontalAlignment="HorizontalAlignment.SpaceBetween"
                          VerticalAlignment="VerticalAlignment.Center"
@@ -56,7 +56,7 @@
                     @foreach (var theme in Filtered)
                     {
                         <FluentGridItem xs="6" sm="4" md="3" lg="2">
-                            <FluentCard Style="text-align: center; padding: 16px;">
+                            <FluentCard Style="text-align: center; padding: 16px;" AreaRestricted="false">
                                 <FluentIcon Value="@(new Size24.Color())" Color="Color.Accent" Style="margin-bottom: 8px;" />
                                 <FluentLabel Weight="FontWeight.Bold">@theme.Name</FluentLabel>
                                 <FluentStack Orientation="Orientation.Horizontal" HorizontalAlignment="HorizontalAlignment.Center" HorizontalGap="4" Style="margin-top: 8px;">
diff --git a/MW-GC.EventManager.Web/staticwebapp.config.json b/MW-GC.EventManager.Web/staticwebapp.config.json
index c4aac66..20c0548 100644
--- a/MW-GC.EventManager.Web/staticwebapp.config.json
+++ b/MW-GC.EventManager.Web/staticwebapp.config.json
@@ -16,32 +16,12 @@
       "route": "/manifest.webmanifest",
       "allowedRoles": [ "anonymous" ]
     },
-    {
-      "route": "/service-worker.js",
-      "allowedRoles": [ "anonymous" ]
-    },
-    {
-      "route": "/service-worker.published.js",
-      "allowedRoles": [ "anonymous" ]
-    },
-    {
-      "route": "/service-worker-assets.js",
-      "allowedRoles": [ "anonymous" ]
-    },
-    {
-      "route": "/favicon.ico",
-      "allowedRoles": [ "anonymous" ]
-    },
-    {
-      "route": "/icon-*.png",
-      "allowedRoles": [ "anonymous" ]
-    },
     {
       "route": "/api/*",
       "allowedRoles": [ "admin" ]
     },
     {
-      "route": "/*",
+      "route": "*",
       "allowedRoles": [ "admin" ]
     }
   ],
diff --git a/MW-GC.EventManager.Web/wwwroot/favicon.png b/MW-GC.EventManager.Web/wwwroot/favicon.png
index 8422b59..fbc10af 100644
Binary files a/MW-GC.EventManager.Web/wwwroot/favicon.png and b/MW-GC.EventManager.Web/wwwroot/favicon.png differ
diff --git a/MW-GC.EventManager.Web/wwwroot/icon-192.png b/MW-GC.EventManager.Web/wwwroot/icon-192.png
index 166f56d..0480aa3 100644
Binary files a/MW-GC.EventManager.Web/wwwroot/icon-192.png and b/MW-GC.EventManager.Web/wwwroot/icon-192.png differ
diff --git a/MW-GC.EventManager.Web/wwwroot/icon-512.png b/MW-GC.EventManager.Web/wwwroot/icon-512.png
index c2dd484..ed0d010 100644
Binary files a/MW-GC.EventManager.Web/wwwroot/icon-512.png and b/MW-GC.EventManager.Web/wwwroot/icon-512.png differ
diff --git a/MW-GC.EventManager.Web/wwwroot/index.html b/MW-GC.EventManager.Web/wwwroot/index.html
index 0140c58..9363fac 100644
--- a/MW-GC.EventManager.Web/wwwroot/index.html
+++ b/MW-GC.EventManager.Web/wwwroot/index.html
@@ -31,7 +31,7 @@
         <a href="." class="reload">Reload</a>
         <span class="dismiss">🗙</span>
     </div>
-    <script src="_framework/blazor.webassembly#[.{fingerprint}].js"></script>
+    <script src="_framework/blazor.webassembly.js"></script>
     <script>navigator.serviceWorker.register('service-worker.js', { updateViaCache: 'none' });</script>
 </body>
 
diff --git a/MW-GC.EventManager.Web/wwwroot/manifest.webmanifest b/MW-GC.EventManager.Web/wwwroot/manifest.webmanifest
index 8ab83b7..ad90839 100644
--- a/MW-GC.EventManager.Web/wwwroot/manifest.webmanifest
+++ b/MW-GC.EventManager.Web/wwwroot/manifest.webmanifest
@@ -1,6 +1,6 @@
 {
-  "name": "MW-GC.EventManager.Web",
-  "short_name": "MW-GC.EventManager.Web",
+  "name": "MWG - Event Manager",
+  "short_name": "Event Manager",
   "id": "./",
   "start_url": "./",
   "display": "standalone",