diff --git a/Tests/Consistency.Tests.ps1 b/Tests/Consistency.Tests.ps1
index b694b47..46c73d0 100644
--- a/Tests/Consistency.Tests.ps1
+++ b/Tests/Consistency.Tests.ps1
@@ -64,6 +64,7 @@ Describe 'Consistency contract' {
             'Get-IntuneAnomaliesReport'       = @('ExportPath')
             'Get-EntraAdminRolesReport'       = @('ExportPath')
             'Get-M365LicenseAssignmentReport' = @('ExportPath')
+            'Get-CustomSecurityAttributesReport' = @('AttributeSet', 'ExportPath')
         }
     }
 
diff --git a/docs/PERMISSIONS.md b/docs/PERMISSIONS.md
index 3ee53d4..82c6be0 100644
--- a/docs/PERMISSIONS.md
+++ b/docs/PERMISSIONS.md
@@ -11,6 +11,7 @@ Use these when registering an app in Azure AD / Entra ID or when calling `Connec
 | Permission | Used by |
 |------------|---------|
 | **AuditLog.Read.All** | Get-EntraAdminRolesReport, Get-M365LicenseAssignmentReport |
+| **CustomSecAttributeAssignment.Read.All** | Get-CustomSecurityAttributesReport |
 | **CloudLicensing.Read** | Get-M365LicenseAssignmentReport |
 | **CloudPC.Read.All** | Get-IntuneEnrollmentFlowsReport, Get-IntuneAnomaliesReport |
 | **Device.Read.All** | Get-IntuneEnrollmentFlowsReport |
@@ -21,13 +22,13 @@ Use these when registering an app in Azure AD / Entra ID or when calling `Connec
 | **Directory.Read.All** | Get-IntuneAnomaliesReport, Get-EntraAdminRolesReport, Get-M365LicenseAssignmentReport |
 | **Group.Read.All** | Get-IntuneEnrollmentFlowsReport, Get-M365LicenseAssignmentReport |
 | **GroupMember.Read.All** | Get-M365LicenseAssignmentReport |
-| **Mail.Send** | Get-IntuneAnomaliesReport, Get-EntraAdminRolesReport, Get-M365LicenseAssignmentReport (optional, for email report) |
-| **Organization.Read.All** | Get-EntraAdminRolesReport, Get-M365LicenseAssignmentReport |
+| **Mail.Send** | Get-IntuneAnomaliesReport, Get-EntraAdminRolesReport, Get-M365LicenseAssignmentReport, Get-CustomSecurityAttributesReport (optional, for email report) |
+| **Organization.Read.All** | Get-EntraAdminRolesReport, Get-M365LicenseAssignmentReport, Get-CustomSecurityAttributesReport |
 | **PrivilegedEligibilitySchedule.Read.AzureADGroup** | Get-EntraAdminRolesReport |
 | **RoleAssignmentSchedule.Read.Directory** | Get-EntraAdminRolesReport |
 | **RoleManagement.Read.Directory** | Get-EntraAdminRolesReport, Get-M365LicenseAssignmentReport |
 | **User.Read** | Get-IntuneAnomaliesReport (minimum for interactive) |
-| **User.Read.All** | Get-IntuneEnrollmentFlowsReport, Get-IntuneAnomaliesReport, Get-M365LicenseAssignmentReport |
+| **User.Read.All** | Get-IntuneEnrollmentFlowsReport, Get-IntuneAnomaliesReport, Get-M365LicenseAssignmentReport, Get-CustomSecurityAttributesReport |
 
 ---
 
@@ -54,7 +55,8 @@ Default `-RequiredScopes` is the **union** of all scopes below so one connection
 - PrivilegedEligibilitySchedule.Read.AzureADGroup  
 - Mail.Send  
 - CloudLicensing.Read  
-- CloudPC.Read.All  
+- CloudPC.Read.All
+- CustomSecAttributeAssignment.Read.All
 
 ---
 
@@ -110,6 +112,15 @@ Default `-RequiredScopes` is the **union** of all scopes below so one connection
 
 ---
 
+### Get-CustomSecurityAttributesReport
+
+- CustomSecAttributeAssignment.Read.All
+- User.Read.All
+- Organization.Read.All
+- Mail.Send
+
+---
+
 ## Notes
 
 - **Application vs Delegated:** These are typically **Application** or **Delegated** depending on whether you connect with client secret/certificate (application) or interactive/device code (delegated). Configure the same permission names in the Azure app registration under Microsoft Graph.
diff --git a/docs/superpowers/plans/2026-05-03-report-rebrand-integration.md b/docs/superpowers/plans/2026-05-03-report-rebrand-integration.md
new file mode 100644
index 0000000..fb93e2a
--- /dev/null
+++ b/docs/superpowers/plans/2026-05-03-report-rebrand-integration.md
@@ -0,0 +1,205 @@
+# Report Rebrand + Custom Security Attributes Integration
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Create a shared HTML report template with rksolutions.nl branding, integrate Get-CustomSecurityAttributesReport, and migrate all existing reports to the shared template.
+
+**Architecture:** A single `New-RKSolutionsReportTemplate` PowerShell function provides the full HTML shell (head, CSS, JS, brand elements). Each report only builds its unique content (stats cards, tables, filters) and passes it to the template. The new Custom Security Attributes report is built on the template from the start; existing reports are migrated one at a time.
+
+**Tech Stack:** PowerShell 7.0+, Microsoft Graph API, HTML5/CSS3/JS, Bootstrap 5, DataTables, Google Fonts (Playfair Display, Source Serif 4, JetBrains Mono)
+
+**Spec:** `docs/superpowers/specs/2026-05-03-report-integration-rebrand-design.md`
+
+---
+
+### Task 1: Create Shared HTML Report Template
+
+**Files:**
+- Create: `module/Private/New-RKSolutionsReportTemplate.ps1`
+
+This is the foundation. Every subsequent task depends on it.
+
+- [ ] **Step 1: Create `New-RKSolutionsReportTemplate.ps1`**
+
+The function accepts: `$TenantName`, `$ReportTitle`, `$ReportSlug`, `$Eyebrow`, `$Lede`, `$StatsCardsHtml`, `$BodyContentHtml`, `$CustomCss`, `$ReportDate`, `$Tags`.
+
+Returns a complete HTML document string via expandable here-string with:
+- Google Fonts + CDN links (Bootstrap 5, DataTables, Font Awesome, jQuery, jszip, pdfmake)
+- CSS custom properties for light (`:root`) and dark (`[data-theme="dark"]`) themes using the validated brand tokens from the spec
+- Shared CSS: typography (Playfair Display for titles, Source Serif 4 for body, JetBrains Mono for monospace), breadcrumb pill, eyebrow line, title block, stat tile colors (rust/olive/steel/rose), filter bar, table styles, status badges, tag pills, theme toggle, DataTables overrides, PS prompt footer
+- `$CustomCss` injected inside `<style>` block
+- HTML structure: theme toggle -> breadcrumb pill -> eyebrow -> title -> lede -> tags -> dashed divider -> stats cards -> body content -> PS prompt footer
+- JavaScript: theme toggle with localStorage, DataTable init helper function `initRKTable(selector, options)`, pagination color management
+
+- [ ] **Step 2: Register in PSM1**
+
+Edit `module/RKSolutions.psm1` line 27 `$sharedOrder` array: add `'New-RKSolutionsReportTemplate.ps1'` after `'ConvertTo-DateString.ps1'`.
+
+- [ ] **Step 3: Commit**
+
+```
+feat: add shared HTML report template with rksolutions.nl brand
+```
+
+---
+
+### Task 2: Integrate Custom Security Attributes Report
+
+**Files:**
+- Create: `module/Private/CustomSecurityAttributes.ps1`
+- Create: `module/Public/Get-CustomSecurityAttributesReport.ps1`
+- Modify: `module/Public/Connect-RKGraph.ps1`
+- Modify: `module/RKSolutions.psm1`
+
+- [ ] **Step 1: Create `CustomSecurityAttributes.ps1`**
+
+Two functions:
+- `Get-CustomSecurityAttributeData`: fetches attribute definitions from `beta/directory/customSecurityAttributeDefinitions`, queries users via `v1.0/users` with `$filter` and `ConsistencyLevel=eventual` header, builds PSCustomObject array
+- `New-CustomSecurityAttributesHTMLReport`: builds stats cards HTML (total users + up to 3 unique attribute counts), filter dropdowns, table rows, then calls `New-RKSolutionsReportTemplate` with slug `custom-security-attributes`, eyebrow `CUSTOM SECURITY ATTRIBUTES`, etc.
+
+Port the data-fetching logic from `/Users/roy/github/Get-CustomSecurityAttributesReport.ps1` (lines 1526-1644), adapting to use existing Graph context instead of inline auth.
+
+- [ ] **Step 2: Create `Get-CustomSecurityAttributesReport.ps1`**
+
+Thin wrapper with `.SYNOPSIS` help block. Parameters: `$AttributeSet` (default "CustomerData"), `$AttributeNames`, `$Filters`, `$SendEmail`, `$Recipient`, `$From`, `$ExportPath`, `$DebugMode`. Follows the same pattern as `Get-IntuneAnomaliesReport.ps1`.
+
+- [ ] **Step 3: Add scope to Connect-RKGraph**
+
+Add `'CustomSecAttributeAssignment.Read.All'` to the `$RequiredScopes` default array in `module/Public/Connect-RKGraph.ps1`.
+
+- [ ] **Step 4: Register in PSM1**
+
+- Add `'CustomSecurityAttributes.ps1'` to `$domainOrder` array
+- Add `'Get-CustomSecurityAttributesReport'` to `Export-ModuleMember`
+
+- [ ] **Step 5: Commit**
+
+```
+feat: add Get-CustomSecurityAttributesReport cmdlet
+```
+
+---
+
+### Task 3: Migrate Intune Anomalies Report to Shared Template
+
+**Files:**
+- Modify: `module/Private/IntuneAnomalies.ps1`
+
+- [ ] **Step 1: Refactor `New-IntuneAnomaliesHTMLReport`**
+
+Keep: parameter list, count calculations, stat cards HTML generation, tab structure, table row generation, filter logic.
+
+Remove: entire `<head>` section, all CSS (`:root` vars, theme toggle, stats cards, tables, badges, DataTables overrides, footer), theme toggle HTML, footer HTML, DataTable init JS boilerplate.
+
+Replace: build `$statsCardsHtml` (8 stat tiles using the template's `.stat-tile.t-{color}` classes), `$bodyContentHtml` (tabs + tables + filters), and any report-specific `$customCss`. Call `New-RKSolutionsReportTemplate` with slug `intune-anomalies`, eyebrow `INTUNE ANOMALIES`, title accent word `Anomalies`, lede from spec.
+
+- [ ] **Step 2: Verify structure**
+
+Confirm the function still outputs HTML to `$ExportPath` and sets `$script:ExportPath` for email flow.
+
+- [ ] **Step 3: Commit**
+
+```
+refactor: migrate Intune Anomalies report to shared brand template
+```
+
+---
+
+### Task 4: Migrate Entra Admin Roles Report to Shared Template
+
+**Files:**
+- Modify: `module/Private/EntraAdminRoles.ps1`
+
+- [ ] **Step 1: Refactor `New-AdminRoleHTMLReport`**
+
+Same pattern as Task 3. Keep report-specific: shimmer animation CSS (pass via `$CustomCss`), stat cards for Permanent/Eligible/Group/ServicePrincipal counts, tab structure with role tables, badge styling for assignment types, group-jump highlight animation.
+
+Call `New-RKSolutionsReportTemplate` with slug `entra-admin-roles`, eyebrow `ENTRA ADMIN ROLES`, title accent word `Admin Roles`.
+
+- [ ] **Step 2: Commit**
+
+```
+refactor: migrate Entra Admin Roles report to shared brand template
+```
+
+---
+
+### Task 5: Migrate M365 License Assignment Report to Shared Template
+
+**Files:**
+- Modify: `module/Private/M365License.ps1`
+
+- [ ] **Step 1: Refactor `New-HTMLReport`**
+
+Keep report-specific: stat cards for Direct/Inherited/Both/Disabled, license filter badges, subscription overview table, disabled users table.
+
+Call `New-RKSolutionsReportTemplate` with slug `m365-licenses`, eyebrow `M365 LICENSE ASSIGNMENT`, title accent word `License`.
+
+- [ ] **Step 2: Commit**
+
+```
+refactor: migrate M365 License report to shared brand template
+```
+
+---
+
+### Task 6: Migrate Intune Enrollment Flows Reports to Shared Template
+
+**Files:**
+- Modify: `module/Private/IntuneEnrollmentFlows.ps1`
+
+- [ ] **Step 1: Refactor `New-AssignmentOverviewHtmlReport`**
+
+Call `New-RKSolutionsReportTemplate` with slug `intune-enrollment-overview`, eyebrow `INTUNE ENROLLMENT FLOWS`, title accent word `Enrollment`.
+
+- [ ] **Step 2: Refactor `New-DeviceVisualizationHtmlReport`**
+
+Call `New-RKSolutionsReportTemplate` with slug `intune-enrollment-device`, eyebrow `DEVICE ENROLLMENT FLOW`, title accent word `Enrollment`. Keep Mermaid diagram integration CSS via `$CustomCss`.
+
+- [ ] **Step 3: Commit**
+
+```
+refactor: migrate Intune Enrollment Flows reports to shared brand template
+```
+
+---
+
+### Task 7: Update Manifest, Tests, and Docs
+
+**Files:**
+- Modify: `module/RKSolutions.psd1`
+- Modify: `Tests/Consistency.Tests.ps1`
+- Modify: `docs/PERMISSIONS.md`
+
+- [ ] **Step 1: Update manifest**
+
+- Add `'Get-CustomSecurityAttributesReport'` to `FunctionsToExport`
+- Bump `ModuleVersion` to `'1.1.0'`
+- Change `PowerShellVersion` from `'5.1'` to `'7.0'`
+- Update `Description` to include Custom Security Attributes
+- Add 1.1.0 to `ReleaseNotes`
+
+- [ ] **Step 2: Update consistency tests**
+
+Add to `$script:expectedParameters`:
+```powershell
+'Get-CustomSecurityAttributesReport' = @('AttributeSet', 'ExportPath')
+```
+
+- [ ] **Step 3: Update PERMISSIONS.md**
+
+Add `CustomSecAttributeAssignment.Read.All` to summary table and add per-cmdlet section for `Get-CustomSecurityAttributesReport`.
+
+- [ ] **Step 4: Run tests**
+
+```bash
+pwsh -Command "Invoke-Pester ./Tests/Consistency.Tests.ps1 -Verbose"
+```
+
+Expected: All tests pass, including the new cmdlet.
+
+- [ ] **Step 5: Commit**
+
+```
+feat: update manifest, tests, and docs for v1.1.0
+```
diff --git a/docs/superpowers/specs/2026-05-03-report-integration-rebrand-design.md b/docs/superpowers/specs/2026-05-03-report-integration-rebrand-design.md
new file mode 100644
index 0000000..74d35c7
--- /dev/null
+++ b/docs/superpowers/specs/2026-05-03-report-integration-rebrand-design.md
@@ -0,0 +1,268 @@
+# Design: Custom Security Attributes Report Integration + Brand Rebrand
+
+**Date:** 2026-05-03
+**Author:** Roy Klooster + Claude
+
+## Overview
+
+Two tasks in one spec:
+
+1. **Integrate** `Get-CustomSecurityAttributesReport.ps1` (source: `/Users/roy/github/Get-CustomSecurityAttributesReport.ps1`) into the RKSolutions module as `Get-CustomSecurityAttributesReport`
+2. **Rebrand** all 5 HTML reports (4 existing + 1 new) with the rksolutions.nl editorial parchment brand, using a shared template function
+
+### Delivery Order
+
+Task 1 (integration) and Task 2 (rebrand) are delivered together since the new report will be built on the shared template from the start. However, commits are structured incrementally:
+
+1. Create shared template (`New-RKSolutionsReportTemplate.ps1`)
+2. Integrate the new Custom Security Attributes report (built on template)
+3. Migrate each existing report to the shared template (one commit per report)
+4. Update manifest, PSM1, tests, permissions docs
+
+## Task 1: Custom Security Attributes Report Integration
+
+### New Files
+
+| File | Purpose |
+|------|---------|
+| `module/Public/Get-CustomSecurityAttributesReport.ps1` | Public cmdlet (thin wrapper) |
+| `module/Private/CustomSecurityAttributes.ps1` | Data fetching + HTML report generation |
+
+### Public Cmdlet Parameters
+
+Follow the existing module pattern (same as Get-IntuneAnomaliesReport, Get-EntraAdminRolesReport). The cmdlet must include a `.SYNOPSIS` comment-based help block matching the pattern in existing public cmdlets.
+
+```powershell
+function Get-CustomSecurityAttributesReport {
+    [CmdletBinding()]
+    param(
+        # Domain-specific parameters (unique to this report)
+        [string]   $AttributeSet = "CustomerData",
+        [string[]] $AttributeNames,
+        [hashtable]$Filters,
+        # Common report parameters (shared across all report cmdlets)
+        [switch]   $SendEmail,
+        [string[]] $Recipient,
+        [string]   $From,
+        [string]   $ExportPath,
+        [switch]   $DebugMode
+    )
+}
+```
+
+**Note:** `$AttributeSet`, `$AttributeNames`, and `$Filters` are domain-specific additions required by the Custom Security Attributes API. They follow the same principle as `Get-IntuneEnrollmentFlowsReport`'s domain-specific `$Device`, `$AssignmentOverviewOnly`, and `$ApplyPlatformFilter` parameters. The `$ExportCSV` switch from the standalone script is removed to maintain the common parameter contract.
+
+**Differences from standalone script:**
+- No auth parameters on the cmdlet. User calls `Connect-RKGraph` first (module pattern).
+- No `Install-Requirements` or `Connect-ToMgGraph` calls inline. Uses existing Graph context.
+- Script's `Connect-ToMgGraph` helper is already in `module/Private/Connect-ToMgGraph.ps1`.
+- Uses `Send-EmailWithAttachment` from `module/Private/Send-EmailWithAttachment.ps1`.
+
+### Required Scopes
+
+The standalone script requires: `CustomSecAttributeAssignment.Read.All`, `User.Read.All`, `Organization.Read.All`, `Mail.Send`.
+
+`User.Read.All`, `Organization.Read.All`, and `Mail.Send` are already in `Connect-RKGraph` default scopes.
+
+**Action:** Add `CustomSecAttributeAssignment.Read.All` to `Connect-RKGraph`'s default `$RequiredScopes` array.
+
+### Private Helper Functions
+
+`CustomSecurityAttributes.ps1` will contain:
+
+- `Get-CustomSecurityAttributeData` -- fetches attribute definitions and user data from Graph API
+- `New-CustomSecurityAttributesHTMLReport` -- generates HTML using the shared template
+
+### Data Flow
+
+```
+User calls Get-CustomSecurityAttributesReport
+  -> Verify Graph context (Get-MgContext)
+  -> Get tenant info (Organization.Read.All)
+  -> Get attribute definitions (beta/directory/customSecurityAttributeDefinitions)
+  -> Query users with attributes (v1.0/users with $filter + ConsistencyLevel=eventual)
+  -> Build report data array
+  -> Call New-CustomSecurityAttributesHTMLReport (shared template)
+  -> Optional: Send-EmailWithAttachment
+```
+
+### Module Loader Updates (RKSolutions.psm1)
+
+The PSM1 has two hardcoded script loading lists that must be updated:
+
+1. **`$sharedOrder` array (line 27):** Add `'New-RKSolutionsReportTemplate.ps1'` to load the shared template before any report-specific script.
+2. **`$domainOrder` array (line 41):** Add `'CustomSecurityAttributes.ps1'` to the report-specific loading list.
+3. **`Export-ModuleMember` call (line 55):** Add `'Get-CustomSecurityAttributesReport'` to the exported functions list.
+
+### Manifest Updates
+
+- Add `Get-CustomSecurityAttributesReport` to `FunctionsToExport` in `RKSolutions.psd1`
+- Update description to mention Custom Security Attributes
+- Bump version to `1.1.0`
+- Correct `PowerShellVersion` from `'5.1'` to `'7.0'` (the PSM1 already enforces 7.0 at runtime; the manifest should match)
+- Add `1.1.0` entry to `ReleaseNotes`
+
+### Test Updates
+
+- Add `Get-CustomSecurityAttributesReport` to consistency tests
+- Add expected parameters: `AttributeSet`, `ExportPath`
+- The new public cmdlet must have a `.SYNOPSIS` help block (validated by existing "Get-Help is filled" test)
+
+## Task 2: Brand Rebrand with Shared Template
+
+### Architecture: Shared Template Function
+
+Create `module/Private/New-RKSolutionsReportTemplate.ps1` containing a single function:
+
+```powershell
+function New-RKSolutionsReportTemplate {
+    param(
+        [string]$TenantName,
+        [string]$ReportTitle,        # e.g. "Anomalies"
+        [string]$ReportSlug,         # e.g. "intune-anomalies" (for breadcrumb)
+        [string]$Eyebrow,            # e.g. "INTUNE ANOMALIES"
+        [string]$Lede,               # italic subtitle
+        [string]$StatsCardsHtml,     # pre-built stat cards HTML
+        [string]$BodyContentHtml,    # tabs, tables, filters -- everything unique
+        [string]$CustomCss,          # report-specific CSS (e.g. shimmer animations)
+        [string]$ReportDate,
+        [string[]]$Tags              # optional tag pills
+    )
+}
+```
+
+This function returns the complete HTML document string using PowerShell expandable here-strings (`@"..."@`) with direct variable interpolation. No `{{placeholder}}` string replacement -- parameters are embedded directly in the here-string via `$StatsCardsHtml`, `$BodyContentHtml`, etc. Each report only needs to provide its unique content.
+
+### Report Template Parameter Values
+
+| Report | ReportSlug | Eyebrow | ReportTitle accent word | Lede |
+|--------|-----------|---------|------------------------|------|
+| Intune Anomalies | `intune-anomalies` | `INTUNE ANOMALIES` | `Anomalies` | Device compliance overview with flagged anomalies across encryption, activity, and application health. |
+| Entra Admin Roles | `entra-admin-roles` | `ENTRA ADMIN ROLES` | `Admin Roles` | Privileged role assignments including permanent, eligible, group-based, and service principal assignments. |
+| M365 License Assignment | `m365-licenses` | `M365 LICENSE ASSIGNMENT` | `License` | License assignment overview including direct, inherited, and disabled user assignments. |
+| Intune Enrollment Flows (Overview) | `intune-enrollment-overview` | `INTUNE ENROLLMENT FLOWS` | `Enrollment` | Assignment overview across all Intune policy types with group and filter targeting. |
+| Intune Enrollment Flows (Device) | `intune-enrollment-device` | `DEVICE ENROLLMENT FLOW` | `Enrollment` | Device-specific enrollment flow with policy assignments, group membership, and filter evaluation. |
+| Custom Security Attributes | `custom-security-attributes` | `CUSTOM SECURITY ATTRIBUTES` | `Security Attributes` | Users with custom security attribute assignments across the specified attribute set. |
+
+### What the Template Provides (single source of truth)
+
+1. `<!DOCTYPE html>` + `<head>` with meta, Google Fonts, CDN links
+2. CSS custom properties (`:root` light tokens, `[data-theme="dark"]` dark tokens)
+3. All shared CSS: typography, breadcrumb pill, eyebrow, title block, stat tiles, filter bar, table styles, badges, tag pills, footer, theme toggle, DataTables overrides
+4. `$CustomCss` injection point in `<style>` block for report-specific styles
+5. Theme toggle switch (fixed top-right)
+6. Breadcrumb pill: `<- cd ./reports/{slug}`
+7. Eyebrow + Playfair title + lede
+8. Stats cards area (from `$StatsCardsHtml`)
+9. Body content area (from `$BodyContentHtml`)
+10. PS prompt footer
+11. JavaScript: theme toggle, DataTable init helper, filter infrastructure
+
+### Validated Brand Tokens
+
+**Light mode (chalk-white):**
+
+| Token | Hex | Use |
+|-------|-----|-----|
+| --bg-base | #fcfbf8 | Page background |
+| --bg-elevated | #f3f0e8 | Cards, filter bar, code blocks |
+| --bg-warm | #e8e4dc | Table header strip, tag pills |
+| --border | #e2ddd2 | Borders, table grid |
+| --border-dashed | #ddd8ce | Section dividers |
+| --text | #181410 | Headlines |
+| --text-body | #46423a | Running text, table cells |
+| --text-muted | #787468 | Captions, secondary info |
+| --text-dim | #a8a298 | Decorative chrome |
+| --accent | #84441c | Rust accent, links, eyebrows |
+| --accent-hover | #a85b1d | Hover state |
+| --accent-soft | #fceadb | Callout backgrounds, hover rows |
+
+**Dark mode (warm parchment, matching rksolutions.nl):**
+
+| Token | Hex | Use |
+|-------|-----|-----|
+| --bg-base | #1a1710 | Page background |
+| --bg-elevated | #252118 | Cards, elevated surfaces |
+| --bg-deep | #151210 | Alternating table rows |
+| --border | #3a3228 | Borders |
+| --text | #e0d8c8 | Headlines |
+| --text-body | #e0d8c8 | Running text |
+| --text-muted | #8a7a60 | Captions, mono identifiers |
+| --text-dim | #5a5040 | Decorative chrome |
+| --accent | #c8a060 | Amber accent (replaces rust) |
+
+**Status badges:**
+
+| Status | Light BG | Dark Style |
+|--------|----------|------------|
+| OK/Compliant | #2d7a3a (white text) | rgba(90,160,90,0.2) border+text #6abf6a |
+| Warning | #c46a1a (white text) | rgba(200,150,50,0.18) border+text #d4a840 |
+| Error/NonCompliant | #c0392b (white text) | rgba(200,80,70,0.18) border+text #e06050 |
+| N/A | #e8e4dc (muted text) | rgba(140,120,90,0.15) border+text #8a7a60 |
+
+**Stat tile colors (solid background, white text in light; tinted bg + colored text in dark):**
+
+| Tile | Light BG | Dark BG | Dark Text |
+|------|----------|---------|-----------|
+| Rust (hero) | #84441c | #3a2810 | #e8c080 |
+| Olive | #4a6830 | #1a2c10 | #a0d870 |
+| Steel | #3e5c78 | #10202e | #78c0e8 |
+| Rose | #8a3e38 | #2e1410 | #e88878 |
+
+### Migration Per Report
+
+Each report's private helper gets refactored:
+
+1. **Remove** all inline CSS, `<head>`, `<style>`, theme toggle HTML, footer HTML, DataTables init boilerplate
+2. **Keep** only report-specific logic: stat cards HTML, filter dropdowns, table generation, tab structure
+3. **Call** `New-RKSolutionsReportTemplate` with the report-specific content
+4. Report-specific CSS (e.g. shimmer animation for Entra eligible badges) is passed via the `-CustomCss` parameter
+
+**Files affected:**
+- `module/Private/IntuneAnomalies.ps1` -- `New-IntuneAnomaliesHTMLReport`
+- `module/Private/EntraAdminRoles.ps1` -- `New-AdminRoleHTMLReport`
+- `module/Private/M365License.ps1` -- `New-HTMLReport`
+- `module/Private/IntuneEnrollmentFlows.ps1` -- `New-AssignmentOverviewHtmlReport` + `New-DeviceVisualizationHtmlReport`
+- `module/Private/CustomSecurityAttributes.ps1` -- new, built on template from start
+
+### CDN Dependencies (unchanged)
+
+- Bootstrap 5.3.0 CSS
+- DataTables 1.13.6 + Buttons
+- jQuery 3.7.0
+- Font Awesome 6.4.0
+- jszip, pdfmake (for export buttons)
+- **New:** Google Fonts (Playfair Display, Source Serif 4, JetBrains Mono)
+
+### Signature Elements (every report)
+
+1. **Breadcrumb pill** -- `<- cd ./reports/{slug}`
+2. **Eyebrow** -- `REPORT NAME . GENERATED YYYY-MM-DD`
+3. **Playfair title** -- one word in accent color
+4. **Source Serif italic lede**
+5. **Dashed divider** between sections
+6. **PS prompt footer** -- `PS C:\Blog\rksolutions>` + blinking cursor + `rksolutions.nl`
+7. **Theme toggle** -- sun/moon, fixed top-right
+
+## Testing Strategy
+
+- Existing Pester consistency tests extended for new cmdlet
+- Manual visual verification of all 5 reports in both themes
+- No Graph connection required for template unit testing
+
+## File Summary
+
+| Action | File |
+|--------|------|
+| Create | `module/Private/New-RKSolutionsReportTemplate.ps1` |
+| Create | `module/Public/Get-CustomSecurityAttributesReport.ps1` |
+| Create | `module/Private/CustomSecurityAttributes.ps1` |
+| Modify | `module/Private/IntuneAnomalies.ps1` |
+| Modify | `module/Private/EntraAdminRoles.ps1` |
+| Modify | `module/Private/M365License.ps1` |
+| Modify | `module/Private/IntuneEnrollmentFlows.ps1` |
+| Modify | `module/Public/Connect-RKGraph.ps1` |
+| Modify | `module/RKSolutions.psd1` |
+| Modify | `module/RKSolutions.psm1` |
+| Modify | `Tests/Consistency.Tests.ps1` |
+| Modify | `docs/PERMISSIONS.md` |
diff --git a/module/Private/CustomSecurityAttributes.ps1 b/module/Private/CustomSecurityAttributes.ps1
new file mode 100644
index 0000000..1e1c438
--- /dev/null
+++ b/module/Private/CustomSecurityAttributes.ps1
@@ -0,0 +1,538 @@
+# Custom Security Attributes - Private helpers
+
+function Get-CustomSecurityAttributeData {
+    param(
+        [Parameter(Mandatory = $false)]
+        [string]$AttributeSet,
+
+        [Parameter(Mandatory = $false)]
+        [switch]$DebugMode
+    )
+
+    # Helper: query entities with paging and extract custom security attributes
+    function Get-EntitiesWithAttributes {
+        param([string]$Uri, [string]$EntityType, [hashtable]$Headers = @{})
+        $all = [System.Collections.Generic.List[object]]::new()
+        try {
+            $results = Invoke-MgGraphRequest -Method GET -Uri $Uri -Headers $Headers -OutputType PSObject
+            if ($results.value) { $all.AddRange($results.value) }
+            while ($results.'@odata.nextLink') {
+                $results = Invoke-MgGraphRequest -Method GET -Uri $results.'@odata.nextLink' -Headers $Headers -OutputType PSObject
+                if ($results.value) { $all.AddRange($results.value) }
+            }
+        } catch {
+            Write-Host "  WARNING: Could not query $EntityType - $($_.Exception.Message)" -ForegroundColor Yellow
+        }
+        return $all
+    }
+
+    # ===== Step 1: Query all three entity types =====
+    Write-Host "Querying users..." -ForegroundColor Cyan
+    $allUsers = Get-EntitiesWithAttributes `
+        -Uri "https://graph.microsoft.com/v1.0/users?`$count=true&`$select=id,displayName,userPrincipalName,customSecurityAttributes&`$top=999" `
+        -EntityType "users" -Headers @{ ConsistencyLevel = 'eventual' }
+    Write-Host "  Found $($allUsers.Count) user(s)" -ForegroundColor Green
+
+    Write-Host "Querying devices..." -ForegroundColor Cyan
+    $allDevices = Get-EntitiesWithAttributes `
+        -Uri "https://graph.microsoft.com/beta/devices?`$select=id,displayName,operatingSystem,customSecurityAttributes&`$top=999" `
+        -EntityType "devices"
+    Write-Host "  Found $($allDevices.Count) device(s)" -ForegroundColor Green
+
+    Write-Host "Querying enterprise applications..." -ForegroundColor Cyan
+    $allApps = Get-EntitiesWithAttributes `
+        -Uri "https://graph.microsoft.com/beta/servicePrincipals?`$select=id,displayName,appId,customSecurityAttributes&`$top=999" `
+        -EntityType "service principals"
+    Write-Host "  Found $($allApps.Count) app(s)" -ForegroundColor Green
+
+    # ===== Step 2: Discover all attribute sets from all entities =====
+    Write-Host "Discovering attribute sets..." -ForegroundColor Cyan
+    $allAttributeSets = [System.Collections.Generic.HashSet[string]]::new()
+    $allEntities = @($allUsers) + @($allDevices) + @($allApps)
+
+    foreach ($entity in $allEntities) {
+        if ($entity.customSecurityAttributes) {
+            foreach ($prop in $entity.customSecurityAttributes.PSObject.Properties) {
+                if ($prop.Name -ne '@odata.type' -and $prop.Value -is [System.Management.Automation.PSCustomObject]) {
+                    [void]$allAttributeSets.Add($prop.Name)
+                }
+            }
+        }
+    }
+
+    $sortedSets = @($allAttributeSets | Sort-Object)
+    if ($sortedSets.Count -eq 0) {
+        throw "No custom security attribute sets found in your tenant."
+    }
+    Write-Host "  Found attribute sets: $($sortedSets -join ', ')" -ForegroundColor Green
+
+    # If a specific set was requested, validate it exists
+    if ($AttributeSet -and $AttributeSet -notin $sortedSets) {
+        throw "Attribute set '$AttributeSet' not found. Available sets: $($sortedSets -join ', ')"
+    }
+
+    # ===== Step 3: Discover attributes per set =====
+    $setData = [ordered]@{}
+    $setsToProcess = if ($AttributeSet) { @($AttributeSet) } else { $sortedSets }
+
+    foreach ($setName in $setsToProcess) {
+        $discoveredAttrs = [System.Collections.Generic.HashSet[string]]::new()
+        foreach ($entity in $allEntities) {
+            $attrData = $entity.customSecurityAttributes.$setName
+            if ($attrData) {
+                foreach ($prop in $attrData.PSObject.Properties) {
+                    if ($prop.Name -ne '@odata.type') {
+                        [void]$discoveredAttrs.Add($prop.Name)
+                    }
+                }
+            }
+        }
+        $attrNames = @($discoveredAttrs | Sort-Object)
+        if ($attrNames.Count -eq 0) { continue }
+
+        # Process each entity type for this set
+        $usersForSet = [System.Collections.Generic.List[PSObject]]::new()
+        $devicesForSet = [System.Collections.Generic.List[PSObject]]::new()
+        $appsForSet = [System.Collections.Generic.List[PSObject]]::new()
+
+        foreach ($user in $allUsers) {
+            $attrData = $user.customSecurityAttributes.$setName
+            if (-not $attrData) { continue }
+            $obj = [ordered]@{ DisplayName = $user.displayName; Identifier = $user.userPrincipalName }
+            foreach ($a in $attrNames) { $obj[$a] = if ($attrData.$a) { $attrData.$a } else { '-' } }
+            $obj['ObjectId'] = $user.id
+            $usersForSet.Add([PSCustomObject]$obj)
+        }
+
+        foreach ($device in $allDevices) {
+            $attrData = $device.customSecurityAttributes.$setName
+            if (-not $attrData) { continue }
+            $obj = [ordered]@{ DisplayName = $device.displayName; Identifier = if ($device.operatingSystem) { $device.operatingSystem } else { '-' } }
+            foreach ($a in $attrNames) { $obj[$a] = if ($attrData.$a) { $attrData.$a } else { '-' } }
+            $obj['ObjectId'] = $device.id
+            $devicesForSet.Add([PSCustomObject]$obj)
+        }
+
+        foreach ($app in $allApps) {
+            $attrData = $app.customSecurityAttributes.$setName
+            if (-not $attrData) { continue }
+            $obj = [ordered]@{ DisplayName = $app.displayName; Identifier = if ($app.appId) { $app.appId } else { '-' } }
+            foreach ($a in $attrNames) { $obj[$a] = if ($attrData.$a) { $attrData.$a } else { '-' } }
+            $obj['ObjectId'] = $app.id
+            $appsForSet.Add([PSCustomObject]$obj)
+        }
+
+        $setData[$setName] = @{
+            AttributeNames = $attrNames
+            Users          = $usersForSet
+            Devices        = $devicesForSet
+            Apps           = $appsForSet
+        }
+
+        Write-Host "  $setName : $($attrNames.Count) attributes, $($usersForSet.Count) users, $($devicesForSet.Count) devices, $($appsForSet.Count) apps" -ForegroundColor Yellow
+    }
+
+    # Build overview data (coverage matrix)
+    $overviewData = [System.Collections.Generic.List[hashtable]]::new()
+    foreach ($user in $allUsers) {
+        if (-not $user.customSecurityAttributes) { continue }
+        $hasSets = @{}
+        foreach ($s in $setsToProcess) { $hasSets[$s] = if ($user.customSecurityAttributes.$s) { $true } else { $false } }
+        if (-not ($hasSets.Values -contains $true)) { continue }
+        $overviewData.Add(@{ Type = 'User'; Name = $user.displayName; Identifier = $user.userPrincipalName; Sets = $hasSets })
+    }
+    foreach ($device in $allDevices) {
+        if (-not $device.customSecurityAttributes) { continue }
+        $hasSets = @{}
+        foreach ($s in $setsToProcess) { $hasSets[$s] = if ($device.customSecurityAttributes.$s) { $true } else { $false } }
+        if (-not ($hasSets.Values -contains $true)) { continue }
+        $overviewData.Add(@{ Type = 'Device'; Name = $device.displayName; Identifier = if ($device.operatingSystem) { $device.operatingSystem } else { '-' }; Sets = $hasSets })
+    }
+    foreach ($app in $allApps) {
+        if (-not $app.customSecurityAttributes) { continue }
+        $hasSets = @{}
+        foreach ($s in $setsToProcess) { $hasSets[$s] = if ($app.customSecurityAttributes.$s) { $true } else { $false } }
+        if (-not ($hasSets.Values -contains $true)) { continue }
+        $overviewData.Add(@{ Type = 'App'; Name = $app.displayName; Identifier = if ($app.appId) { $app.appId } else { '-' }; Sets = $hasSets })
+    }
+
+    return @{
+        SetData       = $setData
+        AttributeSets = $setsToProcess
+        OverviewData  = $overviewData
+        Counts        = @{
+            Users   = ($overviewData | Where-Object { $_.Type -eq 'User' }).Count
+            Devices = ($overviewData | Where-Object { $_.Type -eq 'Device' }).Count
+            Apps    = ($overviewData | Where-Object { $_.Type -eq 'App' }).Count
+            Sets    = $setsToProcess.Count
+        }
+    }
+}
+
+function New-CustomSecurityAttributesHTMLReport {
+    param(
+        [Parameter(Mandatory = $true)] [string]$TenantName,
+        [Parameter(Mandatory = $true)] [hashtable]$ReportData,
+        [Parameter(Mandatory = $false)] [string]$ExportPath
+    )
+
+    if (-not $ExportPath) {
+        $ExportPath = Join-Path (Get-Location).Path "$TenantName-CustomSecurityAttributes.html"
+    }
+
+    $exportDir = Split-Path -Path $ExportPath -Parent
+    if ($exportDir -and -not (Test-Path $exportDir)) {
+        New-Item -Path $exportDir -ItemType Directory -Force | Out-Null
+    }
+
+    $reportDate = (Get-Date).ToString('yyyy-MM-dd HH:mm:ss')
+    $sets = $ReportData.AttributeSets
+    $setData = $ReportData.SetData
+    $overview = $ReportData.OverviewData
+    $counts = $ReportData.Counts
+
+    # Stat tiles
+    $statsCardsHtml = @"
+            <div class="rk-stat-tile t-rust">
+                <div class="rk-stat-eyebrow">USERS</div>
+                <div class="rk-stat-number">$($counts.Users)</div>
+                <div class="rk-stat-caption">With attributes assigned</div>
+            </div>
+            <div class="rk-stat-tile t-olive">
+                <div class="rk-stat-eyebrow">DEVICES</div>
+                <div class="rk-stat-number">$($counts.Devices)</div>
+                <div class="rk-stat-caption">With attributes assigned</div>
+            </div>
+            <div class="rk-stat-tile t-steel">
+                <div class="rk-stat-eyebrow">ENTERPRISE APPS</div>
+                <div class="rk-stat-number">$($counts.Apps)</div>
+                <div class="rk-stat-caption">With attributes assigned</div>
+            </div>
+            <div class="rk-stat-tile t-rose">
+                <div class="rk-stat-eyebrow">ATTRIBUTE SETS</div>
+                <div class="rk-stat-number">$($counts.Sets)</div>
+                <div class="rk-stat-caption">Active in tenant</div>
+            </div>
+"@
+
+    # ===== Build tab buttons =====
+    $tabButtonsHtml = '        <button class="rk-tab active" data-target="panel-overview">Overview</button>'
+    foreach ($setName in $sets) {
+        $tabButtonsHtml += "`n        <button class=`"rk-tab`" data-target=`"panel-$($setName.ToLower())`">$setName</button>"
+    }
+
+    # ===== Build Overview panel =====
+    $overviewHeaders = "                            <th>Type</th>`n                            <th>Name</th>"
+    foreach ($s in $sets) { $overviewHeaders += "`n                            <th>$s</th>" }
+
+    $overviewRows = ''
+    foreach ($item in $overview) {
+        $typeLabel = switch ($item.Type) {
+            'User'   { 'User' }
+            'Device' { 'Device' }
+            'App'    { 'Enterprise App' }
+        }
+        $overviewRows += "                        <tr>`n"
+        $overviewRows += "                            <td>$typeLabel</td>`n"
+        $overviewRows += "                            <td>$([System.Net.WebUtility]::HtmlEncode($item.Name))</td>`n"
+        foreach ($s in $sets) {
+            $check = if ($item.Sets[$s]) { '<span class="rk-check">&#10003;</span>' } else { '<span class="rk-dash">&mdash;</span>' }
+            $overviewRows += "                            <td style=`"text-align:center`">$check</td>`n"
+        }
+        $overviewRows += "                        </tr>`n"
+    }
+
+    # Calculate coverage metrics
+    $totalEntities = $overview.Count
+    $totalSlots = $totalEntities * $sets.Count
+    $assignedSlots = 0
+    $fullCoverageCount = 0
+    foreach ($item in $overview) {
+        $assignedCount = ($sets | Where-Object { $item.Sets[$_] }).Count
+        $assignedSlots += $assignedCount
+        if ($assignedCount -eq $sets.Count) { $fullCoverageCount++ }
+    }
+    $avgCoverage = if ($totalSlots -gt 0) { [Math]::Round(($assignedSlots / $totalSlots) * 100) } else { 0 }
+    $noCoverageCount = $totalSlots - $assignedSlots
+
+    # Coverage per set
+    $setCoverageHtml = ''
+    $barColors = @('orange', 'blue', 'green', 'purple', 'red', 'orange', 'blue', 'green')
+    $setIdx = 0
+    foreach ($s in $sets) {
+        $entitiesWithSet = ($overview | Where-Object { $_.Sets[$s] }).Count
+        $pct = if ($totalEntities -gt 0) { [Math]::Round(($entitiesWithSet / $totalEntities) * 100) } else { 0 }
+        $color = $barColors[$setIdx % $barColors.Count]
+        $setCoverageHtml += "<div class=`"rk-cov-row`"><span class=`"rk-cov-name`">$s</span><div class=`"rk-cov-track`"><div class=`"rk-cov-fill rk-cov-$color`" style=`"width:${pct}%`"></div></div><span class=`"rk-cov-pct`">${pct}%</span></div>`n"
+        $setIdx++
+    }
+
+    # Coverage per entity type
+    $userCount = ($overview | Where-Object { $_.Type -eq 'User' }).Count
+    $deviceCount = ($overview | Where-Object { $_.Type -eq 'Device' }).Count
+    $appCount = ($overview | Where-Object { $_.Type -eq 'App' }).Count
+    $entityCoverageHtml = @"
+        <div class="rk-cov-row"><span class="rk-cov-name">Users</span><div class="rk-cov-track"><div class="rk-cov-fill rk-cov-orange" style="width:$(if ($totalEntities -gt 0) { [Math]::Round(($userCount / $totalEntities) * 100) } else { 0 })%"></div></div><span class="rk-cov-pct">$userCount</span></div>
+        <div class="rk-cov-row"><span class="rk-cov-name">Devices</span><div class="rk-cov-track"><div class="rk-cov-fill rk-cov-blue" style="width:$(if ($totalEntities -gt 0) { [Math]::Round(($deviceCount / $totalEntities) * 100) } else { 0 })%"></div></div><span class="rk-cov-pct">$deviceCount</span></div>
+        <div class="rk-cov-row"><span class="rk-cov-name">Enterprise Apps</span><div class="rk-cov-track"><div class="rk-cov-fill rk-cov-green" style="width:$(if ($totalEntities -gt 0) { [Math]::Round(($appCount / $totalEntities) * 100) } else { 0 })%"></div></div><span class="rk-cov-pct">$appCount</span></div>
+"@
+
+    $overviewPanelHtml = @"
+    <div id="panel-overview" class="rk-panel active">
+        <!-- Mini Stats -->
+        <div class="rk-mini-stats">
+            <div class="rk-mini-stat"><div class="rk-mini-number">$totalEntities</div><div class="rk-mini-label">Total Entities</div></div>
+            <div class="rk-mini-stat"><div class="rk-mini-number">$($sets.Count)</div><div class="rk-mini-label">Attribute Sets</div></div>
+            <div class="rk-mini-stat"><div class="rk-mini-number">${avgCoverage}%</div><div class="rk-mini-label">Avg Coverage</div></div>
+            <div class="rk-mini-stat"><div class="rk-mini-number">$fullCoverageCount</div><div class="rk-mini-label">Full Coverage</div></div>
+            <div class="rk-mini-stat"><div class="rk-mini-number">$noCoverageCount</div><div class="rk-mini-label">Unassigned Slots</div></div>
+        </div>
+
+        <!-- Coverage Bars -->
+        <div class="rk-cov-grid">
+            <div class="rk-cov-card">
+                <div class="rk-cov-title">Coverage by Attribute Set</div>
+$setCoverageHtml
+            </div>
+            <div class="rk-cov-card">
+                <div class="rk-cov-title">Entities by Type</div>
+$entityCoverageHtml
+            </div>
+        </div>
+
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>Attribute Set Coverage Matrix</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="overviewShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="overviewTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+$overviewHeaders
+                        </tr>
+                    </thead>
+                    <tbody>
+$overviewRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+"@
+
+    # ===== Build attribute set panels =====
+    $setPanelsHtml = ''
+    $setScriptHtml = ''
+    $tableCounter = 0
+
+    foreach ($setName in $sets) {
+        $sd = $setData[$setName]
+        $attrNames = $sd.AttributeNames
+        $panelId = "panel-$($setName.ToLower())"
+
+        $panelContent = "    <div id=`"$panelId`" class=`"rk-panel`">`n"
+
+        # Build filter bar with dropdowns per attribute
+        $filterId = "filter_$($setName.ToLower())"
+        $allEntitiesForSet = @($sd.Users) + @($sd.Devices) + @($sd.Apps)
+        $filterDropdowns = "<span>Filters:</span>"
+        foreach ($a in $attrNames) {
+            $uniqueVals = @($allEntitiesForSet | ForEach-Object { $_.$a } | Where-Object { $_ -and $_ -ne '-' } | Sort-Object -Unique)
+            $options = ($uniqueVals | ForEach-Object { "<option value=`"$([System.Net.WebUtility]::HtmlEncode($_))`">$([System.Net.WebUtility]::HtmlEncode($_))</option>" }) -join ''
+            $filterDropdowns += "`n            <select class=`"form-select ${filterId}-filter`" style=`"max-width:180px;`"><option value=`"`">All $a</option>$options</select>"
+        }
+        $filterDropdowns += "`n            <button class=`"rk-filter-chip`" onclick=`"document.querySelectorAll('.${filterId}-filter').forEach(f=>f.value='');document.querySelectorAll('.${filterId}-filter').forEach(f=>f.dispatchEvent(new Event('change')))`">Clear</button>"
+
+        $panelContent += @"
+        <div class="rk-filter-bar">
+            $filterDropdowns
+        </div>
+"@
+
+        # Single combined table: Type | Name | Identifier | attributes...
+        $tableCounter++
+        $tableId = "table_${tableCounter}"
+        $toggleId = "toggle_${tableCounter}"
+
+        $combinedHeaders = "                            <th>Type</th>`n                            <th>Name</th>`n                            <th>Identifier</th>"
+        foreach ($a in $attrNames) { $combinedHeaders += "`n                            <th>$a</th>" }
+
+        $combinedRows = ''
+        # Users
+        foreach ($u in $sd.Users) {
+            $combinedRows += "                        <tr>`n"
+            $combinedRows += "                            <td>User</td>`n"
+            $combinedRows += "                            <td>$([System.Net.WebUtility]::HtmlEncode($u.DisplayName))</td>`n"
+            $combinedRows += "                            <td class=`"rk-mono`">$([System.Net.WebUtility]::HtmlEncode($u.Identifier))</td>`n"
+            foreach ($a in $attrNames) {
+                $val = $u.$a
+                $display = if ($val -ne '-') { [System.Net.WebUtility]::HtmlEncode($val) } else { '<span style="color:var(--text-dim);font-style:italic">-</span>' }
+                $combinedRows += "                            <td>$display</td>`n"
+            }
+            $combinedRows += "                        </tr>`n"
+        }
+        # Devices
+        foreach ($d in $sd.Devices) {
+            $combinedRows += "                        <tr>`n"
+            $combinedRows += "                            <td>Device</td>`n"
+            $combinedRows += "                            <td>$([System.Net.WebUtility]::HtmlEncode($d.DisplayName))</td>`n"
+            $combinedRows += "                            <td>$([System.Net.WebUtility]::HtmlEncode($d.Identifier))</td>`n"
+            foreach ($a in $attrNames) {
+                $val = $d.$a
+                $display = if ($val -ne '-') { [System.Net.WebUtility]::HtmlEncode($val) } else { '<span style="color:var(--text-dim);font-style:italic">-</span>' }
+                $combinedRows += "                            <td>$display</td>`n"
+            }
+            $combinedRows += "                        </tr>`n"
+        }
+        # Apps
+        foreach ($app in $sd.Apps) {
+            $combinedRows += "                        <tr>`n"
+            $combinedRows += "                            <td>Enterprise App</td>`n"
+            $combinedRows += "                            <td>$([System.Net.WebUtility]::HtmlEncode($app.DisplayName))</td>`n"
+            $combinedRows += "                            <td class=`"rk-mono`">$([System.Net.WebUtility]::HtmlEncode($app.Identifier))</td>`n"
+            foreach ($a in $attrNames) {
+                $val = $app.$a
+                $display = if ($val -ne '-') { [System.Net.WebUtility]::HtmlEncode($val) } else { '<span style="color:var(--text-dim);font-style:italic">-</span>' }
+                $combinedRows += "                            <td>$display</td>`n"
+            }
+            $combinedRows += "                        </tr>`n"
+        }
+
+        $totalCount = $sd.Users.Count + $sd.Devices.Count + $sd.Apps.Count
+        $panelContent += @"
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>$setName ($totalCount)</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch"><input type="checkbox" id="$toggleId"><span class="rk-toggle-slider"></span></label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="$tableId" class="table table-bordered" style="width:100%">
+                    <thead><tr>
+$combinedHeaders
+                    </tr></thead>
+                    <tbody>
+$combinedRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+"@
+        $setScriptHtml += "        var t$tableCounter = initRKTable('#$tableId');`n"
+        $setScriptHtml += "        `$('#$toggleId').on('change', function() { t$tableCounter.page.len(`$(this).is(':checked') ? -1 : 10).draw(); });`n"
+
+        $panelContent += "    </div>`n"
+        $setPanelsHtml += $panelContent
+    }
+
+    # ===== Assemble body content =====
+    $bodyContentHtml = @"
+    <!-- Tab Navigation -->
+    <div class="rk-tabs">
+$tabButtonsHtml
+    </div>
+
+$overviewPanelHtml
+$setPanelsHtml
+
+    <script>
+    `$(document).ready(function() {
+        var overviewTable = initRKTable('#overviewTable');
+        `$('#overviewShowAllToggle').on('change', function() {
+            overviewTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+$setScriptHtml
+
+        // Generic filter logic: each .rk-filter-bar filters all DataTables in the same .rk-panel
+        `$.fn.dataTable.ext.search.push(function(settings, data) {
+            var table = `$(settings.nTable);
+            var panel = table.closest('.rk-panel');
+            if (panel.length === 0) return true;
+            var filters = panel.find('.rk-filter-bar select');
+            if (filters.length === 0) return true;
+            for (var i = 0; i < filters.length; i++) {
+                var val = `$(filters[i]).val();
+                if (val && data[3 + i].indexOf(val) === -1) return false;
+            }
+            return true;
+        });
+
+        // Redraw all tables in the panel when a filter changes
+        `$(document).on('change', '.rk-filter-bar select', function() {
+            var panel = `$(this).closest('.rk-panel');
+            panel.find('table.dataTable').each(function() {
+                `$(this).DataTable().draw();
+            });
+        });
+    });
+    </script>
+"@
+
+    # Custom CSS
+    $customCss = @"
+    .rk-check { display: inline-flex; align-items: center; justify-content: center; width: 24px; height: 24px; border-radius: 6px; background: rgba(22,163,74,0.1); color: var(--success); font-size: 0.85rem; font-weight: 700; }
+    .rk-dash { display: inline-flex; align-items: center; justify-content: center; width: 24px; height: 24px; border-radius: 6px; background: rgba(163,163,163,0.08); color: var(--text-dim); font-size: 0.8rem; }
+    [data-theme="dark"] .rk-check { background: rgba(74,222,128,0.1); }
+    [data-theme="dark"] .rk-dash { background: rgba(82,82,82,0.15); }
+    .rk-mono { font-family: 'Geist Mono', ui-monospace, monospace; font-size: 0.82rem; }
+    .table tbody td, .table thead th { word-wrap: break-word; overflow-wrap: break-word; max-width: 300px; }
+    .rk-filter-bar .form-select { font-family: 'Geist', -apple-system, sans-serif; font-size: 0.8rem; padding: 4px 8px; border-radius: 6px; }
+
+    /* Mini Stats */
+    .rk-mini-stats { display: grid; grid-template-columns: repeat(5, 1fr); gap: 12px; margin-bottom: 20px; }
+    .rk-mini-stat { background: var(--bg-elevated); border: 1px solid var(--border); border-radius: 10px; padding: 16px; text-align: center; }
+    .rk-mini-number { font-family: 'Geist', sans-serif; font-size: 1.6rem; font-weight: 700; color: var(--text); }
+    .rk-mini-label { font-family: 'Geist Mono', monospace; font-size: 0.62rem; color: var(--text-muted); text-transform: uppercase; letter-spacing: 0.08em; margin-top: 2px; }
+
+    /* Coverage Bars */
+    .rk-cov-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 16px; margin-bottom: 20px; }
+    .rk-cov-card { background: var(--bg-elevated); border: 1px solid var(--border); border-radius: 10px; padding: 16px 20px; }
+    .rk-cov-title { font-family: 'Geist Mono', monospace; font-size: 0.68rem; font-weight: 600; color: var(--text-muted); text-transform: uppercase; letter-spacing: 0.08em; margin-bottom: 12px; }
+    .rk-cov-row { display: flex; align-items: center; gap: 12px; margin-bottom: 8px; }
+    .rk-cov-row:last-child { margin-bottom: 0; }
+    .rk-cov-name { font-size: 0.78rem; color: var(--text-body); min-width: 130px; }
+    .rk-cov-track { flex: 1; height: 8px; background: var(--bg-warm); border-radius: 4px; overflow: hidden; }
+    .rk-cov-fill { height: 100%; border-radius: 4px; }
+    .rk-cov-orange { background: linear-gradient(90deg, #ea580c, #fb923c); }
+    .rk-cov-blue { background: linear-gradient(90deg, #0284c7, #38bdf8); }
+    .rk-cov-green { background: linear-gradient(90deg, #16a34a, #4ade80); }
+    .rk-cov-purple { background: linear-gradient(90deg, #9333ea, #c084fc); }
+    .rk-cov-red { background: linear-gradient(90deg, #dc2626, #f87171); }
+    .rk-cov-pct { font-family: 'Geist Mono', monospace; font-size: 0.72rem; color: var(--text-muted); min-width: 36px; text-align: right; }
+"@
+
+    # Build tags from attribute set names
+    $tags = @('Entra ID', 'Security') + $sets
+
+    # Generate final HTML
+    $htmlContent = Get-RKSolutionsReportTemplate `
+        -TenantName $TenantName `
+        -ReportTitle 'Custom Security Attributes' `
+        -ReportSlug 'custom-security-attributes' `
+        -Eyebrow 'CUSTOM SECURITY ATTRIBUTES' `
+        -Lede 'Custom security attribute assignments across users, devices, and enterprise applications.' `
+        -StatsCardsHtml $statsCardsHtml `
+        -BodyContentHtml $bodyContentHtml `
+        -CustomCss $customCss `
+        -ReportDate $reportDate `
+        -Tags $tags
+
+    $htmlContent | Out-File -FilePath $ExportPath -Encoding utf8
+
+    $script:ExportPath = $ExportPath
+    Write-Host "Report saved to: $ExportPath" -ForegroundColor Cyan
+
+    try { Invoke-Item $ExportPath -ErrorAction Stop }
+    catch { Write-Host "Report saved to: $ExportPath (could not open automatically)." -ForegroundColor Yellow }
+
+    return $ExportPath
+}
diff --git a/module/Private/EntraAdminRoles.ps1 b/module/Private/EntraAdminRoles.ps1
index d33b284..609bf96 100644
--- a/module/Private/EntraAdminRoles.ps1
+++ b/module/Private/EntraAdminRoles.ps1
@@ -4,16 +4,16 @@ function New-AdminRoleHTMLReport {
     param(
         [Parameter(Mandatory = $true)]
         [string]$TenantName,
-        
+
         [Parameter(Mandatory = $true)]
         [array]$Report,
-        
+
         [Parameter(Mandatory = $false)]
         [array]$GroupAssignmentReport,
-        
+
         [Parameter(Mandatory = $false)]
         [array]$ServicePrincipalReport,
-        
+
         [Parameter(Mandatory = $false)]
         [array]$UserAssignmentReport,
 
@@ -22,7 +22,7 @@ function New-AdminRoleHTMLReport {
 
         [Parameter(Mandatory = $false)]
         [array]$PIMAuditLogsReport,
-        
+
         [Parameter(Mandatory = $false)]
         [string]$ExportPath
     )
@@ -42,2091 +42,35 @@ function New-AdminRoleHTMLReport {
     # Get the current date and time for the report header
     $CurrentDate = (Get-Date).ToString("yyyy-MM-dd HH:mm:ss")
 
-    # Create HTML Template with DataTables
-    $htmlTemplate = @'
-        <!DOCTYPE html>
-        <html lang="en">
-        <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>$TenantName Admin Roles Report</title>
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.3.0/css/bootstrap.min.css">
-        <link rel="stylesheet" href="https://cdn.datatables.net/1.13.6/css/dataTables.bootstrap5.min.css">
-        <link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.1/css/buttons.bootstrap5.min.css">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-        <script src="https://code.jquery.com/jquery-3.7.0.js"></script>
-        <script src="https://cdn.datatables.net/1.13.6/js/jquery.dataTables.min.js"></script>
-        <script src="https://cdn.datatables.net/1.13.6/js/dataTables.bootstrap5.min.js"></script>
-        <script src="https://cdn.datatables.net/buttons/2.4.1/js/dataTables.buttons.min.js"></script>
-        <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.bootstrap5.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/pdfmake.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/vfs_fonts.js"></script>
-        <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.html5.min.js"></script>
-        <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.print.min.js"></script>
-        <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.colVis.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
-        <style>
-        :root {
-            /* Light mode variables (default) */
-            --primary-color: #0078d4;
-            --secondary-color: #2b88d8;
-            --permanent-color: #d83b01;
-            --eligible-color: #107c10;
-            --group-color: #5c2d91;
-            --disabled-color: #d9534f;
-            --enabled-color: #5cb85c;
-            --service-principal-color: #0078d4;
-            --na-color: #6c757d;
-            --bg-color: #f8f9fa;
-            --card-bg: #ffffff;
-            --text-color: #333333;
-            --table-header-bg: #f5f5f5;
-            --table-header-color: #333333;
-            --table-stripe-bg: rgba(0,0,0,0.02);
-            --table-hover-bg: rgba(0,0,0,0.04);
-            --table-border-color: #dee2e6;
-            --filter-tag-bg: #e9ecef;
-            --filter-tag-color: #495057;
-            --filter-bg: white;
-            --btn-outline-color: #6c757d;
-            --border-color: #dee2e6;
-            --toggle-bg: #ccc;
-            --button-bg: #f8f9fa;
-            --button-color: #333;
-            --button-border: #ddd;
-            --button-hover-bg: #e9ecef;
-            --footer-text: white;
-            --input-bg: #fff;
-            --input-color: #333;
-            --input-border: #ced4da;
-            --input-focus-border: #86b7fe;
-            --input-focus-shadow: rgba(13, 110, 253, 0.25);
-            --datatable-even-row-bg: #fff;
-            --datatable
-            --tab-active-color: #fff;
-        }
-        
-        [data-theme="dark"] {
-            /* Dark mode variables */
-            --primary-color: #0078d4;
-            --secondary-color: #2b88d8;
-            --permanent-color: #d83b01;
-            --eligible-color: #107c10;
-            --group-color: #5c2d91;
-            --disabled-color: #6c757d;
-            --enabled-color: #0078d4;
-            --service-principal-color: #0078d4;
-            --bg-color: #121212;
-            --card-bg: #1e1e1e;
-            --text-color: #e0e0e0;
-            --table-header-bg: #333333;
-            --table-header-color: #e0e0e0;
-            --table-header-bg: #333333;#e0e0e0;5,255,0.03);
-            --table-header-color: #e0e0e0;
-            --table-stripe-bg: rgba(255,255,255,0.03);
-            --table-hover-bg: rgba(255,255,255,0.05);
-            --table-border-color: #444444;
-            --filter-bg: #252525;
-            --btn-outline-color: #adb5bd;
-            --border-color: #444444;
-            --toggle-bg: #555555;
-            --button-bg: #2a2a2a;
-            --button-color: #e0e0e0;
-            --button-border: #444;
-            --button-hover-bg: #3a3a3a;
-            --footer-text: white;
-            --input-bg: #2a2a2a;
-            --input-color: #e0e0e0;
-            --input-border: #444444;
-            --input-focus-border: #0078d4;
-            --input-focus-shadow: rgba(0, 120, 212, 0.25);
-            --datatable-even-row-bg: #1e1e1e;
-            --datatable-odd-row-bg: #252525;
-            --tab-active-bg: #0078d4;
-            --tab-active-color: #fff;
-        }
-        
-        body {
-            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-            margin: 0;
-            padding: 0;
-            background-color: var(--bg-color);
-            color: var(--text-color);
-            min-height: 100vh;
-            display: flex;
-            flex-direction: column;
-            transition: background-color 0.3s ease, color 0.3s ease;
-        }
-        
-        .container-fluid {
-            max-width: 1600px;
-            padding: 20px;
-            flex: 1;
-        }
-        
-        .dashboard-header {
-            padding: 20px 0;
-            margin-bottom: 30px;
-            border-bottom: 1px solid rgba(128,128,128,0.2);
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-        }
-        
-        .dashboard-title {
-            display: flex;
-            align-items: center;
-            gap: 15px;
-        }
-        
-        .dashboard-title h1 {
-            margin: 0;
-            font-size: 1.8rem;
-            font-weight: 600;
-            color: var(--primary-color);
-        }
-        
-        .logo {
-            height: 45px;
-            width: 45px;
-        }
-        
-        .report-date {
-            font-size: 0.9rem;
-            color: var(--text-color);
-            opacity: 0.8;
-        }
-        
-        .card {
-            border: none;
-            border-radius: 10px;
-            box-shadow: 0 4px 12px rgba(0,0,0,0.05);
-            margin-bottom: 25px;
-            transition: transform 0.2s, box-shadow 0.2s, background-color 0.3s ease;
-            overflow: hidden;
-            background-color: var(--card-bg);
-        }
-        
-        .card:hover {
-            transform: translateY(-5px);
-            box-shadow: 0 8px 16px rgba(0,0,0,0.1);
-        }
-        
-        .card-header {
-            background-color: var(--primary-color);
-            color: white;
-            font-weight: 600;
-            padding: 15px 20px;
-            border-bottom: none;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            gap: 10px;
-        }
-        
-        .card-header i {
-            font-size: 1.2rem;
-        }
-        
-        .card-body {
-            padding: 20px;
-        }
-        
-        .stats-card {
-            height: 100%;
-            text-align: center;
-            padding: 25px 15px;
-            border-radius: 10px;
-            color: white;
-            position: relative;
-            overflow: hidden;
-            min-height: 160px;
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            align-items: center;
-            cursor: pointer;
-            transition: all 0.3s;
-        }
-        
-        .stats-card.active {
-            box-shadow: 0 0 0 4px rgba(255,255,255,0.6), 0 8px 16px rgba(0,0,0,0.2);
-            transform: scale(1.05);
-        }
-        
-        .stats-card::before {
-            content: '';
-            position: absolute;
-            top: -20px;
-            right: -20px;
-            width: 100px;
-            height: 100px;
-            border-radius: 50%;
-            background-color: rgba(255,255,255,0.1);
-            z-index: 0;
-        }
-        
-        .stats-card i {
-            font-size: 2.5rem;
-            margin-bottom: 15px;
-            position: relative;
-            z-index: 1;
-        }
-        
-        .stats-card h3 {
-            font-size: 1rem;
-            font-weight: 500;
-            margin-bottom: 10px;
-            position: relative;
-            z-index: 1;
-        }
-        
-        .stats-card .number {
-            font-size: 2.2rem;
-            font-weight: 700;
-            position: relative;
-            z-index: 1;
-        }
-        
-        .permanent-bg {
-            background: linear-gradient(135deg, var(--permanent-color), #f25c05);
-        }
-        
-        .eligible-bg {
-            background: linear-gradient(135deg, var(--eligible-color), #2a9d2a);
-        }
-        
-        .group-bg {
-            background: linear-gradient(135deg, var(--group-color), #7b4db2);
-        }
-
-        .disabled-bg {
-            background: linear-gradient(135deg, var(--disabled-color), #6c757d);
-        }
-
-        .enabled-bg {
-            background: linear-gradient(135deg, var(--enabled-color), #0078d4);
-        }
-        
-        .service-principal-bg {
-            background: linear-gradient(135deg, var(--service-principal-color), #2b88d8);
-        }
-        
-        /* DataTables Dark Mode Overrides */
-        table.dataTable {
-            border-collapse: collapse !important;
-            width: 100% !important;
-            color: var(--text-color) !important;
-            border-color: var(--table-border-color) !important;
-        }
-        
-        .table {
-            color: var(--text-color) !important;
-            border-color: var(--table-border-color) !important;
-        }
-        
-        .table-striped>tbody>tr:nth-of-type(odd) {
-            background-color: var(--datatable-odd-row-bg) !important;
-        }
-        
-        .table-striped>tbody>tr:nth-of-type(even) {
-            background-color: var(--datatable-even-row-bg) !important;
-        }
-        
-        .table thead th {
-            background-color: var(--table-header-bg) !important;
-            color: var(--table-header-color) !important;
-            font-weight: 600;
-            border-top: none;
-            padding: 12px;
-            border-color: var(--table-border-color) !important;
-        }
-        
-        .table tbody td {
-            padding: 12px;
-            vertical-align: middle;
-            border-color: var(--table-border-color) !important;
-            color: var(--text-color) !important;
-        }
-        
-        .table.table-bordered {
-            border-color: var(--table-border-color) !important;
-        }
-        
-        .table-bordered td, .table-bordered th {
-            border-color: var(--table-border-color) !important;
-        }
-        
-        .table-hover tbody tr:hover {
-            background-color: var(--table-hover-bg) !important;
-        }
-        
-        .badge {
-            padding: 6px 10px;
-            font-weight: 500;
-            border-radius: 6px;
-        }
-        
-        .badge-permanent {
-            background-color: var(--permanent-color);
-            color: white;
-        }
-        
-        .badge-eligible {
-            background-color: var(--eligible-color);
-            color: white;
-        }
-        
-        .badge-eligible-active {
-            background-color: var(--eligible-color);
-            color: white;
-            box-shadow: 0 0 8px rgba(16, 124, 16, 0.6), 0 0 16px rgba(16, 124, 16, 0.4);
-            border: 2px solid rgba(255, 255, 255, 0.3);
-            animation: shimmer 2s infinite;
-        }
-        
-        /* Clickable badge specific styles */
-        .badge-eligible-active.group-jump-link {
-            transition: all 0.3s ease;
-            cursor: pointer;
-            position: relative;
-        }
-        
-        .badge-eligible-active.group-jump-link:hover {
-            background-color: #0a5a0a;
-            box-shadow: 0 0 12px rgba(16, 124, 16, 0.8), 0 0 24px rgba(16, 124, 16, 0.6);
-            transform: translateY(-1px);
-            border-color: rgba(255, 255, 255, 0.5);
-        }
-        
-        .badge-eligible-active.group-jump-link:active {
-            transform: translateY(0);
-            box-shadow: 0 0 6px rgba(16, 124, 16, 0.4), 0 0 12px rgba(16, 124, 16, 0.3);
-        }
-        
-        @keyframes shimmer {
-            0% { box-shadow: 0 0 8px rgba(16, 124, 16, 0.6), 0 0 16px rgba(16, 124, 16, 0.4); }
-            50% { box-shadow: 0 0 12px rgba(16, 124, 16, 0.8), 0 0 24px rgba(16, 124, 16, 0.6); }
-            100% { box-shadow: 0 0 8px rgba(16, 124, 16, 0.6), 0 0 16px rgba(16, 124, 16, 0.4); }
-        }
-        
-        .badge-active {
-            background-color: var(--service-principal-color);
-            color: white;
-        }
-        
-        .badge-group {
-            background-color: var(--group-color);
-            color: white;
-        }
-        
-        /* Highlight effect for group rows when jumping from main table */
-        .highlight-row {
-            background-color: rgba(255, 193, 7, 0.3) !important;
-            border: 2px solid #ffc107 !important;
-            animation: highlightPulse 3s ease-in-out;
-            transition: all 0.3s ease;
-            position: relative;
-            z-index: 10; /* Ensure highlight appears above table headers */
-        }
-        
-        .highlight-row td {
-            position: relative;
-            z-index: 10; /* Ensure highlighted cells appear above headers */
-        }
-        
-        @keyframes highlightPulse {
-            0% { 
-                background-color: rgba(255, 193, 7, 0.6);
-                box-shadow: 0 0 15px rgba(255, 193, 7, 0.8);
-            }
-            50% { 
-                background-color: rgba(255, 193, 7, 0.4);
-                box-shadow: 0 0 25px rgba(255, 193, 7, 0.6);
-            }
-            100% { 
-                background-color: rgba(255, 193, 7, 0.3);
-                box-shadow: 0 0 10px rgba(255, 193, 7, 0.4);
-            }
-        }
-        
-        .dataTables_wrapper .dataTables_length, 
-        .dataTables_wrapper .dataTables_filter, 
-        .dataTables_wrapper .dataTables_info, 
-        .dataTables_wrapper .dataTables_processing, 
-        .dataTables_wrapper .dataTables_paginate {
-            color: var(--text-color) !important;
-        }
-        
-        .dataTables_wrapper .dataTables_paginate .paginate_button {
-            padding: 0.3em 0.8em;
-            border-radius: 4px;
-            margin: 0 3px;
-            color: var(--text-color) !important;
-            border: 1px solid var(--border-color) !important;
-            background-color: var(--button-bg) !important;
-        }
-        
-        .dataTables_wrapper .dataTables_paginate .paginate_button.current {
-            background: var(--primary-color) !important;
-            border-color: var(--primary-color) !important;
-            color: white !important;
-        }
-        
-        .dataTables_wrapper .dataTables_paginate .paginate_button:hover {
-            background: var(--button-hover-bg) !important;
-            border-color: var(--border-color) !important;
-            color: var(--text-color) !important;
-        }
-        
-        .dataTables_wrapper .dataTables_length select,
-        .dataTables_wrapper .dataTables_filter input {
-            border: 1px solid var(--input-border);
-            background-color: var(--input-bg);
-            color: var(--input-color);
-            border-radius: 4px;
-            padding: 5px 10px;
-        }
-        
-        .dataTables_wrapper .dataTables_filter input:focus {
-            border-color: var(--input-focus-border);
-            box-shadow: 0 0 0 0.25rem var(--input-focus-shadow);
-        }
-        
-        .dataTables_info {
-            padding-top: 10px;
-            color: var(--text-color);
-        }
-        
-        footer {
-            background-color: var(--primary-color);
-            color: var(--footer-text);
-            text-align: center;
-            padding: 15px 0;
-            margin-top: auto;
-        }
-        
-        footer p {
-            margin: 0;
-            font-weight: 500;
-        }
-        
-        .filter-buttons {
-            display: flex;
-            flex-wrap: wrap;
-            gap: 10px;
-            margin-bottom: 20px;
-        }
-        
-        .filter-button {
-            padding: 8px 16px;
-            border-radius: 20px;
-            border: none;
-            cursor: pointer;
-            font-weight: 500;
-            transition: all 0.2s;
-            display: flex;
-            align-items: center;
-            gap: 8px;
-        }
-        
-        .filter-button:hover {
-            opacity: 0.9;
-        }
-        
-        .filter-button.active {
-            box-shadow: 0 0 0 2px rgba(128,128,128,0.2);
-        }
-        
-        .toggle-container {
-            display: flex;
-            align-items: center;
-            gap: 10px;
-            margin-bottom: 15px;
-        }
-        
-        .toggle-switch {
-            position: relative;
-            display: inline-block;
-            width: 60px;
-            height: 30px;
-        }
-        
-        .toggle-switch input {
-            opacity: 0;
-            width: 0;
-            height: 0;
-        }
-        
-        .toggle-slider {
-            position: absolute;
-            cursor: pointer;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-            background-color: var(--toggle-bg);
-            transition: .4s;
-            border-radius: 34px;
-        }
-        
-        .toggle-slider:before {
-            position: absolute;
-            content: "";
-            height: 22px;
-            width: 22px;
-            left: 4px;
-            bottom: 4px;
-            background-color: white;
-            transition: .4s;
-            border-radius: 50%;
-        }
-        
-        input:checked + .toggle-slider {
-            background-color: var(--primary-color);
-        }
-        
-        input:checked + .toggle-slider:before {
-            transform: translateX(30px);
-        }
-        
-        .filter-section {
-            background-color: var(--filter-bg);
-            padding: 15px;
-            border-radius: 8px;
-            box-shadow: 0 2px 8px rgba(0,0,0,0.05);
-            margin-bottom: 20px;
-            transition: background-color 0.3s ease;
-        }
-        
-        .filter-section h5 {
-            color: var(--primary-color);
-            margin-bottom: 12px;
-            font-weight: 600;
-        }
-        
-        .filter-tags {
-            display: flex;
-            flex-wrap: wrap;
-            gap: 8px;
-            margin-top: 8px;
-        }
-        
-        .filter-tag {
-            background-color: var(--filter-tag-bg);
-            padding: 4px 12px;
-            border-radius: 16px;
-            font-size: 0.85rem;
-            color: var(--filter-tag-color);
-            display: flex;
-            align-items: center;
-            gap: 6px;
-            transition: background-color 0.3s ease, color 0.3s ease;
-        }
-        
-        .filter-tag i {
-            cursor: pointer;
-            color: var(--filter-tag-color);
-        }
-        
-        .filter-tag i:hover {
-            color: var(--permanent-color);
-        }
-        
-        .custom-search {
-            display: flex;
-            gap: 10px;
-            margin-bottom: 15px;
-        }
-        
-        .custom-search input {
-            flex: 1;
-            padding: 8px 12px;
-            border: 1px solid var(--border-color);
-            background-color: var(--bg-color);
-            color: var(--text-color);
-            border-radius: 4px;
-        }
-        
-        .custom-search button {
-            background-color: var(--primary-color);
-            color: white;
-            border: none;
-            border-radius: 4px;
-            padding: 8px 16px;
-            cursor: pointer;
-        }
-        
-        .enabled-filters-container {
-            margin-bottom: 15px;
-        }
-        
-        /* Show all entries toggle */
-        .show-all-container {
-            display: flex;
-            align-items: center;
-            gap: 12px;
-            background-color: transparent;
-            padding: 0;
-            border: none;
-            margin-left: 15px;
-        }
-        
-        .show-all-text {
-            font-weight: 500;
-            margin: 0;
-            color: white;
-            font-size: 0.85rem;
-        }
-        
-        /* Custom DataTable controls wrapper */
-        .datatable-header {
-            display: flex;
-            align-items: center;
-            flex-wrap: wrap;
-            margin-bottom: 1rem;
-        }
-        
-        .datatable-controls {
-            display: flex;
-            align-items: center;
-            gap: 15px;
-            flex-wrap: wrap;
-        }
-        
-        /* Theme toggle styles */
-        .theme-toggle {
-            position: fixed;
-            top: 20px;
-            right: 20px;
-            z-index: 1000;
-            display: flex;
-            align-items: center;
-            gap: 10px;
-            background-color: var(--card-bg);
-            padding: 8px 12px;
-            border-radius: 30px;
-            box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-            transition: background-color 0.3s ease;
-        }
-        
-        .theme-toggle-switch {
-            position: relative;
-            display: inline-block;
-            width: 50px;
-            height: 26px;
-        }
-        
-        .theme-toggle-switch input {
-            opacity: 0;
-            width: 0;
-            height: 0;
-        }
-        
-        .theme-toggle-slider {
-            position: absolute;
-            cursor: pointer;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-            background-color: var(--toggle-bg);
-            transition: .4s;
-            border-radius: 34px;
-        }
-        
-        .theme-toggle-slider:before {
-            position: absolute;
-            content: "";
-            height: 18px;
-            width: 18px;
-            left: 4px;
-            bottom: 4px;
-            background-color: white;
-            transition: .4s;
-            border-radius: 50%;
-        }
-        
-        input:checked + .theme-toggle-slider {
-            background-color: var(--primary-color);
-        }
-        
-        input:checked + .theme-toggle-slider:before {
-            transform: translateX(24px);
-        }
-        
-        .theme-icon {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            font-size: 16px;
-            color: var(--text-color);
-        }
-        
-        /* Form elements for dark mode */
-        .form-select, .form-control {
-            background-color: var(--input-bg) !important;
-            color: var(--input-color) !important;
-            border-color: var(--input-border) !important;
-        }
-        
-        .form-select:focus, .form-control:focus {
-            border-color: var(--input-focus-border) !important;
-            box-shadow: 0 0 0 0.25rem var(--input-focus-shadow) !important;
-        }
-        
-        .form-label {
-            color: var(--text-color);
-        }
-        
-        .btn-outline-secondary {
-            color: var(--text-color);
-            border-color: var(--border-color);
-            background-color: transparent;
-        }
-        
-        .btn-outline-secondary:hover {
-            background-color: var(--filter-tag-bg);
-            color: var(--text-color);
-        }
-        
-        /* Override for dropdown menus and selects */
-        .form-select option {
-            background-color: var(--input-bg);
-            color: var(--input-color);
-        }
-        
-        /* Fix DataTables odd/even row striping */
-        table.dataTable.stripe tbody tr.odd, 
-        table.dataTable.display tbody tr.odd {
-            background-color: var(--datatable-odd-row-bg) !important;
-        }
-        
-        table.dataTable.stripe tbody tr.even, 
-        table.dataTable.display tbody tr.even {
-            background-color: var(--datatable-even-row-bg) !important;
-        }
-        
-        /* Fix DataTables background color for hovered rows */
-        table.dataTable.hover tbody tr:hover, 
-        table.dataTable.display tbody tr:hover {
-            background-color: var(--table-hover-bg) !important;
-        }
-        
-        /* Fix DataTables border colors */
-        table.dataTable.border-bottom,
-        table.dataTable.border-top,
-        table.dataTable thead th,
-        table.dataTable tfoot th,
-        table.dataTable thead td,
-        table.dataTable tfoot td {
-            border-color: var(--table-border-color) !important;
-        }
-        
-        /* Bootstrap 5 DataTables specific overrides */
-        .table-striped>tbody>tr:nth-of-type(odd)>* {
-            --bs-table-accent-bg: var(--datatable-odd-row-bg) !important;
-            color: var(--text-color) !important;
-        }
-        
-        .table>:not(caption)>*>* {
-            background-color: var(--card-bg) !important;
-            color: var(--text-color) !important;
-        }
-        
-        .table-striped>tbody>tr {
-            background-color: var(--datatable-even-row-bg) !important;
-        }
-        
-        /* Direct cell background colors */
-        .table tbody tr td {
-            background-color: transparent !important;
-        }
-        
-        /* Force Bootstrap Tables to use the correct colors */
-        .table-striped>tbody>tr:nth-of-type(odd) {
-            --bs-table-accent-bg: var(--datatable-odd-row-bg) !important;
-        }
-
-        /* Report selector tabs */
-        .report-tabs {
-            display: flex;
-            flex-wrap: wrap;
-            gap: 10px;
-            margin-bottom: 20px;
-        }
-        
-        .report-tab {
-            padding: 10px 20px;
-            border-radius: 5px;
-            background-color: var(--button-bg);
-            color: var(--button-color);
-            border: 1px solid var(--button-border);
-            cursor: pointer;
-            font-weight: 600;
-            transition: all 0.2s;
-        }
-        
-        .report-tab:hover {
-            background-color: var(--button-hover-bg);
-        }
-        
-        .report-tab.active {
-            background-color: var(--tab-active-bg);
-            color: var(--tab-active-color);
-            border-color: var(--tab-active-bg);
-        }
-        
-        .report-panel {
-            display: none;
-        }
-        
-        .report-panel.active {
-            display: block;
-        }
-    </style>
-    </head>
-    <body>
-        <!-- Dark Mode Toggle -->
-        <div class="theme-toggle">
-            <div class="theme-icon">
-                <i class="fas fa-sun"></i>
-            </div>
-            <label class="theme-toggle-switch">
-                <input type="checkbox" id="themeToggle">
-                <span class="theme-toggle-slider"></span>
-            </label>
-            <div class="theme-icon">
-                <i class="fas fa-moon"></i>
-            </div>
-        </div>
-        
-        <div class="container-fluid">
-            <div class="dashboard-header">
-                <div class="dashboard-title">
-                    <svg class="logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
-                        <path fill="#ff5722" d="M6 6H22V22H6z" transform="rotate(-180 14 14)"/>
-                        <path fill="#4caf50" d="M26 6H42V22H26z" transform="rotate(-180 34 14)"/>
-                        <path fill="#ffc107" d="M6 26H22V42H6z" transform="rotate(-180 14 34)"/>
-                        <path fill="#03a9f4" d="M26 26H42V42H26z" transform="rotate(-180 34 34)"/>
-                    </svg>
-                    <h1>$TenantName Admin Roles Report</h1>
-                </div>
-                <div class="report-date">
-                    <i class="fas fa-calendar-alt me-2"></i> Report generated on: $ReportDate
-                </div>
-            </div>
-            
-            <div class="row mb-4">
-                <div class="col-md-3 mb-3">
-                    <div class="stats-card permanent-bg" id="permanentFilter">
-                        <i class="fas fa-key"></i>
-                        <h3>Permanent Assignments</h3>
-                        <div class="number">$permanentRoles</div>
-                    </div>
-                </div>
-                <div class="col-md-3 mb-3">
-                    <div class="stats-card eligible-bg" id="eligibleFilter">
-                        <i class="fas fa-clock"></i>
-                        <h3>Eligible Assignments</h3>
-                        <div class="number">$eligibleRoles</div>
-                    </div>
-                </div>
-                <div class="col-md-3 mb-3">
-                    <div class="stats-card group-bg" id="groupFilter">
-                        <i class="fas fa-users"></i>
-                        <h3>Group Assignments</h3>
-                        <div class="number">$groupAssignedRoles</div>
-                    </div>
-                </div>
-                <div class="col-md-3 mb-3">
-                    <div class="stats-card service-principal-bg" id="spFilter">
-                        <i class="fas fa-robot"></i>
-                        <h3>Service Principal Assignments</h3>
-                        <div class="number">$servicePrincipalRoles</div>
-                    </div>
-                </div>
-            </div>
-            
-            <div class="report-tabs">
-            </div>
-
-            <div class="filter-section" id="general-filter-section">
-                <h5><i class="fas fa-filter me-2"></i>Filter Options</h5>
-                
-                <div class="row">
-                    <div class="col-md-6">
-                        <div class="mb-3">
-                            <label for="principalTypeFilter" class="form-label">Principal Type</label>
-                            <select id="principalTypeFilter" class="form-select">
-                                <option value="">All Types</option>
-                                <option value="user">User</option>
-                                <option value="group">Group</option>
-                                <option value="service Principal">Service Principal</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="mb-3">
-                            <label for="assignmentTypeFilter" class="form-label">Assignment Type</label>
-                            <select id="assignmentTypeFilter" class="form-select">
-                                <option value="">All Types</option>
-                                <option value="Permanent">Permanent</option>
-                                <option value="Eligible">Eligible</option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                
-                <div class="mb-3">
-                    <label for="roleNameFilter" class="form-label">Role Name</label>
-                    <input type="text" id="roleNameFilter" class="form-control" placeholder="Search for role names...">
-                </div>
-
-                <div class="mb-3">
-                    <label for="scopeFilter" class="form-label">Role Scope</label>
-                    <select id="scopeFilter" class="form-select">
-                        <option value="">All Scopes</option>
-                        <option value="Tenant-Wide">Tenant-Wide</option>
-                        <option value="AU/">Administrative Unit</option>
-                    </select>
-                </div>
-                
-                <div class="enabled-filters-container">
-                    <div class="d-flex justify-content-between align-items-center">
-                        <label class="form-label mb-0">Enabled Filters:</label>
-                        <button id="clearAllFilters" class="btn btn-sm btn-outline-secondary">Clear All</button>
-                    </div>
-                    <div class="filter-tags" id="enabledFilters">
-                        <!-- Enabled filters will be displayed here -->
-                    </div>
-                </div>
-            </div>
-            
-            <div id="all-report" class="report-panel active">
-                <div class="card">
-                    <div class="card-header">
-                        <div>
-                            <i class="fas fa-user-shield"></i> All Role Assignments
-                        </div>
-                        <div class="show-all-container">
-                            <label class="toggle-switch">
-                                <input type="checkbox" id="allShowAllToggle">
-                                <span class="toggle-slider"></span>
-                            </label>
-                            <p class="show-all-text">Show all entries</p>
-                        </div>
-                    </div>
-                    <div class="card-body">
-                        <div class="table-responsive">
-                            <table id="allRolesTable" class="table table-striped table-bordered" style="width:100%">
-                                <thead>
-                                    <tr>
-                                        <th>Principal</th>
-                                        <th>Display Name</th>
-                                        <th>Principal Type</th>
-                                        <th>Account Status</th>
-                                        <th>Assigned Role</th>
-                                        <th>Role Scope</th>
-                                        <th>Assignment Type</th>
-                                        <th>Start Date</th>
-                                        <th>End Date</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    {{ALL_ROLES_DATA}}
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div id="user-report" class="report-panel">
-                <div class="card">
-                    <div class="card-header">
-                        <div>
-                            <i class="fas fa-user"></i> User Role Assignments
-                        </div>
-                        <div class="show-all-container">
-                            <label class="toggle-switch">
-                                <input type="checkbox" id="userShowAllToggle">
-                                <span class="toggle-slider"></span>
-                            </label>
-                            <p class="show-all-text">Show all entries</p>
-                        </div>
-                    </div>
-                    <div class="card-body">
-                        <div class="table-responsive">
-                            <table id="userRolesTable" class="table table-striped table-bordered" style="width:100%">
-                                <thead>
-                                    <tr>
-                                        <th>Principal</th>
-                                        <th>Display Name</th>
-                                        <th>Principal Type</th>
-                                        <th>Account Status</th>
-                                        <th>Assigned Role</th>
-                                        <th>Role Scope</th>
-                                        <th>Assignment Type</th>
-                                        <th>Start Date</th>
-                                        <th>End Date</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    {{USER_ROLES_DATA}}
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div id="group-report" class="report-panel">
-                <div class="card">
-                    <div class="card-header">
-                        <div>
-                            <i class="fas fa-users"></i> Group Role Assignments
-                        </div>
-                        <div class="show-all-container">
-                            <label class="toggle-switch">
-                                <input type="checkbox" id="groupShowAllToggle">
-                                <span class="toggle-slider"></span>
-                            </label>
-                            <p class="show-all-text">Show all entries</p>
-                        </div>
-                    </div>
-                    <div class="card-body">
-                        <div class="table-responsive">
-                            <table id="groupRolesTable" class="table table-striped table-bordered" style="width:100%">
-                                <thead>
-                                    <tr>
-                                        <th>Principal</th>
-                                        <th>Display Name</th>
-                                        <th>Principal Type</th>
-                                        <th>Account Status</th>
-                                        <th>Assigned Role</th>
-                                        <th>Role Scope</th>
-                                        <th>Assignment Type</th>
-                                        <th>Start Date</th>
-                                        <th>End Date</th>
-                                        <th>Members</th>
-                                        <th>Activated Members</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    {{GROUP_ROLES_DATA}}
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div id="service-principal-report" class="report-panel">
-                <div class="card">
-                    <div class="card-header">
-                        <div>
-                            <i class="fas fa-robot"></i> Service Principal Role Assignments
-                        </div>
-                        <div class="show-all-container">
-                            <label class="toggle-switch">
-                                <input type="checkbox" id="spShowAllToggle">
-                                <span class="toggle-slider"></span>
-                            </label>
-                            <p class="show-all-text">Show all entries</p>
-                        </div>
-                    </div>
-                    <div class="card-body">
-                        <div class="table-responsive">
-                            <table id="spRolesTable" class="table table-striped table-bordered" style="width:100%">
-                                <thead>
-                                    <tr>
-                                        <th>Principal</th>
-                                        <th>Display Name</th>
-                                        <th>Principal Type</th>
-                                        <th>Account Status</th>
-                                        <th>Assigned Role</th>
-                                        <th>Role Scope</th>
-                                        <th>Assignment Type</th>
-                                        <th>Start Date</th>
-                                        <th>End Date</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    {{SP_ROLES_DATA}}
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div id="pim-audit-logs-report" class="report-panel">
-            <div class="filter-section" id="pim-filter-section">
-                <h5><i class="fas fa-filter me-2"></i>PIM Audit Logs Filters</h5>
-                
-                <div class="row">
-                    <div class="col-md-4">
-                        <div class="mb-3">
-                            <label for="pimOperationTypeFilter" class="form-label">Operation Type</label>
-                            <select id="pimOperationTypeFilter" class="form-select">
-                                <option value="">All Operations</option>
-                                <option value="Add">Add</option>
-                                <option value="Update">Update</option>
-                                <option value="Delete">Delete</option>
-                                <option value="Activate">Activate</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-md-4">
-                        <div class="mb-3">
-                            <label for="pimInitiatorFilter" class="form-label">Initiated By</label>
-                            <input type="text" id="pimInitiatorFilter" class="form-control" placeholder="Filter by user...">
-                        </div>
-                    </div>
-                    <div class="col-md-4">
-                        <div class="mb-3">
-                            <label for="pimResultFilter" class="form-label">Result</label>
-                            <select id="pimResultFilter" class="form-select">
-                                <option value="">All Results</option>
-                                <option value="Success">Success</option>
-                                <option value="Failure">Failure</option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                
-                <div class="row">
-                    <div class="col-md-4">
-                        <div class="mb-3">
-                            <label for="pimRoleFilter" class="form-label">Role</label>
-                            <input type="text" id="pimRoleFilter" class="form-control" placeholder="Filter by role...">
-                        </div>
-                    </div>
-                    <div class="col-md-4">
-                        <div class="mb-3">
-                            <label for="pimTargetFilter" class="form-label">Target User</label>
-                            <input type="text" id="pimTargetFilter" class="form-control" placeholder="Filter by target user...">
-                        </div>
-                    </div>
-                    <div class="col-md-4">
-                        <div class="mb-3">
-                            <label for="pimDateRangeFilter" class="form-label">Date Range</label>
-                            <div class="input-group">
-                                <input type="date" id="pimStartDateFilter" class="form-control">
-                                <span class="input-group-text">to</span>
-                                <input type="date" id="pimEndDateFilter" class="form-control">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                
-                <div class="enabled-filters-container">
-                    <div class="d-flex justify-content-between align-items-center">
-                        <label class="form-label mb-0">PIM Audit Logs Filters:</label>
-                        <button id="clearPimFilters" class="btn btn-sm btn-outline-secondary">Clear Filters</button>
-                    </div>
-                    <div class="filter-tags" id="pimEnabledFilters">
-                        <!-- Enabled PIM filters will be displayed here -->
-                    </div>
-                </div>
-            </div>
-
-            <div class="card">
-                <div class="card-header">
-                    <div>
-                        <i class="fas fa-history"></i> PIM Audit Logs
-                    </div>
-                    <div class="show-all-container">
-                        <label class="toggle-switch">
-                            <input type="checkbox" id="pimAuditLogsShowAllToggle">
-                            <span class="toggle-slider"></span>
-                        </label>
-                        <p class="show-all-text">Show all entries</p>
-                    </div>
-                </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table id="pimAuditLogsTable" class="table table-striped table-bordered" style="width:100%">
-                            <thead>
-                                <tr>
-                                    <th>Date/Time</th>
-                                    <th>Initiated By</th>
-                                    <th>Operation Type</th>
-                                    <th>Initiator Type</th>
-                                    <th>Role</th>
-                                    <th>Target</th>
-                                    <th>Operation</th>
-                                    <th>Result</th>
-                                    <th>Role Properties</th>
-                                    <th>Justification</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {{PIM_AUDIT_LOGS_DATA}}
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <footer>
-            <p>Generated by Roy Klooster - RK Solutions</p>
-        </footer>
-        
-        <script>
-            // Initialize DataTables
-            $(document).ready(function() {
-                // Theme toggling functionality
-                const themeToggle = document.getElementById('themeToggle');
-                const prefersDarkScheme = window.matchMedia('(prefers-color-scheme: dark)');
-                
-                // Function to update table colors for dark mode
-                function updateTableColors() {
-                    // Force all table cells to have the correct background
-                    if (document.documentElement.getAttribute('data-theme') === 'dark') {
-                        // Dark mode
-                        $('table.dataTable tbody tr').css('background-color', 'var(--datatable-even-row-bg)');
-                        $('table.dataTable tbody tr:nth-child(odd)').css('background-color', 'var(--datatable-odd-row-bg)');
-                        $('table.dataTable tbody td').css('color', 'var(--text-color)');
-                        $('table.dataTable thead th').css({
-                            'background-color': 'var(--table-header-bg)',
-                            'color': 'var(--table-header-color)'
-                        });
-                    } else {
-                        // Light mode
-                        $('table.dataTable tbody tr').css('background-color', 'var(--datatable-even-row-bg)');
-                        $('table.dataTable tbody tr:nth-child(odd)').css('background-color', 'var(--datatable-odd-row-bg)');
-                        $('table.dataTable tbody td').css('color', 'var(--text-color)');
-                        $('table.dataTable thead th').css({
-                            'background-color': 'var(--table-header-bg)',
-                            'color': 'var(--table-header-color)'
-                        });
-                    }
-                }
-                
-                // Check for saved user preference, or use system preference
-                const savedTheme = localStorage.getItem('theme');
-                if (savedTheme === 'dark' || (!savedTheme && prefersDarkScheme.matches)) {
-                    document.documentElement.setAttribute('data-theme', 'dark');
-                    themeToggle.checked = true;
-                }
-                
-                // Add event listener for theme toggle
-                themeToggle.addEventListener('change', function() {
-                    if (this.checked) {
-                        document.documentElement.setAttribute('data-theme', 'dark');
-                        localStorage.setItem('theme', 'dark');
-                    } else {
-                        document.documentElement.setAttribute('data-theme', 'light');
-                        localStorage.setItem('theme', 'light');
-                    }
-                    
-                    // Apply the table color changes after theme switch
-                    setTimeout(updateTableColors, 50);
-                });
-                
-                // Tab switching functionality with filter section toggle
-                $('.report-tab').on('click', function() {
-                    // Remove active class from all tabs and panels
-                    $('.report-tab').removeClass('active');
-                    $('.report-panel').removeClass('active');
-                    
-                    // Add active class to clicked tab and corresponding panel
-                    $(this).addClass('active');
-                    const panelId = $(this).data('panel');
-                    $(`#${panelId}`).addClass('active');
-                    
-                    // Toggle visibility of filter sections based on active tab
-                    // Initialize filter visibility - hide PIM filter by default
-                    $('#pim-filter-section').hide();
-                    
-                    // Adjust DataTables columns when switching tabs
-                    setTimeout(function() {
-                        $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
-                    }, 10);
-                });
-                
-                // Initialize DataTable for all roles
-                const allRolesTable = $('#allRolesTable').DataTable({
-                    dom: 'Bfrtip',
-                    buttons: [
-                        {
-                            extend: 'collection',
-                            text: '<i class="fas fa-download"></i> Export',
-                            buttons: [
-                                {
-                                    extend: 'excel',
-                                    text: '<i class="fas fa-file-excel"></i> Excel',
-                                    exportOptions: {
-                                        columns: ':visible'
-                                    }
-                                },
-                                {
-                                    extend: 'csv',
-                                    text: '<i class="fas fa-file-csv"></i> CSV',
-                                    exportOptions: {
-                                        columns: ':visible'
-                                    }
-                                },
-                                {
-                                    extend: 'pdf',
-                                    text: '<i class="fas fa-file-pdf"></i> PDF',
-                                    exportOptions: {
-                                        columns: ':visible'
-                                    }
-                                },
-                                {
-                                    extend: 'print',
-                                    text: '<i class="fas fa-print"></i> Print',
-                                    exportOptions: {
-                                        columns: ':visible'
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            extend: 'colvis',
-                            text: '<i class="fas fa-columns"></i> Columns'
-                        }
-                    ],
-                    paging: true,
-                    searching: true,
-                    ordering: true,
-                    info: true,
-                    responsive: true,
-                    lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
-                    order: [[3, 'asc']],
-                    language: {
-                        search: "<i class='fas fa-search'></i> _INPUT_",
-                        searchPlaceholder: "Search records...",
-                        lengthMenu: "Show _MENU_ entries",
-                        info: "Showing _START_ to _END_ of _TOTAL_ entries",
-                        paginate: {
-                            first: "<i class='fas fa-angle-double-left'></i>",
-                            last: "<i class='fas fa-angle-double-right'></i>",
-                            next: "<i class='fas fa-angle-right'></i>",
-                            previous: "<i class='fas fa-angle-left'></i>"
-                        }
-                    },
-                    drawCallback: function() {
-                        updateTableColors();
-                    }
-                });
-                
-                // Initialize DataTable for user roles
-                const userRolesTable = $('#userRolesTable').DataTable({
-                    dom: 'Bfrtip',
-                    buttons: [
-                        {
-                            extend: 'collection',
-                            text: '<i class="fas fa-download"></i> Export',
-                            buttons: [
-                                { extend: 'excel', text: '<i class="fas fa-file-excel"></i> Excel', exportOptions: { columns: ':visible' } },
-                                { extend: 'csv', text: '<i class="fas fa-file-csv"></i> CSV', exportOptions: { columns: ':visible' } },
-                                { extend: 'pdf', text: '<i class="fas fa-file-pdf"></i> PDF', exportOptions: { columns: ':visible' } },
-                                { extend: 'print', text: '<i class="fas fa-print"></i> Print', exportOptions: { columns: ':visible' } }
-                            ]
-                        },
-                        { extend: 'colvis', text: '<i class="fas fa-columns"></i> Columns' }
-                    ],
-                    paging: true, searching: true, ordering: true, info: true, responsive: true,
-                    lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
-                    order: [[3, 'asc']],
-                    language: { search: "<i class='fas fa-search'></i> _INPUT_", searchPlaceholder: "Search records..." },
-                    drawCallback: function() { updateTableColors(); }
-                });
-
-                // Initialize DataTable for group roles
-                const groupRolesTable = $('#groupRolesTable').DataTable({
-                    dom: 'Bfrtip',
-                    buttons: [
-                        {
-                            extend: 'collection',
-                            text: '<i class="fas fa-download"></i> Export',
-                            buttons: [
-                                { extend: 'excel', text: '<i class="fas fa-file-excel"></i> Excel', exportOptions: { columns: ':visible' } },
-                                { extend: 'csv', text: '<i class="fas fa-file-csv"></i> CSV', exportOptions: { columns: ':visible' } },
-                                { extend: 'pdf', text: '<i class="fas fa-file-pdf"></i> PDF', exportOptions: { columns: ':visible' } },
-                                { extend: 'print', text: '<i class="fas fa-print"></i> Print', exportOptions: { columns: ':visible' } }
-                            ]
-                        },
-                        { extend: 'colvis', text: '<i class="fas fa-columns"></i> Columns' }
-                    ],
-                    paging: true, searching: true, ordering: true, info: true, responsive: true,
-                    lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
-                    order: [[3, 'asc']],
-                    language: { search: "<i class='fas fa-search'></i> _INPUT_", searchPlaceholder: "Search records..." },
-                    drawCallback: function() { updateTableColors(); }
-                });
-
-                // Initialize DataTable for service principal roles
-                const spRolesTable = $('#spRolesTable').DataTable({
-                    dom: 'Bfrtip',
-                    buttons: [
-                        {
-                            extend: 'collection',
-                            text: '<i class="fas fa-download"></i> Export',
-                            buttons: [
-                                { extend: 'excel', text: '<i class="fas fa-file-excel"></i> Excel', exportOptions: { columns: ':visible' } },
-                                { extend: 'csv', text: '<i class="fas fa-file-csv"></i> CSV', exportOptions: { columns: ':visible' } },
-                                { extend: 'pdf', text: '<i class="fas fa-file-pdf"></i> PDF', exportOptions: { columns: ':visible' } },
-                                { extend: 'print', text: '<i class="fas fa-print"></i> Print', exportOptions: { columns: ':visible' } }
-                            ]
-                        },
-                        { extend: 'colvis', text: '<i class="fas fa-columns"></i> Columns' }
-                    ],
-                    paging: true, searching: true, ordering: true, info: true, responsive: true,
-                    lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
-                    order: [[3, 'asc']],
-                    language: { search: "<i class='fas fa-search'></i> _INPUT_", searchPlaceholder: "Search records..." },
-                    drawCallback: function() { updateTableColors(); }
-                });
-
-                // Initialize DataTable for PIM audit logs
-                const pimAuditLogsTable = $('#pimAuditLogsTable').DataTable({
-                    dom: 'Bfrtip',
-                    buttons: [
-                        {
-                            extend: 'collection',
-                            text: '<i class="fas fa-download"></i> Export',
-                            buttons: [
-                                { extend: 'excel', text: '<i class="fas fa-file-excel"></i> Excel', exportOptions: { columns: ':visible' } },
-                                { extend: 'csv', text: '<i class="fas fa-file-csv"></i> CSV', exportOptions: { columns: ':visible' } },
-                                { extend: 'pdf', text: '<i class="fas fa-file-pdf"></i> PDF', exportOptions: { columns: ':visible' } },
-                                { extend: 'print', text: '<i class="fas fa-print"></i> Print', exportOptions: { columns: ':visible' } }
-                            ]
-                        },
-                        { extend: 'colvis', text: '<i class="fas fa-columns"></i> Columns' }
-                    ],
-                    paging: true, 
-                    searching: true, 
-                    ordering: true, 
-                    info: true, 
-                    scrollX: true,
-                    scrollCollapse: true,
-                    fixedHeader: true,
-                    responsive: true,
-                    lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
-                    order: [[0, 'desc']], // Sort by date/time descending
-                    language: { search: "<i class='fas fa-search'></i> _INPUT_", searchPlaceholder: "Search records..." },
-                    drawCallback: function() { 
-                        updateTableColors();
-                        
-                        // Ensure the search and pagination controls maintain their position
-                        $('.dataTables_filter, .dataTables_paginate').css({
-                            'position': 'sticky',
-                            'right': '0',
-                            'background-color': 'var(--card-bg)',
-                            'z-index': '10'
-                        });
-                    }
-                });
-
-                // Apply initial table colors
-                setTimeout(updateTableColors, 100);
-
-                // Show all toggle functionality
-                $('#pimAuditLogsShowAllToggle').on('change', function() {
-                    if ($(this).is(':checked')) {
-                        pimAuditLogsTable.page.len(-1).draw();
-                    } else {
-                        pimAuditLogsTable.page.len(10).draw();
-                    }
-                });
-
-                // Add these event handlers for the other toggles:
-                $('#allShowAllToggle').on('change', function() {
-                    if ($(this).is(':checked')) {
-                        allRolesTable.page.len(-1).draw();
-                    } else {
-                        allRolesTable.page.len(10).draw();
-                    }
-                });
-
-                $('#userShowAllToggle').on('change', function() {
-                    if ($(this).is(':checked')) {
-                        userRolesTable.page.len(-1).draw();
-                    } else {
-                        userRolesTable.page.len(10).draw();
-                    }
-                });
-
-                $('#groupShowAllToggle').on('change', function() {
-                    if ($(this).is(':checked')) {
-                        groupRolesTable.page.len(-1).draw();
-                    } else {
-                        groupRolesTable.page.len(10).draw();
-                    }
-                });
-
-                // Add this handler if you have a service principal toggle as well
-                $('#spShowAllToggle').on('change', function() {
-                    if ($(this).is(':checked')) {
-                        spRolesTable.page.len(-1).draw();
-                    } else {
-                        spRolesTable.page.len(10).draw();
-                    }
-                });
-
-                // Custom filtering function for PIM audit logs
-                $.fn.dataTable.ext.search.push(
-                    function(settings, data, dataIndex) {
-                        // Only apply to PIM audit logs table
-                        if (settings.nTable.id !== 'pimAuditLogsTable') {
-                            return true;
-                        }
-                        
-                        // Get PIM filter values
-                        const operationType = $('#pimOperationTypeFilter').val().toLowerCase();
-                        const initiator = $('#pimInitiatorFilter').val().toLowerCase();
-                        const result = $('#pimResultFilter').val().toLowerCase();
-                        const role = $('#pimRoleFilter').val().toLowerCase();
-                        const target = $('#pimTargetFilter').val().toLowerCase();
-                        const startDate = $('#pimStartDateFilter').val();
-                        const endDate = $('#pimEndDateFilter').val();
-                        
-                        // Get row data with column indices for PIM audit logs table
-                        const colDateTime = data[0]; // Date/Time column
-                        const colInitiator = data[1].toLowerCase(); // Initiated By column
-                        const colOperation = data[2].toLowerCase(); // Operation Type column
-                        const colRole = data[4].toLowerCase(); // Role column
-                        const colTarget = data[5].toLowerCase(); // Target column
-                        const colResult = data[7].toLowerCase(); // Result column
-                        
-                        // Parse date from the colDateTime value
-                        let rowDate = null;
-                        try {
-                            // Extract date part from "MM/DD/YYYY HH:MM:SS" format
-                            const dateMatch = colDateTime.match(/(\d{1,2})\/(\d{1,2})\/(\d{4})/);
-                            if (dateMatch) {
-                                // Create date object (month is 0-indexed in JavaScript)
-                                rowDate = new Date(dateMatch[3], dateMatch[1] - 1, dateMatch[2]);
-                            } else {
-                                // Try parsing as ISO date if not in the expected format
-                                rowDate = new Date(colDateTime);
-                            }
-                        } catch (e) {
-                            // If date parsing fails, skip date filtering for this row
-                            console.warn("Failed to parse date:", colDateTime);
-                        }
-                        
-                        // Filter by operation type
-                        if (operationType && !colOperation.includes(operationType)) {
-                            return false;
-                        }
-                        
-                        // Filter by initiator
-                        if (initiator && !colInitiator.includes(initiator)) {
-                            return false;
-                        }
-                        
-                        // Filter by result
-                        if (result && !colResult.includes(result)) {
-                            return false;
-                        }
-                        
-                        // Filter by role
-                        if (role && !colRole.includes(role)) {
-                            return false;
-                        }
-                        
-                        // Filter by target
-                        if (target && !colTarget.includes(target)) {
-                            return false;
-                        }
-                        
-                        // Filter by date range
-                        if (startDate && endDate && rowDate) {
-                            const filterStartDate = new Date(startDate);
-                            const filterEndDate = new Date(endDate);
-                            // Set end date to end of day for inclusive filtering
-                            filterEndDate.setHours(23, 59, 59, 999);
-                            
-                            if (rowDate < filterStartDate || rowDate > filterEndDate) {
-                                return false;
-                            }
-                        } else if (startDate && rowDate) {
-                            const filterStartDate = new Date(startDate);
-                            if (rowDate < filterStartDate) {
-                                return false;
-                            }
-                        } else if (endDate && rowDate) {
-                            const filterEndDate = new Date(endDate);
-                            filterEndDate.setHours(23, 59, 59, 999);
-                            if (rowDate > filterEndDate) {
-                                return false;
-                            }
-                        }
-                        
-                        return true;
-                    }
-                );
-
-                // Apply PIM filters when select inputs change
-                $('#pimOperationTypeFilter, #pimResultFilter').on('change', function() {
-                    const filterType = $(this).attr('id');
-                    const filterValue = $(this).val();
-                    const filterLabel = $(this).prev('label').text();
-                    
-                    if (filterValue) {
-                        updatePimEnabledFilter(filterLabel, filterValue);
-                    } else {
-                        removePimEnabledFilter(filterLabel);
-                    }
-                    
-                    applyPimFilters();
-                });
-
-                // Apply PIM filters on text input
-                $('#pimInitiatorFilter, #pimRoleFilter, #pimTargetFilter').on('input', function() {
-                    const filterType = $(this).attr('id');
-                    const filterValue = $(this).val();
-                    const filterLabel = $(this).prev('label').text();
-                    
-                    if (filterValue) {
-                        updatePimEnabledFilter(filterLabel, filterValue);
-                    } else {
-                        removePimEnabledFilter(filterLabel);
-                    }
-                    
-                    // Slight delay for typing
-                    clearTimeout($(this).data('timeout'));
-                    $(this).data('timeout', setTimeout(function() {
-                        applyPimFilters();
-                    }, 300));
-                });
-
-                // Apply date range filter
-                $('#pimStartDateFilter, #pimEndDateFilter').on('change', function() {
-                    const startDate = $('#pimStartDateFilter').val();
-                    const endDate = $('#pimEndDateFilter').val();
-                    
-                    if (startDate || endDate) {
-                        let dateRangeText = '';
-                        if (startDate && endDate) {
-                            dateRangeText = `${startDate} to ${endDate}`;
-                        } else if (startDate) {
-                            dateRangeText = `From ${startDate}`;
-                        } else if (endDate) {
-                            dateRangeText = `Until ${endDate}`;
-                        }
-                        updatePimEnabledFilter('Date Range', dateRangeText);
-                    } else {
-                        removePimEnabledFilter('Date Range');
-                    }
-                    
-                    applyPimFilters();
-                });
-
-                // Clear PIM filters button
-                $('#clearPimFilters').on('click', function() {
-                    // Reset all PIM filter inputs
-                    $('#pimOperationTypeFilter').val('');
-                    $('#pimInitiatorFilter').val('');
-                    $('#pimResultFilter').val('');
-                    $('#pimRoleFilter').val('');
-                    $('#pimTargetFilter').val('');
-                    $('#pimStartDateFilter').val('');
-                    $('#pimEndDateFilter').val('');
-                    
-                    // Clear the PIM filter tags
-                    $('#pimEnabledFilters').empty();
-                    
-                    // Apply the filters (with all values cleared)
-                    applyPimFilters();
-                });
-
-                // Function to apply PIM filters
-                function applyPimFilters() {
-                    pimAuditLogsTable.draw();
-                }
-
-                // Function to update PIM enabled filters
-                function updatePimEnabledFilter(filterType, filterValue) {
-                    // Remove existing filter of the same type
-                    removePimEnabledFilter(filterType);
-                    
-                    // Add new filter tag
-                    const filterTag = `
-                        <div class="filter-tag" data-pim-filter-type="${filterType}">
-                            <span>${filterType}: ${filterValue}</span>
-                            <i class="fas fa-times-circle remove-pim-filter" data-pim-filter-type="${filterType}"></i>
-                        </div>
-                    `;
-                    
-                    $('#pimEnabledFilters').append(filterTag);
-                    
-                    // Add click handler to remove filter
-                    $('.remove-pim-filter').off('click').on('click', function() {
-                        const filterTypeToRemove = $(this).data('pim-filter-type');
-                        
-                        if (filterTypeToRemove === 'Operation Type') {
-                            $('#pimOperationTypeFilter').val('');
-                        } else if (filterTypeToRemove === 'Initiated By') {
-                            $('#pimInitiatorFilter').val('');
-                        } else if (filterTypeToRemove === 'Result') {
-                            $('#pimResultFilter').val('');
-                        } else if (filterTypeToRemove === 'Role') {
-                            $('#pimRoleFilter').val('');
-                        } else if (filterTypeToRemove === 'Target User') {
-                            $('#pimTargetFilter').val('');
-                        } else if (filterTypeToRemove === 'Date Range') {
-                            $('#pimStartDateFilter').val('');
-                            $('#pimEndDateFilter').val('');
-                        }
-                        
-                        $(this).closest('.filter-tag').remove();
-                        applyPimFilters();
-                    });
-                }
-
-                // Function to remove PIM enabled filter by type
-                function removePimEnabledFilter(filterType) {
-                    $('.filter-tag[data-pim-filter-type="' + filterType + '"]').remove();
-                }
-
-                // Make PIM filter options visible when tab is active
-                $('.report-tab').on('click', function() {
-                    // Remove active class from all tabs and panels
-                    $('.report-tab').removeClass('active');
-                    $('.report-panel').removeClass('active');
-                    
-                    // Add active class to clicked tab and corresponding panel
-                    $(this).addClass('active');
-                    const panelId = $(this).data('panel');
-                    $(`#${panelId}`).addClass('active');
-                    
-                    // Toggle visibility of filter sections based on active tab
-                    if (panelId === 'pim-audit-logs-report') {
-                        // When PIM audit logs tab is active
-                        $('#general-filter-section').hide(); // Hide general filter section
-                        $('#pim-filter-section').show(); // Show PIM filter section
-                        
-                        // Refresh the table when switching to PIM tab to ensure correct column widths
-                        setTimeout(function() {
-                            pimAuditLogsTable.columns.adjust();
-                        }, 10);
-                    } else {
-                        // For all other tabs
-                        $('#general-filter-section').show(); // Show general filter section
-                        $('#pim-filter-section').hide(); // Hide PIM filter section
-                    }
-                });
-
-                
-                // Custom filtering function for all tables
-                $.fn.dataTable.ext.search.push(
-                    function(settings, data, dataIndex) {
-                        // Get filter values
-                        const principalType = $('#principalTypeFilter').val().toLowerCase();
-                        const assignmentType = $('#assignmentTypeFilter').val();
-                        const roleName = $('#roleNameFilter').val().toLowerCase();
-                        const scopeFilter = $('#scopeFilter').val();
-                        
-                        // Get row data with CORRECTED column indices
-                        const colPrincipalType = data[2].toLowerCase(); // Principal Type column (index 2)
-                        const colRole = data[4].toLowerCase(); // Assigned Role column (index 4)
-                        const colAssignmentType = data[6]; // Assignment Type column (index 6) 
-                        const colScope = data[5]; // Scope column (index 5)
-                        
-                        // Filter by principal type
-                        if (principalType && !colPrincipalType.includes(principalType)) {
-                            return false;
-                        }
-                        
-                        // Filter by assignment type
-                        if (assignmentType && !colAssignmentType.includes(assignmentType)) {
-                            return false;
-                        }
-                        
-                        // Filter by role name
-                        if (roleName && !colRole.includes(roleName)) {
-                            return false;
-                        }
-                        
-                        // Filter by scope
-                        if (scopeFilter && !colScope.toLowerCase().includes(scopeFilter.toLowerCase())) {
-                        return false;
-                        }
-                        
-                        return true;
-                    }
-                );
-                
-                // Stats card filtering
-                $('#permanentFilter').on('click', function() {
-                    $('#assignmentTypeFilter').val('Permanent');
-                    updateEnabledFilters('Assignment Type', 'Permanent');
-                    applyFilters();
-                    toggleStatsCardEnabled('permanentFilter');
-                });
-                
-                $('#eligibleFilter').on('click', function() {
-                    $('#assignmentTypeFilter').val('Eligible');
-                    updateEnabledFilters('Assignment Type', 'Eligible');
-                    applyFilters();
-                    toggleStatsCardEnabled('eligibleFilter');
-                });
-                
-                $('#groupFilter').on('click', function() {
-                    $('#principalTypeFilter').val('group');
-                    updateEnabledFilters('Principal Type', 'Group');
-                    applyFilters();
-                    toggleStatsCardEnabled('groupFilter');
-                    
-                    // Switch to group report tab
-                    $('.report-tab[data-panel="group-report"]').click();
-                });
-                
-                $('#spFilter').on('click', function() {
-                    $('#principalTypeFilter').val('service Principal');
-                    updateEnabledFilters('Principal Type', 'Service Principal');
-                    applyFilters();
-                    toggleStatsCardEnabled('spFilter');
-                    
-                    // Switch to service principal report tab
-                    $('.report-tab[data-panel="service-principal-report"]').click();
-                });
-                
-                // Apply filters when select boxes change
-                $('#principalTypeFilter, #assignmentTypeFilter, #scopeFilter').on('change', function() {
-                    const filterType = $(this).attr('id');
-                    const filterValue = $(this).val();
-                    
-                    if (filterValue) {
-                        if (filterType === 'principalTypeFilter') {
-                            updateEnabledFilters('Principal Type', filterValue);
-                        } else if (filterType === 'assignmentTypeFilter') {
-                            updateEnabledFilters('Assignment Type', filterValue);
-                        } else if (filterType === 'scopeFilter') {
-                            updateEnabledFilters('Scope', filterValue);
-                        }
-                    } else {
-                        if (filterType === 'principalTypeFilter') {
-                            removeEnabledFilter('Principal Type');
-                        } else if (filterType === 'assignmentTypeFilter') {
-                            removeEnabledFilter('Assignment Type');
-                        } else if (filterType === 'scopeFilter') {
-                            removeEnabledFilter('Scope');
-                        }
-                    }
-                    
-                    applyFilters();
-                });
-                
-                // Apply filter when role name input changes
-                $('#roleNameFilter').on('input', function() {
-                    const filterValue = $(this).val();
-                    
-                    if (filterValue) {
-                        updateEnabledFilters('Role Name', filterValue);
-                    } else {
-                        removeEnabledFilter('Role Name');
-                    }
-                    
-                    applyFilters();
-                });
-                
-                // Clear all filters button
-                $('#clearAllFilters').on('click', function() {
-                    // Reset all filter inputs
-                    $('#principalTypeFilter').val('');
-                    $('#assignmentTypeFilter').val('');
-                    $('#roleNameFilter').val('');
-                    $('#scopeFilter').val('');
-                    
-                    // Remove active state from stats cards
-                    $('.stats-card').removeClass('active');
-                    
-                    // Clear the visible filter tags
-                    clearEnabledFilters();
-                    
-                    // This is critical - force DataTables to redraw with cleared filters
-                    allRolesTable.search('').columns().search('').draw();
-                    userRolesTable.search('').columns().search('').draw();
-                    groupRolesTable.search('').columns().search('').draw();
-                    spRolesTable.search('').columns().search('').draw();
-                    
-                    // Apply the filters (with all values cleared)
-                    applyFilters();
-
-                    // IMPORTANT: Switch back to "All Assignments" tab
-                    $('.report-tab[data-panel="all-report"]').click();
-                }); 
-                
-                // Function to apply all filters
-                function applyFilters() {
-                    allRolesTable.draw();
-                    userRolesTable.draw();
-                    groupRolesTable.draw();
-                    spRolesTable.draw();
-                }
-                
-                // Function to toggle stats card active state
-                function toggleStatsCardEnabled(cardId) {
-                    $('.stats-card').removeClass('active');
-                    $('#' + cardId).addClass('active');
-                }
-                
-                // Function to update enabled filters
-                function updateEnabledFilters(filterType, filterValue) {
-                    // Remove existing filter of the same type
-                    removeEnabledFilter(filterType);
-                    
-                    // Add new filter tag
-                    const filterTag = `
-                        <div class="filter-tag" data-filter-type="${filterType}">
-                            <span>${filterType}: ${filterValue}</span>
-                            <i class="fas fa-times-circle remove-filter" data-filter-type="${filterType}"></i>
-                        </div>
-                    `;
-                    
-                    $('#enabledFilters').append(filterTag);
-                    
-                    // Add click handler to remove filter
-                    $('.remove-filter').off('click').on('click', function() {
-                        const filterTypeToRemove = $(this).data('filter-type');
-                        
-                        if (filterTypeToRemove === 'Principal Type') {
-                            $('#principalTypeFilter').val('');
-                        } else if (filterTypeToRemove === 'Assignment Type') {
-                            $('#assignmentTypeFilter').val('');
-                        } else if (filterTypeToRemove === 'Role Name') {
-                            $('#roleNameFilter').val('');
-                        } else if (filterTypeToRemove === 'Scope') {
-                            $('#scopeFilter').val('');
-                        }
-                        
-                        $(this).closest('.filter-tag').remove();
-                        
-                        // Remove active state from stat cards
-                        if (filterTypeToRemove === 'Assignment Type') {
-                            if ($('#permanentFilter').hasClass('active') || $('#eligibleFilter').hasClass('active')) {
-                                $('#permanentFilter, #eligibleFilter').removeClass('active');
-                            }
-                        } else if (filterTypeToRemove === 'Principal Type') {
-                            if ($('#groupFilter').hasClass('active') || $('#spFilter').hasClass('active')) {
-                                $('#groupFilter, #spFilter').removeClass('active');
-                            }
-                        }
-                        
-                        applyFilters();
-                    });
-                }
-                
-                // Function to remove enabled filter by type
-                function removeEnabledFilter(filterType) {
-                    $('.filter-tag[data-filter-type="' + filterType + '"]').remove();
-                }
-                
-                // Function to clear all enabled filters
-                function clearEnabledFilters() {
-                    $('#enabledFilters').empty();
-                }
-                
-                // Force dark mode to take effect on page elements
-                $(window).on('load', function() {
-                    setTimeout(updateTableColors, 200);
-                });
-                
-                // Re-apply styles after DataTables operations
-                allRolesTable.on('draw.dt', function() {
-                    setTimeout(updateTableColors, 50);
-                });
-                
-                userRolesTable.on('draw.dt', function() {
-                    setTimeout(updateTableColors, 50);
-                });
-                
-                groupRolesTable.on('draw.dt', function() {
-                    setTimeout(updateTableColors, 50);
-                });
-                
-                spRolesTable.on('draw.dt', function() {
-                    setTimeout(updateTableColors, 50);
-                });
-                
-                // Group jump functionality - handle clicks on group links in main table
-                $(document).on('click', '.group-jump-link', function(e) {
-                    e.preventDefault();
-                    
-                    const groupId = $(this).data('group-id');
-                    const targetRow = $('#group-' + groupId);
-                    
-                    if (targetRow.length > 0) {
-                        // Switch to Group Assignments tab
-                        $('.report-tab').removeClass('active');
-                        $('.report-panel').removeClass('active');
-                        $('.report-tab[data-panel="group-report"]').addClass('active');
-                        $('#group-report').addClass('active');
-                        
-                        // Show general filter section, hide PIM filter section
-                        $('#general-filter-section').show();
-                        $('#pim-filter-section').hide();
-                        
-                        // Adjust DataTables columns for the newly visible tab
-                        setTimeout(function() {
-                            groupRolesTable.columns.adjust();
-                            
-                            // Scroll to the target row and highlight it
-                            const targetRowElement = targetRow[0];
-                            if (targetRowElement) {
-                                // Scroll to the row
-                                targetRowElement.scrollIntoView({ 
-                                    behavior: 'smooth', 
-                                    block: 'center' 
-                                });
-                                
-                                // Add highlight effect
-                                targetRow.addClass('highlight-row');
-                                
-                                // Remove highlight after 3 seconds
-                                setTimeout(function() {
-                                    targetRow.removeClass('highlight-row');
-                                }, 3000);
-                            }
-                        }, 100);
-                    } else {
-                        console.warn('Target group row not found:', groupId);
-                    }
-                });
-            });
-        </script>
-    </body>
-    </html>
-'@
-    
     # Generate table rows for all role assignments
     $allRolesRows = ""
-    foreach ($item in $Report) {        
+    foreach ($item in $Report) {
         $assignmentTypeBadge = switch ($item.AssignmentType) {
-            "Permanent" { "<span class=`"badge badge-permanent`">Permanent</span>" }
-            "Eligible" { "<span class=`"badge badge-eligible`">Eligible</span>" }
-            "Eligible (Active)" { 
+            "Permanent" { "<span class=`"rk-badge rk-badge-error`">Permanent</span>" }
+            "Eligible" { "<span class=`"rk-badge rk-badge-ok`">Eligible</span>" }
+            "Eligible (Active)" {
                 if ($item.PrincipalType -eq "group") {
                     # Create a safe ID from the principal name and role
                     $safeId = ($item.Principal + "-" + $item.'Assigned Role').Replace(" ", "-").Replace("@", "-").Replace(".", "-")
-                    "<span class=`"badge badge-eligible-active group-jump-link`" data-group-id=`"$safeId`" style=`"cursor: pointer;`" title=`"Click to view group details in Group Assignments tab`">Eligible (Active) <i class=`"fas fa-external-link-alt`" style=`"font-size: 10px; margin-left: 4px;`"></i></span>"
+                    "<span class=`"rk-badge rk-badge-ok badge-eligible-active group-jump-link`" data-group-id=`"$safeId`" style=`"cursor: pointer;`" title=`"Click to view group details in Group Assignments tab`">Eligible (Active) <i class=`"fas fa-external-link-alt`" style=`"font-size: 10px; margin-left: 4px;`"></i></span>"
                 } else {
-                    "<span class=`"badge badge-eligible-active`">Eligible (Active)</span>"
+                    "<span class=`"rk-badge rk-badge-ok badge-eligible-active`">Eligible (Active)</span>"
                 }
             }
-            default { "<span class=`"badge bg-secondary`">Unknown</span>" }
+            default { "<span class=`"rk-badge rk-badge-na`">Unknown</span>" }
         }
-        
+
         $allRolesRows += @"
         <tr>
-            <td>$($item.Principal)</td>
-            <td>$($item.DisplayName)</td>
-            <td>$($item.PrincipalType)</td>
-            <td>$($item.AccountStatus)</td>
-            <td>$($item.'Assigned Role')</td>
-            <td>$($item.AssignedRoleScopeName)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Principal))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DisplayName))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.PrincipalType))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.AccountStatus))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.'Assigned Role'))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignedRoleScopeName))</td>
             <td>$assignmentTypeBadge</td>
-            <td>$($item.AssignmentStartDate)</td>
-            <td>$($item.AssignmentEndDate)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignmentStartDate))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignmentEndDate))</td>
         </tr>
 "@
     }
@@ -2135,23 +79,23 @@ function New-AdminRoleHTMLReport {
     $userRolesRows = ""
     foreach ($item in $UserAssignmentReport) {
         $assignmentTypeBadge = switch ($item.AssignmentType) {
-            "Permanent" { "<span class=`"badge badge-permanent`">Permanent</span>" }
-            "Eligible" { "<span class=`"badge badge-eligible`">Eligible</span>" }
-            "Eligible (Active)" { "<span class=`"badge badge-eligible-active`">Eligible (Active)</span>" }
-            default { "<span class=`"badge bg-secondary`">Unknown</span>" }
+            "Permanent" { "<span class=`"rk-badge rk-badge-error`">Permanent</span>" }
+            "Eligible" { "<span class=`"rk-badge rk-badge-ok`">Eligible</span>" }
+            "Eligible (Active)" { "<span class=`"rk-badge rk-badge-ok badge-eligible-active`">Eligible (Active)</span>" }
+            default { "<span class=`"rk-badge rk-badge-na`">Unknown</span>" }
         }
-        
+
         $userRolesRows += @"
     <tr>
-        <td>$($item.Principal)</td>
-        <td>$($item.DisplayName)</td>
-        <td>$($item.PrincipalType)</td>
-        <td>$($item.AccountStatus)</td>
-        <td>$($item.'Assigned Role')</td>
-        <td>$($item.AssignedRoleScopeName)</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.Principal))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.DisplayName))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.PrincipalType))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.AccountStatus))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.'Assigned Role'))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignedRoleScopeName))</td>
         <td>$assignmentTypeBadge</td>
-        <td>$($item.AssignmentStartDate)</td>
-        <td>$($item.AssignmentEndDate)</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignmentStartDate))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignmentEndDate))</td>
     </tr>
 "@
     }
@@ -2160,43 +104,43 @@ function New-AdminRoleHTMLReport {
     $groupRolesRows = ""
     foreach ($item in $GroupAssignmentReport) {
         $assignmentTypeBadge = switch ($item.AssignmentType) {
-            "Permanent" { "<span class=`"badge badge-permanent`">Permanent</span>" }
-            "Eligible" { "<span class=`"badge badge-eligible`">Eligible</span>" }
-            "Eligible (Active)" { "<span class=`"badge badge-eligible-active`">Eligible (Active)</span>" }
-            default { "<span class=`"badge bg-secondary`">Unknown</span>" }
+            "Permanent" { "<span class=`"rk-badge rk-badge-error`">Permanent</span>" }
+            "Eligible" { "<span class=`"rk-badge rk-badge-ok`">Eligible</span>" }
+            "Eligible (Active)" { "<span class=`"rk-badge rk-badge-ok badge-eligible-active`">Eligible (Active)</span>" }
+            default { "<span class=`"rk-badge rk-badge-na`">Unknown</span>" }
         }
-        
+
         # Get group members from the overview report
         $groupMembers = ($GroupMembershipOverviewReport | Where-Object { $_.Principal -eq $item.Principal }).Members
         if (-not $groupMembers) {
             $groupMembers = "None"
         }
-        
+
         # Format activated members information (simplified - UserPrincipalName only)
         $activatedMembersText = "None"
         if ($item.ActivatedMembers -and @($item.ActivatedMembers).Count -gt 0) {
             $activatedList = @()
             foreach ($activatedMember in $item.ActivatedMembers) {
-                $activatedList += "$($activatedMember.UserPrincipalName)"
+                $activatedList += [System.Net.WebUtility]::HtmlEncode($activatedMember.UserPrincipalName)
             }
             $activatedMembersText = $activatedList -join "<br/>"
         }
-        
+
         # Create a safe ID from the principal name and role for targeting
         $safeId = ($item.Principal + "-" + $item.'Assigned Role').Replace(" ", "-").Replace("@", "-").Replace(".", "-")
-        
+
         $groupRolesRows += @"
         <tr id="group-$safeId" class="group-assignment-row">
-            <td>$($item.Principal)</td>
-            <td>$($item.DisplayName)</td>
-            <td>$($item.PrincipalType)</td>
-            <td>$($item.AccountStatus)</td>
-            <td>$($item.'Assigned Role')</td>
-            <td>$($item.AssignedRoleScopeName)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Principal))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DisplayName))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.PrincipalType))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.AccountStatus))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.'Assigned Role'))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignedRoleScopeName))</td>
             <td>$assignmentTypeBadge</td>
-            <td>$($item.AssignmentStartDate)</td>
-            <td>$($item.AssignmentEndDate)</td>
-            <td>$groupMembers</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignmentStartDate))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignmentEndDate))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($groupMembers))</td>
             <td style="max-width: 300px; word-wrap: break-word;">$activatedMembersText</td>
         </tr>
 "@
@@ -2206,23 +150,23 @@ function New-AdminRoleHTMLReport {
     $spRolesRows = ""
     foreach ($item in $ServicePrincipalReport) {
         $assignmentTypeBadge = switch ($item.AssignmentType) {
-            "Permanent" { "<span class=`"badge badge-permanent`">Permanent</span>" }
-            "Eligible" { "<span class=`"badge badge-eligible`">Eligible</span>" }
-            "Eligible (Active)" { "<span class=`"badge badge-eligible-active`">Eligible (Active)</span>" }
-            default { "<span class=`"badge bg-secondary`">Unknown</span>" }
+            "Permanent" { "<span class=`"rk-badge rk-badge-error`">Permanent</span>" }
+            "Eligible" { "<span class=`"rk-badge rk-badge-ok`">Eligible</span>" }
+            "Eligible (Active)" { "<span class=`"rk-badge rk-badge-ok badge-eligible-active`">Eligible (Active)</span>" }
+            default { "<span class=`"rk-badge rk-badge-na`">Unknown</span>" }
         }
-        
+
         $spRolesRows += @"
     <tr>
-        <td>$($item.Principal)</td>
-        <td>$($item.DisplayName)</td>
-        <td>$($item.PrincipalType)</td>
-        <td>$($item.AccountStatus)</td>
-        <td>$($item.'Assigned Role')</td>
-        <td>$($item.AssignedRoleScopeName)</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.Principal))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.DisplayName))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.PrincipalType))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.AccountStatus))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.'Assigned Role'))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignedRoleScopeName))</td>
         <td>$assignmentTypeBadge</td>
-        <td>$($item.AssignmentStartDate)</td>
-        <td>$($item.AssignmentEndDate)</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignmentStartDate))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignmentEndDate))</td>
     </tr>
 "@
     }
@@ -2232,140 +176,749 @@ function New-AdminRoleHTMLReport {
     if ($PIMAuditLogsReport -and $PIMAuditLogsReport.Count -gt 0) {
         foreach ($log in $PIMAuditLogsReport) {
             $resultBadge = switch ($log.Result) {
-                "Success" { "<span class=`"badge badge-eligible`">Success</span>" }
-                "Failure" { "<span class=`"badge badge-permanent`">Failure</span>" }
-                default { "<span class=`"badge bg-secondary`">Unknown</span>" }
+                "Success" { "<span class=`"rk-badge rk-badge-ok`">Success</span>" }
+                "Failure" { "<span class=`"rk-badge rk-badge-error`">Failure</span>" }
+                default { "<span class=`"rk-badge rk-badge-na`">Unknown</span>" }
             }
-            
+
             $pimAuditLogsRows += @"
         <tr>
-            <td>$($log.DateTime)</td>
-            <td>$($log.InitiatedBy)</td>
-            <td>$($log.OperationType)</td>
-            <td>$($log.InitiatedByType)</td>
-            <td>$($log.Role)</td>
-            <td>$($log.Target)</td>
-            <td>$($log.Operation)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($log.DateTime))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($log.InitiatedBy))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($log.OperationType))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($log.InitiatedByType))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($log.Role))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($log.Target))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($log.Operation))</td>
             <td>$resultBadge</td>
-            <td>$($log.RoleProperties)</td>
-            <td>$($log.Justification)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($log.RoleProperties))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($log.Justification))</td>
         </tr>
 "@
         }
     }
 
-    # Replace placeholders in template with actual values
-    $htmlContent = $htmlTemplate
-    $htmlContent = $htmlContent.Replace('$TenantName', $TenantName)
-    $htmlContent = $htmlContent.Replace('$ReportDate', $currentDate)
-    $htmlContent = $htmlContent.Replace('$permanentRoles', $permanentRoles)
-    $htmlContent = $htmlContent.Replace('$eligibleRoles', $eligibleRoles)
-    $htmlContent = $htmlContent.Replace('$groupAssignedRoles', $groupAssignedRoles)
-    $htmlContent = $htmlContent.Replace('$servicePrincipalRoles', $servicePrincipalRoles)
-    $htmlContent = $htmlContent.Replace('{{PIM_AUDIT_LOGS_DATA}}', $pimAuditLogsRows)
-
-    # Add report tabs based on available data
-    $reportTabs = @"
-<div class="report-tab active" data-panel="all-report">Assignments</div>
+    # Build stat tiles HTML
+    $statsCardsHtml = @"
+            <div class="rk-stat-tile t-rust">
+                <div class="rk-stat-eyebrow">PERMANENT</div>
+                <div class="rk-stat-number">$permanentRoles</div>
+                <div class="rk-stat-caption">Permanent assignments</div>
+            </div>
+            <div class="rk-stat-tile t-olive">
+                <div class="rk-stat-eyebrow">ELIGIBLE</div>
+                <div class="rk-stat-number">$eligibleRoles</div>
+                <div class="rk-stat-caption">Eligible assignments</div>
+            </div>
+            <div class="rk-stat-tile t-steel">
+                <div class="rk-stat-eyebrow">GROUP</div>
+                <div class="rk-stat-number">$groupAssignedRoles</div>
+                <div class="rk-stat-caption">Group assignments</div>
+            </div>
+            <div class="rk-stat-tile t-rose">
+                <div class="rk-stat-eyebrow">SERVICE PRINCIPAL</div>
+                <div class="rk-stat-number">$servicePrincipalRoles</div>
+                <div class="rk-stat-caption">Service principal assignments</div>
+            </div>
+"@
+
+    # Build dynamic tab buttons
+    $tabButtons = @"
+        <button class="rk-tab active" data-target="panel-all-roles">All Assignments</button>
 "@
 
     if ($UserAssignmentReport.Count -gt 0) {
-        $reportTabs += @"
-<div class="report-tab" data-panel="user-report" style="display:none;">User Assignments</div>
+        $tabButtons += @"
+        <button class="rk-tab" data-target="panel-user-roles">User Assignments</button>
 "@
     }
-    
+
     if ($GroupAssignmentReport.Count -gt 0) {
-        $reportTabs += @"
-<div class="report-tab" data-panel="group-report" style="display:none;">Group Assignments</div>
+        $tabButtons += @"
+        <button class="rk-tab" data-target="panel-group-roles">Group Assignments</button>
 "@
     }
-    
+
     if ($ServicePrincipalReport.Count -gt 0) {
-        $reportTabs += @"
-<div class="report-tab" data-panel="service-principal-report" style="display:none;">Service Principal Assignments</div>
+        $tabButtons += @"
+        <button class="rk-tab" data-target="panel-sp-roles">Service Principal Assignments</button>
 "@
     }
 
-
     if ($PIMAuditLogsReport -and $PIMAuditLogsReport.Count -gt 0) {
-        $reportTabs += @"
-<div class="report-tab" data-panel="pim-audit-logs-report">PIM Audit Logs</div>
+        $tabButtons += @"
+        <button class="rk-tab" data-target="panel-pim-audit-logs">PIM Audit Logs</button>
 "@
     }
 
-    
-    $htmlContent = $htmlContent.Replace("<div class=`"report-tabs`">", "<div class=`"report-tabs`">`n$reportTabs")
-
-    # Replace table data placeholders
-    $htmlContent = $htmlContent.Replace('{{ALL_ROLES_DATA}}', $allRolesRows)
-    $htmlContent = $htmlContent.Replace('{{USER_ROLES_DATA}}', $userRolesRows)
-    $htmlContent = $htmlContent.Replace('{{GROUP_ROLES_DATA}}', $groupRolesRows)
-    $htmlContent = $htmlContent.Replace('{{SP_ROLES_DATA}}', $spRolesRows)
-
-    # Add additional CSS for dark mode pagination
-    $darkModePaginationCss = @'
-    <style>
-        [data-theme="dark"] .page-item.active .page-link {
-            color: white !important;
-            border-color: var(--primary-color) !important;
-        }
-        
-        [data-theme="dark"] .page-item.disabled .page-link {
-            background-color: var(--card-bg) !important;
-            color: #6c757d !important;
-            border-color: var(--border-color) !important;
+    # Build body content HTML
+    $bodyContentHtml = @"
+    <!-- Filter Bar -->
+    <div class="rk-filter-bar" id="general-filter-section">
+        <span>Filters:</span>
+        <select id="principalTypeFilter" class="form-select" style="max-width:180px;">
+            <option value="">All Principal Types</option>
+            <option value="user">User</option>
+            <option value="group">Group</option>
+            <option value="service Principal">Service Principal</option>
+        </select>
+        <select id="assignmentTypeFilter" class="form-select" style="max-width:180px;">
+            <option value="">All Assignment Types</option>
+            <option value="Permanent">Permanent</option>
+            <option value="Eligible">Eligible</option>
+        </select>
+        <input type="text" id="roleNameFilter" class="form-control" placeholder="Search role names..." style="max-width:200px;">
+        <select id="scopeFilter" class="form-select" style="max-width:180px;">
+            <option value="">All Scopes</option>
+            <option value="Tenant-Wide">Tenant-Wide</option>
+            <option value="AU/">Administrative Unit</option>
+        </select>
+        <button class="rk-filter-chip" onclick="clearAllFilters()">Clear</button>
+        <div class="rk-filter-tags" id="enabledFilters"></div>
+    </div>
+
+    <!-- PIM Audit Logs Filter Bar (hidden by default) -->
+    <div class="rk-filter-bar" id="pim-filter-section" style="display:none;">
+        <span>PIM Filters:</span>
+        <select id="pimOperationTypeFilter" class="form-select" style="max-width:180px;">
+            <option value="">All Operations</option>
+            <option value="Add">Add</option>
+            <option value="Update">Update</option>
+            <option value="Delete">Delete</option>
+            <option value="Activate">Activate</option>
+        </select>
+        <input type="text" id="pimInitiatorFilter" class="form-control" placeholder="Filter by user..." style="max-width:180px;">
+        <select id="pimResultFilter" class="form-select" style="max-width:180px;">
+            <option value="">All Results</option>
+            <option value="Success">Success</option>
+            <option value="Failure">Failure</option>
+        </select>
+        <input type="text" id="pimRoleFilter" class="form-control" placeholder="Filter by role..." style="max-width:180px;">
+        <input type="text" id="pimTargetFilter" class="form-control" placeholder="Filter by target..." style="max-width:180px;">
+        <div style="display:flex;align-items:center;gap:4px;">
+            <input type="date" id="pimStartDateFilter" class="form-control" style="max-width:140px;">
+            <span>to</span>
+            <input type="date" id="pimEndDateFilter" class="form-control" style="max-width:140px;">
+        </div>
+        <button class="rk-filter-chip" onclick="clearPimFilters()">Clear</button>
+        <div class="rk-filter-tags" id="pimEnabledFilters"></div>
+    </div>
+
+    <!-- Tab Navigation -->
+    <div class="rk-tabs">
+$tabButtons
+    </div>
+
+    <!-- All Roles Panel -->
+    <div id="panel-all-roles" class="rk-panel active">
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>All Role Assignments</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="allShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="allRolesTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Principal</th>
+                            <th>Display Name</th>
+                            <th>Principal Type</th>
+                            <th>Account Status</th>
+                            <th>Assigned Role</th>
+                            <th>Role Scope</th>
+                            <th>Assignment Type</th>
+                            <th>Start Date</th>
+                            <th>End Date</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $allRolesRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <!-- User Roles Panel -->
+    <div id="panel-user-roles" class="rk-panel">
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>User Role Assignments</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="userShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="userRolesTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Principal</th>
+                            <th>Display Name</th>
+                            <th>Principal Type</th>
+                            <th>Account Status</th>
+                            <th>Assigned Role</th>
+                            <th>Role Scope</th>
+                            <th>Assignment Type</th>
+                            <th>Start Date</th>
+                            <th>End Date</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $userRolesRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <!-- Group Roles Panel -->
+    <div id="panel-group-roles" class="rk-panel">
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>Group Role Assignments</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="groupShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="groupRolesTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Principal</th>
+                            <th>Display Name</th>
+                            <th>Principal Type</th>
+                            <th>Account Status</th>
+                            <th>Assigned Role</th>
+                            <th>Role Scope</th>
+                            <th>Assignment Type</th>
+                            <th>Start Date</th>
+                            <th>End Date</th>
+                            <th>Members</th>
+                            <th>Activated Members</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $groupRolesRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <!-- Service Principal Roles Panel -->
+    <div id="panel-sp-roles" class="rk-panel">
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>Service Principal Role Assignments</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="spShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="spRolesTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Principal</th>
+                            <th>Display Name</th>
+                            <th>Principal Type</th>
+                            <th>Account Status</th>
+                            <th>Assigned Role</th>
+                            <th>Role Scope</th>
+                            <th>Assignment Type</th>
+                            <th>Start Date</th>
+                            <th>End Date</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $spRolesRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <!-- PIM Audit Logs Panel -->
+    <div id="panel-pim-audit-logs" class="rk-panel">
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>PIM Audit Logs</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="pimAuditLogsShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="pimAuditLogsTable" class="table table-bordered" style="width:100%; table-layout:fixed;">
+                    <thead>
+                        <tr>
+                            <th style="width:10%">Date/Time</th>
+                            <th style="width:14%">Initiated By</th>
+                            <th style="width:7%">Operation Type</th>
+                            <th style="width:7%">Initiator Type</th>
+                            <th style="width:12%">Role</th>
+                            <th style="width:14%">Target</th>
+                            <th style="width:12%">Operation</th>
+                            <th style="width:6%">Result</th>
+                            <th style="width:10%">Role Properties</th>
+                            <th style="width:8%">Justification</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $pimAuditLogsRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <script>
+    `$(document).ready(function() {
+        // Initialize all tables using the shared helper
+        var allRolesTable = initRKTable('#allRolesTable', { order: [[3, 'asc']] });
+        var userRolesTable = initRKTable('#userRolesTable', { order: [[3, 'asc']] });
+        var groupRolesTable = initRKTable('#groupRolesTable', { order: [[3, 'asc']] });
+        var spRolesTable = initRKTable('#spRolesTable', { order: [[3, 'asc']] });
+        var pimAuditLogsTable = initRKTable('#pimAuditLogsTable', { order: [[0, 'desc']] });
+
+        // Toggle filter sections based on active tab
+        `$(document).on('click', '.rk-tab', function() {
+            var target = `$(this).data('target');
+            if (target === 'panel-pim-audit-logs') {
+                `$('#general-filter-section').hide();
+                `$('#pim-filter-section').show();
+            } else {
+                `$('#general-filter-section').show();
+                `$('#pim-filter-section').hide();
+            }
+            // Adjust DataTables columns when switching tabs
+            setTimeout(function() {
+                `$.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
+            }, 10);
+        });
+
+        // Custom filtering function for all tables (general filters)
+        `$.fn.dataTable.ext.search.push(
+            function(settings, data, dataIndex) {
+                // Skip PIM audit logs table for general filters
+                if (settings.nTable.id === 'pimAuditLogsTable') {
+                    return true;
+                }
+
+                var principalType = `$('#principalTypeFilter').val().toLowerCase();
+                var assignmentType = `$('#assignmentTypeFilter').val();
+                var roleName = `$('#roleNameFilter').val().toLowerCase();
+                var scopeFilter = `$('#scopeFilter').val();
+
+                var colPrincipalType = data[2].toLowerCase();
+                var colRole = data[4].toLowerCase();
+                var colAssignmentType = data[6];
+                var colScope = data[5];
+
+                if (principalType && !colPrincipalType.includes(principalType)) return false;
+                if (assignmentType && !colAssignmentType.includes(assignmentType)) return false;
+                if (roleName && !colRole.includes(roleName)) return false;
+                if (scopeFilter && !colScope.toLowerCase().includes(scopeFilter.toLowerCase())) return false;
+
+                return true;
+            }
+        );
+
+        // Custom filtering function for PIM audit logs
+        `$.fn.dataTable.ext.search.push(
+            function(settings, data, dataIndex) {
+                if (settings.nTable.id !== 'pimAuditLogsTable') return true;
+
+                var operationType = `$('#pimOperationTypeFilter').val().toLowerCase();
+                var initiator = `$('#pimInitiatorFilter').val().toLowerCase();
+                var result = `$('#pimResultFilter').val().toLowerCase();
+                var role = `$('#pimRoleFilter').val().toLowerCase();
+                var target = `$('#pimTargetFilter').val().toLowerCase();
+                var startDate = `$('#pimStartDateFilter').val();
+                var endDate = `$('#pimEndDateFilter').val();
+
+                var colDateTime = data[0];
+                var colInitiator = data[1].toLowerCase();
+                var colOperation = data[2].toLowerCase();
+                var colRole = data[4].toLowerCase();
+                var colTarget = data[5].toLowerCase();
+                var colResult = data[7].toLowerCase();
+
+                if (operationType && !colOperation.includes(operationType)) return false;
+                if (initiator && !colInitiator.includes(initiator)) return false;
+                if (result && !colResult.includes(result)) return false;
+                if (role && !colRole.includes(role)) return false;
+                if (target && !colTarget.includes(target)) return false;
+
+                // Date range filtering
+                if (startDate || endDate) {
+                    var rowDate = null;
+                    try {
+                        var dateMatch = colDateTime.match(/(\d{1,2})\/(\d{1,2})\/(\d{4})/);
+                        if (dateMatch) {
+                            rowDate = new Date(dateMatch[3], dateMatch[1] - 1, dateMatch[2]);
+                        } else {
+                            rowDate = new Date(colDateTime);
+                        }
+                    } catch (e) { rowDate = null; }
+
+                    if (rowDate) {
+                        if (startDate) {
+                            var filterStartDate = new Date(startDate);
+                            if (rowDate < filterStartDate) return false;
+                        }
+                        if (endDate) {
+                            var filterEndDate = new Date(endDate);
+                            filterEndDate.setHours(23, 59, 59, 999);
+                            if (rowDate > filterEndDate) return false;
+                        }
+                    }
+                }
+
+                return true;
+            }
+        );
+
+        // Apply general filters
+        function applyFilters() {
+            allRolesTable.draw();
+            userRolesTable.draw();
+            groupRolesTable.draw();
+            spRolesTable.draw();
         }
-        
-        [data-theme="dark"] .dataTables_paginate .paginate_button {
-            background-color: var(--button-bg) !important;
-            color: var(--text-color) !important;
-            border-color: var(--border-color) !important;
+
+        // Apply PIM filters
+        function applyPimFilters() {
+            pimAuditLogsTable.draw();
         }
-        
-        [data-theme="dark"] .dataTables_paginate .paginate_button.current, 
-        [data-theme="dark"] .dataTables_paginate .paginate_button.current:hover {
-            background: var(--primary-color) !important;
-            color: white !important;
-            border-color: var(--primary-color) !important;
+
+        // General filter change handlers
+        `$('#principalTypeFilter, #assignmentTypeFilter, #scopeFilter').on('change', function() {
+            var filterType = `$(this).attr('id');
+            var filterValue = `$(this).val();
+            if (filterValue) {
+                if (filterType === 'principalTypeFilter') updateEnabledFilters('Principal Type', filterValue);
+                else if (filterType === 'assignmentTypeFilter') updateEnabledFilters('Assignment Type', filterValue);
+                else if (filterType === 'scopeFilter') updateEnabledFilters('Scope', filterValue);
+            } else {
+                if (filterType === 'principalTypeFilter') removeEnabledFilter('Principal Type');
+                else if (filterType === 'assignmentTypeFilter') removeEnabledFilter('Assignment Type');
+                else if (filterType === 'scopeFilter') removeEnabledFilter('Scope');
+            }
+            applyFilters();
+        });
+
+        `$('#roleNameFilter').on('input', function() {
+            var filterValue = `$(this).val();
+            if (filterValue) {
+                updateEnabledFilters('Role Name', filterValue);
+            } else {
+                removeEnabledFilter('Role Name');
+            }
+            applyFilters();
+        });
+
+        // PIM filter change handlers
+        `$('#pimOperationTypeFilter, #pimResultFilter').on('change', function() {
+            var filterValue = `$(this).val();
+            var filterLabel = `$(this).attr('id') === 'pimOperationTypeFilter' ? 'Operation Type' : 'Result';
+            if (filterValue) {
+                updatePimEnabledFilter(filterLabel, filterValue);
+            } else {
+                removePimEnabledFilter(filterLabel);
+            }
+            applyPimFilters();
+        });
+
+        `$('#pimInitiatorFilter, #pimRoleFilter, #pimTargetFilter').on('input', function() {
+            var filterValue = `$(this).val();
+            var filterLabel;
+            if (`$(this).attr('id') === 'pimInitiatorFilter') filterLabel = 'Initiated By';
+            else if (`$(this).attr('id') === 'pimRoleFilter') filterLabel = 'Role';
+            else filterLabel = 'Target User';
+            if (filterValue) {
+                updatePimEnabledFilter(filterLabel, filterValue);
+            } else {
+                removePimEnabledFilter(filterLabel);
+            }
+            clearTimeout(`$(this).data('timeout'));
+            `$(this).data('timeout', setTimeout(function() { applyPimFilters(); }, 300));
+        });
+
+        `$('#pimStartDateFilter, #pimEndDateFilter').on('change', function() {
+            var startDate = `$('#pimStartDateFilter').val();
+            var endDate = `$('#pimEndDateFilter').val();
+            if (startDate || endDate) {
+                var dateRangeText = '';
+                if (startDate && endDate) dateRangeText = startDate + ' to ' + endDate;
+                else if (startDate) dateRangeText = 'From ' + startDate;
+                else if (endDate) dateRangeText = 'Until ' + endDate;
+                updatePimEnabledFilter('Date Range', dateRangeText);
+            } else {
+                removePimEnabledFilter('Date Range');
+            }
+            applyPimFilters();
+        });
+
+        // Clear all general filters
+        window.clearAllFilters = function() {
+            `$('#principalTypeFilter').val('');
+            `$('#assignmentTypeFilter').val('');
+            `$('#roleNameFilter').val('');
+            `$('#scopeFilter').val('');
+            `$('#enabledFilters').empty();
+            allRolesTable.search('').columns().search('').draw();
+            userRolesTable.search('').columns().search('').draw();
+            groupRolesTable.search('').columns().search('').draw();
+            spRolesTable.search('').columns().search('').draw();
+            applyFilters();
+            // Switch back to All Assignments tab
+            `$('.rk-tab[data-target="panel-all-roles"]').click();
+        };
+
+        // Clear PIM filters
+        window.clearPimFilters = function() {
+            `$('#pimOperationTypeFilter').val('');
+            `$('#pimInitiatorFilter').val('');
+            `$('#pimResultFilter').val('');
+            `$('#pimRoleFilter').val('');
+            `$('#pimTargetFilter').val('');
+            `$('#pimStartDateFilter').val('');
+            `$('#pimEndDateFilter').val('');
+            `$('#pimEnabledFilters').empty();
+            applyPimFilters();
+        };
+
+        // Enabled filter tag management (general)
+        function updateEnabledFilters(filterType, filterValue) {
+            removeEnabledFilter(filterType);
+            var filterTag = '<div class="rk-filter-tag" data-filter-type="' + filterType + '">' +
+                '<span>' + filterType + ': ' + filterValue + '</span>' +
+                '<i class="fas fa-times-circle remove-filter" data-filter-type="' + filterType + '"></i>' +
+                '</div>';
+            `$('#enabledFilters').append(filterTag);
+            `$('.remove-filter').off('click').on('click', function() {
+                var ft = `$(this).data('filter-type');
+                if (ft === 'Principal Type') `$('#principalTypeFilter').val('');
+                else if (ft === 'Assignment Type') `$('#assignmentTypeFilter').val('');
+                else if (ft === 'Role Name') `$('#roleNameFilter').val('');
+                else if (ft === 'Scope') `$('#scopeFilter').val('');
+                `$(this).closest('.rk-filter-tag').remove();
+                applyFilters();
+            });
         }
-        
-        [data-theme="dark"] .dataTables_paginate .paginate_button:hover {
-            background: var(--button-hover-bg) !important;
-            color: var(--text-color) !important;
-            border-color: var(--button-border) !important;
+
+        function removeEnabledFilter(filterType) {
+            `$('.rk-filter-tag[data-filter-type="' + filterType + '"]').remove();
+        }
+
+        // Enabled filter tag management (PIM)
+        function updatePimEnabledFilter(filterType, filterValue) {
+            removePimEnabledFilter(filterType);
+            var filterTag = '<div class="rk-filter-tag" data-pim-filter-type="' + filterType + '">' +
+                '<span>' + filterType + ': ' + filterValue + '</span>' +
+                '<i class="fas fa-times-circle remove-pim-filter" data-pim-filter-type="' + filterType + '"></i>' +
+                '</div>';
+            `$('#pimEnabledFilters').append(filterTag);
+            `$('.remove-pim-filter').off('click').on('click', function() {
+                var ft = `$(this).data('pim-filter-type');
+                if (ft === 'Operation Type') `$('#pimOperationTypeFilter').val('');
+                else if (ft === 'Initiated By') `$('#pimInitiatorFilter').val('');
+                else if (ft === 'Result') `$('#pimResultFilter').val('');
+                else if (ft === 'Role') `$('#pimRoleFilter').val('');
+                else if (ft === 'Target User') `$('#pimTargetFilter').val('');
+                else if (ft === 'Date Range') { `$('#pimStartDateFilter').val(''); `$('#pimEndDateFilter').val(''); }
+                `$(this).closest('.rk-filter-tag').remove();
+                applyPimFilters();
+            });
         }
-        
-        [data-theme="dark"] .dataTables_paginate .paginate_button.disabled, 
-        [data-theme="dark"] .dataTables_paginate .paginate_button.disabled:hover {
-            background-color: var(--card-bg) !important;
-            color: #6c757d !important;
-            border-color: var(--border-color) !important;
-            opacity: 0.6;
+
+        function removePimEnabledFilter(filterType) {
+            `$('.rk-filter-tag[data-pim-filter-type="' + filterType + '"]').remove();
+        }
+
+        // Show all toggle functionality
+        `$('#allShowAllToggle').on('change', function() {
+            allRolesTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+        `$('#userShowAllToggle').on('change', function() {
+            userRolesTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+        `$('#groupShowAllToggle').on('change', function() {
+            groupRolesTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+        `$('#spShowAllToggle').on('change', function() {
+            spRolesTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+        `$('#pimAuditLogsShowAllToggle').on('change', function() {
+            pimAuditLogsTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+
+        // Group jump functionality - handle clicks on group links in main table
+        `$(document).on('click', '.group-jump-link', function(e) {
+            e.preventDefault();
+
+            var groupId = `$(this).data('group-id');
+            var targetRow = `$('#group-' + groupId);
+
+            if (targetRow.length > 0) {
+                // Switch to Group Assignments tab
+                `$('.rk-tab').removeClass('active');
+                `$('.rk-panel').removeClass('active');
+                `$('.rk-tab[data-target="panel-group-roles"]').addClass('active');
+                `$('#panel-group-roles').addClass('active');
+
+                // Show general filter section, hide PIM filter section
+                `$('#general-filter-section').show();
+                `$('#pim-filter-section').hide();
+
+                // Adjust DataTables columns for the newly visible tab
+                setTimeout(function() {
+                    groupRolesTable.columns.adjust();
+
+                    // Scroll to the target row and highlight it
+                    var targetRowElement = targetRow[0];
+                    if (targetRowElement) {
+                        targetRowElement.scrollIntoView({
+                            behavior: 'smooth',
+                            block: 'center'
+                        });
+
+                        // Add highlight effect
+                        targetRow.addClass('highlight-row');
+
+                        // Remove highlight after 3 seconds
+                        setTimeout(function() {
+                            targetRow.removeClass('highlight-row');
+                        }, 3000);
+                    }
+                }, 100);
+            } else {
+                console.warn('Target group row not found:', groupId);
+            }
+        });
+    });
+    </script>
+"@
+
+    # Report-specific CSS (shimmer animation for eligible-active badges, highlight-pulse for group jumps)
+    $customCss = @"
+    /* Shimmer animation for eligible-active badges */
+    .badge-eligible-active {
+        box-shadow: 0 0 8px rgba(45, 122, 58, 0.6), 0 0 16px rgba(45, 122, 58, 0.4);
+        border: 2px solid rgba(255, 255, 255, 0.3);
+        animation: shimmer 2s infinite;
+    }
+
+    .badge-eligible-active.group-jump-link {
+        transition: all 0.3s ease;
+        cursor: pointer;
+        position: relative;
+    }
+
+    .badge-eligible-active.group-jump-link:hover {
+        box-shadow: 0 0 12px rgba(45, 122, 58, 0.8), 0 0 24px rgba(45, 122, 58, 0.6);
+        transform: translateY(-1px);
+        border-color: rgba(255, 255, 255, 0.5);
+    }
+
+    .badge-eligible-active.group-jump-link:active {
+        transform: translateY(0);
+        box-shadow: 0 0 6px rgba(45, 122, 58, 0.4), 0 0 12px rgba(45, 122, 58, 0.3);
+    }
+
+    @keyframes shimmer {
+        0% { box-shadow: 0 0 8px rgba(45, 122, 58, 0.6), 0 0 16px rgba(45, 122, 58, 0.4); }
+        50% { box-shadow: 0 0 12px rgba(45, 122, 58, 0.8), 0 0 24px rgba(45, 122, 58, 0.6); }
+        100% { box-shadow: 0 0 8px rgba(45, 122, 58, 0.6), 0 0 16px rgba(45, 122, 58, 0.4); }
+    }
+
+    /* Highlight effect for group rows when jumping from main table */
+    .highlight-row {
+        background-color: rgba(255, 193, 7, 0.3) !important;
+        border: 2px solid #ffc107 !important;
+        animation: highlightPulse 3s ease-in-out;
+        transition: all 0.3s ease;
+        position: relative;
+        z-index: 10;
+    }
+
+    .highlight-row td {
+        position: relative;
+        z-index: 10;
+    }
+
+    @keyframes highlightPulse {
+        0% {
+            background-color: rgba(255, 193, 7, 0.6);
+            box-shadow: 0 0 15px rgba(255, 193, 7, 0.8);
         }
-        
-        .dataTables_wrapper .dataTables_filter,
-        .dataTables_wrapper .dataTables_paginate {
-            position: sticky;
-            right: 0;
-            background-color: var(--card-bg);
-            padding: 5px;
-            z-index: 10;
+        50% {
+            background-color: rgba(255, 193, 7, 0.4);
+            box-shadow: 0 0 25px rgba(255, 193, 7, 0.6);
         }
-        
-        .dataTables_wrapper .dataTables_info,
-        .dataTables_wrapper .dataTables_length {
-            position: sticky;
-            left: 0;
-            background-color: var(--card-bg);
-            padding: 5px;
-            z-index: 10;
+        100% {
+            background-color: rgba(255, 193, 7, 0.3);
+            box-shadow: 0 0 10px rgba(255, 193, 7, 0.4);
         }
-    </style>
-'@
+    }
 
-    # Insert the dark mode pagination CSS before the </head> tag
-    $htmlContent = $htmlContent.Replace("</head>", "$darkModePaginationCss`n</head>")
+    /* Filter bar form controls */
+    .rk-filter-bar .form-select,
+    .rk-filter-bar .form-control {
+        font-family: 'Geist Mono', ui-monospace, monospace;
+        font-size: 0.75rem;
+        padding: 4px 8px;
+        border-radius: 6px;
+    }
+
+    /* PIM Audit Logs: constrain long-content columns */
+    #pimAuditLogsTable td {
+        word-break: break-word;
+        overflow-wrap: break-word;
+        vertical-align: top;
+    }
+    #pimAuditLogsTable td:nth-child(9),
+    #pimAuditLogsTable td:nth-child(10) {
+        font-size: 0.7rem;
+        max-height: 6em;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+"@
+
+    # Generate the full HTML report using the shared template
+    $htmlContent = Get-RKSolutionsReportTemplate `
+        -TenantName $TenantName `
+        -ReportTitle 'Admin Roles' `
+        -ReportSlug 'entra-admin-roles' `
+        -Eyebrow 'ENTRA ADMIN ROLES' `
+        -Lede 'Privileged role assignments including permanent, eligible, group-based, and service principal assignments.' `
+        -StatsCardsHtml $statsCardsHtml `
+        -BodyContentHtml $bodyContentHtml `
+        -CustomCss $customCss `
+        -ReportDate $CurrentDate `
+        -Tags @('Entra ID', 'PIM', 'Security')
 
     # Export to HTML file
     $htmlContent | Out-File -FilePath $ExportPath -Encoding utf8
@@ -2387,7 +940,7 @@ function Get-SecurityGroups {
     param (
         [switch]$Verbose
     )
-    
+
     $securityGroups = Invoke-GraphRequestWithPaging -Uri "beta/groups?`$filter=isassignabletorole eq true" -Method Get
     if ($Verbose) {
         Write-Verbose "Found $($securityGroups.Count) security groups that are assignable to roles"
@@ -2403,10 +956,10 @@ function Get-SecurityGroups {
         } Else {
             Write-Host "INFO: Collecting members for security group: $($group.displayName)"
         }
-        
+
         try {
             $members = Invoke-GraphRequestWithPaging -Uri "beta/groups/$($group.id)/transitiveMembers?`$select=id,displayName,userPrincipalName" -Method Get
-            
+
             # Create member list with useful information
             $memberList = @()
             foreach ($member in $members) {
@@ -2432,7 +985,7 @@ function Get-SecurityGroups {
                     }
                 }
             }
-            
+
             # Store the members in the hashtable
             $securityGroupMembers[$group.id] = @{
                 GroupDisplayName = $group.displayName
@@ -2440,13 +993,13 @@ function Get-SecurityGroups {
                 Members          = $memberList
                 MemberCount      = $memberList.Count
             }
-            
+
         } catch {
             Write-Error "ERROR: Collecting members for group $($group.displayName): $_"
             continue
         }
     }
-    
+
     # Return the security group members
     return $securityGroupMembers
 }
@@ -2454,7 +1007,7 @@ function Get-SecurityGroups {
 Function Get-PIMAuditLogs {
     # Get PIM audit logs
     $PIMAudits = Invoke-GraphRequestWithPaging "beta/auditLogs/directoryAudits?`$filter=loggedByService eq 'PIM'"
-    
+
     $results = @()
     foreach ($PIMaudit in $PIMAudits) {
         # Extract user who initiated the action
@@ -2478,7 +1031,7 @@ Function Get-PIMAuditLogs {
                 $initiatedByUser = "Unknown"
             }
         }
-        
+
         # Determine initiator type
         $initiatorType = "Unknown"
         if ($PIMaudit.InitiatedBy.user) {
@@ -2488,12 +1041,12 @@ Function Get-PIMAuditLogs {
         } elseif ($PIMaudit.InitiatedBy.servicePrincipal) {
             $initiatorType = "Service Principal"
         }
-        
+
         # Get role information
         $roleResource = $PIMaudit.TargetResources | Where-Object { $_.Type -eq "Role" }
         $roleName = $roleResource.DisplayName
         $roleId = $roleResource.id
-        
+
         # Extract modified properties information
         $roleProperties = @()
         if ($roleResource.modifiedProperties) {
@@ -2501,7 +1054,7 @@ Function Get-PIMAuditLogs {
                 # Clean up the values
                 $oldValue = $prop.oldValue -replace "^'|'$", ""
                 $newValue = $prop.newValue -replace "^'|'$", ""
-                
+
                 # Make property name more readable
                 $propName = $prop.displayName
                 # Handle common PIM property names
@@ -2513,13 +1066,13 @@ Function Get-PIMAuditLogs {
                     "*MemberType*" { $propName = "Member Type" }
                     "*AssignmentState*" { $propName = "Assignment" }
                 }
-                
+
                 # Format datetime values as before...
-                
+
                 # For empty values
                 if ([string]::IsNullOrWhiteSpace($oldValue)) { $oldValue = "(none)" }
                 if ([string]::IsNullOrWhiteSpace($newValue)) { $newValue = "(none)" }
-                
+
                 # Create property change format - using HTML entity for arrow instead of Unicode
                 if ($oldValue -eq "(none)" -and $newValue -ne "(none)") {
                     $roleProperties += "$($propName): $newValue"
@@ -2528,53 +1081,52 @@ Function Get-PIMAuditLogs {
                 } elseif ($oldValue -eq $newValue) {
                     $roleProperties += "$($propName): $newValue"
                 } else {
-                    # Use HTML arrow entity instead of Unicode character
-                    $roleProperties += "$($propName): $oldValue &rarr; $newValue"
+                    $roleProperties += "$($propName): $oldValue → $newValue"
                 }
             }
         }
         $rolePropertiesText = $roleProperties -join " | "
-        
+
         # Get request information
         $requestResource = $PIMaudit.TargetResources | Where-Object { $_.type -eq "Request" }
         $requestId = $requestResource.id
-        
+
         # Extract target user details with enhanced group context
         $userDetails = "N/A"
         $targetUserId = $null
-        
+
         # Check target resources for user
         $userResource = $PIMaudit.TargetResources | Where-Object { $_.type -eq "User" }
         if ($userResource -and $userResource.userPrincipalName) {
             $userDetails = $userResource.userPrincipalName
             $targetUserId = $userResource.id
-        } 
-        
+        }
+
         # Check if this is a group-based activation
         $isGroupBasedActivation = $false
         $groupInfo = $null
-        
+
         # Look for group information in additional details
         $groupDetail = $PIMaudit.AdditionalDetails | Where-Object { $_.key -eq "GroupId" -or $_.key -eq "Group" -or $_.key -eq "MemberType" }
         if ($groupDetail -and $groupDetail.value -eq "Group") {
             $isGroupBasedActivation = $true
         }
-        
+
         # Check if the operation indicates group-based activation
         if ($PIMaudit.ActivityDisplayName -like "*group*" -or $rolePropertiesText -like "*Group*") {
             $isGroupBasedActivation = $true
-        } 
-        
+        }
+
         # Get directory information
         $directoryResource = $PIMaudit.TargetResources | Where-Object { $_.type -eq "Directory" }
         $directoryName = $directoryResource.displayName
-        
+
         # Get reason for the action
         $reason = $PIMaudit.ResultReason
         if ([string]::IsNullOrWhiteSpace($reason)) {
             $reason = "N/A"
         }
-        
+
         # Extract start time and duration for better activation tracking
         $startTime = "N/A"
         $duration = "N/A"
@@ -2587,12 +1139,12 @@ Function Get-PIMAuditLogs {
                 $startTime = $startTimeDetail.value
             }
         }
-        
+
         $durationDetail = $PIMaudit.AdditionalDetails | Where-Object { $_.key -eq "Duration" }
         if ($durationDetail) {
             $duration = $durationDetail.value
         }
-        
+
         # Create custom object with enhanced information for group activation tracking
         $results += [PSCustomObject]@{
             "DateTime"               = $PIMaudit.ActivityDateTime
@@ -2615,7 +1167,7 @@ Function Get-PIMAuditLogs {
             "Duration"               = $duration
         }
     }
-    
+
     # Sort the results by DateTime in descending order
     $results = $results | Sort-Object -Property DateTime -Descending
     # Return the results
@@ -2633,14 +1185,14 @@ function Get-GroupActivationDetails {
         [Parameter(Mandatory = $true)]
         [string]$RoleName
     )
-    
+
     $enrichedActivations = @()
-    
+
     # Return empty array if no activated members (PowerShell 5 compatible)
     if (-not $ActivatedMembers -or @($ActivatedMembers).Count -eq 0) {
         return $enrichedActivations
     }
-    
+
     foreach ($member in $ActivatedMembers) {
         # Find corresponding PIM audit logs for this member and role
         $memberAuditLogs = $PIMAuditLogs | Where-Object {
@@ -2650,10 +1202,10 @@ function Get-GroupActivationDetails {
             $_.Result -eq "Success" -and
             ($_.Operation -like "*Activate*" -or $_.OperationType -eq "Assign")
         }
-        
+
         # Get the most recent activation for this member
         $recentActivation = $memberAuditLogs | Sort-Object DateTime -Descending | Select-Object -First 1
-        
+
         if ($recentActivation) {
             $enrichedActivations += [PSCustomObject]@{
                 UserPrincipalName = $member.UserPrincipalName
@@ -2691,7 +1243,7 @@ function Get-GroupActivationDetails {
             }
         }
     }
-    
+
     return $enrichedActivations
 }
 
@@ -2755,12 +1307,12 @@ function Invoke-EntraAdminRolesReportCore {
         try {
             Write-Host "INFO: Collecting PIM eligible role assignments..." -ForegroundColor Cyan
             $eligibleRoles = Invoke-GraphRequestWithPaging -Uri "beta/roleManagement/directory/roleEligibilitySchedules?`$expand=roleDefinition,principal" -Method Get
-    
+
             if ($DebugMode) { Write-Host "debug: Eligible roles API call completed" -ForegroundColor Magenta }
             if ($DebugMode) { Write-Host "debug: eligibleRoles type: $($eligibleRoles.GetType().Name)" -ForegroundColor Magenta }
             if ($DebugMode) { Write-Host "debug: eligibleRoles is null: $($null -eq $eligibleRoles)" -ForegroundColor Magenta }
             if ($DebugMode) { Write-Host "debug: eligibleRoles count: $($eligibleRoles.Count)" -ForegroundColor Magenta }
-    
+
             if ($null -eq $eligibleRoles) {
                 Write-Warning "Unable to collect PIM eligible role assignments. This MAY be due to missing Microsoft Entra ID Premium P2 license."
                 Write-Host "INFO: Continuing without PIM eligible role assignments..." -ForegroundColor Yellow
@@ -2773,7 +1325,7 @@ function Invoke-EntraAdminRolesReportCore {
             Write-Host "INFO: Continuing without PIM eligible role assignments..." -ForegroundColor Yellow
             if ($DebugMode) { Write-Host "debug: Exception details: $($_.Exception.Message)" -ForegroundColor Red }
             $eligibleRoles = @() # Set to empty array so the code can continue
-        } 
+        }
 
         foreach ($eligibleRole in $eligibleRoles) {
             $eligibleRole | Add-Member -MemberType NoteProperty -Name roleDefinition1 -Value $eligibleRole.roleDefinition -Force
@@ -2787,14 +1339,14 @@ function Invoke-EntraAdminRolesReportCore {
         try {
             Write-Host "INFO: Collecting activated PIM role assignments..." -ForegroundColor Cyan
             if ($DebugMode) { Write-Host "debug: Using API endpoint: beta/roleManagement/directory/roleAssignmentScheduleInstances?`$filter=assignmentType eq 'Activated'" -ForegroundColor Magenta }
-    
+
             $roleActivations = Invoke-GraphRequestWithPaging -Uri "beta/roleManagement/directory/roleAssignmentScheduleInstances?`$filter=assignmentType eq 'Activated'" -Method Get
-    
+
             if ($DebugMode) { Write-Host "debug: API call completed. Checking results..." -ForegroundColor Magenta }
             if ($DebugMode) { Write-Host "debug: roleActivations type: $($roleActivations.GetType().Name)" -ForegroundColor Magenta }
             if ($DebugMode) { Write-Host "debug: roleActivations is null: $($null -eq $roleActivations)" -ForegroundColor Magenta }
             if ($DebugMode) { Write-Host "debug: roleActivations count: $($roleActivations.Count)" -ForegroundColor Magenta }
-    
+
             if ($roleActivations -and $roleActivations.Count -gt 0) {
                 Write-Host "INFO: Found $($roleActivations.Count) activated PIM role assignments." -ForegroundColor Green
                 # Add debug info about the activations
@@ -2817,13 +1369,13 @@ function Invoke-EntraAdminRolesReportCore {
                 if ($DebugMode) { Write-Host "  1. No users have currently activated PIM roles" -ForegroundColor Yellow }
                 if ($DebugMode) { Write-Host "  2. Permission issues preventing access to activation data" -ForegroundColor Yellow }
                 if ($DebugMode) { Write-Host "  3. API endpoint or filter syntax issues" -ForegroundColor Yellow }
-        
+
                 # Try alternative API call without filter to see if we get any data
                 if ($DebugMode) { Write-Host "debug: Trying alternative API call without filter..." -ForegroundColor Magenta }
                 try {
                     $allInstances = Invoke-GraphRequestWithPaging -Uri "beta/roleManagement/directory/roleAssignmentScheduleInstances" -Method Get | Select-Object -First 10
                     if ($DebugMode) { Write-Host "debug: Alternative call returned $($allInstances.Count) items (showing first 10)" -ForegroundColor Magenta }
-            
+
                     if ($allInstances -and $allInstances.Count -gt 0) {
                         if ($DebugMode) { Write-Host "debug: Sample of all roleAssignmentScheduleInstances:" -ForegroundColor Magenta }
                         if ($DebugMode) {
@@ -2831,17 +1383,17 @@ function Invoke-EntraAdminRolesReportCore {
                                 Write-Host "  Instance - Assignment Type: $($instance.assignmentType), Principal: $($instance.principalId), Role: $($instance.roleDefinitionId)" -ForegroundColor Cyan
                             }
                         }
-                
+
                         # Check if any of these are activated
                         $activatedFromAll = $allInstances | Where-Object { $_.assignmentType -eq "Activated" }
                         if ($DebugMode) { Write-Host "debug: Found $($activatedFromAll.Count) activated assignments in unfiltered results" -ForegroundColor Magenta }
-                
+
                         if ($activatedFromAll.Count -gt 0) {
                             if ($DebugMode) { Write-Host "debug: Using activated assignments from unfiltered results" -ForegroundColor Green }
                             $roleActivations = $activatedFromAll
                         }
                     }
-            
+
                     # Also try another endpoint that might contain activation data
                     if ($DebugMode) { Write-Host "debug: Trying roleAssignmentSchedules endpoint..." -ForegroundColor Magenta }
                     $schedules = Invoke-GraphRequestWithPaging -Uri "beta/roleManagement/directory/roleAssignmentSchedules" -Method Get | Select-Object -First 5
@@ -2851,11 +1403,11 @@ function Invoke-EntraAdminRolesReportCore {
                             Write-Host "  Schedule - Assignment Type: $($schedule.assignmentType), Principal: $($schedule.principalId), Status: $($schedule.status)" -ForegroundColor Cyan
                         }
                     }
-            
+
                 } catch {
                     if ($DebugMode) { Write-Host "debug: Alternative API calls also failed: $_" -ForegroundColor Red }
                 }
-        
+
                 $roleActivations = @()
             }
         } catch {
@@ -2865,13 +1417,13 @@ function Invoke-EntraAdminRolesReportCore {
             $roleActivations = @()
         }
 
-        if (!$roles) { 
+        if (!$roles) {
             if ($verbose) {
                 Write-Verbose "No role assignments found, exiting..."
             } else {
                 Write-Host "INFO: No role assignments found" -ForegroundColor Red
             }
-            return 
+            return
         }
 
         $Report = @()
@@ -2896,7 +1448,7 @@ function Invoke-EntraAdminRolesReportCore {
                 '#microsoft.graph.user' {
                     $principalType = "User"
                     $Principal = $role.principal.userPrincipalName
-            
+
                     if ($null -eq $role.principal.accountEnabled) {
                         $AccountStatus = "N/A"
                     } elseif ($role.principal.accountEnabled -eq $true) {
@@ -2919,7 +1471,7 @@ function Invoke-EntraAdminRolesReportCore {
                 '#microsoft.graph.servicePrincipal' {
                     $principalType = "Service Principal"
                     $Principal = $role.principal.id
-            
+
                     if ($null -eq $role.principal.accountEnabled) {
                         $AccountStatus = "N/A"
                     } elseif ($role.principal.accountEnabled -eq $true) {
@@ -2942,19 +1494,19 @@ function Invoke-EntraAdminRolesReportCore {
             # Decide the role assignment type based on the role eligibility schedule
             if ($role.status) {
                 $status = "Eligible"
-        
+
                 # Initialize activated members array (only for groups with actual activations)
                 $activatedMembers = @()
-        
+
                 # Check for activated assignments - only for individual users, not groups
                 if ($roleActivations.Count -gt 0 -and $principalType -eq "User") {
                     # Look for user activations in the roleActivations data
-                    $userActivation = $roleActivations | Where-Object { 
-                        $_.roleDefinitionId -eq $role.roleDefinitionId -and 
+                    $userActivation = $roleActivations | Where-Object {
+                        $_.roleDefinitionId -eq $role.roleDefinitionId -and
                         $_.principalId -eq $role.principalId -and
                         $_.directoryScopeId -eq $role.directoryScopeId
                     }
-            
+
                     if ($userActivation) {
                         $status = "Eligible (Active)"
                     }
@@ -2962,82 +1514,82 @@ function Invoke-EntraAdminRolesReportCore {
                 # For groups, collect which members have activated this role using roleActivations data
                 elseif ($roleActivations.Count -gt 0 -and $principalType -eq "Group") {
                     # First check if there are any activations for this specific role+scope combination
-                    $roleSpecificActivationsPreCheck = $roleActivations | Where-Object { 
+                    $roleSpecificActivationsPreCheck = $roleActivations | Where-Object {
                         $_.roleDefinitionId -eq $role.roleDefinitionId -and
                         $_.directoryScopeId -eq $role.directoryScopeId
                     }
-                    
+
                     # Only proceed if there are potential activations for this role
                     if ($roleSpecificActivationsPreCheck.Count -gt 0) {
                         if ($DebugMode) { Write-Host "debug: Processing group $($role.principal.displayName) for role $assignedRole" -ForegroundColor Yellow }
                         if ($DebugMode) { Write-Host "debug: Group ID: $($role.principal.id)" -ForegroundColor Yellow }
                         if ($DebugMode) { Write-Host "debug: Role Definition ID: $($role.roleDefinitionId)" -ForegroundColor Yellow }
                         if ($DebugMode) { Write-Host "debug: Directory Scope ID: $($role.directoryScopeId)" -ForegroundColor Yellow }
-            
+
                         # Get members of this specific group
                         $groupMembers = $securityGroupMembers[$role.principal.id]
                         if ($DebugMode) { Write-Host "debug: Group members found: $($null -ne $groupMembers)" -ForegroundColor Yellow }
-            
+
                         if ($groupMembers -and $groupMembers.Members) {
                             if ($DebugMode) { Write-Host "debug: Group has $($groupMembers.Members.Count) members" -ForegroundColor Yellow }
-                
+
                             # Show first few group members for debugging
                             if ($DebugMode) {
                                 foreach ($member in ($groupMembers.Members | Select-Object -First 3)) {
                                     Write-Host "debug: Group member: $($member.UserPrincipalName) (ID: $($member.Id))" -ForegroundColor Cyan
                                 }
                             }
-                
+
                             # Look for activations for this specific role definition
-                            $roleSpecificActivations = $roleActivations | Where-Object { 
+                            $roleSpecificActivations = $roleActivations | Where-Object {
                                 $_.roleDefinitionId -eq $role.roleDefinitionId -and
                                 $_.directoryScopeId -eq $role.directoryScopeId
                                 # Remove the memberType filter to catch all activations
                             }
-                
+
                             if ($DebugMode) { Write-Host "debug: Found $($roleSpecificActivations.Count) role activations for role $assignedRole" -ForegroundColor Yellow }
-                
+
                             # If no activations found, try broader search
                             if ($roleSpecificActivations.Count -eq 0) {
                                 if ($DebugMode) { Write-Host "debug: No activations found with exact match, trying broader search..." -ForegroundColor Yellow }
-                    
+
                                 # Try without directory scope restriction
-                                $broadActivations = $roleActivations | Where-Object { 
+                                $broadActivations = $roleActivations | Where-Object {
                                     $_.roleDefinitionId -eq $role.roleDefinitionId
                                 }
                                 if ($DebugMode) { Write-Host "debug: Found $($broadActivations.Count) activations for this role (any scope)" -ForegroundColor Yellow }
-                    
+
                                 # Try looking for any activations involving group members
-                                $memberActivations = $roleActivations | Where-Object { 
+                                $memberActivations = $roleActivations | Where-Object {
                                     $activation = $_
                                     $groupMembers.Members | Where-Object { $_.Id -eq $activation.principalId }
                                 }
                                 if ($DebugMode) { Write-Host "debug: Found $($memberActivations.Count) activations involving group members (any role)" -ForegroundColor Yellow }
                             }
-                
+
                             foreach ($activation in $roleSpecificActivations) {
                                 if ($DebugMode) { Write-Host "debug: Checking activation for principal $($activation.principalId)" -ForegroundColor Cyan }
                                 if ($DebugMode) { Write-Host "debug: Activation start time: $($activation.startDateTime) (type: $($activation.startDateTime.GetType().Name))" -ForegroundColor Cyan }
                                 if ($DebugMode) { Write-Host "debug: Activation end time: $($activation.endDateTime) (type: $($activation.endDateTime.GetType().Name))" -ForegroundColor Cyan }
-                    
+
                                 # Check if the activation's principal is a member of this group
-                                $targetUser = $groupMembers.Members | Where-Object { 
+                                $targetUser = $groupMembers.Members | Where-Object {
                                     $_.Id -eq $activation.principalId
                                 }
-                    
+
                                 if ($targetUser) {
                                     if ($DebugMode) { Write-Host "debug: Found matching user: $($targetUser.UserPrincipalName)" -ForegroundColor Green }
-                        
+
                                     # Check if we already have this activation recorded
-                                    $existingActivation = $activatedMembers | Where-Object { 
-                                        $_.UserId -eq $targetUser.Id 
+                                    $existingActivation = $activatedMembers | Where-Object {
+                                        $_.UserId -eq $targetUser.Id
                                     }
-                        
+
                                     if (-not $existingActivation) {
                                         # Calculate end time and duration with robust datetime parsing
                                         $startTime = $null
                                         $endTime = $null
-                            
+
                                         if ($activation.startDateTime) {
                                             try {
                                                 # Try different parsing approaches
@@ -3056,7 +1608,7 @@ function Invoke-EntraAdminRolesReportCore {
                                                 $startTime = $null
                                             }
                                         }
-                            
+
                                         if ($activation.endDateTime) {
                                             try {
                                                 # Try different parsing approaches
@@ -3075,8 +1627,8 @@ function Invoke-EntraAdminRolesReportCore {
                                                 $endTime = $null
                                             }
                                         }
-                            
-                                        $duration = if ($startTime -and $endTime) { 
+
+                                        $duration = if ($startTime -and $endTime) {
                                             $timeSpan = $endTime - $startTime
                                             if ($timeSpan.TotalDays -ge 1) {
                                                 "$([math]::Floor($timeSpan.TotalDays)) days, $($timeSpan.Hours) hours"
@@ -3084,7 +1636,7 @@ function Invoke-EntraAdminRolesReportCore {
                                                 "$($timeSpan.Hours) hours, $($timeSpan.Minutes) minutes"
                                             }
                                         } else { "N/A" }
-                            
+
                                         $activatedMembers += [PSCustomObject]@{
                                             UserPrincipalName = $targetUser.UserPrincipalName
                                             DisplayName       = $targetUser.DisplayName
@@ -3108,83 +1660,83 @@ function Invoke-EntraAdminRolesReportCore {
                                 }
                             }
                             if ($DebugMode) { Write-Host "debug: Final activated members count: $(@($activatedMembers).Count)" -ForegroundColor Magenta }
-                        
+
                             # Update status if we found activated members
                             if (@($activatedMembers).Count -gt 0) {
                                 $status = "Eligible (Active)"
                                 if ($DebugMode) { Write-Host "debug: Group marked as Eligible (Active) due to activated members" -ForegroundColor Green }
                             }
-                
+
                             # If no activated members found through roleActivations, try using PIM audit logs as fallback
                             if (@($activatedMembers).Count -eq 0) {
                                 if ($DebugMode) { Write-Host "debug: No activated members found via roleActivations, trying enhanced PIM audit logs search..." -ForegroundColor Yellow }
-                    
+
                                 # Get PIM audit logs if not already collected
                                 if (-not $PIMAuditLogsReport) {
                                     if ($DebugMode) { Write-Host "debug: Collecting PIM audit logs for activation detection..." -ForegroundColor Yellow }
                                     $PIMAuditLogsReport = Get-PIMAuditLogs
                                 }
-                    
+
                                 if ($PIMAuditLogsReport) {
                                     if ($DebugMode) { Write-Host "debug: PIM audit logs available: $($PIMAuditLogsReport.Count) entries" -ForegroundColor Yellow }
-                        
+
                                     # Look for recent activations in PIM audit logs for this role with enhanced search
-                                    $roleActivationLogs = $PIMAuditLogsReport | Where-Object { 
-                            ($_.Operation -like "*Activate*" -or $_.Operation -like "*activate*" -or $_.OperationType -eq "Assign") -and 
+                                    $roleActivationLogs = $PIMAuditLogsReport | Where-Object {
+                            ($_.Operation -like "*Activate*" -or $_.Operation -like "*activate*" -or $_.OperationType -eq "Assign") -and
                             ($_.Role -eq $assignedRole -or $_.RoleID -eq $role.roleDefinitionId) -and
                                         $_.Result -eq "Success" -and
                                         $_.DateTime -gt (Get-Date).AddDays(-7)  # Look at last 7 days for more recent data
                                     }
-                        
+
                                     if ($DebugMode) { Write-Host "debug: Found $($roleActivationLogs.Count) activation logs for role $assignedRole in last 7 days" -ForegroundColor Yellow }
-                        
+
                                     # If still no results, try broader search criteria
                                     if ($roleActivationLogs.Count -eq 0) {
                                         if ($DebugMode) { Write-Host "debug: No activations in last 7 days, trying last 30 days..." -ForegroundColor Yellow }
-                                        $roleActivationLogs = $PIMAuditLogsReport | Where-Object { 
-                                ($_.Operation -like "*Activate*" -or $_.Operation -like "*activate*" -or $_.OperationType -eq "Assign") -and 
+                                        $roleActivationLogs = $PIMAuditLogsReport | Where-Object {
+                                ($_.Operation -like "*Activate*" -or $_.Operation -like "*activate*" -or $_.OperationType -eq "Assign") -and
                                 ($_.Role -eq $assignedRole -or $_.RoleID -eq $role.roleDefinitionId) -and
                                             $_.Result -eq "Success" -and
                                             $_.DateTime -gt (Get-Date).AddDays(-30)  # Look at last 30 days
                                         }
                                         if ($DebugMode) { Write-Host "debug: Found $($roleActivationLogs.Count) activation logs for role $assignedRole in last 30 days" -ForegroundColor Yellow }
                                     }
-                        
+
                                     # If still no results, try even broader search without role name restriction
                                     if ($roleActivationLogs.Count -eq 0) {
                                         if ($DebugMode) { Write-Host "debug: Trying even broader search for any activations by group members..." -ForegroundColor Yellow }
-                                        $memberActivationLogs = $PIMAuditLogsReport | Where-Object { 
-                                ($_.Operation -like "*Activate*" -or $_.Operation -like "*activate*" -or $_.OperationType -eq "Assign") -and 
+                                        $memberActivationLogs = $PIMAuditLogsReport | Where-Object {
+                                ($_.Operation -like "*Activate*" -or $_.Operation -like "*activate*" -or $_.OperationType -eq "Assign") -and
                                             $_.Result -eq "Success" -and
                                             $_.DateTime -gt (Get-Date).AddDays(-7) -and
                                 ($groupMembers.Members | Where-Object { $_.UserPrincipalName -eq $_.Target -or $_.Id -eq $_.TargetUserId })
                                         }
                                         if ($DebugMode) { Write-Host "debug: Found $($memberActivationLogs.Count) activation logs for any group members in last 7 days" -ForegroundColor Yellow }
-                            
+
                                         # Filter these to matching roles if possible
-                                        $roleActivationLogs = $memberActivationLogs | Where-Object { 
-                                            $_.Role -eq $assignedRole -or $_.RoleID -eq $role.roleDefinitionId 
+                                        $roleActivationLogs = $memberActivationLogs | Where-Object {
+                                            $_.Role -eq $assignedRole -or $_.RoleID -eq $role.roleDefinitionId
                                         }
                                         if ($DebugMode) { Write-Host "debug: Of those, $($roleActivationLogs.Count) match the current role" -ForegroundColor Yellow }
                                     }
-                        
+
                                     foreach ($activationLog in $roleActivationLogs) {
                                         if ($DebugMode) { Write-Host "debug: Processing audit log activation: $($activationLog.Target) for role $($activationLog.Role)" -ForegroundColor Cyan }
-                            
+
                                         # Check if the target user is a member of this group
-                                        $targetUser = $groupMembers.Members | Where-Object { 
-                                            $_.UserPrincipalName -eq $activationLog.Target -or 
-                                            $_.Id -eq $activationLog.TargetUserId 
+                                        $targetUser = $groupMembers.Members | Where-Object {
+                                            $_.UserPrincipalName -eq $activationLog.Target -or
+                                            $_.Id -eq $activationLog.TargetUserId
                                         }
-                            
+
                                         if ($targetUser) {
                                             if ($DebugMode) { Write-Host "debug: Found group member match: $($targetUser.UserPrincipalName)" -ForegroundColor Green }
-                                
+
                                             # Check if we already have this activation recorded
-                                            $existingActivation = $activatedMembers | Where-Object { 
-                                                $_.UserPrincipalName -eq $targetUser.UserPrincipalName 
+                                            $existingActivation = $activatedMembers | Where-Object {
+                                                $_.UserPrincipalName -eq $targetUser.UserPrincipalName
                                             }
-                                
+
                                             if (-not $existingActivation) {
                                                 $activatedMembers += [PSCustomObject]@{
                                                     UserPrincipalName = $targetUser.UserPrincipalName
@@ -3207,9 +1759,9 @@ function Invoke-EntraAdminRolesReportCore {
                                             if ($DebugMode) { Write-Host "debug: Target user $($activationLog.Target) not found in group members" -ForegroundColor Red }
                                         }
                                     }
-                        
+
                                     if ($DebugMode) { Write-Host "debug: Final activated members count after enhanced audit log check: $(@($activatedMembers).Count)" -ForegroundColor Magenta }
-                                
+
                                     # Update status if we found activated members through audit logs
                                     if (@($activatedMembers).Count -gt 0) {
                                         $status = "Eligible (Active)"
@@ -3247,7 +1799,7 @@ function Invoke-EntraAdminRolesReportCore {
 
             # Create a unique key for this role assignment to detect duplicates
             $uniqueKey = "$Principal|$assignedRole|$($role.directoryScopeId)"
-    
+
             $Reportline = [PSCustomObject]@{
                 "Principal"             = $Principal
                 "DisplayName"           = $role.principal.displayName
@@ -3258,9 +1810,9 @@ function Invoke-EntraAdminRolesReportCore {
                 "AssignmentType"        = $status
                 "AssignmentStartDate"   = $startDate
                 "AssignmentEndDate"     = $endDate
-                "ActivatedMembers"      = if ($principalType -eq "Group" -and @($activatedMembers).Count -gt 0) { 
+                "ActivatedMembers"      = if ($principalType -eq "Group" -and @($activatedMembers).Count -gt 0) {
                     $activatedMembers  # Return activated members for groups that have them
-                } else { 
+                } else {
                     @()  # Return empty array for groups without activated members or non-groups
                 }
                 "IsBuiltIn"             = if ($role.roleDefinition.isBuiltIn) { $role.roleDefinition.isBuiltIn } elseif ($role.roleDefinition1.isBuiltIn) { $role.roleDefinition1.isBuiltIn } else { $null }
@@ -3269,11 +1821,11 @@ function Invoke-EntraAdminRolesReportCore {
             # Check if we already have this role assignment
             if ($roleAssignmentTracker.ContainsKey($uniqueKey)) {
                 $existingAssignment = $roleAssignmentTracker[$uniqueKey]
-        
+
                 if ($DebugMode) { Write-Host "debug: Found duplicate for $Principal - $assignedRole" -ForegroundColor Yellow }
                 if ($DebugMode) { Write-Host "debug: Existing: $($existingAssignment.AssignmentType), Current: $status" -ForegroundColor Yellow }
                 if ($DebugMode) { Write-Host "debug: Existing activated members: $($existingAssignment.ActivatedMembers.Count), Current: $($Reportline.ActivatedMembers.Count)" -ForegroundColor Yellow }
-        
+
                 # If the existing assignment is permanent and the current one is eligible, replace it
                 # Eligible assignments take priority over permanent ones
                 if ($existingAssignment.AssignmentType -eq "Permanent" -and ($status -eq "Eligible" -or $status -eq "Eligible (Active)")) {
@@ -3283,11 +1835,11 @@ function Invoke-EntraAdminRolesReportCore {
                 # If both are eligible, merge the activated members to preserve all activations
                 elseif ($existingAssignment.AssignmentType -eq "Eligible" -and ($status -eq "Eligible" -or $status -eq "Eligible (Active)")) {
                     Write-Host "MERGING: eligible assignments for: $Principal - $assignedRole" -ForegroundColor Green
-            
+
                     # Merge activated members from both assignments
                     $mergedActivatedMembers = @()
                     $mergedActivatedMembers += $existingAssignment.ActivatedMembers
-            
+
                     # Add new activated members that aren't already present
                     foreach ($newMember in $Reportline.ActivatedMembers) {
                         $existingMember = $mergedActivatedMembers | Where-Object { $_.UserId -eq $newMember.UserId }
@@ -3295,11 +1847,11 @@ function Invoke-EntraAdminRolesReportCore {
                             $mergedActivatedMembers += $newMember
                         }
                     }
-            
+
                     # Update the existing assignment with merged data
                     $existingAssignment.ActivatedMembers = $mergedActivatedMembers
                     $existingAssignment.AssignmentType = if (@($mergedActivatedMembers).Count -gt 0) { "Eligible (Active)" } else { "Eligible" }
-            
+
                     if ($DebugMode) { Write-Host "debug: Merged assignment now has $(@($mergedActivatedMembers).Count) activated members" -ForegroundColor Green }
                 }
                 # If both are permanent, keep the first one
@@ -3334,7 +1886,7 @@ function Invoke-EntraAdminRolesReportCore {
                     $_.AssignedRoleScopeName -eq $assignment.AssignedRoleScopeName -and
             ($_.AssignmentType -eq "Eligible" -or $_.AssignmentType -eq "Eligible (Active)")
                 }
-        
+
                 foreach ($groupAssignment in $equivalentGroupAssignments) {
                     # Check if the user is a member of this group
                     $groupMembers = $securityGroupMembers[$groupAssignment.Principal]
@@ -3342,17 +1894,17 @@ function Invoke-EntraAdminRolesReportCore {
                         $userIsMember = $groupMembers.Members | Where-Object {
                             $_.UserPrincipalName -eq $assignment.Principal
                         }
-                
+
                         if ($userIsMember) {
                             if ($DebugMode) { Write-Host "DETECTED ACTIVATION: User $($assignment.Principal) has active assignment for $($assignment."Assigned Role") through group $($groupAssignment.DisplayName)" -ForegroundColor Green }
-                    
+
                             # Create the group key
                             $groupKey = "$($groupAssignment.Principal)|$($assignment."Assigned Role")|$($assignment.AssignedRoleScopeName)"
-                    
+
                             if (-not $activatedMembersByGroup.ContainsKey($groupKey)) {
                                 $activatedMembersByGroup[$groupKey] = @()
                             }
-                    
+
                             # Add this user as an activated member
                             $activatedMember = [PSCustomObject]@{
                                 UserPrincipalName = $assignment.Principal
@@ -3361,7 +1913,7 @@ function Invoke-EntraAdminRolesReportCore {
                                 ActivationTime    = if ($assignment.AssignmentStartDate -ne "Permanent") { $assignment.AssignmentStartDate } else { "N/A" }
                                 StartTime         = if ($assignment.AssignmentStartDate -ne "Permanent") { $assignment.AssignmentStartDate } else { "N/A" }
                                 EndTime           = if ($assignment.AssignmentEndDate -ne "Permanent") { $assignment.AssignmentEndDate } else { "N/A" }
-                                Duration          = if ($assignment.AssignmentStartDate -ne "Permanent" -and $assignment.AssignmentEndDate -ne "Permanent") { 
+                                Duration          = if ($assignment.AssignmentStartDate -ne "Permanent" -and $assignment.AssignmentEndDate -ne "Permanent") {
                                     try {
                                         $start = [DateTime]::Parse($assignment.AssignmentStartDate)
                                         $end = [DateTime]::Parse($assignment.AssignmentEndDate)
@@ -3378,12 +1930,12 @@ function Invoke-EntraAdminRolesReportCore {
                                 ActivatedBy       = "N/A"
                                 Justification     = "N/A"
                             }
-                    
+
                             # Check if this user is already in the list for this group
-                            $existingMember = $activatedMembersByGroup[$groupKey] | Where-Object { 
-                                $_.UserPrincipalName -eq $activatedMember.UserPrincipalName 
+                            $existingMember = $activatedMembersByGroup[$groupKey] | Where-Object {
+                                $_.UserPrincipalName -eq $activatedMember.UserPrincipalName
                             }
-                    
+
                             if (-not $existingMember) {
                                 $activatedMembersByGroup[$groupKey] += $activatedMember
                                 # Mark this user assignment for removal since it's represented in the group
@@ -3393,7 +1945,7 @@ function Invoke-EntraAdminRolesReportCore {
                         }
                     }
                 }
-        
+
                 # Also check for direct PIM activations (user assignments that appear but are actually activated PIM roles)
                 # If this user has an "Permanent" assignment but there are role activations, it might be an activated PIM role
                 if ($assignment.AssignmentType -eq "Permanent" -and $roleActivations.Count -gt 0) {
@@ -3402,7 +1954,7 @@ function Invoke-EntraAdminRolesReportCore {
                         $_.principalId -eq $assignment.Principal -and
                         $_.assignmentType -eq "Activated"
                     }
-            
+
                     if ($userActivation) {
                         # This user assignment is actually an activated PIM role, mark it for removal
                         $userAssignmentsToRemove += $assignment
@@ -3415,32 +1967,32 @@ function Invoke-EntraAdminRolesReportCore {
         # Now update the group assignments with the detected activated members
         foreach ($groupAssignment in $report | Where-Object { $_.PrincipalType -eq "Group" }) {
             $groupKey = "$($groupAssignment.Principal)|$($groupAssignment."Assigned Role")|$($groupAssignment.AssignedRoleScopeName)"
-    
+
             if ($activatedMembersByGroup.ContainsKey($groupKey)) {
                 $detectedMembers = $activatedMembersByGroup[$groupKey]
-        
+
                 # Merge with any existing activated members (from the original PIM API detection)
                 $allActivatedMembers = @()
-        
+
                 # Add existing activated members first
                 if ($groupAssignment.ActivatedMembers -and $groupAssignment.ActivatedMembers.Count -gt 0) {
                     $allActivatedMembers += $groupAssignment.ActivatedMembers
                 }
-        
+
                 # Add newly detected members if they're not already there
                 foreach ($detectedMember in $detectedMembers) {
-                    $existingMember = $allActivatedMembers | Where-Object { 
-                        $_.UserPrincipalName -eq $detectedMember.UserPrincipalName 
+                    $existingMember = $allActivatedMembers | Where-Object {
+                        $_.UserPrincipalName -eq $detectedMember.UserPrincipalName
                     }
                     if (-not $existingMember) {
                         $allActivatedMembers += $detectedMember
                     }
                 }
-        
+
                 # Update the group assignment
                 $groupAssignment.ActivatedMembers = $allActivatedMembers
                 $groupAssignment.AssignmentType = if (@($allActivatedMembers).Count -gt 0) { "Eligible (Active)" } else { $groupAssignment.AssignmentType }
-        
+
                 if ($DebugMode) { Write-Host "Updated group $($groupAssignment.DisplayName) with $(@($allActivatedMembers).Count) total activated members" -ForegroundColor Green }
             }
         }
@@ -3448,7 +2000,7 @@ function Invoke-EntraAdminRolesReportCore {
         # Remove user assignments that are actually activated PIM roles (to avoid duplicates)
         if (@($userAssignmentsToRemove).Count -gt 0) {
             if ($DebugMode) { Write-Host "INFO: Removing $(@($userAssignmentsToRemove).Count) user assignments that are activated PIM roles (to avoid duplicates)..." -ForegroundColor Cyan }
-    
+
             $originalCount = $report.Count
             $report = $report | Where-Object {
                 $currentAssignment = $_
@@ -3459,7 +2011,7 @@ function Invoke-EntraAdminRolesReportCore {
                     })
             }
             $newCount = $report.Count
-    
+
             if ($DebugMode) { Write-Host "debug: Removed $($originalCount - $newCount) user assignments from report (activated PIM roles)" -ForegroundColor Green }
         }
 
diff --git a/module/Private/Export-Results.ps1 b/module/Private/Export-Results.ps1
index ab04f5c..344aa4a 100644
--- a/module/Private/Export-Results.ps1
+++ b/module/Private/Export-Results.ps1
@@ -22,32 +22,6 @@ function Export-Results {
             Write-Host "OSVersion: $($osInfo.Platform), $($osInfo.Version)" -ForegroundColor Green
         }
 
-        $detectedWindows = $false
-        $detectedMacOS = $false
-        $detectedLinux = $false
-        if (Get-Variable -Name 'IsWindows' -ErrorAction SilentlyContinue) {
-            $detectedWindows = $IsWindows
-            $detectedMacOS = $IsMacOS
-            $detectedLinux = $IsLinux
-        } else {
-            $osInfo = [System.Environment]::OSVersion.Platform
-            switch ($osInfo) {
-                'Win32NT' { $detectedWindows = $true }
-                'Unix' {
-                    if (Test-Path '/System/Library/CoreServices/SystemVersion.plist') { $detectedMacOS = $true }
-                    else { $detectedLinux = $true }
-                }
-                default {
-                    try {
-                        if ([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform([System.Runtime.InteropServices.OSPlatform]::Windows)) { $detectedWindows = $true }
-                        elseif ([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform([System.Runtime.InteropServices.OSPlatform]::OSX)) { $detectedMacOS = $true }
-                        elseif ([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform([System.Runtime.InteropServices.OSPlatform]::Linux)) { $detectedLinux = $true }
-                        else { $detectedWindows = $true }
-                    } catch { $detectedWindows = $true }
-                }
-            }
-        }
-
         $documentsPath = if ($OutputFolder -and (Test-Path $OutputFolder)) {
             $OutputFolder
         } else {
diff --git a/module/Private/Get-RKSolutionsReportTemplate.ps1 b/module/Private/Get-RKSolutionsReportTemplate.ps1
new file mode 100644
index 0000000..d5105db
--- /dev/null
+++ b/module/Private/Get-RKSolutionsReportTemplate.ps1
@@ -0,0 +1,931 @@
+function Get-RKSolutionsReportTemplate {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$TenantName,
+
+        [Parameter(Mandatory = $true)]
+        [string]$ReportTitle,
+
+        [Parameter(Mandatory = $true)]
+        [string]$ReportSlug,
+
+        [Parameter(Mandatory = $true)]
+        [string]$Eyebrow,
+
+        [Parameter(Mandatory = $false)]
+        [string]$Lede,
+
+        [Parameter(Mandatory = $false)]
+        [string]$StatsCardsHtml = '',
+
+        [Parameter(Mandatory = $true)]
+        [string]$BodyContentHtml,
+
+        [Parameter(Mandatory = $false)]
+        [string]$CustomCss = '',
+
+        [Parameter(Mandatory = $false)]
+        [string]$ReportDate = (Get-Date).ToString('yyyy-MM-dd HH:mm:ss'),
+
+        [Parameter(Mandatory = $false)]
+        [string[]]$Tags = @(),
+
+        [Parameter(Mandatory = $false)]
+        [string]$StatsClass = ''
+    )
+
+    # Build tag pills HTML
+    $tagPillsHtml = ''
+    if ($Tags.Count -gt 0) {
+        $tagPillsHtml = '<div class="rk-tags">'
+        foreach ($tag in $Tags) {
+            $tagPillsHtml += "<span class=`"rk-tag`">$tag</span>"
+        }
+        $tagPillsHtml += '</div>'
+    }
+
+    # Build lede HTML
+    $ledeHtml = ''
+    if ($Lede) {
+        $ledeHtml = "<p class=`"rk-lede`">$Lede</p>"
+    }
+
+    # Build stats section
+    $statsHtml = ''
+    if ($StatsCardsHtml) {
+        $statsClasses = if ($StatsClass) { "rk-stats $StatsClass" } else { "rk-stats" }
+        $statsHtml = @"
+        <div class="$statsClasses">
+$StatsCardsHtml
+        </div>
+"@
+    }
+
+    $html = @"
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>$TenantName - $Eyebrow</title>
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Geist:wght@400;500;600;700&family=Geist+Mono:wght@400;500;600&display=swap" rel="stylesheet">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.3.0/css/bootstrap.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.13.6/css/dataTables.bootstrap5.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.1/css/buttons.bootstrap5.min.css">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+<script src="https://code.jquery.com/jquery-3.7.0.js"></script>
+<script src="https://cdn.datatables.net/1.13.6/js/jquery.dataTables.min.js"></script>
+<script src="https://cdn.datatables.net/1.13.6/js/dataTables.bootstrap5.min.js"></script>
+<script src="https://cdn.datatables.net/buttons/2.4.1/js/dataTables.buttons.min.js"></script>
+<script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.bootstrap5.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/pdfmake.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/vfs_fonts.js"></script>
+<script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.html5.min.js"></script>
+<script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.print.min.js"></script>
+<script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.colVis.min.js"></script>
+<style>
+/* ========================================
+   RKSolutions Report Template
+   Brand: Carbon Ember
+   ======================================== */
+
+/* --- Light Theme (default) --- */
+:root {
+    --bg-base: #fafafa;
+    --bg-elevated: #ffffff;
+    --bg-warm: #f5f5f5;
+    --bg-deep: #ededed;
+    --border: #e5e5e5;
+    --border-dashed: #d4d4d4;
+    --text: #0a0a0a;
+    --text-body: #171717;
+    --text-muted: #737373;
+    --text-dim: #a3a3a3;
+    --accent: #ea580c;
+    --accent-hover: #f97316;
+    --accent-soft: #fff7ed;
+    --success: #16a34a;
+    --warn: #ca8a04;
+    --error: #dc2626;
+    --tile-rust: #ea580c;
+    --tile-olive: #16a34a;
+    --tile-steel: #0284c7;
+    --tile-rose: #dc2626;
+    --tile-amber: #ca8a04;
+    --tile-violet: #9333ea;
+    --tile-teal: #0891b2;
+    --tile-slate: #475569;
+    --toggle-bg: #d4d4d4;
+    --input-bg: #ffffff;
+    --input-border: #e5e5e5;
+    --input-color: #171717;
+    --button-bg: #f5f5f5;
+    --button-color: #171717;
+    --button-border: #e5e5e5;
+    --button-hover-bg: #ededed;
+}
+
+/* --- Dark Theme (Carbon) --- */
+[data-theme="dark"] {
+    --bg-base: #0a0a0a;
+    --bg-elevated: #141414;
+    --bg-warm: #1c1c1c;
+    --bg-deep: #0e0e0e;
+    --border: #262626;
+    --border-dashed: #333333;
+    --text: #fafafa;
+    --text-body: #e5e5e5;
+    --text-muted: #a3a3a3;
+    --text-dim: #525252;
+    --accent: #fb923c;
+    --accent-hover: #fdba74;
+    --accent-soft: rgba(251,146,60,0.06);
+    --success: #4ade80;
+    --warn: #facc15;
+    --error: #f87171;
+    --tile-rust-bg: #431407;
+    --tile-rust-border: #7c2d1233;
+    --tile-rust-text: #fdba74;
+    --tile-rust-eyebrow: #fb923c;
+    --tile-rust-caption: #c2410c;
+    --tile-olive-bg: #14532d;
+    --tile-olive-border: #16653433;
+    --tile-olive-text: #86efac;
+    --tile-olive-eyebrow: #4ade80;
+    --tile-olive-caption: #15803d;
+    --tile-steel-bg: #0c4a6e;
+    --tile-steel-border: #07598533;
+    --tile-steel-text: #7dd3fc;
+    --tile-steel-eyebrow: #38bdf8;
+    --tile-steel-caption: #0369a1;
+    --tile-rose-bg: #7f1d1d;
+    --tile-rose-border: #991b1b33;
+    --tile-rose-text: #fca5a5;
+    --tile-rose-eyebrow: #f87171;
+    --tile-rose-caption: #b91c1c;
+    --tile-amber-bg: #78350f;
+    --tile-amber-border: #92400e33;
+    --tile-amber-text: #fde68a;
+    --tile-amber-eyebrow: #fbbf24;
+    --tile-amber-caption: #b45309;
+    --tile-violet-bg: #3b0764;
+    --tile-violet-border: #581c8733;
+    --tile-violet-text: #c4b5fd;
+    --tile-violet-eyebrow: #a78bfa;
+    --tile-violet-caption: #7c3aed;
+    --tile-teal-bg: #164e63;
+    --tile-teal-border: #155e7533;
+    --tile-teal-text: #67e8f9;
+    --tile-teal-eyebrow: #22d3ee;
+    --tile-teal-caption: #0891b2;
+    --tile-slate-bg: #1e293b;
+    --tile-slate-border: #33415533;
+    --tile-slate-text: #cbd5e1;
+    --tile-slate-eyebrow: #94a3b8;
+    --tile-slate-caption: #64748b;
+    --toggle-bg: #404040;
+    --input-bg: #141414;
+    --input-border: #262626;
+    --input-color: #e5e5e5;
+    --button-bg: #1c1c1c;
+    --button-color: #e5e5e5;
+    --button-border: #262626;
+    --button-hover-bg: #262626;
+}
+
+/* --- Base --- */
+*, *::before, *::after { box-sizing: border-box; }
+
+body {
+    font-family: 'Geist', -apple-system, BlinkMacSystemFont, system-ui, sans-serif;
+    margin: 0; padding: 0;
+    background-color: var(--bg-base);
+    color: var(--text-body);
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+    transition: background-color 0.3s ease, color 0.3s ease;
+    font-size: 14px;
+    line-height: 1.6;
+    -webkit-font-smoothing: antialiased;
+}
+
+.rk-container {
+    position: relative;
+    max-width: 1600px;
+    margin: 0 auto;
+    padding: 24px 30px;
+    flex: 1;
+}
+
+/* --- Theme Toggle --- */
+.rk-theme-toggle {
+    position: fixed;
+    top: 16px;
+    right: 20px;
+    z-index: 1000;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    background: var(--bg-elevated);
+    border: 1px solid var(--border);
+    padding: 6px 14px;
+    border-radius: 20px;
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    font-size: 0.7rem;
+    color: var(--text-muted);
+    transition: background-color 0.3s, border-color 0.3s;
+}
+.rk-theme-toggle-switch {
+    position: relative;
+    display: inline-block;
+    width: 40px; height: 22px;
+}
+.rk-theme-toggle-switch input { opacity: 0; width: 0; height: 0; }
+.rk-theme-toggle-slider {
+    position: absolute; cursor: pointer;
+    top: 0; left: 0; right: 0; bottom: 0;
+    background-color: var(--toggle-bg);
+    transition: 0.3s; border-radius: 22px;
+}
+.rk-theme-toggle-slider:before {
+    position: absolute; content: "";
+    height: 16px; width: 16px; left: 3px; bottom: 3px;
+    background-color: white;
+    transition: 0.3s; border-radius: 50%;
+}
+input:checked + .rk-theme-toggle-slider { background-color: var(--accent); }
+input:checked + .rk-theme-toggle-slider:before { transform: translateX(18px); }
+
+/* --- Breadcrumb Pill --- */
+.rk-breadcrumb {
+    display: inline-flex;
+    align-items: center;
+    gap: 8px;
+    background: var(--bg-elevated);
+    border: 1px solid var(--border);
+    border-radius: 20px;
+    padding: 6px 16px;
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    font-size: 0.78rem;
+    color: var(--text-muted);
+    margin-bottom: 24px;
+    transition: background-color 0.3s, border-color 0.3s;
+}
+.rk-breadcrumb .rk-arrow { color: var(--accent); }
+
+/* --- Eyebrow --- */
+.rk-eyebrow {
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    font-size: 0.68rem;
+    letter-spacing: 0.18em;
+    text-transform: uppercase;
+    color: var(--accent);
+    margin-bottom: 8px;
+}
+
+/* --- Title --- */
+.rk-title {
+    font-family: 'Geist', -apple-system, sans-serif;
+    font-size: 2rem;
+    font-weight: 800;
+    color: var(--text);
+    letter-spacing: -0.02em;
+    margin-bottom: 8px;
+    line-height: 1.2;
+}
+.rk-title .rk-accent { color: var(--accent); }
+
+/* --- Lede --- */
+.rk-lede {
+    font-family: 'Geist', -apple-system, sans-serif;
+    font-style: italic;
+    color: var(--text-muted);
+    font-size: 1rem;
+    margin-bottom: 20px;
+    max-width: 720px;
+    line-height: 1.5;
+}
+
+/* --- Tags --- */
+.rk-tags { margin-bottom: 20px; display: flex; flex-wrap: wrap; gap: 6px; }
+.rk-tag {
+    display: inline-block;
+    background: var(--bg-warm);
+    border: 1px solid var(--border);
+    border-radius: 12px;
+    padding: 3px 12px;
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    font-size: 0.65rem;
+    color: var(--accent);
+    transition: background-color 0.3s, border-color 0.3s, color 0.3s;
+}
+
+/* --- Dashed Divider --- */
+.rk-divider {
+    border: none;
+    border-top: 1px dashed var(--border-dashed);
+    margin: 24px 0;
+}
+
+/* --- Stat Tiles --- */
+.rk-stats {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
+    gap: 16px;
+    margin-bottom: 28px;
+}
+.rk-stats.rk-stats-5 { grid-template-columns: repeat(5, 1fr); }
+.rk-stat-tile {
+    border-radius: 14px;
+    padding: 20px 16px;
+    text-align: center;
+    transition: transform 0.2s, background-color 0.3s, border-color 0.3s;
+}
+.rk-stat-tile:hover { transform: translateY(-3px); }
+.rk-stat-eyebrow {
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    font-size: 0.62rem;
+    letter-spacing: 0.15em;
+    text-transform: uppercase;
+    margin-bottom: 6px;
+}
+.rk-stat-number {
+    font-family: 'Geist', -apple-system, sans-serif;
+    font-size: 2.2rem;
+    font-weight: 800;
+    line-height: 1.1;
+}
+.rk-stat-caption {
+    font-family: 'Geist', -apple-system, sans-serif;
+    font-size: 0.72rem;
+    margin-top: 4px;
+}
+
+/* Light mode tiles: gradient bg, white text */
+.rk-stat-tile.t-rust { background: linear-gradient(135deg, #ea580c, #f97316); color: #fff; }
+.rk-stat-tile.t-rust .rk-stat-eyebrow { opacity: 0.92; }
+.rk-stat-tile.t-rust .rk-stat-caption { opacity: 0.85; }
+.rk-stat-tile.t-olive { background: linear-gradient(135deg, #16a34a, #22c55e); color: #fff; }
+.rk-stat-tile.t-olive .rk-stat-eyebrow { opacity: 0.92; }
+.rk-stat-tile.t-olive .rk-stat-caption { opacity: 0.85; }
+.rk-stat-tile.t-steel { background: linear-gradient(135deg, #0284c7, #0ea5e9); color: #fff; }
+.rk-stat-tile.t-steel .rk-stat-eyebrow { opacity: 0.92; }
+.rk-stat-tile.t-steel .rk-stat-caption { opacity: 0.85; }
+.rk-stat-tile.t-rose { background: linear-gradient(135deg, #dc2626, #ef4444); color: #fff; }
+.rk-stat-tile.t-rose .rk-stat-eyebrow { opacity: 0.92; }
+.rk-stat-tile.t-rose .rk-stat-caption { opacity: 0.85; }
+.rk-stat-tile.t-amber { background: linear-gradient(135deg, #ca8a04, #eab308); color: #fff; }
+.rk-stat-tile.t-amber .rk-stat-eyebrow { opacity: 0.92; }
+.rk-stat-tile.t-amber .rk-stat-caption { opacity: 0.85; }
+.rk-stat-tile.t-violet { background: linear-gradient(135deg, #9333ea, #a855f7); color: #fff; }
+.rk-stat-tile.t-violet .rk-stat-eyebrow { opacity: 0.92; }
+.rk-stat-tile.t-violet .rk-stat-caption { opacity: 0.85; }
+.rk-stat-tile.t-teal { background: linear-gradient(135deg, #0891b2, #06b6d4); color: #fff; }
+.rk-stat-tile.t-teal .rk-stat-eyebrow { opacity: 0.92; }
+.rk-stat-tile.t-teal .rk-stat-caption { opacity: 0.85; }
+.rk-stat-tile.t-slate { background: linear-gradient(135deg, #475569, #64748b); color: #fff; }
+.rk-stat-tile.t-slate .rk-stat-eyebrow { opacity: 0.92; }
+.rk-stat-tile.t-slate .rk-stat-caption { opacity: 0.85; }
+
+/* Dark mode tiles: gradient tinted bg, bright colored text */
+[data-theme="dark"] .rk-stat-tile.t-rust {
+    background: linear-gradient(135deg, var(--tile-rust-bg), #5a3818); border: 1px solid var(--tile-rust-border); color: var(--tile-rust-text);
+}
+[data-theme="dark"] .rk-stat-tile.t-rust .rk-stat-eyebrow { color: var(--tile-rust-eyebrow); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-rust .rk-stat-caption { color: var(--tile-rust-caption); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-olive {
+    background: linear-gradient(135deg, var(--tile-olive-bg), #204820); border: 1px solid var(--tile-olive-border); color: var(--tile-olive-text);
+}
+[data-theme="dark"] .rk-stat-tile.t-olive .rk-stat-eyebrow { color: var(--tile-olive-eyebrow); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-olive .rk-stat-caption { color: var(--tile-olive-caption); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-steel {
+    background: linear-gradient(135deg, var(--tile-steel-bg), #183848); border: 1px solid var(--tile-steel-border); color: var(--tile-steel-text);
+}
+[data-theme="dark"] .rk-stat-tile.t-steel .rk-stat-eyebrow { color: var(--tile-steel-eyebrow); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-steel .rk-stat-caption { color: var(--tile-steel-caption); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-rose {
+    background: linear-gradient(135deg, var(--tile-rose-bg), #482020); border: 1px solid var(--tile-rose-border); color: var(--tile-rose-text);
+}
+[data-theme="dark"] .rk-stat-tile.t-rose .rk-stat-eyebrow { color: var(--tile-rose-eyebrow); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-rose .rk-stat-caption { color: var(--tile-rose-caption); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-amber {
+    background: linear-gradient(135deg, var(--tile-amber-bg), #483808); border: 1px solid var(--tile-amber-border); color: var(--tile-amber-text);
+}
+[data-theme="dark"] .rk-stat-tile.t-amber .rk-stat-eyebrow { color: var(--tile-amber-eyebrow); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-amber .rk-stat-caption { color: var(--tile-amber-caption); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-violet {
+    background: linear-gradient(135deg, var(--tile-violet-bg), #382048); border: 1px solid var(--tile-violet-border); color: var(--tile-violet-text);
+}
+[data-theme="dark"] .rk-stat-tile.t-violet .rk-stat-eyebrow { color: var(--tile-violet-eyebrow); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-violet .rk-stat-caption { color: var(--tile-violet-caption); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-teal {
+    background: linear-gradient(135deg, var(--tile-teal-bg), #104048); border: 1px solid var(--tile-teal-border); color: var(--tile-teal-text);
+}
+[data-theme="dark"] .rk-stat-tile.t-teal .rk-stat-eyebrow { color: var(--tile-teal-eyebrow); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-teal .rk-stat-caption { color: var(--tile-teal-caption); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-slate {
+    background: linear-gradient(135deg, var(--tile-slate-bg), #283040); border: 1px solid var(--tile-slate-border); color: var(--tile-slate-text);
+}
+[data-theme="dark"] .rk-stat-tile.t-slate .rk-stat-eyebrow { color: var(--tile-slate-eyebrow); opacity: 1; }
+[data-theme="dark"] .rk-stat-tile.t-slate .rk-stat-caption { color: var(--tile-slate-caption); opacity: 1; }
+
+/* --- Filter Bar --- */
+.rk-filter-bar {
+    background: var(--bg-elevated);
+    border: 1px solid var(--border);
+    border-radius: 10px;
+    padding: 14px 18px;
+    margin-bottom: 20px;
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    flex-wrap: wrap;
+    font-family: 'Geist', -apple-system, sans-serif;
+    font-size: 0.8rem;
+    color: var(--text-muted);
+    transition: background-color 0.3s, border-color 0.3s;
+}
+.rk-filter-chip {
+    background: var(--accent-soft);
+    color: var(--accent);
+    border: 1px solid var(--border);
+    border-radius: 14px;
+    padding: 4px 12px;
+    font-size: 0.72rem;
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    cursor: pointer;
+    transition: background-color 0.3s, color 0.3s, border-color 0.3s;
+}
+.rk-filter-chip:hover { border-color: var(--accent); }
+.rk-filter-chip.active { background: var(--accent); color: #fff; border-color: var(--accent); }
+
+/* --- Tables --- */
+.rk-card {
+    background: var(--bg-elevated);
+    border: 1px solid var(--border);
+    border-radius: 14px;
+    overflow: hidden;
+    margin-bottom: 24px;
+    transition: background-color 0.3s, border-color 0.3s;
+}
+.rk-card-header {
+    background: var(--bg-warm);
+    padding: 14px 20px;
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    font-size: 0.78rem;
+    font-weight: 600;
+    letter-spacing: 0.08em;
+    text-transform: uppercase;
+    color: var(--text-body);
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 12px;
+    transition: background-color 0.3s, color 0.3s;
+}
+.rk-header-buttons { display: flex; gap: 6px; margin-left: auto; align-items: center; }
+.rk-header-buttons .dt-button {
+    font-family: 'Geist', -apple-system, sans-serif !important;
+    font-size: 0.68rem !important;
+    font-weight: 500 !important;
+    padding: 4px 10px !important;
+    border-radius: 6px !important;
+    background: transparent !important;
+    border: 1px solid var(--border) !important;
+    color: var(--text-muted) !important;
+    transition: all 0.15s !important;
+    letter-spacing: 0.02em;
+}
+.rk-header-buttons .dt-button:hover {
+    background: var(--accent-soft) !important;
+    border-color: var(--accent) !important;
+    color: var(--accent) !important;
+}
+.rk-card-body {
+    padding: 20px;
+    background-color: var(--bg-base);
+    transition: background-color 0.3s;
+}
+
+table.dataTable, .table {
+    width: 100% !important;
+    border-collapse: collapse !important;
+    color: var(--text-body) !important;
+    background-color: var(--bg-base) !important;
+}
+.table thead th {
+    background-color: var(--bg-warm) !important;
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    font-size: 0.68rem;
+    letter-spacing: 0.1em;
+    text-transform: uppercase;
+    color: var(--text-body) !important;
+    font-weight: 600;
+    padding: 12px;
+    border: 1px solid var(--border) !important;
+    transition: background-color 0.3s, color 0.3s, border-color 0.3s;
+}
+.table tbody td {
+    padding: 12px;
+    vertical-align: middle;
+    border: 1px solid var(--border) !important;
+    color: var(--text-body) !important;
+    background-color: inherit !important;
+    font-family: 'Geist', -apple-system, sans-serif;
+    transition: background-color 0.3s, color 0.3s, border-color 0.3s;
+}
+.table tbody td.rk-mono {
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    font-size: 0.82rem;
+}
+.table tbody tr { background-color: var(--bg-base) !important; transition: background-color 0.2s; }
+.table tbody tr:nth-child(even) { background-color: var(--bg-elevated) !important; }
+[data-theme="dark"] .table tbody tr { background-color: var(--bg-base) !important; }
+[data-theme="dark"] .table tbody tr:nth-child(even) { background-color: var(--bg-deep) !important; }
+.table tbody tr:hover { background-color: var(--accent-soft) !important; }
+.table tbody tr:hover td { background-color: inherit !important; }
+
+/* Override Bootstrap table backgrounds */
+.table-striped > tbody > tr:nth-of-type(odd),
+.table-striped > tbody > tr:nth-of-type(even),
+.table-striped > tbody > tr > td,
+.table > tbody > tr > td,
+.table > tbody > tr {
+    background-color: inherit !important;
+    --bs-table-bg: transparent;
+    --bs-table-striped-bg: transparent;
+    --bs-table-hover-bg: transparent;
+}
+
+/* DataTables wrapper backgrounds */
+.dataTables_wrapper { background-color: transparent !important; color: var(--text-body) !important; }
+.dataTables_wrapper .row { background-color: transparent !important; }
+
+/* --- Status Badges --- */
+.rk-badge {
+    display: inline-block;
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    font-size: 0.65rem;
+    letter-spacing: 0.05em;
+    text-transform: uppercase;
+    padding: 3px 8px;
+    border-radius: 4px;
+    font-weight: 500;
+}
+.rk-badge-ok { background: rgba(22,163,74,0.1); color: var(--success); }
+.rk-badge-warn { background: rgba(202,138,4,0.1); color: var(--warn); }
+.rk-badge-error { background: rgba(220,38,38,0.1); color: var(--error); }
+.rk-badge-na { background: var(--bg-warm); color: var(--text-muted); }
+.rk-badge-accent { background: rgba(234,88,12,0.1); color: var(--accent); }
+
+[data-theme="dark"] .rk-badge-ok { background: rgba(74,222,128,0.1); color: #4ade80; }
+[data-theme="dark"] .rk-badge-warn { background: rgba(250,204,21,0.1); color: #facc15; }
+[data-theme="dark"] .rk-badge-error { background: rgba(248,113,113,0.1); color: #f87171; }
+[data-theme="dark"] .rk-badge-na { background: rgba(82,82,82,0.2); color: #a3a3a3; }
+[data-theme="dark"] .rk-badge-accent { background: rgba(251,146,60,0.1); color: #fb923c; }
+
+/* --- Report Tabs (pill switcher) --- */
+.rk-tabs {
+    display: grid;
+    grid-auto-columns: 1fr;
+    grid-auto-flow: column;
+    gap: 2px;
+    margin-bottom: 20px;
+    background: var(--bg-warm);
+    border-radius: 10px;
+    padding: 3px;
+}
+.rk-tab {
+    text-align: center;
+    font-family: 'Geist', -apple-system, sans-serif;
+    font-size: 0.8rem;
+    padding: 8px 16px;
+    border-radius: 8px;
+    cursor: pointer;
+    color: var(--text-muted);
+    background: transparent;
+    border: none;
+    transition: all 0.2s;
+    letter-spacing: 0;
+    font-weight: 500;
+}
+.rk-tab:hover { color: var(--text-body); }
+.rk-tab.active {
+    color: var(--text);
+    background: var(--bg-elevated);
+    box-shadow: 0 1px 3px rgba(0,0,0,0.08);
+    font-weight: 600;
+}
+[data-theme="dark"] .rk-tab.active { box-shadow: 0 1px 3px rgba(0,0,0,0.3); }
+.rk-panel { visibility: hidden; height: 0; overflow: hidden; }
+.rk-panel.active { visibility: visible; height: auto; overflow: visible; }
+.rk-panel .dataTables_wrapper,
+.rk-panel table.dataTable { width: 100% !important; }
+
+/* --- Show All Toggle --- */
+.rk-show-all {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    font-size: 0.72rem;
+    color: var(--text-muted);
+}
+.rk-toggle-switch {
+    position: relative;
+    display: inline-block;
+    width: 44px; height: 24px;
+}
+.rk-toggle-switch input { opacity: 0; width: 0; height: 0; }
+.rk-toggle-slider {
+    position: absolute; cursor: pointer;
+    top: 0; left: 0; right: 0; bottom: 0;
+    background-color: var(--toggle-bg);
+    transition: 0.3s; border-radius: 24px;
+}
+.rk-toggle-slider:before {
+    position: absolute; content: "";
+    height: 18px; width: 18px; left: 3px; bottom: 3px;
+    background-color: white;
+    transition: 0.3s; border-radius: 50%;
+}
+input:checked + .rk-toggle-slider { background-color: var(--accent); }
+input:checked + .rk-toggle-slider:before { transform: translateX(20px); }
+
+/* --- DataTables Overrides --- */
+.dataTables_wrapper .dataTables_length,
+.dataTables_wrapper .dataTables_filter,
+.dataTables_wrapper .dataTables_info,
+.dataTables_wrapper .dataTables_paginate { color: var(--text-body) !important; }
+
+.dataTables_wrapper .dataTables_length select,
+.dataTables_wrapper .dataTables_filter input {
+    border: 1px solid var(--input-border);
+    background-color: var(--input-bg);
+    color: var(--input-color);
+    border-radius: 6px;
+    padding: 5px 10px;
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    font-size: 0.78rem;
+}
+
+.dataTables_wrapper .dataTables_paginate .paginate_button,
+.dataTables_wrapper .dataTables_paginate .page-link {
+    padding: 0.3em 0.8em;
+    border-radius: 6px;
+    margin: 0 2px;
+    color: var(--button-color) !important;
+    border: 1px solid var(--button-border) !important;
+    background-color: var(--button-bg) !important;
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    font-size: 0.75rem;
+}
+.dataTables_wrapper .dataTables_paginate .paginate_button.current,
+.dataTables_wrapper .dataTables_paginate .paginate_button.current:hover,
+.dataTables_wrapper .dataTables_paginate .page-item.active .page-link {
+    background: var(--accent) !important;
+    border-color: var(--accent) !important;
+    color: white !important;
+}
+.dataTables_wrapper .dataTables_paginate .paginate_button:hover,
+.dataTables_wrapper .dataTables_paginate .page-link:hover {
+    background: var(--button-hover-bg) !important;
+    border-color: var(--border) !important;
+    color: var(--button-color) !important;
+}
+.dataTables_wrapper .dataTables_paginate .paginate_button.disabled,
+.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover,
+.dataTables_wrapper .dataTables_paginate .page-item.disabled .page-link {
+    color: var(--text-dim) !important;
+    background-color: var(--bg-base) !important;
+    border-color: var(--border) !important;
+}
+
+div.dt-buttons { background-color: transparent !important; }
+div.dt-buttons .dt-button {
+    background-color: var(--button-bg) !important;
+    color: var(--button-color) !important;
+    border: 1px solid var(--button-border) !important;
+    border-radius: 6px;
+    font-family: 'Geist', -apple-system, sans-serif;
+    font-size: 0.78rem;
+}
+div.dt-buttons .dt-button:hover {
+    background-color: var(--button-hover-bg) !important;
+    color: var(--button-color) !important;
+}
+
+.form-select, .form-control {
+    background-color: var(--input-bg) !important;
+    color: var(--input-color) !important;
+    border-color: var(--input-border) !important;
+    font-family: 'Geist', -apple-system, sans-serif;
+    font-size: 0.8rem;
+}
+.form-label { color: var(--text-body); font-family: 'Geist', -apple-system, sans-serif; font-size: 0.8rem; }
+
+.btn-outline-secondary {
+    color: var(--text-body);
+    border-color: var(--border);
+    font-family: 'Geist', -apple-system, sans-serif;
+    font-size: 0.8rem;
+}
+.btn-outline-secondary:hover { background-color: var(--bg-warm); color: var(--text-body); }
+
+/* --- Filter Tags --- */
+.rk-filter-tags { display: flex; flex-wrap: wrap; gap: 8px; margin-top: 8px; }
+.rk-filter-tag {
+    background-color: var(--bg-warm);
+    padding: 4px 12px;
+    border-radius: 16px;
+    font-size: 0.78rem;
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    color: var(--text-body);
+    display: flex; align-items: center; gap: 6px;
+    transition: background-color 0.3s, color 0.3s;
+}
+.rk-filter-tag i { cursor: pointer; color: var(--text-muted); }
+.rk-filter-tag i:hover { color: var(--error); }
+
+/* --- PS Prompt Footer --- */
+.rk-footer {
+    border-top: 1px solid var(--border);
+    padding: 14px 30px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-family: 'Geist Mono', ui-monospace, monospace;
+    font-size: 0.78rem;
+    transition: border-color 0.3s;
+}
+.rk-footer-prompt { color: var(--text-body); }
+.rk-footer-cursor {
+    display: inline-block;
+    width: 9px; height: 18px;
+    background: var(--accent);
+    vertical-align: middle;
+    margin-left: 4px;
+    animation: rk-blink 1.2s step-end infinite;
+}
+.rk-footer-site { color: var(--text-dim); }
+@keyframes rk-blink { 50% { opacity: 0; } }
+
+/* --- Responsive --- */
+@media (max-width: 768px) {
+    .rk-stats { grid-template-columns: repeat(2, 1fr); }
+    .rk-title { font-size: 1.5rem; }
+    .rk-container { padding: 16px; }
+    .rk-footer { padding: 14px 16px; }
+}
+
+/* --- Report-specific CSS injection --- */
+$CustomCss
+</style>
+</head>
+<body>
+
+<!-- Theme Toggle -->
+<div class="rk-theme-toggle">
+    <i class="fas fa-sun" style="font-size: 14px;"></i>
+    <label class="rk-theme-toggle-switch">
+        <input type="checkbox" id="rkThemeToggle">
+        <span class="rk-theme-toggle-slider"></span>
+    </label>
+    <i class="fas fa-moon" style="font-size: 14px;"></i>
+</div>
+
+<div class="rk-container">
+    <!-- Breadcrumb Pill -->
+    <div class="rk-breadcrumb">
+        <span class="rk-arrow">&larr;</span> cd ./reports/$ReportSlug
+    </div>
+
+    <!-- Eyebrow -->
+    <div class="rk-eyebrow">$Eyebrow &middot; GENERATED $ReportDate</div>
+
+    <!-- Title -->
+    <h1 class="rk-title">$TenantName <span class="rk-accent">$ReportTitle</span> Report</h1>
+
+    <!-- Lede -->
+    $ledeHtml
+
+    <!-- Tags -->
+    $tagPillsHtml
+
+    <!-- Divider -->
+    <hr class="rk-divider">
+
+    <!-- Stats -->
+    $statsHtml
+
+    <!-- Body Content (tables, tabs, filters -- report-specific) -->
+    $BodyContentHtml
+
+</div>
+
+<!-- PS Prompt Footer -->
+<div class="rk-footer">
+    <span class="rk-footer-prompt">PS C:\Blog\rksolutions&gt;<span class="rk-footer-cursor"></span></span>
+    <span class="rk-footer-site">rksolutions.nl</span>
+</div>
+
+<script>
+`$(document).ready(function() {
+    // Theme toggle
+    const toggle = document.getElementById('rkThemeToggle');
+    const prefersDark = window.matchMedia('(prefers-color-scheme: dark)');
+    const saved = localStorage.getItem('rk-theme');
+    if (saved === 'dark' || (!saved && prefersDark.matches)) {
+        document.documentElement.setAttribute('data-theme', 'dark');
+        toggle.checked = true;
+    }
+    toggle.addEventListener('change', function() {
+        if (this.checked) {
+            document.documentElement.setAttribute('data-theme', 'dark');
+            localStorage.setItem('rk-theme', 'dark');
+        } else {
+            document.documentElement.setAttribute('data-theme', 'light');
+            localStorage.setItem('rk-theme', 'light');
+        }
+    });
+
+    // Tab switching
+    `$(document).on('click', '.rk-tab', function() {
+        const target = `$(this).data('target');
+        `$(this).closest('.rk-tabs').find('.rk-tab').removeClass('active');
+        `$(this).addClass('active');
+        `$(this).closest('.rk-tabs').siblings('.rk-panel').removeClass('active');
+        `$('#' + target).addClass('active');
+        `$('#' + target).find('table.dataTable').each(function() {
+            `$(this).DataTable().columns.adjust();
+        });
+    });
+});
+
+// DataTable helper
+function initRKTable(selector, extraOptions) {
+    var defaults = {
+        dom: 'frtip',
+        buttons: [
+            {
+                extend: 'collection',
+                text: '<i class="fas fa-download"></i> Export',
+                buttons: [
+                    { extend: 'excel', text: '<i class="fas fa-file-excel"></i> Excel', exportOptions: { columns: ':visible' } },
+                    { extend: 'csv', text: '<i class="fas fa-file-csv"></i> CSV', exportOptions: { columns: ':visible' } },
+                    { extend: 'print', text: '<i class="fas fa-print"></i> Print', exportOptions: { columns: ':visible' } }
+                ]
+            },
+            { extend: 'colvis', text: '<i class="fas fa-columns"></i> Columns' }
+        ],
+        paging: true,
+        searching: true,
+        ordering: true,
+        info: true,
+        responsive: false,
+        autoWidth: true,
+        initComplete: function() {
+            var table = this.api().table();
+            var headerCells = `$(table.header()).find('th');
+            headerCells.each(function() {
+                `$(this).css('width', `$(this).outerWidth() + 'px');
+            });
+            `$(table.node()).css('table-layout', 'fixed');
+            // Move buttons into the card header (next to show-all toggle)
+            var btnContainer = table.buttons().container();
+            var cardHeader = `$(table.node()).closest('.rk-card').find('.rk-card-header');
+            if (cardHeader.length) {
+                btnContainer.addClass('rk-header-buttons');
+                cardHeader.find('.rk-show-all').before(btnContainer);
+            }
+        },
+        lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, 'All']],
+        order: [[0, 'asc']],
+        language: {
+            search: "<i class='fas fa-search'></i> _INPUT_",
+            searchPlaceholder: 'Search records...',
+            lengthMenu: 'Show _MENU_ entries',
+            info: 'Showing _START_ to _END_ of _TOTAL_ entries',
+            paginate: {
+                first: "<i class='fas fa-angle-double-left'></i>",
+                last: "<i class='fas fa-angle-double-right'></i>",
+                next: "<i class='fas fa-angle-right'></i>",
+                previous: "<i class='fas fa-angle-left'></i>"
+            }
+        }
+    };
+    if (extraOptions) { `$.extend(true, defaults, extraOptions); }
+    return `$(selector).DataTable(defaults);
+}
+</script>
+
+</body>
+</html>
+"@
+
+    return $html
+}
diff --git a/module/Private/IntuneAnomalies.ps1 b/module/Private/IntuneAnomalies.ps1
index 24e6bae..d266a1e 100644
--- a/module/Private/IntuneAnomalies.ps1
+++ b/module/Private/IntuneAnomalies.ps1
@@ -4,7 +4,7 @@ function New-IntuneAnomaliesHTMLReport {
     param(
         [Parameter(Mandatory = $true)]
         [string]$TenantName,
-        
+
         [Parameter(Mandatory = $false)]
         [array]$Report_ApplicationFailureReport,
         [Parameter(Mandatory = $false)]
@@ -16,7 +16,7 @@ function New-IntuneAnomaliesHTMLReport {
         [Parameter(Mandatory = $false)]
         [array]$Report_InactiveDevices,
         [Parameter(Mandatory = $false)]
-        [array]$Report_OperationSystemEdtionOverview,
+        [array]$Report_OperatingSystemEditionOverview,
         [Parameter(Mandatory = $false)]
         [array]$Report_NoncompliantDevices,
         [Parameter(Mandatory = $false)]
@@ -27,7 +27,8 @@ function New-IntuneAnomaliesHTMLReport {
 
     # Default ExportPath to current folder if not provided
     if (-not $ExportPath) {
-        $ExportPath = Join-Path (Get-Location).Path "$TenantName-IntuneAnomaliesReport.html"
+        $safeTenantName = $TenantName -replace '[\\/:*?"<>|]', '_'
+        $ExportPath = Join-Path (Get-Location).Path "$safeTenantName-IntuneAnomaliesReport.html"
     }
 
     # Calculate counts for dashboard statistics
@@ -37,1946 +38,21 @@ function New-IntuneAnomaliesHTMLReport {
     $Report_DevicesWithoutAutopilotHash_Count = $Report_DevicesWithoutAutopilotHash | Measure-Object | Select-Object -ExpandProperty Count
     $Report_InactiveDevices_Count = $Report_InactiveDevices | Measure-Object | Select-Object -ExpandProperty Count
     $Report_NoncompliantDevices_Count = ($Report_NoncompliantDevices | Select-Object -Property DeviceName -Unique | Measure-Object).Count
-    $Report_OperationSystemEdtionOverview_Count = $Report_OperationSystemEdtionOverview | Measure-Object | Select-Object -ExpandProperty Count
+    $Report_OperatingSystemEditionOverview_Count = $Report_OperatingSystemEditionOverview | Measure-Object | Select-Object -ExpandProperty Count
     $Report_DisabledPrimaryUsers_Count = $Report_DisabledPrimaryUsers | Measure-Object | Select-Object -ExpandProperty Count
-    
+
     # Get the current date and time for the report header
     $CurrentDate = (Get-Date).ToString("yyyy-MM-dd HH:mm:ss")
 
-    # Create HTML Template with DataTables
-    $htmlTemplate = @'
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>$TenantName Intune Anomalies Report</title>
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.3.0/css/bootstrap.min.css">
-<link rel="stylesheet" href="https://cdn.datatables.net/1.13.6/css/dataTables.bootstrap5.min.css">
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.1/css/buttons.bootstrap5.min.css">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-<script src="https://code.jquery.com/jquery-3.7.0.js"></script>
-<script src="https://cdn.datatables.net/1.13.6/js/jquery.dataTables.min.js"></script>
-<script src="https://cdn.datatables.net/1.13.6/js/dataTables.bootstrap5.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/2.4.1/js/dataTables.buttons.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.bootstrap5.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/pdfmake.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/vfs_fonts.js"></script>
-<script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.html5.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.print.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.colVis.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
-<style>
-:root {
-    --primary-color: #0078d4;
-    --secondary-color: #2b88d8;
-    --permanent-color: #d83b01;
-    --eligible-color: #107c10;
-    --group-color: #5c2d91;
-    --disabled-color: #d9534f;
-    --enabled-color: #5cb85c;
-    --service-principal-color: #0078d4;
-    --na-color: #6c757d;
-    --bg-color: #f8f9fa;
-    --card-bg: #ffffff;
-    --text-color: #333333;
-    --table-header-bg: #f5f5f5;
-    --table-header-color: #333333;
-    --table-stripe-bg: rgba(0,0,0,0.02);
-    --table-hover-bg: rgba(0,0,0,0.04);
-    --table-border-color: #dee2e6;
-    --filter-tag-bg: #e9ecef;
-    --filter-tag-color: #495057;
-    --filter-bg: white;
-    --btn-outline-color: #6c757d;
-    --border-color: #dee2e6;
-    --toggle-bg: #ccc;
-    --button-bg: #f8f9fa;
-    --button-color: #333;
-    --button-border: #ddd;
-    --button-hover-bg: #e9ecef;
-    --footer-text: white;
-    --input-bg: #fff;
-    --input-color: #333;
-    --input-border: #ced4da;
-    --input-focus-border: #86b7fe;
-    --input-focus-shadow: rgba(13, 110, 253, 0.25);
-    --datatable-even-row-bg: #fff;
-    --datatable-odd-row-bg: #f9f9f9;
-    --tab-active-bg: #0078d4;
-    --tab-active-color: #fff;
-}
- 
-[data-theme="dark"] {
-    --primary-color: #0078d4;
-    --secondary-color: #2b88d8;
-    --permanent-color: #d83b01;
-    --eligible-color: #107c10;
-    --group-color: #5c2d91;
-    --disabled-color: #6c757d;
-    --enabled-color: #0078d4;
-    --service-principal-color: #0078d4;
-    --bg-color: #121212;
-    --card-bg: #1e1e1e;
-    --text-color: #e0e0e0;
-    --table-header-bg: #333333;
-    --table-header-color: #e0e0e0;
-    --table-stripe-bg: rgba(255,255,255,0.03);
-    --table-hover-bg: rgba(255,255,255,0.05);
-    --table-border-color: #444444;
-    --filter-bg: #252525;
-    --btn-outline-color: #adb5bd;
-    --border-color: #444444;
-    --toggle-bg: #555555;
-    --button-bg: #2a2a2a;
-    --button-color: #e0e0e0;
-    --button-border: #444;
-    --button-hover-bg: #3a3a3a;
-    --footer-text: white;
-    --input-bg: #2a2a2a;
-    --input-color: #e0e0e0;
-    --input-border: #444444;
-    --input-focus-border: #0078d4;
-    --input-focus-shadow: rgba(0, 120, 212, 0.25);
-    --datatable-even-row-bg: #1e1e1e;
-    --datatable-odd-row-bg: #252525;
-    --tab-active-bg: #0078d4;
-    --tab-active-color: #fff;
-}
- 
-body {
-    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-    margin: 0;
-    padding: 0;
-    background-color: var(--bg-color);
-    color: var(--text-color);
-    min-height: 100vh;
-    display: flex;
-    flex-direction: column;
-    transition: background-color 0.3s ease, color 0.3s ease;
-}
- 
-.container-fluid {
-    max-width: 1600px;
-    padding: 20px;
-    flex: 1;
-}
- 
-.dashboard-header {
-    padding: 20px 0;
-    margin-bottom: 30px;
-    border-bottom: 1px solid rgba(128,128,128,0.2);
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
- 
-.dashboard-title {
-    display: flex;
-    align-items: center;
-    gap: 15px;
-}
- 
-.dashboard-title h1 {
-    margin: 0;
-    font-size: 1.8rem;
-    font-weight: 600;
-    color: var(--primary-color);
-}
- 
-.logo {
-    height: 45px;
-    width: 45px;
-}
- 
-.report-date {
-    font-size: 0.9rem;
-    color: var(--text-color);
-    opacity: 0.8;
-}
- 
-.card {
-    border: none;
-    border-radius: 10px;
-    box-shadow: 0 4px 12px rgba(0,0,0,0.05);
-    margin-bottom: 25px;
-    transition: transform 0.2s, box-shadow 0.2s, background-color 0.3s ease;
-    overflow: hidden;
-    background-color: var(--card-bg);
-}
- 
-.card:hover {
-    transform: translateY(-5px);
-    box-shadow: 0 8px 16px rgba(0,0,0,0.1);
-}
- 
-.card-header {
-    background-color: var(--primary-color);
-    color: white;
-    font-weight: 600;
-    padding: 15px 20px;
-    border-bottom: none;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 10px;
-}
- 
-.card-header i {
-    font-size: 1.2rem;
-}
- 
-.card-body {
-    padding: 20px;
-}
- 
-.stats-card {
-    height: 100%;
-    text-align: center;
-    padding: 8px 12px;
-    border-radius: 6px;
-    color: white;
-    position: relative;
-    overflow: hidden;
-    min-height: 70px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    cursor: pointer;
-    transition: all 0.3s;
-}
- 
-.stats-card::before {
-    content: '';
-    position: absolute;
-    top: -8px;
-    right: -8px;
-    width: 40px;
-    height: 40px;
-    border-radius: 50%;
-    background-color: rgba(255,255,255,0.1);
-    z-index: 0;
-}
- 
-.stats-card i {
-    font-size: 1.2rem;
-    margin-bottom: 4px;
-    position: relative;
-    z-index: 1;
-}
- 
-.stats-card h3 {
-    font-size: 0.65rem;
-    font-weight: 500;
-    margin-bottom: 4px;
-    position: relative;
-    z-index: 1;
-    line-height: 1.0;
-    height: 24px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
- 
-.stats-card .number {
-    font-size: 1.2rem;
-    font-weight: 700;
-    position: relative;
-    z-index: 1;
-}
- 
-.permanent-bg {
-    background: linear-gradient(135deg, var(--permanent-color), #f25c05);
-}
- 
-.eligible-bg {
-    background: linear-gradient(135deg, var(--eligible-color), #2a9d2a);
-}
- 
-.group-bg {
-    background: linear-gradient(135deg, var(--group-color), #7b4db2);
-}
- 
-.disabled-bg {
-    background: linear-gradient(135deg, var(--disabled-color), #6c757d);
-}
- 
-.enabled-bg {
-    background: linear-gradient(135deg, var(--enabled-color), #0078d4);
-}
- 
-.service-principal-bg {
-    background: linear-gradient(135deg, var(--service-principal-color), #2b88d8);
-}
- 
-table.dataTable {
-    border-collapse: collapse !important;
-    width: 100% !important;
-    color: var(--text-color) !important;
-    border-color: var(--table-border-color) !important;
-}
- 
-.table {
-    color: var(--text-color) !important;
-    border-color: var(--table-border-color) !important;
-}
- 
-.table-striped>tbody>tr:nth-of-type(odd) {
-    background-color: var(--datatable-odd-row-bg) !important;
-}
- 
-.table-striped>tbody>tr:nth-of-type(even) {
-    background-color: var(--datatable-even-row-bg) !important;
-}
- 
-.table thead th {
-    background-color: var(--table-header-bg) !important;
-    color: var(--table-header-color) !important;
-    font-weight: 600;
-    border-top: none;
-    padding: 12px;
-    border-color: var(--table-border-color) !important;
-}
- 
-.table tbody td {
-    padding: 12px;
-    vertical-align: middle;
-    border-color: var(--table-border-color) !important;
-    color: var(--text-color) !important;
-}
- 
-.table.table-bordered {
-    border-color: var(--table-border-color) !important;
-}
- 
-.table-bordered td, .table-bordered th {
-    border-color: var(--table-border-color) !important;
-}
- 
-.table-hover tbody tr:hover {
-    background-color: var(--table-hover-bg) !important;
-}
- 
-.badge {
-    padding: 6px 10px;
-    font-weight: 500;
-    border-radius: 6px;
-}
- 
-.badge-permanent {
-    background-color: var(--permanent-color);
-    color: white;
-}
- 
-.badge-eligible {
-    background-color: var(--eligible-color);
-    color: white;
-}
- 
-.badge-active {
-    background-color: var(--service-principal-color);
-    color: white;
-}
- 
-.badge-group {
-    background-color: var(--group-color);
-    color: white;
-}
- 
-.dataTables_wrapper .dataTables_length,
-.dataTables_wrapper .dataTables_filter,
-.dataTables_wrapper .dataTables_info,
-.dataTables_wrapper .dataTables_processing,
-.dataTables_wrapper .dataTables_paginate {
-    color: var(--text-color) !important;
-}
- 
-.dataTables_wrapper .dataTables_paginate .paginate_button {
-    padding: 0.3em 0.8em;
-    border-radius: 4px;
-    margin: 0 3px;
-    color: var(--text-color) !important;
-    border: 1px solid var(--border-color) !important;
-    background-color: var(--button-bg) !important;
-}
- 
-.dataTables_wrapper .dataTables_paginate .paginate_button.current {
-    background: var(--primary-color) !important;
-    border-color: var(--primary-color) !important;
-    color: white !important;
-}
- 
-.dataTables_wrapper .dataTables_paginate .paginate_button:hover {
-    background: var(--button-hover-bg) !important;
-    border-color: var(--border-color) !important;
-    color: var(--text-color) !important;
-}
- 
-.dataTables_wrapper .dataTables_length select,
-.dataTables_wrapper .dataTables_filter input {
-    border: 1px solid var(--input-border);
-    background-color: var(--input-bg);
-    color: var(--input-color);
-    border-radius: 4px;
-    padding: 5px 10px;
-}
- 
-.dataTables_wrapper .dataTables_filter input:focus {
-    border-color: var(--input-focus-border);
-    box-shadow: 0 0 0 0.25rem var(--input-focus-shadow);
-}
- 
-.dataTables_info {
-    padding-top: 10px;
-    color: var(--text-color);
-}
- 
-footer {
-    background-color: var(--primary-color);
-    color: var(--footer-text);
-    text-align: center;
-    padding: 15px 0;
-    margin-top: auto;
-}
- 
-footer p {
-    margin: 0;
-    font-weight: 500;
-}
- 
-.toggle-switch {
-    position: relative;
-    display: inline-block;
-    width: 60px;
-    height: 30px;
-}
- 
-.toggle-switch input {
-    opacity: 0;
-    width: 0;
-    height: 0;
-}
- 
-.toggle-slider {
-    position: absolute;
-    cursor: pointer;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: var(--toggle-bg);
-    transition: .4s;
-    border-radius: 34px;
-}
- 
-.toggle-slider:before {
-    position: absolute;
-    content: "";
-    height: 22px;
-    width: 22px;
-    left: 4px;
-    bottom: 4px;
-    background-color: white;
-    transition: .4s;
-    border-radius: 50%;
-}
- 
-input:checked + .toggle-slider {
-    background-color: var(--primary-color);
-}
- 
-input:checked + .toggle-slider:before {
-    transform: translateX(30px);
-}
- 
-.show-all-container {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-    background-color: transparent;
-    padding: 0;
-    border: none;
-    margin-left: 15px;
-}
- 
-.show-all-text {
-    font-weight: 500;
-    margin: 0;
-    color: white;
-    font-size: 0.85rem;
-}
- 
-.theme-toggle {
-    position: fixed;
-    top: 20px;
-    right: 20px;
-    z-index: 1000;
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    background-color: var(--card-bg);
-    padding: 8px 12px;
-    border-radius: 30px;
-    box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-    transition: background-color 0.3s ease;
-}
- 
-.theme-toggle-switch {
-    position: relative;
-    display: inline-block;
-    width: 50px;
-    height: 26px;
-}
- 
-.theme-toggle-switch input {
-    opacity: 0;
-    width: 0;
-    height: 0;
-}
- 
-.theme-toggle-slider {
-    position: absolute;
-    cursor: pointer;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: var(--toggle-bg);
-    transition: .4s;
-    border-radius: 34px;
-}
- 
-.theme-toggle-slider:before {
-    position: absolute;
-    content: "";
-    height: 18px;
-    width: 18px;
-    left: 4px;
-    bottom: 4px;
-    background-color: white;
-    transition: .4s;
-    border-radius: 50%;
-}
- 
-input:checked + .theme-toggle-slider {
-    background-color: var(--primary-color);
-}
- 
-input:checked + .theme-toggle-slider:before {
-    transform: translateX(24px);
-}
- 
-.theme-icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 16px;
-    color: var(--text-color);
-}
- 
-.form-select, .form-control {
-    background-color: var(--input-bg) !important;
-    color: var(--input-color) !important;
-    border-color: var(--input-border) !important;
-}
- 
-.form-select:focus, .form-control:focus {
-    border-color: var(--input-focus-border) !important;
-    box-shadow: 0 0 0 0.25rem var(--input-focus-shadow) !important;
-}
- 
-.form-label {
-    color: var(--text-color);
-}
- 
-.filter-container {
-    background-color: var(--card-bg);
-    border: 1px solid var(--border-color);
-    border-radius: 8px;
-    padding: 20px;
-    margin-bottom: 20px;
-}
- 
-.filter-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 15px;
-    align-items: end;
-}
- 
-.filter-group {
-    flex: 1;
-    min-width: 200px;
-}
- 
-.filter-group label {
-    display: block;
-    margin-bottom: 5px;
-    font-weight: 500;
-    color: var(--text-color);
-}
- 
-.filter-buttons {
-    display: flex;
-    gap: 10px;
-    align-items: end;
-}
- 
-.btn-filter {
-    padding: 8px 16px;
-    border: none;
-    border-radius: 4px;
-    font-weight: 500;
-    cursor: pointer;
-    transition: all 0.2s;
-}
- 
-.btn-primary {
-    background-color: var(--primary-color);
-    color: white;
-}
- 
-.btn-primary:hover {
-    background-color: var(--secondary-color);
-}
- 
-.btn-secondary {
-    background-color: var(--button-bg);
-    color: var(--button-color);
-    border: 1px solid var(--button-border);
-}
- 
-.btn-secondary:hover {
-    background-color: var(--button-hover-bg);
-}
- 
-.btn-outline-secondary {
-    color: var(--text-color);
-    border-color: var(--border-color);
-    background-color: transparent;
-}
- 
-.btn-outline-secondary:hover {
-    background-color: var(--filter-tag-bg);
-    color: var(--text-color);
-}
- 
-.form-select option {
-    background-color: var(--input-bg);
-    color: var(--input-color);
-}
- 
-table.dataTable.stripe tbody tr.odd,
-table.dataTable.display tbody tr.odd {
-    background-color: var(--datatable-odd-row-bg) !important;
-}
- 
-table.dataTable.stripe tbody tr.even,
-table.dataTable.display tbody tr.even {
-    background-color: var(--datatable-even-row-bg) !important;
-}
- 
-table.dataTable.hover tbody tr:hover,
-table.dataTable.display tbody tr:hover {
-    background-color: var(--table-hover-bg) !important;
-}
- 
-table.dataTable.border-bottom,
-table.dataTable.border-top,
-table.dataTable thead th,
-table.dataTable tfoot th,
-table.dataTable thead td,
-table.dataTable tfoot td {
-    border-color: var(--table-border-color) !important;
-}
- 
-.table-striped>tbody>tr:nth-of-type(odd)>* {
-    --bs-table-accent-bg: var(--datatable-odd-row-bg) !important;
-    color: var(--text-color) !important;
-}
- 
-.table>:not(caption)>*>* {
-    background-color: var(--card-bg) !important;
-    color: var(--text-color) !important;
-}
- 
-.table-striped>tbody>tr {
-    background-color: var(--datatable-even-row-bg) !important;
-}
- 
-.table tbody tr td {
-    background-color: transparent !important;
-}
- 
-.table-striped>tbody>tr:nth-of-type(odd) {
-    --bs-table-accent-bg: var(--datatable-odd-row-bg) !important;
-}
- 
-.report-tabs {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 10px;
-    margin-bottom: 20px;
-}
- 
-.report-tab {
-    padding: 10px 20px;
-    border-radius: 5px;
-    background-color: var(--button-bg);
-    color: var(--button-color);
-    border: 1px solid var(--button-border);
-    cursor: pointer;
-    font-weight: 600;
-    transition: all 0.2s;
-}
- 
-.report-tab:hover {
-    background-color: var(--button-hover-bg);
-}
- 
-.report-tab.active {
-    background-color: var(--tab-active-bg);
-    color: var(--tab-active-color);
-    border-color: var(--tab-active-bg);
-}
- 
-.report-panel {
-    display: none;
-}
- 
-.report-panel.active {
-    display: block;
-}
-</style>
-</head>
-<body>
-    <div class="theme-toggle">
-        <div class="theme-icon">
-            <i class="fas fa-sun"></i>
-        </div>
-        <label class="theme-toggle-switch">
-            <input type="checkbox" id="themeToggle">
-            <span class="theme-toggle-slider"></span>
-        </label>
-        <div class="theme-icon">
-            <i class="fas fa-moon"></i>
-        </div>
-    </div>
-     
-    <div class="container-fluid">
-        <div class="dashboard-header">
-            <div class="dashboard-title">
-                <svg class="logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
-                    <path fill="#ff5722" d="M6 6H22V22H6z" transform="rotate(-180 14 14)"/>
-                    <path fill="#4caf50" d="M26 6H42V22H26z" transform="rotate(-180 34 14)"/>
-                    <path fill="#ffc107" d="M6 26H22V42H6z" transform="rotate(-180 14 34)"/>
-                    <path fill="#03a9f4" d="M26 26H42V42H26z" transform="rotate(-180 34 34)"/>
-                </svg>
-                <h1>$TenantName Intune Anomalies Report</h1>
-            </div>
-            <div class="report-date">
-                <i class="fas fa-calendar-alt me-2"></i> Report generated on: $ReportDate
-            </div>
-        </div>
-         
-        <div class="row mb-4">
-            <div class="col-md-4 mb-3">
-                <div class="stats-card permanent-bg">
-                    <i class="fas fa-exclamation-triangle"></i>
-                    <h3>Application Failures</h3>
-                    <div class="number">$applicationFailures</div>
-                </div>
-            </div>
-            <div class="col-md-4 mb-3">
-                <div class="stats-card eligible-bg">
-                    <i class="fas fa-users"></i>
-                    <h3>Multiple users on non-shared devices</h3>
-                    <div class="number">$multipleUsers</div>
-                </div>
-            </div>
-            <div class="col-md-4 mb-3">
-                <div class="stats-card group-bg">
-                    <i class="fas fa-shield-alt"></i>
-                    <h3>Not Encrypted Devices</h3>
-                    <div class="number">$notEncrypted</div>
-                </div>
-            </div>
-            <div class="col-md-4 mb-3">
-                <div class="stats-card service-principal-bg">
-                    <i class="fas fa-unlink"></i>
-                    <h3>No Autopilot Hash</h3>
-                    <div class="number">$noAutopilot</div>
-                </div>
-            </div>
-            <div class="col-md-4 mb-3">
-                <div class="stats-card disabled-bg">
-                    <i class="fas fa-clock"></i>
-                    <h3>Inactive Devices</h3>
-                    <div class="number">$inactiveDevices</div>
-                </div>
-            </div>
-            <div class="col-md-4 mb-3">
-                <div class="stats-card enabled-bg">
-                    <i class="fas fa-exclamation-circle"></i>
-                    <h3>Noncompliant Devices</h3>
-                    <div class="number">$noncompliantDevices</div>
-                </div>
-            </div>
-            <div class="col-md-4 mb-3">
-                <div class="stats-card" style="background: linear-gradient(135deg, #ff6b35, #f7931e);">
-                    <i class="fas fa-desktop"></i>
-                    <h3>OS Edition Overview</h3>
-                    <div class="number">$osEditionOverview</div>
-                </div>
-            </div>
-            <div class="col-md-4 mb-3">
-                <div class="stats-card" style="background: linear-gradient(135deg, #dc3545, #c82333);">
-                    <i class="fas fa-user-slash"></i>
-                    <h3>Disabled Primary Users</h3>
-                    <div class="number">$disabledPrimaryUsers</div>
-                </div>
-            </div>
-        </div>
- 
-        <div class="report-tabs">
-            <div class="report-tab active" data-panel="application-failures">Application Failures</div>
-            <div class="report-tab" data-panel="multiple-users">Multiple Users</div>
-            <div class="report-tab" data-panel="not-encrypted">Not Encrypted</div>
-            <div class="report-tab" data-panel="no-autopilot">No Autopilot Hash</div>
-            <div class="report-tab" data-panel="inactive-devices">Inactive Devices</div>
-            <div class="report-tab" data-panel="noncompliant-devices">Noncompliant</div>
-            <div class="report-tab" data-panel="os-edition-overview">OS Edition Overview</div>
-            <div class="report-tab" data-panel="disabled-primary-users">Disabled Primary Users</div>
-             
-        </div>
- 
-        <div id="application-failures" class="report-panel active">
-            <div class="alert alert-info mb-3" role="alert">
-                <i class="fas fa-info-circle me-2"></i>
-                <strong>Application Failures:</strong> Shows devices with failed application installations. If the failure count is high it might incidate a wrong packaged application.
-            </div>
-             
-            <div class="filter-container">
-                <div class="filter-row">
-                    <div class="filter-group">
-                        <label for="appFailuresCustomerFilter">Customer</label>
-                        <select id="appFailuresCustomerFilter" class="form-select">
-                            <option value="">All Customers</option>
-                        </select>
-                    </div>
-                    <div class="filter-group">
-                        <label for="appFailuresAppFilter">Application</label>
-                        <select id="appFailuresAppFilter" class="form-select">
-                            <option value="">All Applications</option>
-                        </select>
-                    </div>
-                    <div class="filter-group">
-                        <label for="appFailuresPlatformFilter">Platform</label>
-                        <select id="appFailuresPlatformFilter" class="form-select">
-                            <option value="">All Platforms</option>
-                        </select>
-                    </div>
-                    <div class="filter-group">
-                        <label for="appFailuresVersionFilter">Version</label>
-                        <select id="appFailuresVersionFilter" class="form-select">
-                            <option value="">All Versions</option>
-                        </select>
-                    </div>
-                    <div class="filter-group">
-                        <label for="appFailuresPercentageFilter">Failed Device Percentage</label>
-                        <select id="appFailuresPercentageFilter" class="form-select">
-                            <option value="">All Percentages</option>
-                            <option value="0-20">0-20%</option>
-                            <option value="20-40">20-40%</option>
-                            <option value="40-60">40-60%</option>
-                            <option value="60-80">60-80%</option>
-                            <option value="80-100">80-100%</option>
-                        </select>
-                    </div>
-                    <div class="filter-buttons">
-                        <button class="btn-filter btn-secondary" onclick="clearAppFailuresFilters()">Clear</button>
-                    </div>
-                </div>
-            </div>
-             
-            <div class="card">
-                <div class="card-header">
-                    <div>
-                        <i class="fas fa-exclamation-triangle"></i> Application Failures
-                    </div>
-                    <div class="show-all-container">
-                        <label class="toggle-switch">
-                            <input type="checkbox" id="appFailuresShowAllToggle">
-                            <span class="toggle-slider"></span>
-                        </label>
-                        <p class="show-all-text">Show all entries</p>
-                    </div>
-                </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table id="appFailuresTable" class="table table-striped table-bordered" style="width:100%">
-                            <thead>
-                                <tr>
-                                    <th>Customer</th>
-                                    <th>Application</th>
-                                    <th>Platform</th>
-                                    <th>Version</th>
-                                    <th>Failed Device Count</th>
-                                    <th>Failed Device Percentage</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {{APPLICATION_FAILURES_DATA}}
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
- 
-        <div id="multiple-users" class="report-panel">
-            <div class="alert alert-info mb-3" role="alert">
-                <i class="fas fa-exclamation-triangle me-2"></i>
-                <strong>Multiple Users on user-driven device:</strong> Lists user-driven devices that have multiple users logged on. These devices should typically be re-enrolled as shared devices to ensure proper configuration and security.
-            </div>
- 
-        <div class="filter-container">
-            <div class="filter-row">
-                <div class="filter-group">
-                    <label for="multipleUsersCustomerFilter">Customer</label>
-                    <select id="multipleUsersCustomerFilter" class="form-select">
-                        <option value="">All Customers</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="multipleUsersDeviceFilter">Device Name</label>
-                    <select id="multipleUsersDeviceFilter" class="form-select">
-                        <option value="">All Devices</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="multipleUsersPrimaryUserFilter">Primary User</label>
-                    <select id="multipleUsersPrimaryUserFilter" class="form-select">
-                        <option value="">All Users</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="multipleUsersProfileFilter">Enrollment Profile</label>
-                    <select id="multipleUsersProfileFilter" class="form-select">
-                        <option value="">All Profiles</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="multipleUsersCountFilter">User Count</label>
-                    <select id="multipleUsersCountFilter" class="form-select">
-                        <option value="">All Counts</option>
-                        <option value="2">2 Users</option>
-                        <option value="3">3 Users</option>
-                        <option value="4+">4+ Users</option>
-                    </select>
-                </div>
-                <div class="filter-buttons">
-                    <button class="btn-filter btn-secondary" onclick="clearMultipleUsersFilters()">Clear</button>
-                </div>
-            </div>
-        </div>
- 
-            <div class="card">
-                <div class="card-header">
-                    <div>
-                        <i class="fas fa-users"></i> Devices with Multiple Users
-                    </div>
-                    <div class="show-all-container">
-                        <label class="toggle-switch">
-                            <input type="checkbox" id="multipleUsersShowAllToggle">
-                            <span class="toggle-slider"></span>
-                        </label>
-                        <p class="show-all-text">Show all entries</p>
-                    </div>
-                </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table id="multipleUsersTable" class="table table-striped table-bordered" style="width:100%">
-                            <thead>
-                                <tr>
-                                    <th>Customer</th>
-                                    <th>Device Name</th>
-                                    <th>Primary User</th>
-                                    <th>Enrollment Profile</th>
-                                    <th>User Count</th>
-                                    <th>Logged On User IDs</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {{MULTIPLE_USERS_DATA}}
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
- 
-        <div id="not-encrypted" class="report-panel">
-            <div class="alert alert-info mb-3" role="alert">
-                <i class="fas fa-shield-alt me-2"></i>
-                <strong>Not Encrypted Devices:</strong> Displays devices that are not Bitlocker encrypted. This represents a significant security risk as data on these devices could be accessed if the device is lost or stolen.
-            </div>
- 
-        <div class="filter-container">
-            <div class="filter-row">
-                <div class="filter-group">
-                    <label for="notEncryptedCustomerFilter">Customer</label>
-                    <select id="notEncryptedCustomerFilter" class="form-select">
-                        <option value="">All Customers</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="notEncryptedDeviceFilter">Device Name</label>
-                    <select id="notEncryptedDeviceFilter" class="form-select">
-                        <option value="">All Devices</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="notEncryptedUserFilter">Primary User</label>
-                    <select id="notEncryptedUserFilter" class="form-select">
-                        <option value="">All Users</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="notEncryptedManufacturerFilter">Manufacturer</label>
-                    <select id="notEncryptedManufacturerFilter" class="form-select">
-                        <option value="">All Manufacturers</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="notEncryptedModelFilter">Model</label>
-                    <select id="notEncryptedModelFilter" class="form-select">
-                        <option value="">All Models</option>
-                    </select>
-                </div>
-                <div class="filter-buttons">
-                    <button class="btn-filter btn-secondary" onclick="clearNotEncryptedFilters()">Clear</button>
-                </div>
-            </div>
-        </div>
- 
-            <div class="card">
-                <div class="card-header">
-                    <div>
-                        <i class="fas fa-shield-alt"></i> Not Encrypted Devices
-                    </div>
-                    <div class="show-all-container">
-                        <label class="toggle-switch">
-                            <input type="checkbox" id="notEncryptedShowAllToggle">
-                            <span class="toggle-slider"></span>
-                        </label>
-                        <p class="show-all-text">Show all entries</p>
-                    </div>
-                </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table id="notEncryptedTable" class="table table-striped table-bordered" style="width:100%">
-                            <thead>
-                                <tr>
-                                    <th>Customer</th>
-                                    <th>Device Name</th>
-                                    <th>Primary User</th>
-                                    <th>Serial Number</th>
-                                    <th>Manufacturer</th>
-                                    <th>Model</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {{NOT_ENCRYPTED_DATA}}
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
- 
-        <div id="no-autopilot" class="report-panel">
-            <div class="alert alert-info mb-3" role="alert">
-                <i class="fas fa-plane me-2"></i>
-                <strong>Non-company owned devices:</strong> Shows devices that are missing their hardware hash in Autopilot. These devices can get lost or stolen, and without the hash, they cannot be managed by Autopilot. This can lead to security risks and management challenges.
-            </div>
- 
-        <div class="filter-container">
-            <div class="filter-row">
-                <div class="filter-group">
-                    <label for="noAutopilotCustomerFilter">Customer</label>
-                    <select id="noAutopilotCustomerFilter" class="form-select">
-                        <option value="">All Customers</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="noAutopilotDeviceFilter">Device Name</label>
-                    <select id="noAutopilotDeviceFilter" class="form-select">
-                        <option value="">All Devices</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="noAutopilotUserFilter">Primary User</label>
-                    <select id="noAutopilotUserFilter" class="form-select">
-                        <option value="">All Users</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="noAutopilotManufacturerFilter">Manufacturer</label>
-                    <select id="noAutopilotManufacturerFilter" class="form-select">
-                        <option value="">All Manufacturers</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="noAutopilotModelFilter">Model</label>
-                    <select id="noAutopilotModelFilter" class="form-select">
-                        <option value="">All Models</option>
-                    </select>
-                </div>
-                <div class="filter-buttons">
-                    <button class="btn-filter btn-secondary" onclick="clearNoAutopilotFilters()">Clear</button>
-                </div>
-            </div>
-        </div>
- 
-        <div class="card">
-                <div class="card-header">
-                    <div>
-                        <i class="fas fa-plane"></i> Non-company owned devices
-                    </div>
-                    <div class="show-all-container">
-                        <label class="toggle-switch">
-                            <input type="checkbox" id="noAutopilotShowAllToggle">
-                            <span class="toggle-slider"></span>
-                        </label>
-                        <p class="show-all-text">Show all entries</p>
-                    </div>
-                </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table id="noAutopilotTable" class="table table-striped table-bordered" style="width:100%">
-                            <thead>
-                                <tr>
-                                    <th>Customer</th>
-                                    <th>Device Name</th>
-                                    <th>Primary User</th>
-                                    <th>Serial Number</th>
-                                    <th>Manufacturer</th>
-                                    <th>Model</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {{NO_AUTOPILOT_DATA}}
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
- 
-        <div id="inactive-devices" class="report-panel">
-            <div class="alert alert-info mb-3" role="alert">
-                <i class="fas fa-clock me-2"></i>
-                <strong>Inactive Devices (90+ days):</strong> Lists devices that haven't contacted Intune in 90 or more days. These devices may be decommissioned, lost, or experiencing connectivity issues and should be reviewed for cleanup.
-            </div>
- 
-        <div class="filter-container">
-            <div class="filter-row">
-                <div class="filter-group">
-                    <label for="inactiveCustomerFilter">Customer</label>
-                    <select id="inactiveCustomerFilter" class="form-select">
-                        <option value="">All Customers</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="inactiveDeviceFilter">Device Name</label>
-                    <select id="inactiveDeviceFilter" class="form-select">
-                        <option value="">All Devices</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="inactiveUserFilter">Primary User</label>
-                    <select id="inactiveUserFilter" class="form-select">
-                        <option value="">All Users</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="inactiveManufacturerFilter">Manufacturer</label>
-                    <select id="inactiveManufacturerFilter" class="form-select">
-                        <option value="">All Manufacturers</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="inactiveModelFilter">Model</label>
-                    <select id="inactiveModelFilter" class="form-select">
-                        <option value="">All Models</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="inactiveInactivityFilter">Inactivity Period</label>
-                    <select id="inactiveInactivityFilter" class="form-select">
-                        <option value="">All Periods</option>
-                        <option value="90-180">90-180 days</option>
-                        <option value="180+">180+ days</option>
-                    </select>
-                </div>
-                <div class="filter-buttons">
-                    <button class="btn-filter btn-secondary" onclick="clearInactiveFilters()">Clear</button>
-                </div>
-            </div>
-        </div>
- 
-            <div class="card">
-                <div class="card-header">
-                    <div>
-                        <i class="fas fa-clock"></i> Inactive Devices (90+ days)
-                    </div>
-                    <div class="show-all-container">
-                        <label class="toggle-switch">
-                            <input type="checkbox" id="inactiveDevicesShowAllToggle">
-                            <span class="toggle-slider"></span>
-                        </label>
-                        <p class="show-all-text">Show all entries</p>
-                    </div>
-                </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table id="inactiveDevicesTable" class="table table-striped table-bordered" style="width:100%">
-                            <thead>
-                                <tr>
-                                    <th>Customer</th>
-                                    <th>Device Name</th>
-                                    <th>Primary User</th>
-                                    <th>Serial Number</th>
-                                    <th>Manufacturer</th>
-                                    <th>Model</th>
-                                    <th>Last Contact</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {{INACTIVE_DEVICES_DATA}}
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
- 
-        <div id="noncompliant-devices" class="report-panel">
-            <div class="alert alert-info mb-3" role="alert">
-                <i class="fas fa-exclamation-circle me-2"></i>
-                <strong>Noncompliant Devices:</strong> Displays devices that don't meet your organization's compliance policies. These devices may have security vulnerabilities or configuration issues that need immediate attention to maintain security standards.
-        </div>
- 
-        <div class="filter-container">
-            <div class="filter-row">
-                <div class="filter-group">
-                    <label for="noncompliantCustomerFilter">Customer</label>
-                    <select id="noncompliantCustomerFilter" class="form-select">
-                        <option value="">All Customers</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="noncompliantDeviceFilter">Device Name</label>
-                    <select id="noncompliantDeviceFilter" class="form-select">
-                        <option value="">All Devices</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="noncompliantUserFilter">Primary User</label>
-                    <select id="noncompliantUserFilter" class="form-select">
-                        <option value="">All Users</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="noncompliantManufacturerFilter">Manufacturer</label>
-                    <select id="noncompliantManufacturerFilter" class="form-select">
-                        <option value="">All Manufacturers</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="noncompliantModelFilter">Model</label>
-                    <select id="noncompliantModelFilter" class="form-select">
-                        <option value="">All Models</option>
-                    </select>
-                </div>
-                <div class="filter-group">
-                    <label for="noncompliantReasonFilter">Noncompliant Reason</label>
-                    <select id="noncompliantReasonFilter" class="form-select">
-                        <option value="">All Reasons</option>
-                    </select>
-                </div>
-                <div class="filter-buttons">
-                    <button class="btn-filter btn-secondary" onclick="clearNoncompliantFilters()">Clear</button>
-                </div>
-            </div>
-        </div>
- 
-            <div class="card">
-                <div class="card-header">
-                    <div>
-                        <i class="fas fa-exclamation-circle"></i> Noncompliant Devices
-                    </div>
-                    <div class="show-all-container">
-                        <label class="toggle-switch">
-                            <input type="checkbox" id="noncompliantShowAllToggle">
-                            <span class="toggle-slider"></span>
-                        </label>
-                        <p class="show-all-text">Show all entries</p>
-                    </div>
-                </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table id="noncompliantTable" class="table table-striped table-bordered" style="width:100%">
-                            <thead>
-                                <tr>
-                                    <th>Customer</th>
-                                    <th>Device Name</th>
-                                    <th>Primary User</th>
-                                    <th>Serial Number</th>
-                                    <th>Manufacturer</th>
-                                    <th>Model</th>
-                                    <th>Compliance Status</th>
-                                    <th>Noncompliant Based On</th>
-                                    <th>Noncompliant Alert</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {{NONCOMPLIANT_DEVICES_DATA}}
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
- 
-        <div id="os-edition-overview" class="report-panel">
-            <div class="alert alert-info mb-3" role="alert">
-                <i class="fas fa-desktop me-2"></i>
-                <strong>Operating System Edition Overview:</strong> Provides a comprehensive view of device operating system editions across your environment. This helps identify devices that may need OS edition upgrades (e.g., Pro to Enterprise) for enhanced management and security features.
-            </div>
- 
-            <div class="filter-container">
-                <div class="filter-row">
-                    <div class="filter-group">
-                        <label for="osEditionCustomerFilter">Customer</label>
-                        <select id="osEditionCustomerFilter" class="form-select">
-                            <option value="">All Customers</option>
-                        </select>
-                    </div>
-                    <div class="filter-group">
-                        <label for="osEditionDeviceFilter">Device Name</label>
-                        <select id="osEditionDeviceFilter" class="form-select">
-                            <option value="">All Devices</option>
-                        </select>
-                    </div>
-                    <div class="filter-group">
-                        <label for="osEditionUserFilter">Primary User</label>
-                        <select id="osEditionUserFilter" class="form-select">
-                            <option value="">All Users</option>
-                        </select>
-                    </div>
-                    <div class="filter-group">
-                        <label for="osEditionEditionFilter">OS Edition</label>
-                        <select id="osEditionEditionFilter" class="form-select">
-                            <option value="">All Editions</option>
-                        </select>
-                    </div>
-                    <div class="filter-group">
-                        <label for="osEditionFriendlyNameFilter">OS Friendly Name</label>
-                        <select id="osEditionFriendlyNameFilter" class="form-select">
-                            <option value="">All OS Versions</option>
-                        </select>
-                    </div>
-                    <div class="filter-buttons">
-                        <button class="btn-filter btn-secondary" onclick="clearOSEditionFilters()">Clear</button>
-                    </div>
-                </div>
-            </div>
- 
-            <div class="card">
-                <div class="card-header">
-                    <div>
-                        <i class="fas fa-desktop"></i> Operating System Edition Overview
-                    </div>
-                    <div class="show-all-container">
-                        <label class="toggle-switch">
-                            <input type="checkbox" id="osEditionShowAllToggle">
-                            <span class="toggle-slider"></span>
-                        </label>
-                        <p class="show-all-text">Show all entries</p>
-                    </div>
-                </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table id="osEditionTable" class="table table-striped table-bordered" style="width:100%">
-                            <thead>
-                                <tr>
-                                    <th>Customer</th>
-                                    <th>Device Name</th>
-                                    <th>Primary User</th>
-                                    <th>Operating System Edition</th>
-                                    <th>OS Friendly Name</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {{OS_EDITION_OVERVIEW_DATA}}
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
- 
-        <div id="disabled-primary-users" class="report-panel">
-            <div class="alert alert-info mb-3" role="alert">
-                <i class="fas fa-user-slash me-2"></i>
-                <strong>Devices with Disabled Primary Users:</strong> Shows devices where the primary user account has been disabled in Microsoft Entra ID. These devices may need to be reassigned to active users or cleaned up to maintain security and proper device management.
-            </div>
- 
-            <div class="filter-container">
-                <div class="filter-row">
-                    <div class="filter-group">
-                        <label for="disabledUsersCustomerFilter">Customer</label>
-                        <select id="disabledUsersCustomerFilter" class="form-select">
-                            <option value="">All Customers</option>
-                        </select>
-                    </div>
-                    <div class="filter-group">
-                        <label for="disabledUsersDeviceFilter">Device Name</label>
-                        <select id="disabledUsersDeviceFilter" class="form-select">
-                            <option value="">All Devices</option>
-                        </select>
-                    </div>
-                    <div class="filter-group">
-                        <label for="disabledUsersUserFilter">Primary User</label>
-                        <select id="disabledUsersUserFilter" class="form-select">
-                            <option value="">All Users</option>
-                        </select>
-                    </div>
-                    <div class="filter-group">
-                        <label for="disabledUsersManufacturerFilter">Manufacturer</label>
-                        <select id="disabledUsersManufacturerFilter" class="form-select">
-                            <option value="">All Manufacturers</option>
-                        </select>
-                    </div>
-                    <div class="filter-group">
-                        <label for="disabledUsersModelFilter">Model</label>
-                        <select id="disabledUsersModelFilter" class="form-select">
-                            <option value="">All Models</option>
-                        </select>
-                    </div>
-                    <div class="filter-buttons">
-                        <button class="btn-filter btn-secondary" onclick="clearDisabledUsersFilters()">Clear</button>
-                    </div>
-                </div>
-            </div>
- 
-            <div class="card">
-                <div class="card-header">
-                    <div>
-                        <i class="fas fa-user-slash"></i> Devices with Disabled Primary Users
-                    </div>
-                    <div class="show-all-container">
-                        <label class="toggle-switch">
-                            <input type="checkbox" id="disabledUsersShowAllToggle">
-                            <span class="toggle-slider"></span>
-                        </label>
-                        <p class="show-all-text">Show all entries</p>
-                    </div>
-                </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table id="disabledUsersTable" class="table table-striped table-bordered" style="width:100%">
-                            <thead>
-                                <tr>
-                                    <th>Customer</th>
-                                    <th>Device Name</th>
-                                    <th>Primary User</th>
-                                    <th>Serial Number</th>
-                                    <th>Manufacturer</th>
-                                    <th>Model</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {{DISABLED_PRIMARY_USERS_DATA}}
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-         
-    </div>
-    <footer>
-        <p>Generated by Roy Klooster - RK Solutions</p>
-    </footer>
-     
-    <script>
-        $(document).ready(function() {
-            const themeToggle = document.getElementById('themeToggle');
-            const prefersDarkScheme = window.matchMedia('(prefers-color-scheme: dark)');
-             
-            function updateTableColors() {
-                if (document.documentElement.getAttribute('data-theme') === 'dark') {
-                    $('table.dataTable tbody tr').css('background-color', 'var(--datatable-even-row-bg)');
-                    $('table.dataTable tbody tr:nth-child(odd)').css('background-color', 'var(--datatable-odd-row-bg)');
-                    $('table.dataTable tbody td').css('color', 'var(--text-color)');
-                    $('table.dataTable thead th').css({
-                        'background-color': 'var(--table-header-bg)',
-                        'color': 'var(--table-header-color)'
-                    });
-                } else {
-                    $('table.dataTable tbody tr').css('background-color', 'var(--datatable-even-row-bg)');
-                    $('table.dataTable tbody tr:nth-child(odd)').css('background-color', 'var(--datatable-odd-row-bg)');
-                    $('table.dataTable tbody td').css('color', 'var(--text-color)');
-                    $('table.dataTable thead th').css({
-                        'background-color': 'var(--table-header-bg)',
-                        'color': 'var(--table-header-color)'
-                    });
-                }
-            }
-             
-            const savedTheme = localStorage.getItem('theme');
-            if (savedTheme === 'dark' || (!savedTheme && prefersDarkScheme.matches)) {
-                document.documentElement.setAttribute('data-theme', 'dark');
-                themeToggle.checked = true;
-            }
-             
-            themeToggle.addEventListener('change', function() {
-                if (this.checked) {
-                    document.documentElement.setAttribute('data-theme', 'dark');
-                    localStorage.setItem('theme', 'dark');
-                } else {
-                    document.documentElement.setAttribute('data-theme', 'light');
-                    localStorage.setItem('theme', 'light');
-                }
-                setTimeout(updateTableColors, 50);
-            });
-             
-            $('.report-tab').on('click', function() {
-                $('.report-tab').removeClass('active');
-                $('.report-panel').removeClass('active');
-                $(this).addClass('active');
-                const panelId = $(this).data('panel');
-                $(`#${panelId}`).addClass('active');
-                setTimeout(function() {
-                    $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
-                }, 10);
-            });
-             
-            const tableOptions = {
-                dom: 'Bfrtip',
-                buttons: [
-                    { extend: 'collection', text: '<i class="fas fa-download"></i> Export',
-                    buttons: [
-                        { extend: 'excel', text: '<i class="fas fa-file-excel"></i> Excel', exportOptions: { columns: ':visible' } },
-                        { extend: 'csv', text: '<i class="fas fa-file-csv"></i> CSV', exportOptions: { columns: ':visible' } },
-                        { extend: 'pdf', text: '<i class="fas fa-file-pdf"></i> PDF', exportOptions: { columns: ':visible' } },
-                        { extend: 'print', text: '<i class="fas fa-print"></i> Print', exportOptions: { columns: ':visible' } }
-                    ]
-                    },
-                    { extend: 'colvis', text: '<i class="fas fa-columns"></i> Columns' }
-                ],
-                paging: true, searching: true, ordering: true, info: true, responsive: true,
-                lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
-                order: [[1, 'asc']],
-                language: { search: "<i class='fas fa-search'></i> _INPUT_", searchPlaceholder: "Search records..." },
-                drawCallback: function() { updateTableColors(); }
-            };
-             
-            const appFailuresTable = $('#appFailuresTable').DataTable(tableOptions);
-            const multipleUsersTable = $('#multipleUsersTable').DataTable({...tableOptions, order: [[4, 'desc']]});
-            const notEncryptedTable = $('#notEncryptedTable').DataTable(tableOptions);
-            const noAutopilotTable = $('#noAutopilotTable').DataTable(tableOptions);
-            const inactiveDevicesTable = $('#inactiveDevicesTable').DataTable({...tableOptions, order: [[6, 'asc']]});
-            const noncompliantTable = $('#noncompliantTable').DataTable(tableOptions);
-            const osEditionTable = $('#osEditionTable').DataTable(tableOptions);
-            const disabledUsersTable = $('#disabledUsersTable').DataTable(tableOptions);
-             
-            // Populate filter dropdowns
-            function populateFilters() {
-                // Application Failures filters
-                populateSelectFromColumn('appFailuresCustomerFilter', appFailuresTable, 0); // Customer
-                populateSelectFromColumn('appFailuresAppFilter', appFailuresTable, 1); // Application
-                populateSelectFromColumn('appFailuresPlatformFilter', appFailuresTable, 2); // Platform
-                populateSelectFromColumn('appFailuresVersionFilter', appFailuresTable, 3); // Version
-                // Note: Percentage filter uses predefined ranges, no need to populate from data
-                 
-                // Multiple Users filters
-                populateSelectFromColumn('multipleUsersCustomerFilter', multipleUsersTable, 0);
-                populateSelectFromColumn('multipleUsersDeviceFilter', multipleUsersTable, 1);
-                populateSelectFromColumn('multipleUsersPrimaryUserFilter', multipleUsersTable, 2);
-                populateSelectFromColumn('multipleUsersProfileFilter', multipleUsersTable, 3);
-                 
-                // Not Encrypted filters
-                populateSelectFromColumn('notEncryptedCustomerFilter', notEncryptedTable, 0);
-                populateSelectFromColumn('notEncryptedDeviceFilter', notEncryptedTable, 1);
-                populateSelectFromColumn('notEncryptedUserFilter', notEncryptedTable, 2);
-                populateSelectFromColumn('notEncryptedManufacturerFilter', notEncryptedTable, 4);
-                populateSelectFromColumn('notEncryptedModelFilter', notEncryptedTable, 5);
-                 
-                // No Autopilot filters
-                populateSelectFromColumn('noAutopilotCustomerFilter', noAutopilotTable, 0);
-                populateSelectFromColumn('noAutopilotDeviceFilter', noAutopilotTable, 1);
-                populateSelectFromColumn('noAutopilotUserFilter', noAutopilotTable, 2);
-                populateSelectFromColumn('noAutopilotManufacturerFilter', noAutopilotTable, 4);
-                populateSelectFromColumn('noAutopilotModelFilter', noAutopilotTable, 5);
-                 
-                // Inactive Devices filters
-                populateSelectFromColumn('inactiveCustomerFilter', inactiveDevicesTable, 0);
-                populateSelectFromColumn('inactiveDeviceFilter', inactiveDevicesTable, 1);
-                populateSelectFromColumn('inactiveUserFilter', inactiveDevicesTable, 2);
-                populateSelectFromColumn('inactiveManufacturerFilter', inactiveDevicesTable, 4);
-                populateSelectFromColumn('inactiveModelFilter', inactiveDevicesTable, 5);
-                 
-                // Noncompliant Devices filters
-                populateSelectFromColumn('noncompliantCustomerFilter', noncompliantTable, 0);
-                populateSelectFromColumn('noncompliantDeviceFilter', noncompliantTable, 1);
-                populateSelectFromColumn('noncompliantUserFilter', noncompliantTable, 2);
-                populateSelectFromColumn('noncompliantManufacturerFilter', noncompliantTable, 4);
-                populateSelectFromColumn('noncompliantModelFilter', noncompliantTable, 5);
-                populateSelectFromColumn('noncompliantReasonFilter', noncompliantTable, 7);
- 
-                // OS Edition Overview filters
-                populateSelectFromColumn('osEditionCustomerFilter', osEditionTable, 0);
-                populateSelectFromColumn('osEditionDeviceFilter', osEditionTable, 1);
-                populateSelectFromColumn('osEditionUserFilter', osEditionTable, 2);
-                populateSelectFromColumn('osEditionEditionFilter', osEditionTable, 3);
-                populateSelectFromColumn('osEditionFriendlyNameFilter', osEditionTable, 4);
- 
-                // Disabled Primary Users filters
-                populateSelectFromColumn('disabledUsersCustomerFilter', disabledUsersTable, 0);
-                populateSelectFromColumn('disabledUsersDeviceFilter', disabledUsersTable, 1);
-                populateSelectFromColumn('disabledUsersUserFilter', disabledUsersTable, 2);
-                populateSelectFromColumn('disabledUsersManufacturerFilter', disabledUsersTable, 4);
-                populateSelectFromColumn('disabledUsersModelFilter', disabledUsersTable, 5);
-            }
-             
-            function populateSelectFromColumn(selectId, table, columnIndex) {
-                const values = [...new Set(table.column(columnIndex).data().toArray())].sort();
-                const select = $(`#${selectId}`);
-                values.forEach(value => {
-                    if (value && value.trim() !== '') {
-                        select.append(`<option value="${value}">${value}</option>`);
-                    }
-                });
-            }
-             
-            // Application Failures filter functions
-            window.applyAppFailuresFilters = function() {
-                const customerFilter = $('#appFailuresCustomerFilter').val();
-                const appFilter = $('#appFailuresAppFilter').val();
-                const platformFilter = $('#appFailuresPlatformFilter').val();
-                const versionFilter = $('#appFailuresVersionFilter').val();
-                const percentageFilter = $('#appFailuresPercentageFilter').val();
-                 
-                appFailuresTable.columns().search('').draw();
-                 
-                if (customerFilter) appFailuresTable.column(0).search('^' + customerFilter + '$', true, false);
-                if (appFilter) appFailuresTable.column(1).search('^' + appFilter + '$', true, false);
-                if (platformFilter) appFailuresTable.column(2).search('^' + platformFilter + '$', true, false);
-                if (versionFilter) appFailuresTable.column(3).search('^' + versionFilter + '$', true, false);
-                if (percentageFilter) {
-                    let regex = '';
-                    if (percentageFilter === '0-20') {
-                        regex = '^(0|[1-9]|1[0-9]|20)%$';
-                    } else if (percentageFilter === '20-40') {
-                        regex = '^(2[0-9]|3[0-9]|40)%$';
-                    } else if (percentageFilter === '40-60') {
-                        regex = '^(4[0-9]|5[0-9]|60)%$';
-                    } else if (percentageFilter === '60-80') {
-                        regex = '^(6[0-9]|7[0-9]|80)%$';
-                    } else if (percentageFilter === '80-100') {
-                        regex = '^(8[0-9]|9[0-9]|100)%$';
-                    }
-                    if (regex) appFailuresTable.column(5).search(regex, true, false);
-                }
-                 
-                appFailuresTable.draw();
-            };
- 
-            window.clearAppFailuresFilters = function() {
-                $('#appFailuresCustomerFilter, #appFailuresAppFilter, #appFailuresPlatformFilter, #appFailuresVersionFilter, #appFailuresPercentageFilter').val('');
-                appFailuresTable.search('').columns().search('').draw();
-            };
- 
-            // Multiple Users filter functions
-            window.applyMultipleUsersFilters = function() {
-                const customerFilter = $('#multipleUsersCustomerFilter').val();
-                const deviceFilter = $('#multipleUsersDeviceFilter').val();
-                const userFilter = $('#multipleUsersPrimaryUserFilter').val();
-                const profileFilter = $('#multipleUsersProfileFilter').val();
-                const countFilter = $('#multipleUsersCountFilter').val();
-                 
-                multipleUsersTable.columns().search('').draw();
-                 
-                if (customerFilter) multipleUsersTable.column(0).search('^' + customerFilter + '$', true, false);
-                if (deviceFilter) multipleUsersTable.column(1).search('^' + deviceFilter + '$', true, false);
-                if (userFilter) multipleUsersTable.column(2).search('^' + userFilter + '$', true, false);
-                if (profileFilter) multipleUsersTable.column(3).search('^' + profileFilter + '$', true, false);
-                if (countFilter) {
-                    if (countFilter === '2') multipleUsersTable.column(4).search('^2$', true, false);
-                    else if (countFilter === '3') multipleUsersTable.column(4).search('^3$', true, false);
-                    else if (countFilter === '4+') multipleUsersTable.column(4).search('[4-9]|[1-9][0-9]+', true, false);
-                }
-                 
-                multipleUsersTable.draw();
-            };
- 
-            window.clearMultipleUsersFilters = function() {
-                $('#multipleUsersCustomerFilter, #multipleUsersDeviceFilter, #multipleUsersPrimaryUserFilter, #multipleUsersProfileFilter, #multipleUsersCountFilter').val('');
-                multipleUsersTable.search('').columns().search('').draw();
-            };
- 
-            // Not Encrypted filter functions
-            window.applyNotEncryptedFilters = function() {
-                const customerFilter = $('#notEncryptedCustomerFilter').val();
-                const deviceFilter = $('#notEncryptedDeviceFilter').val();
-                const userFilter = $('#notEncryptedUserFilter').val();
-                const manufacturerFilter = $('#notEncryptedManufacturerFilter').val();
-                const modelFilter = $('#notEncryptedModelFilter').val();
-                 
-                notEncryptedTable.columns().search('').draw();
-                 
-                if (customerFilter) notEncryptedTable.column(0).search('^' + customerFilter + '$', true, false);
-                if (deviceFilter) notEncryptedTable.column(1).search('^' + deviceFilter + '$', true, false);
-                if (userFilter) notEncryptedTable.column(2).search('^' + userFilter + '$', true, false);
-                if (manufacturerFilter) notEncryptedTable.column(4).search('^' + manufacturerFilter + '$', true, false);
-                if (modelFilter) notEncryptedTable.column(5).search('^' + modelFilter + '$', true, false);
-                 
-                notEncryptedTable.draw();
-            };
- 
-            window.clearNotEncryptedFilters = function() {
-                $('#notEncryptedCustomerFilter, #notEncryptedDeviceFilter, #notEncryptedUserFilter, #notEncryptedManufacturerFilter, #notEncryptedModelFilter').val('');
-                notEncryptedTable.search('').columns().search('').draw();
-            };
- 
-            // No Autopilot filter functions
-            window.applyNoAutopilotFilters = function() {
-                const customerFilter = $('#noAutopilotCustomerFilter').val();
-                const deviceFilter = $('#noAutopilotDeviceFilter').val();
-                const userFilter = $('#noAutopilotUserFilter').val();
-                const manufacturerFilter = $('#noAutopilotManufacturerFilter').val();
-                const modelFilter = $('#noAutopilotModelFilter').val();
-                 
-                noAutopilotTable.columns().search('').draw();
-                 
-                if (customerFilter) noAutopilotTable.column(0).search('^' + customerFilter + '$', true, false);
-                if (deviceFilter) noAutopilotTable.column(1).search('^' + deviceFilter + '$', true, false);
-                if (userFilter) noAutopilotTable.column(2).search('^' + userFilter + '$', true, false);
-                if (manufacturerFilter) noAutopilotTable.column(4).search('^' + manufacturerFilter + '$', true, false);
-                if (modelFilter) noAutopilotTable.column(5).search('^' + modelFilter + '$', true, false);
-                 
-                noAutopilotTable.draw();
-            };
- 
-            window.clearNoAutopilotFilters = function() {
-                $('#noAutopilotCustomerFilter, #noAutopilotDeviceFilter, #noAutopilotUserFilter, #noAutopilotManufacturerFilter, #noAutopilotModelFilter').val('');
-                noAutopilotTable.search('').columns().search('').draw();
-            };
- 
-            // Inactive Devices filter functions
-            window.applyInactiveFilters = function() {
-                const customerFilter = $('#inactiveCustomerFilter').val();
-                const deviceFilter = $('#inactiveDeviceFilter').val();
-                const userFilter = $('#inactiveUserFilter').val();
-                const manufacturerFilter = $('#inactiveManufacturerFilter').val();
-                const modelFilter = $('#inactiveModelFilter').val();
-                const inactivityFilter = $('#inactiveInactivityFilter').val();
-                 
-                inactiveDevicesTable.columns().search('').draw();
-                 
-                if (customerFilter) inactiveDevicesTable.column(0).search('^' + customerFilter + '$', true, false);
-                if (deviceFilter) inactiveDevicesTable.column(1).search('^' + deviceFilter + '$', true, false);
-                if (userFilter) inactiveDevicesTable.column(2).search('^' + userFilter + '$', true, false);
-                if (manufacturerFilter) inactiveDevicesTable.column(4).search('^' + manufacturerFilter + '$', true, false);
-                if (modelFilter) inactiveDevicesTable.column(5).search('^' + modelFilter + '$', true, false);
-                 
-                inactiveDevicesTable.draw();
-            };
- 
-            window.clearInactiveFilters = function() {
-                $('#inactiveCustomerFilter, #inactiveDeviceFilter, #inactiveUserFilter, #inactiveManufacturerFilter, #inactiveModelFilter, #inactiveInactivityFilter').val('');
-                inactiveDevicesTable.search('').columns().search('').draw();
-            };
- 
-            // Noncompliant Devices filter functions
-            window.applyNoncompliantFilters = function() {
-                const customerFilter = $('#noncompliantCustomerFilter').val();
-                const deviceFilter = $('#noncompliantDeviceFilter').val();
-                const userFilter = $('#noncompliantUserFilter').val();
-                const manufacturerFilter = $('#noncompliantManufacturerFilter').val();
-                const modelFilter = $('#noncompliantModelFilter').val();
-                const reasonFilter = $('#noncompliantReasonFilter').val();
-                 
-                noncompliantTable.columns().search('').draw();
-                 
-                if (customerFilter) noncompliantTable.column(0).search('^' + customerFilter + '$', true, false);
-                if (deviceFilter) noncompliantTable.column(1).search('^' + deviceFilter + '$', true, false);
-                if (userFilter) noncompliantTable.column(2).search('^' + userFilter + '$', true, false);
-                if (manufacturerFilter) noncompliantTable.column(4).search('^' + manufacturerFilter + '$', true, false);
-                if (modelFilter) noncompliantTable.column(5).search('^' + modelFilter + '$', true, false);
-                if (reasonFilter) noncompliantTable.column(7).search('^' + reasonFilter + '$', true, false);
-                 
-                noncompliantTable.draw();
-            };
- 
-            // OS Edition Overview filter functions
-            window.applyOSEditionFilters = function() {
-                const customerFilter = $('#osEditionCustomerFilter').val();
-                const deviceFilter = $('#osEditionDeviceFilter').val();
-                const userFilter = $('#osEditionUserFilter').val();
-                const editionFilter = $('#osEditionEditionFilter').val();
-                const friendlyNameFilter = $('#osEditionFriendlyNameFilter').val();
-                 
-                osEditionTable.columns().search('').draw();
-                 
-                if (customerFilter) osEditionTable.column(0).search('^' + customerFilter + '$', true, false);
-                if (deviceFilter) osEditionTable.column(1).search('^' + deviceFilter + '$', true, false);
-                if (userFilter) osEditionTable.column(2).search('^' + userFilter + '$', true, false);
-                if (editionFilter) osEditionTable.column(3).search('^' + editionFilter + '$', true, false);
-                if (friendlyNameFilter) osEditionTable.column(4).search('^' + friendlyNameFilter + '$', true, false);
-                 
-                osEditionTable.draw();
-            };
- 
-            // Disabled Primary Users filter functions
-            window.applyDisabledUsersFilters = function() {
-                const customerFilter = $('#disabledUsersCustomerFilter').val();
-                const deviceFilter = $('#disabledUsersDeviceFilter').val();
-                const userFilter = $('#disabledUsersUserFilter').val();
-                const manufacturerFilter = $('#disabledUsersManufacturerFilter').val();
-                const modelFilter = $('#disabledUsersModelFilter').val();
-                 
-                disabledUsersTable.columns().search('').draw();
-                 
-                if (customerFilter) disabledUsersTable.column(0).search('^' + customerFilter + '$', true, false);
-                if (deviceFilter) disabledUsersTable.column(1).search('^' + deviceFilter + '$', true, false);
-                if (userFilter) disabledUsersTable.column(2).search('^' + userFilter + '$', true, false);
-                if (manufacturerFilter) disabledUsersTable.column(4).search('^' + manufacturerFilter + '$', true, false);
-                if (modelFilter) disabledUsersTable.column(5).search('^' + modelFilter + '$', true, false);
-                 
-                disabledUsersTable.draw();
-            };
- 
-            window.clearDisabledUsersFilters = function() {
-                $('#disabledUsersCustomerFilter, #disabledUsersDeviceFilter, #disabledUsersUserFilter, #disabledUsersManufacturerFilter, #disabledUsersModelFilter').val('');
-                disabledUsersTable.search('').columns().search('').draw();
-            };
- 
-            // Auto-apply filters on change - Disabled Primary Users
-            $('#disabledUsersCustomerFilter, #disabledUsersDeviceFilter, #disabledUsersUserFilter, #disabledUsersManufacturerFilter, #disabledUsersModelFilter').on('change', function() {
-                applyDisabledUsersFilters();
-            });
- 
-            $('#disabledUsersShowAllToggle').on('change', function() {
-                disabledUsersTable.page.len($(this).is(':checked') ? -1 : 10).draw();
-            });
- 
-            window.clearOSEditionFilters = function() {
-                $('#osEditionCustomerFilter, #osEditionDeviceFilter, #osEditionUserFilter, #osEditionEditionFilter, #osEditionFriendlyNameFilter').val('');
-                osEditionTable.search('').columns().search('').draw();
-            };
- 
-            window.clearNoncompliantFilters = function() {
-                $('#noncompliantCustomerFilter, #noncompliantDeviceFilter, #noncompliantUserFilter, #noncompliantManufacturerFilter, #noncompliantModelFilter, #noncompliantReasonFilter').val('');
-                noncompliantTable.search('').columns().search('').draw();
-            };
- 
-            // Add automatic filter event listeners after the tables are initialized
-            // Add this after the existing table initialization code and before the setTimeout function:
- 
-            // Auto-apply filters on change - Application Failures
-            $('#appFailuresCustomerFilter, #appFailuresAppFilter, #appFailuresPlatformFilter, #appFailuresVersionFilter, #appFailuresPercentageFilter').on('change', function() {
-                applyAppFailuresFilters();
-            });
- 
-            // Auto-apply filters on change - Multiple Users
-            $('#multipleUsersCustomerFilter, #multipleUsersDeviceFilter, #multipleUsersPrimaryUserFilter, #multipleUsersProfileFilter, #multipleUsersCountFilter').on('change', function() {
-                applyMultipleUsersFilters();
-            });
- 
-            // Auto-apply filters on change - Not Encrypted
-            $('#notEncryptedCustomerFilter, #notEncryptedDeviceFilter, #notEncryptedUserFilter, #notEncryptedManufacturerFilter, #notEncryptedModelFilter').on('change', function() {
-                applyNotEncryptedFilters();
-            });
- 
-            // Auto-apply filters on change - No Autopilot
-            $('#noAutopilotCustomerFilter, #noAutopilotDeviceFilter, #noAutopilotUserFilter, #noAutopilotManufacturerFilter, #noAutopilotModelFilter').on('change', function() {
-                applyNoAutopilotFilters();
-            });
- 
-            // Auto-apply filters on change - Inactive Devices
-            $('#inactiveCustomerFilter, #inactiveDeviceFilter, #inactiveUserFilter, #inactiveManufacturerFilter, #inactiveModelFilter, #inactiveInactivityFilter').on('change', function() {
-                applyInactiveFilters();
-            });
- 
-            // Auto-apply filters on change - Noncompliant Devices
-            $('#noncompliantCustomerFilter, #noncompliantDeviceFilter, #noncompliantUserFilter, #noncompliantManufacturerFilter, #noncompliantModelFilter, #noncompliantReasonFilter').on('change', function() {
-                applyNoncompliantFilters();
-            });
- 
-            // Auto-apply filters on change - OS Edition Overview
-            $('#osEditionCustomerFilter, #osEditionDeviceFilter, #osEditionUserFilter, #osEditionEditionFilter, #osEditionFriendlyNameFilter').on('change', function() {
-                applyOSEditionFilters();
-            });
-             
-            // Show all toggle functions for each table
-            $('#appFailuresShowAllToggle').on('change', function() {
-                appFailuresTable.page.len($(this).is(':checked') ? -1 : 10).draw();
-            });
-             
-            $('#multipleUsersShowAllToggle').on('change', function() {
-                multipleUsersTable.page.len($(this).is(':checked') ? -1 : 10).draw();
-            });
-             
-            $('#notEncryptedShowAllToggle').on('change', function() {
-                notEncryptedTable.page.len($(this).is(':checked') ? -1 : 10).draw();
-            });
-             
-            $('#noAutopilotShowAllToggle').on('change', function() {
-                noAutopilotTable.page.len($(this).is(':checked') ? -1 : 10).draw();
-            });
-             
-            $('#inactiveDevicesShowAllToggle').on('change', function() {
-                inactiveDevicesTable.page.len($(this).is(':checked') ? -1 : 10).draw();
-            });
-             
-            $('#noncompliantShowAllToggle').on('change', function() {
-                noncompliantTable.page.len($(this).is(':checked') ? -1 : 10).draw();
-            });
- 
-            $('#osEditionShowAllToggle').on('change', function() {
-                osEditionTable.page.len($(this).is(':checked') ? -1 : 10).draw();
-            });
-             
-            setTimeout(function() {
-                populateFilters();
-                updateTableColors();
-            }, 100);
-             
-            $(window).on('load', function() {
-                setTimeout(updateTableColors, 200);
-            });
-        });
-        </script>
-</body>
-</html>
-'@
-    
     # Generate table rows for all application failures
     $applicationFailureRows = ""
     foreach ($item in $Report_ApplicationFailureReport) {
         $applicationFailureRows += @"
         <tr>
-            <td>$($item.Customer)</td>
-            <td>$($item.Application)</td>
-            <td>$($item.Platform)</td>
-            <td>$($item.Version)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Customer))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Application))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Platform))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Version))</td>
             <td>$($item.FailedDeviceCount)</td>
             <td>$($item.FailedDevicePercentage)%</td>
         </tr>
@@ -1988,12 +64,12 @@ table.dataTable tfoot td {
     foreach ($item in $Report_DevicesWithMultipleUsers) {
         $multipleUsersRows += @"
         <tr>
-            <td>$($item.Customer)</td>
-            <td>$($item.DeviceName)</td>
-            <td>$($item.PrimaryUser)</td>
-            <td>$($item.EnrollmentProfile)</td>
-            <td><span class="badge badge-permanent">$($item.usersLoggedOnCount)</span></td>
-            <td>$($item.usersLoggedOnIds)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Customer))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceName))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.PrimaryUser))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.EnrollmentProfile))</td>
+            <td><span class="rk-badge rk-badge-warn">$($item.usersLoggedOnCount)</span></td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.usersLoggedOnIds))</td>
         </tr>
 "@
     }
@@ -2003,12 +79,12 @@ table.dataTable tfoot td {
     foreach ($item in $Report_NotEncryptedDevices) {
         $notEncryptedRows += @"
         <tr>
-            <td>$($item.Customer)</td>
-            <td>$($item.DeviceName)</td>
-            <td>$($item.PrimaryUser)</td>
-            <td>$($item.Serialnumber)</td>
-            <td>$($item.DeviceManufacturer)</td>
-            <td>$($item.DeviceModel)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Customer))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceName))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.PrimaryUser))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Serialnumber))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceManufacturer))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceModel))</td>
         </tr>
 "@
     }
@@ -2018,12 +94,12 @@ table.dataTable tfoot td {
     foreach ($item in $Report_DevicesWithoutAutopilotHash) {
         $noAutopilotHashRows += @"
         <tr>
-            <td>$($item.Customer)</td>
-            <td>$($item.DeviceName)</td>
-            <td>$($item.PrimaryUser)</td>
-            <td>$($item.Serialnumber)</td>
-            <td>$($item.DeviceManufacturer)</td>
-            <td>$($item.DeviceModel)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Customer))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceName))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.PrimaryUser))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Serialnumber))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceManufacturer))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceModel))</td>
         </tr>
 "@
     }
@@ -2033,13 +109,13 @@ table.dataTable tfoot td {
     foreach ($item in $Report_InactiveDevices) {
         $inactiveDevicesRows += @"
         <tr>
-            <td>$($item.Customer)</td>
-            <td>$($item.DeviceName)</td>
-            <td>$($item.PrimaryUser)</td>
-            <td>$($item.Serialnumber)</td>
-            <td>$($item.DeviceManufacturer)</td>
-            <td>$($item.DeviceModel)</td>
-            <td>$($item.LastContact)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Customer))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceName))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.PrimaryUser))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Serialnumber))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceManufacturer))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceModel))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.LastContact))</td>
         </tr>
 "@
     }
@@ -2047,33 +123,33 @@ table.dataTable tfoot td {
     # Generate table rows for noncompliant devices
     $noncompliantDevicesRows = ""
     foreach ($item in $Report_NoncompliantDevices) {
-        $statusBadge = '<span class="badge badge-permanent">Noncompliant</span>'
-        
+        $statusBadge = '<span class="rk-badge rk-badge-error">Noncompliant</span>'
+
         $noncompliantDevicesRows += @"
         <tr>
-            <td>$($item.Customer)</td>
-            <td>$($item.DeviceName)</td>
-            <td>$($item.PrimaryUser)</td>
-            <td>$($item.Serialnumber)</td>
-            <td>$($item.DeviceManufacturer)</td>
-            <td>$($item.DeviceModel)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Customer))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceName))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.PrimaryUser))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Serialnumber))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceManufacturer))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceModel))</td>
             <td>$statusBadge</td>
-            <td>$($item.NoncompliantBasedOn)</td>
-            <td>$($item.NoncompliantAlert)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.NoncompliantBasedOn))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.NoncompliantAlert))</td>
         </tr>
 "@
     }
 
     # Generate table rows for OS Edition Overview
     $osEditionOverviewRows = ""
-    foreach ($item in $Report_OperationSystemEdtionOverview) {
+    foreach ($item in $Report_OperatingSystemEditionOverview) {
         $osEditionOverviewRows += @"
         <tr>
-            <td>$($item.Customer)</td>
-            <td>$($item.DeviceName)</td>
-            <td>$($item.PrimaryUser)</td>
-            <td>$($item.OperatingSystemEdition)</td>
-            <td>$($item.OSFriendlyname)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Customer))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceName))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.PrimaryUser))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.OperatingSystemEdition))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.OSFriendlyname))</td>
         </tr>
 "@
     }
@@ -2083,36 +159,892 @@ table.dataTable tfoot td {
     foreach ($item in $Report_DisabledPrimaryUsers) {
         $disabledPrimaryUsersRows += @"
         <tr>
-            <td>$($item.Customer)</td>
-            <td>$($item.DeviceName)</td>
-            <td><span class="badge badge-permanent">$($item.PrimaryUser)</span></td>
-            <td>$($item.Serialnumber)</td>
-            <td>$($item.DeviceManufacturer)</td>
-            <td>$($item.DeviceModel)</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Customer))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceName))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.PrimaryUser))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.Serialnumber))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceManufacturer))</td>
+            <td>$([System.Net.WebUtility]::HtmlEncode($item.DeviceModel))</td>
         </tr>
 "@
     }
 
-    # Replace placeholders in template with actual values
-    $htmlContent = $htmlTemplate
-    $htmlContent = $htmlContent.Replace('$TenantName', $TenantName)
-    $htmlContent = $htmlContent.Replace('$ReportDate', $currentDate)
-    $htmlContent = $htmlContent.Replace('{{APPLICATION_FAILURES_DATA}}', $applicationFailureRows)
-    $htmlContent = $htmlContent.Replace('{{MULTIPLE_USERS_DATA}}', $multipleUsersRows)
-    $htmlContent = $htmlContent.Replace('{{NOT_ENCRYPTED_DATA}}', $notEncryptedRows)
-    $htmlContent = $htmlContent.Replace('{{NO_AUTOPILOT_DATA}}', $noAutopilotHashRows)
-    $htmlContent = $htmlContent.Replace('{{INACTIVE_DEVICES_DATA}}', $inactiveDevicesRows)
-    $htmlContent = $htmlContent.Replace('{{NONCOMPLIANT_DEVICES_DATA}}', $noncompliantDevicesRows)
-    $htmlContent = $htmlContent.Replace('{{OS_EDITION_OVERVIEW_DATA}}', $osEditionOverviewRows)
-    $htmlContent = $htmlContent.Replace('{{DISABLED_PRIMARY_USERS_DATA}}', $disabledPrimaryUsersRows)
-    $htmlContent = $htmlContent.Replace('$applicationFailures', $Report_ApplicationFailureReport_Count)
-    $htmlContent = $htmlContent.Replace('$multipleUsers', $Report_DevicesWithMultipleUsers_Count)
-    $htmlContent = $htmlContent.Replace('$notEncrypted', $Report_NotEncryptedDevices_Count)
-    $htmlContent = $htmlContent.Replace('$noAutopilot', $Report_DevicesWithoutAutopilotHash_Count)
-    $htmlContent = $htmlContent.Replace('$inactiveDevices', $Report_InactiveDevices_Count)
-    $htmlContent = $htmlContent.Replace('$noncompliantDevices', $Report_NoncompliantDevices_Count)
-    $htmlContent = $htmlContent.Replace('$osEditionOverview', $Report_OperationSystemEdtionOverview_Count)
-    $htmlContent = $htmlContent.Replace('$disabledPrimaryUsers', $Report_DisabledPrimaryUsers_Count)
+    # Build stat tiles HTML (8 cards, each with a unique color, 5-column grid)
+    $statsCardsHtml = @"
+            <div class="rk-stat-tile t-rust">
+                <div class="rk-stat-eyebrow">APPLICATION FAILURES</div>
+                <div class="rk-stat-number">$Report_ApplicationFailureReport_Count</div>
+                <div class="rk-stat-caption">Failed app installations</div>
+            </div>
+            <div class="rk-stat-tile t-olive">
+                <div class="rk-stat-eyebrow">MULTIPLE USERS</div>
+                <div class="rk-stat-number">$Report_DevicesWithMultipleUsers_Count</div>
+                <div class="rk-stat-caption">Non-shared devices</div>
+            </div>
+            <div class="rk-stat-tile t-steel">
+                <div class="rk-stat-eyebrow">NOT ENCRYPTED</div>
+                <div class="rk-stat-number">$Report_NotEncryptedDevices_Count</div>
+                <div class="rk-stat-caption">Unencrypted devices</div>
+            </div>
+            <div class="rk-stat-tile t-rose">
+                <div class="rk-stat-eyebrow">NO AUTOPILOT HASH</div>
+                <div class="rk-stat-number">$Report_DevicesWithoutAutopilotHash_Count</div>
+                <div class="rk-stat-caption">Missing hardware hash</div>
+            </div>
+            <div class="rk-stat-tile t-amber">
+                <div class="rk-stat-eyebrow">INACTIVE DEVICES</div>
+                <div class="rk-stat-number">$Report_InactiveDevices_Count</div>
+                <div class="rk-stat-caption">90+ days inactive</div>
+            </div>
+            <div class="rk-stat-tile t-violet">
+                <div class="rk-stat-eyebrow">NONCOMPLIANT</div>
+                <div class="rk-stat-number">$Report_NoncompliantDevices_Count</div>
+                <div class="rk-stat-caption">Unique noncompliant devices</div>
+            </div>
+            <div class="rk-stat-tile t-teal">
+                <div class="rk-stat-eyebrow">OS EDITIONS</div>
+                <div class="rk-stat-number">$Report_OperatingSystemEditionOverview_Count</div>
+                <div class="rk-stat-caption">OS edition entries</div>
+            </div>
+            <div class="rk-stat-tile t-slate">
+                <div class="rk-stat-eyebrow">DISABLED USERS</div>
+                <div class="rk-stat-number">$Report_DisabledPrimaryUsers_Count</div>
+                <div class="rk-stat-caption">Disabled primary users</div>
+            </div>
+"@
+
+    # Build body content HTML (tabs + panels + filter containers + tables + script)
+    $bodyContentHtml = @"
+    <!-- Tab Navigation -->
+    <div class="rk-tabs">
+        <button class="rk-tab active" data-target="panel-app-failures">Application Failures</button>
+        <button class="rk-tab" data-target="panel-multiple-users">Multiple Users</button>
+        <button class="rk-tab" data-target="panel-not-encrypted">Not Encrypted</button>
+        <button class="rk-tab" data-target="panel-no-autopilot">No Autopilot Hash</button>
+        <button class="rk-tab" data-target="panel-inactive-devices">Inactive Devices</button>
+        <button class="rk-tab" data-target="panel-noncompliant">Noncompliant</button>
+        <button class="rk-tab" data-target="panel-os-edition">OS Edition Overview</button>
+        <button class="rk-tab" data-target="panel-disabled-users">Disabled Primary Users</button>
+    </div>
+
+    <!-- Application Failures Panel -->
+    <div id="panel-app-failures" class="rk-panel active">
+        <div class="rk-filter-bar">
+            <span>Filters:</span>
+            <select id="appFailuresCustomerFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Customers</option>
+            </select>
+            <select id="appFailuresAppFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Applications</option>
+            </select>
+            <select id="appFailuresPlatformFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Platforms</option>
+            </select>
+            <select id="appFailuresVersionFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Versions</option>
+            </select>
+            <select id="appFailuresPercentageFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Percentages</option>
+                <option value="0-20">0-20%</option>
+                <option value="20-40">20-40%</option>
+                <option value="40-60">40-60%</option>
+                <option value="60-80">60-80%</option>
+                <option value="80-100">80-100%</option>
+            </select>
+            <button class="rk-filter-chip" onclick="clearAppFailuresFilters()">Clear</button>
+        </div>
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>Application Failures</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="appFailuresShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="appFailuresTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Customer</th>
+                            <th>Application</th>
+                            <th>Platform</th>
+                            <th>Version</th>
+                            <th>Failed Device Count</th>
+                            <th>Failed Device Percentage</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $applicationFailureRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <!-- Multiple Users Panel -->
+    <div id="panel-multiple-users" class="rk-panel">
+        <div class="rk-filter-bar">
+            <span>Filters:</span>
+            <select id="multipleUsersCustomerFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Customers</option>
+            </select>
+            <select id="multipleUsersDeviceFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Devices</option>
+            </select>
+            <select id="multipleUsersPrimaryUserFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Users</option>
+            </select>
+            <select id="multipleUsersProfileFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Profiles</option>
+            </select>
+            <select id="multipleUsersCountFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Counts</option>
+                <option value="2">2 Users</option>
+                <option value="3">3 Users</option>
+                <option value="4+">4+ Users</option>
+            </select>
+            <button class="rk-filter-chip" onclick="clearMultipleUsersFilters()">Clear</button>
+        </div>
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>Devices with Multiple Users</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="multipleUsersShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="multipleUsersTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Customer</th>
+                            <th>Device Name</th>
+                            <th>Primary User</th>
+                            <th>Enrollment Profile</th>
+                            <th>User Count</th>
+                            <th>Logged On User IDs</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $multipleUsersRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <!-- Not Encrypted Panel -->
+    <div id="panel-not-encrypted" class="rk-panel">
+        <div class="rk-filter-bar">
+            <span>Filters:</span>
+            <select id="notEncryptedCustomerFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Customers</option>
+            </select>
+            <select id="notEncryptedDeviceFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Devices</option>
+            </select>
+            <select id="notEncryptedUserFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Users</option>
+            </select>
+            <select id="notEncryptedManufacturerFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Manufacturers</option>
+            </select>
+            <select id="notEncryptedModelFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Models</option>
+            </select>
+            <button class="rk-filter-chip" onclick="clearNotEncryptedFilters()">Clear</button>
+        </div>
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>Not Encrypted Devices</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="notEncryptedShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="notEncryptedTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Customer</th>
+                            <th>Device Name</th>
+                            <th>Primary User</th>
+                            <th>Serial Number</th>
+                            <th>Manufacturer</th>
+                            <th>Model</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $notEncryptedRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <!-- No Autopilot Hash Panel -->
+    <div id="panel-no-autopilot" class="rk-panel">
+        <div class="rk-filter-bar">
+            <span>Filters:</span>
+            <select id="noAutopilotCustomerFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Customers</option>
+            </select>
+            <select id="noAutopilotDeviceFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Devices</option>
+            </select>
+            <select id="noAutopilotUserFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Users</option>
+            </select>
+            <select id="noAutopilotManufacturerFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Manufacturers</option>
+            </select>
+            <select id="noAutopilotModelFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Models</option>
+            </select>
+            <button class="rk-filter-chip" onclick="clearNoAutopilotFilters()">Clear</button>
+        </div>
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>Non-company owned devices</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="noAutopilotShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="noAutopilotTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Customer</th>
+                            <th>Device Name</th>
+                            <th>Primary User</th>
+                            <th>Serial Number</th>
+                            <th>Manufacturer</th>
+                            <th>Model</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $noAutopilotHashRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <!-- Inactive Devices Panel -->
+    <div id="panel-inactive-devices" class="rk-panel">
+        <div class="rk-filter-bar">
+            <span>Filters:</span>
+            <select id="inactiveCustomerFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Customers</option>
+            </select>
+            <select id="inactiveDeviceFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Devices</option>
+            </select>
+            <select id="inactiveUserFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Users</option>
+            </select>
+            <select id="inactiveManufacturerFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Manufacturers</option>
+            </select>
+            <select id="inactiveModelFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Models</option>
+            </select>
+            <select id="inactiveInactivityFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Periods</option>
+                <option value="90-180">90-180 days</option>
+                <option value="180+">180+ days</option>
+            </select>
+            <button class="rk-filter-chip" onclick="clearInactiveFilters()">Clear</button>
+        </div>
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>Inactive Devices (90+ days)</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="inactiveDevicesShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="inactiveDevicesTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Customer</th>
+                            <th>Device Name</th>
+                            <th>Primary User</th>
+                            <th>Serial Number</th>
+                            <th>Manufacturer</th>
+                            <th>Model</th>
+                            <th>Last Contact</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $inactiveDevicesRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <!-- Noncompliant Devices Panel -->
+    <div id="panel-noncompliant" class="rk-panel">
+        <div class="rk-filter-bar">
+            <span>Filters:</span>
+            <select id="noncompliantCustomerFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Customers</option>
+            </select>
+            <select id="noncompliantDeviceFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Devices</option>
+            </select>
+            <select id="noncompliantUserFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Users</option>
+            </select>
+            <select id="noncompliantManufacturerFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Manufacturers</option>
+            </select>
+            <select id="noncompliantModelFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Models</option>
+            </select>
+            <select id="noncompliantReasonFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Reasons</option>
+            </select>
+            <button class="rk-filter-chip" onclick="clearNoncompliantFilters()">Clear</button>
+        </div>
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>Noncompliant Devices</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="noncompliantShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="noncompliantTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Customer</th>
+                            <th>Device Name</th>
+                            <th>Primary User</th>
+                            <th>Serial Number</th>
+                            <th>Manufacturer</th>
+                            <th>Model</th>
+                            <th>Compliance Status</th>
+                            <th>Noncompliant Based On</th>
+                            <th>Noncompliant Alert</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $noncompliantDevicesRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <!-- OS Edition Overview Panel -->
+    <div id="panel-os-edition" class="rk-panel">
+        <div class="rk-filter-bar">
+            <span>Filters:</span>
+            <select id="osEditionCustomerFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Customers</option>
+            </select>
+            <select id="osEditionDeviceFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Devices</option>
+            </select>
+            <select id="osEditionUserFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Users</option>
+            </select>
+            <select id="osEditionEditionFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Editions</option>
+            </select>
+            <select id="osEditionFriendlyNameFilter" class="form-select" style="max-width:180px;">
+                <option value="">All OS Versions</option>
+            </select>
+            <button class="rk-filter-chip" onclick="clearOSEditionFilters()">Clear</button>
+        </div>
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>Operating System Edition Overview</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="osEditionShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="osEditionTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Customer</th>
+                            <th>Device Name</th>
+                            <th>Primary User</th>
+                            <th>Operating System Edition</th>
+                            <th>OS Friendly Name</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $osEditionOverviewRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <!-- Disabled Primary Users Panel -->
+    <div id="panel-disabled-users" class="rk-panel">
+        <div class="rk-filter-bar">
+            <span>Filters:</span>
+            <select id="disabledUsersCustomerFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Customers</option>
+            </select>
+            <select id="disabledUsersDeviceFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Devices</option>
+            </select>
+            <select id="disabledUsersUserFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Users</option>
+            </select>
+            <select id="disabledUsersManufacturerFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Manufacturers</option>
+            </select>
+            <select id="disabledUsersModelFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Models</option>
+            </select>
+            <button class="rk-filter-chip" onclick="clearDisabledUsersFilters()">Clear</button>
+        </div>
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>Devices with Disabled Primary Users</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="disabledUsersShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="disabledUsersTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Customer</th>
+                            <th>Device Name</th>
+                            <th>Primary User</th>
+                            <th>Serial Number</th>
+                            <th>Manufacturer</th>
+                            <th>Model</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $disabledPrimaryUsersRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <script>
+    `$(document).ready(function() {
+        // Initialize all tables using the shared helper
+        var appFailuresTable = initRKTable('#appFailuresTable');
+        var multipleUsersTable = initRKTable('#multipleUsersTable', { order: [[4, 'desc']] });
+        var notEncryptedTable = initRKTable('#notEncryptedTable');
+        var noAutopilotTable = initRKTable('#noAutopilotTable');
+        var inactiveDevicesTable = initRKTable('#inactiveDevicesTable', { order: [[6, 'asc']] });
+        var noncompliantTable = initRKTable('#noncompliantTable');
+        var osEditionTable = initRKTable('#osEditionTable');
+        var disabledUsersTable = initRKTable('#disabledUsersTable');
+
+        // Populate filter dropdowns
+        function populateFilters() {
+            populateSelectFromColumn('appFailuresCustomerFilter', appFailuresTable, 0);
+            populateSelectFromColumn('appFailuresAppFilter', appFailuresTable, 1);
+            populateSelectFromColumn('appFailuresPlatformFilter', appFailuresTable, 2);
+            populateSelectFromColumn('appFailuresVersionFilter', appFailuresTable, 3);
+
+            populateSelectFromColumn('multipleUsersCustomerFilter', multipleUsersTable, 0);
+            populateSelectFromColumn('multipleUsersDeviceFilter', multipleUsersTable, 1);
+            populateSelectFromColumn('multipleUsersPrimaryUserFilter', multipleUsersTable, 2);
+            populateSelectFromColumn('multipleUsersProfileFilter', multipleUsersTable, 3);
+
+            populateSelectFromColumn('notEncryptedCustomerFilter', notEncryptedTable, 0);
+            populateSelectFromColumn('notEncryptedDeviceFilter', notEncryptedTable, 1);
+            populateSelectFromColumn('notEncryptedUserFilter', notEncryptedTable, 2);
+            populateSelectFromColumn('notEncryptedManufacturerFilter', notEncryptedTable, 4);
+            populateSelectFromColumn('notEncryptedModelFilter', notEncryptedTable, 5);
+
+            populateSelectFromColumn('noAutopilotCustomerFilter', noAutopilotTable, 0);
+            populateSelectFromColumn('noAutopilotDeviceFilter', noAutopilotTable, 1);
+            populateSelectFromColumn('noAutopilotUserFilter', noAutopilotTable, 2);
+            populateSelectFromColumn('noAutopilotManufacturerFilter', noAutopilotTable, 4);
+            populateSelectFromColumn('noAutopilotModelFilter', noAutopilotTable, 5);
+
+            populateSelectFromColumn('inactiveCustomerFilter', inactiveDevicesTable, 0);
+            populateSelectFromColumn('inactiveDeviceFilter', inactiveDevicesTable, 1);
+            populateSelectFromColumn('inactiveUserFilter', inactiveDevicesTable, 2);
+            populateSelectFromColumn('inactiveManufacturerFilter', inactiveDevicesTable, 4);
+            populateSelectFromColumn('inactiveModelFilter', inactiveDevicesTable, 5);
+
+            populateSelectFromColumn('noncompliantCustomerFilter', noncompliantTable, 0);
+            populateSelectFromColumn('noncompliantDeviceFilter', noncompliantTable, 1);
+            populateSelectFromColumn('noncompliantUserFilter', noncompliantTable, 2);
+            populateSelectFromColumn('noncompliantManufacturerFilter', noncompliantTable, 4);
+            populateSelectFromColumn('noncompliantModelFilter', noncompliantTable, 5);
+            populateSelectFromColumn('noncompliantReasonFilter', noncompliantTable, 7);
+
+            populateSelectFromColumn('osEditionCustomerFilter', osEditionTable, 0);
+            populateSelectFromColumn('osEditionDeviceFilter', osEditionTable, 1);
+            populateSelectFromColumn('osEditionUserFilter', osEditionTable, 2);
+            populateSelectFromColumn('osEditionEditionFilter', osEditionTable, 3);
+            populateSelectFromColumn('osEditionFriendlyNameFilter', osEditionTable, 4);
+
+            populateSelectFromColumn('disabledUsersCustomerFilter', disabledUsersTable, 0);
+            populateSelectFromColumn('disabledUsersDeviceFilter', disabledUsersTable, 1);
+            populateSelectFromColumn('disabledUsersUserFilter', disabledUsersTable, 2);
+            populateSelectFromColumn('disabledUsersManufacturerFilter', disabledUsersTable, 4);
+            populateSelectFromColumn('disabledUsersModelFilter', disabledUsersTable, 5);
+        }
+
+        function populateSelectFromColumn(selectId, table, columnIndex) {
+            var values = [...new Set(table.column(columnIndex).data().toArray())].sort();
+            var select = `$('#' + selectId);
+            values.forEach(function(value) {
+                if (value && value.toString().trim() !== '') {
+                    select.append($('<option>').val(value).text(value));
+                }
+            });
+        }
+
+        // Application Failures filter functions
+        window.applyAppFailuresFilters = function() {
+            var customerFilter = `$('#appFailuresCustomerFilter').val();
+            var appFilter = `$('#appFailuresAppFilter').val();
+            var platformFilter = `$('#appFailuresPlatformFilter').val();
+            var versionFilter = `$('#appFailuresVersionFilter').val();
+            var percentageFilter = `$('#appFailuresPercentageFilter').val();
+
+            appFailuresTable.columns().search('').draw();
+
+            if (customerFilter) appFailuresTable.column(0).search('^' + customerFilter + '`$', true, false);
+            if (appFilter) appFailuresTable.column(1).search('^' + appFilter + '`$', true, false);
+            if (platformFilter) appFailuresTable.column(2).search('^' + platformFilter + '`$', true, false);
+            if (versionFilter) appFailuresTable.column(3).search('^' + versionFilter + '`$', true, false);
+            if (percentageFilter) {
+                var regex = '';
+                if (percentageFilter === '0-20') regex = '^(0|[1-9]|1[0-9]|20)%`$';
+                else if (percentageFilter === '20-40') regex = '^(2[0-9]|3[0-9]|40)%`$';
+                else if (percentageFilter === '40-60') regex = '^(4[0-9]|5[0-9]|60)%`$';
+                else if (percentageFilter === '60-80') regex = '^(6[0-9]|7[0-9]|80)%`$';
+                else if (percentageFilter === '80-100') regex = '^(8[0-9]|9[0-9]|100)%`$';
+                if (regex) appFailuresTable.column(5).search(regex, true, false);
+            }
+
+            appFailuresTable.draw();
+        };
+
+        window.clearAppFailuresFilters = function() {
+            `$('#appFailuresCustomerFilter, #appFailuresAppFilter, #appFailuresPlatformFilter, #appFailuresVersionFilter, #appFailuresPercentageFilter').val('');
+            appFailuresTable.search('').columns().search('').draw();
+        };
+
+        // Multiple Users filter functions
+        window.applyMultipleUsersFilters = function() {
+            var customerFilter = `$('#multipleUsersCustomerFilter').val();
+            var deviceFilter = `$('#multipleUsersDeviceFilter').val();
+            var userFilter = `$('#multipleUsersPrimaryUserFilter').val();
+            var profileFilter = `$('#multipleUsersProfileFilter').val();
+            var countFilter = `$('#multipleUsersCountFilter').val();
+
+            multipleUsersTable.columns().search('').draw();
+
+            if (customerFilter) multipleUsersTable.column(0).search('^' + customerFilter + '`$', true, false);
+            if (deviceFilter) multipleUsersTable.column(1).search('^' + deviceFilter + '`$', true, false);
+            if (userFilter) multipleUsersTable.column(2).search('^' + userFilter + '`$', true, false);
+            if (profileFilter) multipleUsersTable.column(3).search('^' + profileFilter + '`$', true, false);
+            if (countFilter) {
+                if (countFilter === '2') multipleUsersTable.column(4).search('^2`$', true, false);
+                else if (countFilter === '3') multipleUsersTable.column(4).search('^3`$', true, false);
+                else if (countFilter === '4+') multipleUsersTable.column(4).search('[4-9]|[1-9][0-9]+', true, false);
+            }
+
+            multipleUsersTable.draw();
+        };
+
+        window.clearMultipleUsersFilters = function() {
+            `$('#multipleUsersCustomerFilter, #multipleUsersDeviceFilter, #multipleUsersPrimaryUserFilter, #multipleUsersProfileFilter, #multipleUsersCountFilter').val('');
+            multipleUsersTable.search('').columns().search('').draw();
+        };
+
+        // Not Encrypted filter functions
+        window.applyNotEncryptedFilters = function() {
+            var customerFilter = `$('#notEncryptedCustomerFilter').val();
+            var deviceFilter = `$('#notEncryptedDeviceFilter').val();
+            var userFilter = `$('#notEncryptedUserFilter').val();
+            var manufacturerFilter = `$('#notEncryptedManufacturerFilter').val();
+            var modelFilter = `$('#notEncryptedModelFilter').val();
+
+            notEncryptedTable.columns().search('').draw();
+
+            if (customerFilter) notEncryptedTable.column(0).search('^' + customerFilter + '`$', true, false);
+            if (deviceFilter) notEncryptedTable.column(1).search('^' + deviceFilter + '`$', true, false);
+            if (userFilter) notEncryptedTable.column(2).search('^' + userFilter + '`$', true, false);
+            if (manufacturerFilter) notEncryptedTable.column(4).search('^' + manufacturerFilter + '`$', true, false);
+            if (modelFilter) notEncryptedTable.column(5).search('^' + modelFilter + '`$', true, false);
+
+            notEncryptedTable.draw();
+        };
+
+        window.clearNotEncryptedFilters = function() {
+            `$('#notEncryptedCustomerFilter, #notEncryptedDeviceFilter, #notEncryptedUserFilter, #notEncryptedManufacturerFilter, #notEncryptedModelFilter').val('');
+            notEncryptedTable.search('').columns().search('').draw();
+        };
+
+        // No Autopilot filter functions
+        window.applyNoAutopilotFilters = function() {
+            var customerFilter = `$('#noAutopilotCustomerFilter').val();
+            var deviceFilter = `$('#noAutopilotDeviceFilter').val();
+            var userFilter = `$('#noAutopilotUserFilter').val();
+            var manufacturerFilter = `$('#noAutopilotManufacturerFilter').val();
+            var modelFilter = `$('#noAutopilotModelFilter').val();
+
+            noAutopilotTable.columns().search('').draw();
+
+            if (customerFilter) noAutopilotTable.column(0).search('^' + customerFilter + '`$', true, false);
+            if (deviceFilter) noAutopilotTable.column(1).search('^' + deviceFilter + '`$', true, false);
+            if (userFilter) noAutopilotTable.column(2).search('^' + userFilter + '`$', true, false);
+            if (manufacturerFilter) noAutopilotTable.column(4).search('^' + manufacturerFilter + '`$', true, false);
+            if (modelFilter) noAutopilotTable.column(5).search('^' + modelFilter + '`$', true, false);
+
+            noAutopilotTable.draw();
+        };
+
+        window.clearNoAutopilotFilters = function() {
+            `$('#noAutopilotCustomerFilter, #noAutopilotDeviceFilter, #noAutopilotUserFilter, #noAutopilotManufacturerFilter, #noAutopilotModelFilter').val('');
+            noAutopilotTable.search('').columns().search('').draw();
+        };
+
+        // Inactive Devices filter functions
+        window.applyInactiveFilters = function() {
+            var customerFilter = `$('#inactiveCustomerFilter').val();
+            var deviceFilter = `$('#inactiveDeviceFilter').val();
+            var userFilter = `$('#inactiveUserFilter').val();
+            var manufacturerFilter = `$('#inactiveManufacturerFilter').val();
+            var modelFilter = `$('#inactiveModelFilter').val();
+            var inactivityFilter = `$('#inactiveInactivityFilter').val();
+
+            inactiveDevicesTable.columns().search('').draw();
+
+            if (customerFilter) inactiveDevicesTable.column(0).search('^' + customerFilter + '`$', true, false);
+            if (deviceFilter) inactiveDevicesTable.column(1).search('^' + deviceFilter + '`$', true, false);
+            if (userFilter) inactiveDevicesTable.column(2).search('^' + userFilter + '`$', true, false);
+            if (manufacturerFilter) inactiveDevicesTable.column(4).search('^' + manufacturerFilter + '`$', true, false);
+            if (modelFilter) inactiveDevicesTable.column(5).search('^' + modelFilter + '`$', true, false);
+
+            inactiveDevicesTable.draw();
+        };
+
+        window.clearInactiveFilters = function() {
+            `$('#inactiveCustomerFilter, #inactiveDeviceFilter, #inactiveUserFilter, #inactiveManufacturerFilter, #inactiveModelFilter, #inactiveInactivityFilter').val('');
+            inactiveDevicesTable.search('').columns().search('').draw();
+        };
+
+        // Noncompliant Devices filter functions
+        window.applyNoncompliantFilters = function() {
+            var customerFilter = `$('#noncompliantCustomerFilter').val();
+            var deviceFilter = `$('#noncompliantDeviceFilter').val();
+            var userFilter = `$('#noncompliantUserFilter').val();
+            var manufacturerFilter = `$('#noncompliantManufacturerFilter').val();
+            var modelFilter = `$('#noncompliantModelFilter').val();
+            var reasonFilter = `$('#noncompliantReasonFilter').val();
+
+            noncompliantTable.columns().search('').draw();
+
+            if (customerFilter) noncompliantTable.column(0).search('^' + customerFilter + '`$', true, false);
+            if (deviceFilter) noncompliantTable.column(1).search('^' + deviceFilter + '`$', true, false);
+            if (userFilter) noncompliantTable.column(2).search('^' + userFilter + '`$', true, false);
+            if (manufacturerFilter) noncompliantTable.column(4).search('^' + manufacturerFilter + '`$', true, false);
+            if (modelFilter) noncompliantTable.column(5).search('^' + modelFilter + '`$', true, false);
+            if (reasonFilter) noncompliantTable.column(7).search('^' + reasonFilter + '`$', true, false);
+
+            noncompliantTable.draw();
+        };
+
+        window.clearNoncompliantFilters = function() {
+            `$('#noncompliantCustomerFilter, #noncompliantDeviceFilter, #noncompliantUserFilter, #noncompliantManufacturerFilter, #noncompliantModelFilter, #noncompliantReasonFilter').val('');
+            noncompliantTable.search('').columns().search('').draw();
+        };
+
+        // OS Edition Overview filter functions
+        window.applyOSEditionFilters = function() {
+            var customerFilter = `$('#osEditionCustomerFilter').val();
+            var deviceFilter = `$('#osEditionDeviceFilter').val();
+            var userFilter = `$('#osEditionUserFilter').val();
+            var editionFilter = `$('#osEditionEditionFilter').val();
+            var friendlyNameFilter = `$('#osEditionFriendlyNameFilter').val();
+
+            osEditionTable.columns().search('').draw();
+
+            if (customerFilter) osEditionTable.column(0).search('^' + customerFilter + '`$', true, false);
+            if (deviceFilter) osEditionTable.column(1).search('^' + deviceFilter + '`$', true, false);
+            if (userFilter) osEditionTable.column(2).search('^' + userFilter + '`$', true, false);
+            if (editionFilter) osEditionTable.column(3).search('^' + editionFilter + '`$', true, false);
+            if (friendlyNameFilter) osEditionTable.column(4).search('^' + friendlyNameFilter + '`$', true, false);
+
+            osEditionTable.draw();
+        };
+
+        window.clearOSEditionFilters = function() {
+            `$('#osEditionCustomerFilter, #osEditionDeviceFilter, #osEditionUserFilter, #osEditionEditionFilter, #osEditionFriendlyNameFilter').val('');
+            osEditionTable.search('').columns().search('').draw();
+        };
+
+        // Disabled Primary Users filter functions
+        window.applyDisabledUsersFilters = function() {
+            var customerFilter = `$('#disabledUsersCustomerFilter').val();
+            var deviceFilter = `$('#disabledUsersDeviceFilter').val();
+            var userFilter = `$('#disabledUsersUserFilter').val();
+            var manufacturerFilter = `$('#disabledUsersManufacturerFilter').val();
+            var modelFilter = `$('#disabledUsersModelFilter').val();
+
+            disabledUsersTable.columns().search('').draw();
+
+            if (customerFilter) disabledUsersTable.column(0).search('^' + customerFilter + '`$', true, false);
+            if (deviceFilter) disabledUsersTable.column(1).search('^' + deviceFilter + '`$', true, false);
+            if (userFilter) disabledUsersTable.column(2).search('^' + userFilter + '`$', true, false);
+            if (manufacturerFilter) disabledUsersTable.column(4).search('^' + manufacturerFilter + '`$', true, false);
+            if (modelFilter) disabledUsersTable.column(5).search('^' + modelFilter + '`$', true, false);
+
+            disabledUsersTable.draw();
+        };
+
+        window.clearDisabledUsersFilters = function() {
+            `$('#disabledUsersCustomerFilter, #disabledUsersDeviceFilter, #disabledUsersUserFilter, #disabledUsersManufacturerFilter, #disabledUsersModelFilter').val('');
+            disabledUsersTable.search('').columns().search('').draw();
+        };
+
+        // Auto-apply filters on change - Application Failures
+        `$('#appFailuresCustomerFilter, #appFailuresAppFilter, #appFailuresPlatformFilter, #appFailuresVersionFilter, #appFailuresPercentageFilter').on('change', function() {
+            applyAppFailuresFilters();
+        });
+
+        // Auto-apply filters on change - Multiple Users
+        `$('#multipleUsersCustomerFilter, #multipleUsersDeviceFilter, #multipleUsersPrimaryUserFilter, #multipleUsersProfileFilter, #multipleUsersCountFilter').on('change', function() {
+            applyMultipleUsersFilters();
+        });
+
+        // Auto-apply filters on change - Not Encrypted
+        `$('#notEncryptedCustomerFilter, #notEncryptedDeviceFilter, #notEncryptedUserFilter, #notEncryptedManufacturerFilter, #notEncryptedModelFilter').on('change', function() {
+            applyNotEncryptedFilters();
+        });
+
+        // Auto-apply filters on change - No Autopilot
+        `$('#noAutopilotCustomerFilter, #noAutopilotDeviceFilter, #noAutopilotUserFilter, #noAutopilotManufacturerFilter, #noAutopilotModelFilter').on('change', function() {
+            applyNoAutopilotFilters();
+        });
+
+        // Auto-apply filters on change - Inactive Devices
+        `$('#inactiveCustomerFilter, #inactiveDeviceFilter, #inactiveUserFilter, #inactiveManufacturerFilter, #inactiveModelFilter, #inactiveInactivityFilter').on('change', function() {
+            applyInactiveFilters();
+        });
+
+        // Auto-apply filters on change - Noncompliant Devices
+        `$('#noncompliantCustomerFilter, #noncompliantDeviceFilter, #noncompliantUserFilter, #noncompliantManufacturerFilter, #noncompliantModelFilter, #noncompliantReasonFilter').on('change', function() {
+            applyNoncompliantFilters();
+        });
+
+        // Auto-apply filters on change - OS Edition Overview
+        `$('#osEditionCustomerFilter, #osEditionDeviceFilter, #osEditionUserFilter, #osEditionEditionFilter, #osEditionFriendlyNameFilter').on('change', function() {
+            applyOSEditionFilters();
+        });
+
+        // Auto-apply filters on change - Disabled Primary Users
+        `$('#disabledUsersCustomerFilter, #disabledUsersDeviceFilter, #disabledUsersUserFilter, #disabledUsersManufacturerFilter, #disabledUsersModelFilter').on('change', function() {
+            applyDisabledUsersFilters();
+        });
+
+        // Show all toggle functions for each table
+        `$('#appFailuresShowAllToggle').on('change', function() {
+            appFailuresTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+
+        `$('#multipleUsersShowAllToggle').on('change', function() {
+            multipleUsersTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+
+        `$('#notEncryptedShowAllToggle').on('change', function() {
+            notEncryptedTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+
+        `$('#noAutopilotShowAllToggle').on('change', function() {
+            noAutopilotTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+
+        `$('#inactiveDevicesShowAllToggle').on('change', function() {
+            inactiveDevicesTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+
+        `$('#noncompliantShowAllToggle').on('change', function() {
+            noncompliantTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+
+        `$('#osEditionShowAllToggle').on('change', function() {
+            osEditionTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+
+        `$('#disabledUsersShowAllToggle').on('change', function() {
+            disabledUsersTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
+
+        // Populate filters after tables are initialized
+        setTimeout(function() {
+            populateFilters();
+        }, 100);
+    });
+    </script>
+"@
+
+    # Report-specific CSS (minimal -- filter bar inline styles only)
+    $customCss = @"
+    .rk-filter-bar .form-select {
+        font-family: 'Geist Mono', ui-monospace, monospace;
+        font-size: 0.75rem;
+        padding: 4px 8px;
+        border-radius: 6px;
+    }
+"@
+
+    # Generate the full HTML report using the shared template
+    $htmlContent = Get-RKSolutionsReportTemplate `
+        -TenantName $TenantName `
+        -ReportTitle 'Anomalies' `
+        -ReportSlug 'intune-anomalies' `
+        -Eyebrow 'INTUNE ANOMALIES' `
+        -Lede 'Device compliance overview with flagged anomalies across encryption, activity, and application health.' `
+        -StatsCardsHtml $statsCardsHtml `
+        -BodyContentHtml $bodyContentHtml `
+        -CustomCss $customCss `
+        -ReportDate $CurrentDate `
+        -Tags @('Intune', 'Compliance', 'Security') `
+        -StatsClass 'rk-stats-5'
 
     # Export to HTML file
     $htmlContent | Out-File -FilePath $ExportPath -Encoding utf8
@@ -2125,7 +1057,8 @@ table.dataTable tfoot td {
 
     # Open the HTML file only if we're not sending email
     if (-not $SendEmail) {
-        Invoke-Item $ExportPath
+        try { Invoke-Item $ExportPath -ErrorAction Stop }
+        catch { Write-Host "Report saved to: $ExportPath (could not open automatically)." -ForegroundColor Yellow }
     }
 }
 
@@ -2136,7 +1069,7 @@ function Get-AllDeviceData {
             $Customer
         )
 
-        @{ 
+        @{
             "0"   = "unknown"
             "4"   = "Windows 10/11 Enterprise"
             "27"  = "Windows 10/11 Enterprise N"
@@ -2166,41 +1099,42 @@ function Get-AllDeviceData {
             "^10\.0\.22631" { return "Windows 11 23H2" }
             "^10\.0\.22635" { return "Windows 11 23H2 Insider Preview" }
             "^10\.0\.261" { return "Windows 11 24H2" }
+            "^10\.0\.262" { return "Windows 11 25H2" }
             default { return "Other" }
         }
     }
-    
-    function Convert-Size {            
-        [cmdletbinding()]            
-        param(            
-            [validateset("Bytes", "KB", "MB", "GB", "TB")]            
-            [string]$From,            
-            [validateset("Bytes", "KB", "MB", "GB", "TB")]            
-            [string]$To,            
-            [Parameter(Mandatory = $true)]            
-            [double]$Value,            
-            [int]$Precision = 4            
-        )            
-        switch ($From) {            
-            "Bytes" { $value = $Value }            
-            "KB" { $value = $Value * 1024 }            
-            "MB" { $value = $Value * 1024 * 1024 }            
-            "GB" { $value = $Value * 1024 * 1024 * 1024 }            
-            "TB" { $value = $Value * 1024 * 1024 * 1024 * 1024 }            
-        }            
-                    
-        switch ($To) {            
-            "Bytes" { return $value }            
-            "KB" { $Value = $Value / 1KB }            
-            "MB" { $Value = $Value / 1MB }            
-            "GB" { $Value = $Value / 1GB }            
-            "TB" { $Value = $Value / 1TB }            
-                    
-        }            
-          
-        $Calc = [Math]::Round($value, $Precision, [MidPointRounding]::AwayFromZero) 
-        return "$calc $to" 
-                    
+
+    function Convert-Size {
+        [cmdletbinding()]
+        param(
+            [validateset("Bytes", "KB", "MB", "GB", "TB")]
+            [string]$From,
+            [validateset("Bytes", "KB", "MB", "GB", "TB")]
+            [string]$To,
+            [Parameter(Mandatory = $true)]
+            [double]$Value,
+            [int]$Precision = 4
+        )
+        switch ($From) {
+            "Bytes" { $value = $Value }
+            "KB" { $value = $Value * 1024 }
+            "MB" { $value = $Value * 1024 * 1024 }
+            "GB" { $value = $Value * 1024 * 1024 * 1024 }
+            "TB" { $value = $Value * 1024 * 1024 * 1024 * 1024 }
+        }
+
+        switch ($To) {
+            "Bytes" { return $value }
+            "KB" { $Value = $Value / 1KB }
+            "MB" { $Value = $Value / 1MB }
+            "GB" { $Value = $Value / 1GB }
+            "TB" { $Value = $Value / 1TB }
+
+        }
+
+        $Calc = [Math]::Round($value, $Precision, [MidPointRounding]::AwayFromZero)
+        return "$calc $to"
+
     }
 
     # Optimized Properties List - Only essential properties for better performance
@@ -2228,14 +1162,15 @@ function Get-AllDeviceData {
         'ComplianceState',
         'usersLoggedOn',      # Contains userId for logged-on users
         'hardwareInformation', # Contains nested properties like tpmVersion, OS details, BiosVersion
-        'managementAgent' # Indicates the management agent used (e.g., Intune)
+        'managementAgent', # Indicates the management agent used (e.g., Intune)
+        'skuFamily' # OS edition (Pro, Enterprise, Home, etc.) - more reliable than hardwareInformation.operatingSystemEdition
     )
 
     # Get all Windows Devices from Microsoft Intune
     $AllDeviceData = Invoke-graphRequestWithPaging -Uri "https://graph.microsoft.com/beta/deviceManagement/managedDevices?`$filter=operatingSystem eq 'Windows'&`$select=$($Properties -join ',')"
     #filter out managed by MDE
     $AllDeviceData = $AllDeviceData | Where-Object { $_.managementAgent -ne "msSense" }
-    
+
     # Get all AutoPilot registered devices under "Enrollment"
     Write-Host "Fetching Autopilot devices..." -ForegroundColor Yellow
     $AutopilotDevices = (Invoke-GraphRequestWithPaging -Uri "https://graph.microsoft.com/beta/deviceManagement/windowsAutopilotDeviceIdentities")
@@ -2255,23 +1190,23 @@ function Get-AllDeviceData {
     # Loop through all devices for device data
     $results = [System.Collections.Generic.List[PSObject]]::new()
     $totalDevices = $AllDeviceData.Count
-    
+
     Write-Host "Processing $totalDevices devices..." -ForegroundColor Yellow
 
     for ($i = 0; $i -lt $AllDeviceData.Count; $i++) {
         $DeviceData = $AllDeviceData[$i]
         $currentIndex = $i + 1
-        
+
         # Calculate progress percentage
         $progressPercent = [math]::Round(($currentIndex / $totalDevices) * 100, 1)
-        
+
         # Show progress bar instead of Write-Host
         Write-Progress -Activity "Processing Intune Devices" -Status "Processing device: $($DeviceData.DeviceName)" -CurrentOperation "$currentIndex of $totalDevices devices processed" -PercentComplete $progressPercent
 
         try {
             # Use bulk-fetched data directly (no per-device re-fetch needed - same $select)
             $DeviceProperties = $DeviceData
-            
+
             # Process Autopilot information via pre-built hashtable
             $AutopilotInfo = $AutopilotLookup[$DeviceData.SerialNumber]
             $HashUploaded = $AutopilotLookup.ContainsKey($DeviceData.SerialNumber)
@@ -2286,12 +1221,12 @@ function Get-AllDeviceData {
             if ($DeviceData.complianceState -eq "noncompliant") {
                 try {
                     $ComplianceRules = (Invoke-MgGraphRequest -Method GET -Uri "https://graph.microsoft.com/beta/deviceManagement/managedDevices/$($DeviceData.id)/deviceCompliancePolicyStates" -ErrorAction SilentlyContinue).value | Where-Object { $_.State -eq "nonCompliant" -or $_.State -eq "Error" }
-                    
+
                     if ($ComplianceRules -and $ComplianceRules.count -le 10) {
                         foreach ($ComplianceRule in $ComplianceRules) {
                             try {
                                 $ruleDetails = (Invoke-MgGraphRequest -Method GET -Uri "https://graph.microsoft.com/beta/deviceManagement/managedDevices/$($DeviceData.id)/deviceCompliancePolicyStates/$($ComplianceRule.id)/settingStates" -ErrorAction SilentlyContinue).value | Where-Object { $_.state -match 'nonCompliant' }
-                                
+
                                 if ($ruleDetails) {
                                     # Add individual rule settings to the collection
                                     foreach ($ruleDetail in $ruleDetails) {
@@ -2304,7 +1239,7 @@ function Get-AllDeviceData {
                                 Write-Verbose "Failed to get compliance rule details for $($DeviceData.DeviceName): $_"
                             }
                         }
-                        
+
                         # **FIX**: Get unique values only to eliminate duplicates
                         $uniqueRules = $allRules | Select-Object -Unique
                     }
@@ -2326,16 +1261,16 @@ function Get-AllDeviceData {
             }
 
             # Handle storage calculations with null checking
-            $TotalStorageFormatted = if ($DeviceProperties.TotalStorageSpaceInBytes -and $DeviceProperties.TotalStorageSpaceInBytes -gt 0) { 
-                Convert-Size -From bytes -To GB -Value $DeviceProperties.TotalStorageSpaceInBytes -Precision 2 
-            } else { 
-                "N/A" 
+            $TotalStorageFormatted = if ($DeviceProperties.TotalStorageSpaceInBytes -and $DeviceProperties.TotalStorageSpaceInBytes -gt 0) {
+                Convert-Size -From bytes -To GB -Value $DeviceProperties.TotalStorageSpaceInBytes -Precision 2
+            } else {
+                "N/A"
             }
-            
-            $FreeStorageFormatted = if ($DeviceProperties.FreeStorageSpaceInBytes -and $DeviceProperties.FreeStorageSpaceInBytes -gt 0) { 
-                Convert-Size -From bytes -To GB -Value $DeviceProperties.FreeStorageSpaceInBytes -Precision 2 
-            } else { 
-                "N/A" 
+
+            $FreeStorageFormatted = if ($DeviceProperties.FreeStorageSpaceInBytes -and $DeviceProperties.FreeStorageSpaceInBytes -gt 0) {
+                Convert-Size -From bytes -To GB -Value $DeviceProperties.FreeStorageSpaceInBytes -Precision 2
+            } else {
+                "N/A"
             }
 
             # Access hardware information with null checking
@@ -2363,14 +1298,14 @@ function Get-AllDeviceData {
                 AutopilotAssignedUser      = if ($AutopilotInfo.userprincipalname) { $AutopilotInfo.userprincipalname } else { $null }
                 EnrollmentProfile          = $DeviceProperties.EnrollmentProfileName
                 Encrypted                  = $DeviceProperties.IsEncrypted
-                DeviceEnrollmentType       = $DeviceProperties.DeviceEnrollmentType 
+                DeviceEnrollmentType       = $DeviceProperties.DeviceEnrollmentType
                 usersLoggedOnIds           = if ($ExistingLoggedInUsers) { $ExistingLoggedInUsers -join ', ' } else { "" }
                 usersLoggedOnCount         = if ($LoggedInUsers) { $LoggedInUsers.Count } else { 0 }
                 Operatingsystem            = $DeviceProperties.OperatingSystem
                 OperatingSystemVersion     = $DeviceProperties.OSVersion
                 OSFriendlyname             = Get-OSFriendlyName -OperatingSystemVersion $DeviceProperties.OSVersion
                 OperatingSystemLanguage    = if ($hardwareInfo.operatingSystemLanguage) { $hardwareInfo.operatingSystemLanguage } else { "Unknown" }
-                OperatingSystemEdition     = if ($hardwareInfo.operatingSystemEdition) { $hardwareInfo.operatingSystemEdition } else { "Unknown" }
+                OperatingSystemEdition     = if ($DeviceProperties.skuFamily) { $DeviceProperties.skuFamily } elseif ($hardwareInfo.operatingSystemEdition) { $hardwareInfo.operatingSystemEdition } else { "Unknown" }
                 operatingSystemProductType = if ($hardwareInfo.operatingSystemProductType) { Get-OperatingSystemProductType -Customer "$($hardwareInfo.operatingSystemProductType)" } else { "Unknown" }
                 BiosVersion                = if ($hardwareInfo.systemManagementBIOSVersion) { $hardwareInfo.systemManagementBIOSVersion } else { "Unknown" }
                 ComplianceStatus           = $DeviceProperties.ComplianceState
@@ -2389,14 +1324,14 @@ function Get-AllDeviceData {
 
     Write-Host "Device processing completed!" -ForegroundColor Green
     Write-Host "Processed $($results.Count) devices out of $totalDevices total devices" -ForegroundColor Green
-    
+
     # Debug output for hardware information availability
     $devicesWithoutHardwareInfo = $results | Where-Object { $_.TPMversion -eq "Unknown" }
-        
+
     if ($devicesWithoutHardwareInfo.Count -gt 0) {
         Write-Host "Some devices are missing hardware information:" -ForegroundColor Yellow
         foreach ($device in $devicesWithoutHardwareInfo) {
-            Write-Host " - $($device.DeviceName) (Serial: $($device.Serialnumber))" -ForegroundColor Gray    
+            Write-Host " - $($device.DeviceName) (Serial: $($device.Serialnumber))" -ForegroundColor Gray
         }
     }
     return $results
@@ -2408,7 +1343,7 @@ function Get-ApplicationFailures {
     # Cross-platform temporary file path
     # Detect OS and set appropriate temp path
     $detectedWindows = $false
-    
+
     # Check if automatic variables exist (PowerShell Core 6.0+)
     if (Get-Variable -Name "IsWindows" -ErrorAction SilentlyContinue) {
         $detectedWindows = $IsWindows
@@ -2435,25 +1370,12 @@ function Get-ApplicationFailures {
             }
         }
     }
-    
-    # Set temporary directory and file path based on OS
-    if ($detectedWindows) {
-        $tempDir = "C:\temp"
-    } else {
-        # macOS and Linux
-        $tempDir = "/tmp"
-    }
-    
-    # Use Join-Path for cross-platform compatibility
-    $Data = Join-Path $tempDir "Data.log"
-    
-    # Ensure temp directory exists
-    if (-not (Test-Path -Path $tempDir)) {
-        New-Item -ItemType Directory -Path $tempDir -Force | Out-Null
-    }
+
+    # Use a unique temporary file to avoid race conditions
+    $Data = [System.IO.Path]::GetTempFileName()
 
     $apps = (Invoke-MgGraphRequest -Method GET -Uri "https://graph.microsoft.com/beta/deviceAppManagement/mobileApps?`$filter=(isof(%27microsoft.graph.win32CatalogApp%27)%20or%20isof(%27microsoft.graph.windowsStoreApp%27)%20or%20isof(%27microsoft.graph.microsoftStoreForBusinessApp%27)%20or%20isof(%27microsoft.graph.officeSuiteApp%27)%20or%20(isof(%27microsoft.graph.win32LobApp%27)%20and%20not(isof(%27microsoft.graph.win32CatalogApp%27)))%20or%20isof(%27microsoft.graph.windowsMicrosoftEdgeApp%27)%20or%20isof(%27microsoft.graph.windowsPhone81AppX%27)%20or%20isof(%27microsoft.graph.windowsPhone81StoreApp%27)%20or%20isof(%27microsoft.graph.windowsPhoneXAP%27)%20or%20isof(%27microsoft.graph.windowsAppX%27)%20or%20isof(%27microsoft.graph.windowsMobileMSI%27)%20or%20isof(%27microsoft.graph.windowsUniversalAppX%27)%20or%20isof(%27microsoft.graph.webApp%27)%20or%20isof(%27microsoft.graph.windowsWebApp%27)%20or%20isof(%27microsoft.graph.winGetApp%27))%20and%20(microsoft.graph.managedApp/appAvailability%20eq%20null%20or%20microsoft.graph.managedApp/appAvailability%20eq%20%27lineOfBusiness%27%20or%20isAssigned%20eq%20true)&`$orderby=displayName&").value
-   
+
     $params = @{
         Select  = @(
             "DisplayName"
@@ -2478,15 +1400,15 @@ function Get-ApplicationFailures {
     # Fix char encoding to UTF-8
     $Response = [system.Text.Encoding]::UTF8.GetString(($DataFile).ToCharArray()) | ConvertFrom-Json
 
-    #Maak een nieuwe array
+    # Build result array from response values
     $ReturnObject = New-Object System.Collections.ArrayList
 
-    #voor elke waardeverzameling in values
+    # For each value set in the response
     foreach ($value in $Response.Values) {
-        #maak een nieuw lineobject[hashtable]
+        # Create a new line object (hashtable)
         $LineObject = @{ }
 
-        #voor elke prop in het het schema
+        # For each property in the schema
         foreach ($prop in $Response.Schema) {
             $LineObject[$prop.Column] = $value[$Response.Schema.IndexOf($prop)]
         }
@@ -2497,18 +1419,18 @@ function Get-ApplicationFailures {
             if ($AppAssignment) {
                 $AssignmentStatus = $true
             }
-            
+
             # Use Platform_loc instead of Platform for better readability
             $PlatformName = if ($LineObject.Platform_loc) { $LineObject.Platform_loc } else { $LineObject.Platform }
-            
+
             $ReturnObject.Add([PSCustomObject][ordered]@{
-                    Customer               = $tenantname 
-                    Application            = ($apps | Where-Object { $_.Id -eq $LineObject.ApplicationId }).displayName   
+                    Customer               = $tenantname
+                    Application            = ($apps | Where-Object { $_.Id -eq $LineObject.ApplicationId }).displayName
                     Platform               = $PlatformName
                     Version                = $LineObject.AppVersion
                     AssignmentStatus       = $AssignmentStatus
                     FailedUserCount        = $LineObject.FailedUserCount
-                    FailedDeviceCount      = $LineObject.FailedDeviceCount 
+                    FailedDeviceCount      = $LineObject.FailedDeviceCount
                     FailedDevicePercentage = [double]($LineObject.FailedDevicePercentage / 100).toString('0.00')
                 }) | Out-Null
         }
@@ -2523,6 +1445,5 @@ function Get-ApplicationFailures {
 }
 
 function Get-AutopilotProfilesInformation {
-(Invoke-GraphRequest -Uri "https://graph.microsoft.com/beta/deviceManagement/windowsAutopilotDeploymentProfiles/" -OutputType PSObject).value        
+(Invoke-GraphRequest -Uri "https://graph.microsoft.com/beta/deviceManagement/windowsAutopilotDeploymentProfiles/" -OutputType PSObject).value
 }
-
diff --git a/module/Private/IntuneEnrollmentFlows.ps1 b/module/Private/IntuneEnrollmentFlows.ps1
index b8936d8..0db5aeb 100644
--- a/module/Private/IntuneEnrollmentFlows.ps1
+++ b/module/Private/IntuneEnrollmentFlows.ps1
@@ -62,7 +62,7 @@ function Get-GroupMemberTargetType {
                 elseif ($odataType -eq '#microsoft.graph.user') { $result = 'User' }
             }
         }
-        catch { }
+        catch { Write-Verbose "Get-GroupMemberTargetType: Failed to query members for group $GroupId -- $_" }
     }
     $script:GroupMemberTypeCache[$GroupId] = $result
     return $result
@@ -114,7 +114,10 @@ function Get-AutopilotProfileConfigByDisplayName {
             Locale             = if ($autopilotProfile.locale) { $autopilotProfile.locale } else { "-" }
         }
     }
-    catch { return $null }
+    catch {
+        Write-Verbose "Get-AutopilotProfileConfigByDisplayName: Failed for '$DisplayName' -- $_"
+        return $null
+    }
 }
 
 function Get-MobileAppDisplayName {
@@ -180,7 +183,10 @@ function Get-EspConfigByDisplayName {
             SelectedMobileAppIds            = $selectedIds
         }
     }
-    catch { return $null }
+    catch {
+        Write-Verbose "Get-EspConfigByDisplayName: Failed for '$DisplayName' -- $_"
+        return $null
+    }
 }
 
 function Get-GroupParentGroupNames {
@@ -1675,317 +1681,145 @@ __PH_FILTERS__
 function New-AssignmentOverviewHtmlReport {
     param([Parameter(Mandatory)][array]$PolicyAssignments, [string]$TenantName = "Intune Tenant", [Parameter(Mandatory)][string]$OutputPath)
     $fragment = Get-AssignmentOverviewTabFragment -PolicyAssignments $PolicyAssignments -TenantName $TenantName
-    # Script in literal here-string so $ in JavaScript are not expanded by PowerShell (same approach as device report).
-    $assignmentOverviewScript = @'
-document.addEventListener('DOMContentLoaded', function() {
-  var themeToggle = document.getElementById('themeToggle');
-  var prefersDark = window.matchMedia('(prefers-color-scheme: dark)');
-  function applyTheme(isDark) {
-    document.documentElement.setAttribute('data-theme', isDark ? 'dark' : 'light');
-    if (themeToggle) themeToggle.checked = isDark;
-  }
-  var saved = localStorage.getItem('theme');
-  if (saved === 'dark' || saved === 'light') {
-    applyTheme(saved === 'dark');
-  } else {
-    applyTheme(prefersDark.matches);
-  }
-  if (themeToggle) themeToggle.addEventListener('change', function() {
-    var isDark = this.checked;
-    document.documentElement.setAttribute('data-theme', isDark ? 'dark' : 'light');
-    localStorage.setItem('theme', isDark ? 'dark' : 'light');
-  });
-  prefersDark.addEventListener('change', function(e) {
-    if (localStorage.getItem('theme') === null) {
-      applyTheme(e.matches);
-    }
-  });
-  if (jQuery && jQuery.fn.DataTable && jQuery('#allAssignmentsTable').length > 0) {
-    var $allTbl = jQuery('#allAssignmentsTable');
-    var preCategories = [], preTargets = [], preFilters = [];
-    function normFilter(s) { return String(s||'').replace(/\s*\((?:Include|Exclude)$/i, '').trim() || String(s||''); }
-    $allTbl.find('tbody tr').each(function() {
-      var $row = jQuery(this);
-      var $cells = $row.find('td');
-      if ($cells.length >= 4) {
-        var c = jQuery.trim($cells.eq(1).text()); if (c && preCategories.indexOf(c) === -1) preCategories.push(c);
-        var t = jQuery.trim($cells.eq(2).text()); if (t && preTargets.indexOf(t) === -1) preTargets.push(t);
-        var f = normFilter(jQuery.trim($cells.eq(3).text())); if (f && preFilters.indexOf(f) === -1) preFilters.push(f);
-      }
-    });
-    preCategories.sort(); preTargets.sort(); preFilters.sort();
-    var at = $allTbl.DataTable({
-      responsive: true, pageLength: 25, order: [[1,'asc'],[0,'asc']], dom: 'Bfrtip', buttons: ['copy','csv','excel','pdf','print'],
-            columnDefs: [
-                { targets: [0,1,2,3], className: 'text-start' },
-                { targets: 0, width: '25%' }, { targets: 1, width: '15%' }, { targets: 2, width: '15%' }, { targets: 3, width: '20%' }
-            ],
-      initComplete: function() {
-        var api = this.api();
-        function escOv(v){ return (v||'').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;'); }
-        function getOvChecked(menuId){ return jQuery('#'+menuId+' input.filter-cb:checked').map(function(){ return jQuery(this).attr('data-value'); }).get(); }
-        function updateOvBtn(btnId, menuId, label){ var n = getOvChecked(menuId).length; jQuery('#'+btnId).text(n ? label + ' (' + n + ')' : 'Select...'); }
-        function normalizeFilterName(v) { var s = String(v||''); return s.replace(/\s*\((?:Include|Exclude)\)$/i, '').trim() || s; }
-        function fillOvDropdownFromArray(menuId, btnId, values, label) {
-          var menu = jQuery('#'+menuId); if (!menu.length) return; menu.empty();
-          jQuery.each(values, function(i,v){ menu.append('<label class="dropdown-item"><input type="checkbox" class="filter-cb" data-value="'+escOv(v)+'"> '+escOv(v)+'</label>'); });
-          menu.find('input.filter-cb').on('change', function(e){ e.stopPropagation(); updateOvBtn(btnId, menuId, label); api.draw(); });
-          menu.on('click', function(e){ e.stopPropagation(); });
-          updateOvBtn(btnId, menuId, label);
-        }
-        fillOvDropdownFromArray('overviewFilterCategoryMenu','overviewFilterCategoryBtn', preCategories, 'Category');
-        fillOvDropdownFromArray('overviewFilterTargetMenu','overviewFilterTargetBtn', preTargets, 'Target');
-        fillOvDropdownFromArray('overviewFilterFilterMenu','overviewFilterFilterBtn', preFilters, 'Filter');
-        var overviewSearchFn = function(settings, data, dataIndex) {
-          if (settings.nTable && settings.nTable.id !== 'allAssignmentsTable') return true;
-          if (jQuery('#overviewFilterHideNotAssigned').length && jQuery('#overviewFilterHideNotAssigned').val() === 'hide' && data[2] === 'Not Assigned') return false;
-          var searchStr = ''; try { var searchApi = new jQuery.fn.dataTable.Api(settings); searchStr = (searchApi.search() || '').trim(); } catch (e) {}
-          if (searchStr) { var found = false; for (var i = 0; i < data.length; i++) { if (data[i] && data[i].toString().toLowerCase().indexOf(searchStr.toLowerCase()) !== -1) { found = true; break; } } if (!found) return false; }
-          var c = getOvChecked('overviewFilterCategoryMenu'); if (c.length && jQuery.inArray(data[1], c) === -1) return false;
-          var t = getOvChecked('overviewFilterTargetMenu'); if (t.length && jQuery.inArray(data[2], t) === -1) return false;
-          var rowFilterNorm = normalizeFilterName(data[3]); var f = getOvChecked('overviewFilterFilterMenu'); if (f.length && jQuery.inArray(rowFilterNorm, f) === -1) return false;
-          return true;
-        };
-        jQuery.fn.dataTable.ext.search.push(overviewSearchFn);
-        var hideNotAssigned = jQuery('#overviewFilterHideNotAssigned');
-        if (hideNotAssigned.length) hideNotAssigned.on('change', function(){ api.draw(); });
-        var resetBtn = jQuery('#overviewFiltersReset');
-        if (resetBtn.length) resetBtn.on('click', function(){
-          jQuery('#overviewFilterCategoryMenu,#overviewFilterTargetMenu,#overviewFilterFilterMenu').find('input.filter-cb').prop('checked', false);
-          updateOvBtn('overviewFilterCategoryBtn','overviewFilterCategoryMenu','Category'); updateOvBtn('overviewFilterTargetBtn','overviewFilterTargetMenu','Target'); updateOvBtn('overviewFilterFilterBtn','overviewFilterFilterMenu','Filter');
-          hideNotAssigned.val('');
-          api.draw();
-        });
-      }
-    });
-    jQuery('#showAllAssignments').prop('checked', false);
-    jQuery('#showAllAssignments').on('change', function() {
-      var dt = jQuery('#allAssignmentsTable').DataTable();
-      var paginateControls = jQuery('#allAssignmentsTable').closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info');
-      if (this.checked) { dt.page.len(-1); paginateControls.hide(); } else { dt.page.len(25); paginateControls.show(); }
-      dt.draw();
-    });
-  }
-  if (jQuery && jQuery.fn.DataTable && jQuery('#filtersTable').length > 0) {
-    var filtersTable = jQuery('#filtersTable').DataTable({
-      responsive: true, pageLength: 10, order: [[3, 'desc']],
-      dom: 'Bfrtip', buttons: ['copy', 'csv', 'excel', 'pdf', 'print'],
-            columnDefs: [
-                { targets: [0,1,2,3], className: 'text-start' },
-                { targets: 0, width: '20%' }, { targets: 1, width: '40%' }, { targets: 2, width: '15%' },
-                { targets: 3, width: '25%' }
-            ]
-    });
-    jQuery('#showAllFilters').prop('checked', false);
-    jQuery('#showAllFilters').on('change', function() {
-      var isShowAll = this.checked;
-      var paginateControls = jQuery('#filtersTable').closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info');
-      if (isShowAll) { filtersTable.page.len(-1); paginateControls.hide(); }
-      else { filtersTable.page.len(10); paginateControls.show(); }
-      filtersTable.draw();
-    });
-  }
-});
-'@
-    $html = @"
-<!DOCTYPE html>
-<html lang=`"en`">
-<head>
-    <meta charset=`"UTF-8`">
-    <meta name=`"viewport`" content=`"width=device-width, initial-scale=1.0`">
-    <title>$TenantName Intune Enrollment Flow Visualization</title>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.3.0/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://cdn.datatables.net/1.13.6/css/dataTables.bootstrap5.min.css">
-    <link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.1/css/buttons.bootstrap5.min.css">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-    <script src="https://code.jquery.com/jquery-3.7.0.js"></script>
-    <script src="https://cdn.datatables.net/1.13.6/js/jquery.dataTables.min.js"></script>
-    <script src="https://cdn.datatables.net/1.13.6/js/dataTables.bootstrap5.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.4.1/js/dataTables.buttons.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.bootstrap5.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.html5.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
-    <style>
-        :root { --primary-color: #0078d4; --secondary-color: #2b88d8; --accent-color: #107c10; --bg-color: #e2e8f0; --card-bg: #eef2f7; --text-color: #334155; --text-secondary: #64748b; --border-color: #cbd5e1; --shadow-sm: 0 1px 2px 0 rgb(0 0 0 / 0.05); --shadow-lg: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1); --bg-secondary: #e8ecf1; --bg-tertiary: #e2e8f0; --table-hover-bg: rgba(0,0,0,0.04); }
-        [data-theme="dark"] { --bg-color: #0d0d0d; --card-bg: #1a1a1a; --text-color: #e5e5e5; --text-secondary: #a3a3a3; --border-color: #404040; --bg-secondary: #1a1a1a; --bg-tertiary: #262626; --table-hover-bg: rgba(255,255,255,0.05); }
-        body { background: var(--bg-color); color: var(--text-color); min-height: 100vh; font-family: Segoe UI, Roboto, sans-serif; }
-        .app-container { min-height: 100vh; padding: 0; display: flex; flex-direction: column; }
-        .container { max-width: 1200px; margin: 0 auto; padding: 0 20px; background: var(--card-bg); flex: 1; }
-        .theme-toggle { position: absolute; top: 10px; right: 10px; z-index: 1050; display: flex; align-items: center; gap: 6px; background-color: var(--card-bg); padding: 6px 10px; border-radius: 30px; box-shadow: var(--shadow-lg); border: 1px solid var(--border-color); }
-        .theme-toggle-switch { position: relative; display: inline-block; width: 40px; height: 20px; }
-        .theme-toggle-switch input { opacity: 0; width: 0; height: 0; }
-        .theme-toggle-slider { position: absolute; cursor: pointer; top: 0; left: 0; right: 0; bottom: 0; background-color: #cbd5e1; transition: .4s; border-radius: 20px; }
-        .theme-toggle-slider:before { position: absolute; content: ""; height: 16px; width: 16px; left: 2px; bottom: 2px; background-color: white; transition: .4s; border-radius: 50%; box-shadow: 0 1px 2px rgba(0,0,0,0.2); }
-        input:checked + .theme-toggle-slider { background-color: #334155; }
-        input:checked + .theme-toggle-slider:before { transform: translateX(20px); }
-        .theme-icon { font-size: 12px; color: var(--text-color); }
-        .dashboard-header { background: linear-gradient(180deg, #1e293b 0%, #334155 100%); color: #fff; padding: 3rem 2rem; text-align: center; position: relative; overflow: hidden; box-shadow: 0 4px 24px rgba(0,0,0,0.08); border-bottom: 3px solid #475569; }
-        .dashboard-title { position: relative; z-index: 2; display: flex; align-items: center; justify-content: center; gap: 1.5rem; margin-bottom: 1rem; }
-        .dashboard-title h1 { margin: 0; font-size: 2.5rem; font-weight: 700; color: #fff; letter-spacing: -0.02em; }
-        .logo { height: 50px; width: 50px; filter: drop-shadow(0 6px 16px rgba(0,0,0,0.3)); }
-        .report-date { font-size: 0.9375rem; color: rgba(255,255,255,0.88); position: relative; z-index: 2; background: rgba(255,255,255,0.08); padding: 0.6rem 1.25rem; border-radius: 999px; border: 1px solid rgba(255,255,255,0.15); display: inline-flex; align-items: center; gap: 0.6rem; font-weight: 500; }
-        .overview-container { background: linear-gradient(135deg, var(--bg-color) 0%, var(--bg-secondary) 100%); border-radius: 16px; padding: 2rem; box-shadow: var(--shadow-lg); position: relative; overflow: hidden; }
-        .overview-container::before { content: ''; position: absolute; top: 0; left: 0; right: 0; height: 3px; background: #475569; }
-        .overview-header { text-align: center; margin-bottom: 2.5rem; background: linear-gradient(180deg, #1e293b 0%, #334155 100%); color: #fff; margin-left: -2rem; margin-right: -2rem; margin-top: -2rem; padding: 2rem 2rem 1.5rem; border-radius: 16px 16px 0 0; border-bottom: 2px solid rgba(255,255,255,0.06); }
-        .overview-header h2 { font-size: 2.5rem; font-weight: 700; margin-bottom: 0.5rem; color: #fff; letter-spacing: -0.02em; }
-        .overview-header p { font-size: 1.125rem; color: rgba(255,255,255,0.9); margin: 0; }
-        .summary-card { background: var(--card-bg); border: 1px solid var(--border-color); border-radius: 16px; padding: 1.5rem; transition: all 0.3s ease; box-shadow: var(--shadow-sm); min-height: 160px; display: flex; flex-direction: column; justify-content: center; align-items: center; }
-        .overview-tiles-row .summary-card { min-height: 100px; padding: 0.75rem 1rem; }
-        .overview-tiles-row .summary-card .card-icon { width: 36px; height: 36px; font-size: 1rem; margin: 0 auto 0.4rem; }
-        .overview-tiles-row .summary-card .card-title { font-size: 1.5rem; margin: 0.2rem 0; }
-        .overview-tiles-row .summary-card .card-text { min-height: 2em; font-size: 0.8rem; display: flex; align-items: center; justify-content: center; text-align: center; }
-        .summary-card .card-icon { width: 60px; height: 60px; border-radius: 16px; display: flex; align-items: center; justify-content: center; margin: 0 auto 1rem; font-size: 1.5rem; color: white; }
-        .summary-card.border-primary .card-icon { background: linear-gradient(135deg, #0078d4, #106ebe); }
-        .summary-card.border-success .card-icon { background: linear-gradient(135deg, #107c10, #0e6e0e); }
-        .summary-card.border-warning .card-icon { background: linear-gradient(135deg, #ffc107, #e0a800); }
-        .summary-card.border-danger .card-icon { background: linear-gradient(135deg, #d83b01, #c13401); }
-        .summary-card .card-title { font-size: 2.5rem; font-weight: 700; margin: 0.5rem 0; }
-        .summary-card .card-text { font-size: 0.9rem; font-weight: 500; color: var(--text-secondary); margin: 0; line-height: 1.4; text-align: center; }
-        .modern-table-container { background: var(--card-bg); border-radius: 16px; box-shadow: var(--shadow-lg); overflow: hidden; border: 1px solid var(--border-color); }
-        .modern-table-header { background: linear-gradient(180deg, #1e293b 0%, #334155 100%); padding: 1.5rem; border-bottom: 2px solid #475569; color: #fff; }
-        .modern-table-header h5 { margin: 0; font-weight: 600; font-size: 1.25rem; color: #fff; }
-        .modern-table-header small { color: rgba(255,255,255,0.85); font-size: 0.875rem; }
-        .modern-table-body { padding: 0; }
-        .modern-table { margin: 0; }
-        .modern-table thead th { background: var(--bg-secondary); border: none; font-weight: 600; font-size: 0.875rem; padding: 1rem 0.75rem; text-transform: uppercase; letter-spacing: 0.5px; }
-        .modern-table tbody tr { border-bottom: 1px solid var(--border-color); transition: background-color 0.2s ease; }
-        .modern-table tbody tr:hover { background-color: var(--table-hover-bg); }
-        .modern-table tbody td { padding: 1rem 0.75rem; border: none; vertical-align: middle; }
-        .assignment-filters-modern { background: linear-gradient(180deg, var(--card-bg) 0%, var(--bg-secondary) 100%); border-bottom: 1px solid var(--border-color); padding: 1rem 1.25rem; }
-        .assignment-filters-modern .assignment-filters-inner { display: flex; flex-wrap: wrap; align-items: flex-end; gap: 1rem; }
-        .assignment-filters-modern .filter-group { display: flex; flex-direction: column; gap: 0.25rem; }
-        .assignment-filters-modern .filter-label { font-size: 0.75rem; font-weight: 600; text-transform: uppercase; letter-spacing: 0.03em; color: var(--text-secondary); margin: 0; }
-        .assignment-filters-modern .filter-select { min-width: 140px; padding: 0.5rem 0.75rem; border-radius: 8px; border: 1px solid var(--border-color); background: var(--card-bg); font-size: 0.875rem; color: var(--text-color); }
-        .assignment-filters-modern .filter-reset-btn { display: inline-flex; align-items: center; gap: 0.35rem; padding: 0.5rem 0.9rem; border-radius: 8px; border: 1px solid var(--border-color); background: var(--card-bg); font-size: 0.875rem; color: var(--text-secondary); cursor: pointer; height: 2.15rem; }
-        .assignment-filters-modern .filter-multiselect { min-height: 80px; min-width: 160px; }
-        .assignment-filters-modern .filter-checkbox-group { display: flex; flex-direction: column; justify-content: flex-end; }
-        .assignment-filters-modern .filter-checkbox-label { font-size: 0.875rem; color: var(--text-color); margin: 0; cursor: pointer; display: inline-flex; align-items: center; gap: 0.4rem; white-space: nowrap; }
-        [data-theme="dark"] .assignment-filters-modern { background: linear-gradient(180deg, var(--bg-tertiary) 0%, var(--card-bg) 100%); border-color: var(--border-color); }
-        [data-theme="dark"] .assignment-filters-modern .filter-select, [data-theme="dark"] .assignment-filters-modern .filter-reset-btn { background: var(--card-bg); color: var(--text-color); border-color: var(--border-color); }
-        [data-theme="dark"] .assignment-filters-modern .filter-dropdown-btn { background: var(--card-bg); border-color: var(--border-color); color: var(--text-color); }
-        [data-theme="dark"] .assignment-filters-modern .filter-dropdown-btn:hover, [data-theme="dark"] .assignment-filters-modern .filter-dropdown-btn:focus, [data-theme="dark"] .assignment-filters-modern .filter-dropdown-btn.show { background: var(--bg-tertiary); border-color: var(--border-color); color: var(--text-color); }
-        [data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown { background: var(--card-bg); border-color: var(--border-color); }
-        [data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown .dropdown-item { color: var(--text-color); }
-        [data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown .dropdown-item:hover { background: var(--bg-tertiary); color: var(--text-color); }
-        [data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown label { color: var(--text-color); }
-        [data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown input.filter-cb { accent-color: #a3a3a3; }
-        [data-theme="dark"] .dashboard-header { background: linear-gradient(180deg, #171717 0%, #262626 100%); border-bottom-color: var(--border-color); box-shadow: none; }
-        [data-theme="dark"] .dashboard-title h1 { color: var(--text-color); }
-        [data-theme="dark"] .report-date { background: rgba(255,255,255,0.06); border-color: var(--border-color); color: var(--text-secondary); }
-        [data-theme="dark"] .overview-header { background: var(--bg-tertiary); color: var(--text-color); border-bottom-color: var(--border-color); }
-        [data-theme="dark"] .overview-header h2 { color: var(--text-color); }
-        [data-theme="dark"] .overview-header p { color: var(--text-secondary); opacity: 1; }
-        [data-theme="dark"] .table, [data-theme="dark"] .modern-table { background: var(--card-bg); color: var(--text-color); border-color: var(--border-color); }
-        [data-theme="dark"] .table thead th, [data-theme="dark"] .modern-table thead th { background: var(--bg-tertiary); color: var(--text-color); border-color: var(--border-color); }
-        [data-theme="dark"] .table tbody td, [data-theme="dark"] .modern-table tbody td { background: var(--card-bg); color: var(--text-color); border-color: var(--border-color); }
-        [data-theme="dark"] .table tbody tr:hover td, [data-theme="dark"] .modern-table tbody tr:hover td { background: var(--table-hover-bg); }
-        [data-theme="dark"] .table-striped tbody tr:nth-of-type(odd) td { background: var(--bg-secondary); }
-        [data-theme="dark"] .dataTables_wrapper { color: var(--text-color); background: var(--card-bg); border-color: var(--border-color); }
-        [data-theme="dark"] .dataTables_wrapper .table { background: var(--card-bg); color: var(--text-color); }
-        [data-theme="dark"] .modern-table-container .modern-table-body, [data-theme="dark"] .modern-table-container .table-responsive { background: var(--card-bg); }
-        [data-theme="dark"] .modern-table-container { background: var(--card-bg); }
-        [data-theme="dark"] .modern-table-header { background: var(--bg-tertiary); color: var(--text-color); border-bottom-color: var(--border-color); }
-        [data-theme="dark"] .modern-table-header h5, [data-theme="dark"] .modern-table-header small { color: var(--text-color); }
-        [data-theme="dark"] footer { background: linear-gradient(180deg, #171717 0%, #262626 100%); border-top-color: var(--border-color); }
-        [data-theme="dark"] .dataTables_filter input, [data-theme="dark"] .dataTables_length select { background: var(--bg-tertiary); color: var(--text-color); border-color: var(--border-color); }
-        [data-theme="dark"] .dataTables_info { color: var(--text-secondary); }
-        [data-theme="dark"] .dataTables_paginate .page-link { background: var(--card-bg); color: var(--text-color); border-color: var(--border-color); }
-        [data-theme="dark"] .dataTables_paginate .page-link:hover { background: var(--bg-tertiary); color: var(--text-color); }
-        [data-theme="dark"] .dataTables_paginate .page-item.active .page-link { background: var(--bg-tertiary); border-color: var(--border-color); color: var(--text-color); }
-        [data-theme="dark"] .dataTables_paginate .page-item.disabled .page-link { background: var(--bg-secondary); color: var(--text-secondary); }
-        [data-theme="dark"] .dt-button { background: var(--bg-tertiary); color: var(--text-color); border-color: var(--border-color); }
-        [data-theme="dark"] .dt-button:hover { background: var(--table-hover-bg); color: var(--text-color); }
-        footer { background: linear-gradient(180deg, #1e293b 0%, #334155 100%); color: rgba(255,255,255,0.9); padding: 2rem 0 1rem 0; margin-top: 3rem; border-top: 3px solid #475569; }
-        .footer-content { max-width: 1200px; margin: 0 auto; padding: 0 1rem; display: grid; grid-template-columns: 1fr auto 1fr; align-items: center; gap: 2rem; }
-        .footer-brand { font-size: 1.1rem; font-weight: 600; margin-bottom: 0.5rem; }
-        .footer-description { font-size: 0.85rem; opacity: 0.9; margin: 0; }
-        .footer-center { text-align: center; }
-        .footer-logo { width: 40px; height: 40px; background: rgba(255,255,255,0.1); border-radius: 50%; display: flex; align-items: center; justify-content: center; margin: 0 auto 0.5rem; font-size: 1.2rem; font-weight: bold; }
-        .footer-tagline { font-size: 0.8rem; opacity: 0.8; margin: 0; }
-        .footer-links { text-align: right; }
-        .footer-social { display: flex; gap: 1rem; justify-content: flex-end; margin-bottom: 0.5rem; }
-        .footer-social a { color: rgba(255,255,255,0.8); transition: all 0.3s ease; }
-        .footer-copyright { font-size: 0.75rem; opacity: 0.7; margin: 0; }
-        .footer-bottom { margin-top: 1.5rem; padding-top: 1rem; border-top: 1px solid rgba(255,255,255,0.1); text-align: center; }
-        .footer-tech-stack { font-size: 0.7rem; opacity: 0.6; margin: 0.5rem 0 0 0; }
-        .tech-badge { display: inline-block; background: rgba(255,255,255,0.15); padding: 0.2rem 0.5rem; border-radius: 6px; margin: 0 0.2rem; }
-    </style>
-</head>
-<body>
-    <div class="theme-toggle">
-        <div class="theme-icon"><i class="fas fa-sun"></i></div>
-        <label class="theme-toggle-switch">
-            <input type="checkbox" id="themeToggle">
-            <span class="theme-toggle-slider"></span>
-        </label>
-        <div class="theme-icon"><i class="fas fa-moon"></i></div>
-    </div>
-    <div class="app-container">
-        <div class="container">
-            <div class="dashboard-header">
-                <div class="dashboard-title">
-                    <svg class="logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
-                        <path fill="#ff5722" d="M6 6H22V22H6z" transform="rotate(-180 14 14)"/>
-                        <path fill="#4caf50" d="M26 6H42V22H26z" transform="rotate(-180 34 14)"/>
-                        <path fill="#ffc107" d="M6 26H22V42H6z" transform="rotate(-180 14 34)"/>
-                        <path fill="#03a9f4" d="M26 26H42V42H26z" transform="rotate(-180 34 34)"/>
-                    </svg>
-                    <h1>$TenantName Enrollment Flow Visualization</h1>
-                </div>
-                <div class="report-date">
-                    <i class="fas fa-calendar-alt me-2"></i>
-                    Report generated on: $(Get-Date -Format 'MMMM dd, yyyy \a\t HH:mm')
-                </div>
-            </div>
-            <ul class="nav nav-tabs" id="flowTabs" role="tablist">
-                <li class="nav-item" role="presentation">
-                    <button class="nav-link active" id="assignment-overview-tab" data-bs-toggle="tab" data-bs-target="#assignment-overview" type="button" role="tab" aria-controls="assignment-overview" aria-selected="true">
-                        <i class="fas fa-chart-pie me-2"></i>Assignment Overview
-                    </button>
-                </li>
-            </ul>
-            <div class="tab-content" id="flowTabContent">
-                <div class="tab-pane fade show active" id="assignment-overview" role="tabpanel" aria-labelledby="assignment-overview-tab" tabindex="0">
-$fragment
-                </div>
+
+    # Calculate stats for tiles
+    $totalPolicies = if ($PolicyAssignments) { ($PolicyAssignments | Select-Object -Property PolicyName -Unique).Count } else { 0 }
+    $unassignedPolicies = if ($PolicyAssignments) { ($PolicyAssignments | Where-Object { $_.AssignmentType -eq "Not Assigned" } | Select-Object -Property PolicyName -Unique).Count } else { 0 }
+    $totalAssignments = if ($PolicyAssignments) { $PolicyAssignments.Count } else { 0 }
+    $filtersUsed = ($PolicyAssignments | Where-Object { $_.FilterName -and $_.FilterName -ne "No Filter" -and $_.FilterName -ne "Filter Not Found" } | Select-Object -Property FilterName -Unique).Count
+
+    $statsCardsHtml = @"
+            <div class="rk-stat-tile t-rust">
+                <div class="rk-stat-eyebrow">TOTAL POLICIES</div>
+                <div class="rk-stat-number">$totalPolicies</div>
+                <div class="rk-stat-caption">Policies, apps &amp; scripts</div>
             </div>
-        </div>
-    </div>
-    <footer>
-        <div class="footer-content">
-            <div class="footer-info">
-                <div class="footer-brand">RK Solutions</div>
-                <p class="footer-description">Helping IT professionals with Microsoft 365 and Intune reporting tools and insights</p>
+            <div class="rk-stat-tile t-olive">
+                <div class="rk-stat-eyebrow">TOTAL ASSIGNMENTS</div>
+                <div class="rk-stat-number">$totalAssignments</div>
+                <div class="rk-stat-caption">Assignment entries</div>
             </div>
-            <div class="footer-center">
-                <div class="footer-logo">RK</div>
-                <p class="footer-tagline">Practical IT Solutions & Insights</p>
+            <div class="rk-stat-tile t-steel">
+                <div class="rk-stat-eyebrow">UNASSIGNED</div>
+                <div class="rk-stat-number">$unassignedPolicies</div>
+                <div class="rk-stat-caption">Policies without assignment</div>
             </div>
-            <div class="footer-links">
-                <div class="footer-social">
-                    <a href="https://rksolutions.nl" title="Visit RK Solutions Blog" target="_blank">🌐</a>
-                    <a href="https://github.com/royklo" title="GitHub" target="_blank">🔗</a>
-                    <a href="https://linkedin.com/in/roy-klooster" title="LinkedIn" target="_blank">💼</a>
-                </div>
-                <p class="footer-copyright">© 2025 Roy Klooster - RK Solutions</p>
+            <div class="rk-stat-tile t-rose">
+                <div class="rk-stat-eyebrow">FILTERS IN USE</div>
+                <div class="rk-stat-number">$filtersUsed</div>
+                <div class="rk-stat-caption">Unique assignment filters</div>
             </div>
+"@
+
+    # Build body content with the fragment and DataTables/filter JS
+    $bodyContentHtml = @"
+    <div class="rk-card">
+        <div class="rk-card-body">
+$fragment
         </div>
-        <div class="footer-bottom">
-            <p class="footer-copyright">Generated on $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss')</p>
-            <p class="footer-tech-stack">
-                <span class="tech-badge">PowerShell</span>
-                <span class="tech-badge">Microsoft Graph</span>
-                <span class="tech-badge">Intune</span>
-                <span class="tech-badge">HTML5</span>
-            </p>
-        </div>
-    </footer>
+    </div>
+
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
     <script>
-$assignmentOverviewScript
+    `$(document).ready(function() {
+        if (`$.fn.DataTable && `$('#allAssignmentsTable').length > 0) {
+            var `$allTbl = `$('#allAssignmentsTable');
+            var preCategories = [], preTargets = [], preFilters = [];
+            function normFilter(s) { return String(s||'').replace(/\s*\((?:Include|Exclude)$$/i, '').trim() || String(s||''); }
+            `$allTbl.find('tbody tr').each(function() {
+                var `$row = `$(this);
+                var `$cells = `$row.find('td');
+                if (`$cells.length >= 4) {
+                    var c = `$.trim(`$cells.eq(1).text()); if (c && preCategories.indexOf(c) === -1) preCategories.push(c);
+                    var t = `$.trim(`$cells.eq(2).text()); if (t && preTargets.indexOf(t) === -1) preTargets.push(t);
+                    var f = normFilter(`$.trim(`$cells.eq(3).text())); if (f && preFilters.indexOf(f) === -1) preFilters.push(f);
+                }
+            });
+            preCategories.sort(); preTargets.sort(); preFilters.sort();
+            var at = initRKTable('#allAssignmentsTable', {
+                pageLength: 25, order: [[1,'asc'],[0,'asc']],
+                columnDefs: [
+                    { targets: [0,1,2,3], className: 'text-start' },
+                    { targets: 0, width: '25%' }, { targets: 1, width: '15%' }, { targets: 2, width: '15%' }, { targets: 3, width: '20%' }
+                ],
+                initComplete: function() {
+                    var api = this.api();
+                    function escOv(v){ return (v||'').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;'); }
+                    function getOvChecked(menuId){ return `$('#'+menuId+' input.filter-cb:checked').map(function(){ return `$(this).attr('data-value'); }).get(); }
+                    function updateOvBtn(btnId, menuId, label){ var n = getOvChecked(menuId).length; `$('#'+btnId).text(n ? label + ' (' + n + ')' : 'Select...'); }
+                    function normalizeFilterName(v) { var s = String(v||''); return s.replace(/\s*\((?:Include|Exclude)\)$$/i, '').trim() || s; }
+                    function fillOvDropdownFromArray(menuId, btnId, values, label) {
+                        var menu = `$('#'+menuId); if (!menu.length) return; menu.empty();
+                        `$.each(values, function(i,v){ menu.append('<label class="dropdown-item"><input type="checkbox" class="filter-cb" data-value="'+escOv(v)+'"> '+escOv(v)+'</label>'); });
+                        menu.find('input.filter-cb').on('change', function(e){ e.stopPropagation(); updateOvBtn(btnId, menuId, label); api.draw(); });
+                        menu.on('click', function(e){ e.stopPropagation(); });
+                        updateOvBtn(btnId, menuId, label);
+                    }
+                    fillOvDropdownFromArray('overviewFilterCategoryMenu','overviewFilterCategoryBtn', preCategories, 'Category');
+                    fillOvDropdownFromArray('overviewFilterTargetMenu','overviewFilterTargetBtn', preTargets, 'Target');
+                    fillOvDropdownFromArray('overviewFilterFilterMenu','overviewFilterFilterBtn', preFilters, 'Filter');
+                    var overviewSearchFn = function(settings, data, dataIndex) {
+                        if (settings.nTable && settings.nTable.id !== 'allAssignmentsTable') return true;
+                        if (`$('#overviewFilterHideNotAssigned').length && `$('#overviewFilterHideNotAssigned').val() === 'hide' && data[2] === 'Not Assigned') return false;
+                        var searchStr = ''; try { var searchApi = new `$.fn.dataTable.Api(settings); searchStr = (searchApi.search() || '').trim(); } catch (e) {}
+                        if (searchStr) { var found = false; for (var i = 0; i < data.length; i++) { if (data[i] && data[i].toString().toLowerCase().indexOf(searchStr.toLowerCase()) !== -1) { found = true; break; } } if (!found) return false; }
+                        var c = getOvChecked('overviewFilterCategoryMenu'); if (c.length && `$.inArray(data[1], c) === -1) return false;
+                        var t = getOvChecked('overviewFilterTargetMenu'); if (t.length && `$.inArray(data[2], t) === -1) return false;
+                        var rowFilterNorm = normalizeFilterName(data[3]); var f = getOvChecked('overviewFilterFilterMenu'); if (f.length && `$.inArray(rowFilterNorm, f) === -1) return false;
+                        return true;
+                    };
+                    `$.fn.dataTable.ext.search.push(overviewSearchFn);
+                    var hideNotAssigned = `$('#overviewFilterHideNotAssigned');
+                    if (hideNotAssigned.length) hideNotAssigned.on('change', function(){ api.draw(); });
+                    var resetBtn = `$('#overviewFiltersReset');
+                    if (resetBtn.length) resetBtn.on('click', function(){
+                        `$('#overviewFilterCategoryMenu,#overviewFilterTargetMenu,#overviewFilterFilterMenu').find('input.filter-cb').prop('checked', false);
+                        updateOvBtn('overviewFilterCategoryBtn','overviewFilterCategoryMenu','Category'); updateOvBtn('overviewFilterTargetBtn','overviewFilterTargetMenu','Target'); updateOvBtn('overviewFilterFilterBtn','overviewFilterFilterMenu','Filter');
+                        hideNotAssigned.val('');
+                        api.draw();
+                    });
+                }
+            });
+            `$('#showAllAssignments').prop('checked', false);
+            `$('#showAllAssignments').on('change', function() {
+                var dt = `$('#allAssignmentsTable').DataTable();
+                var paginateControls = `$('#allAssignmentsTable').closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info');
+                if (this.checked) { dt.page.len(-1); paginateControls.hide(); } else { dt.page.len(25); paginateControls.show(); }
+                dt.draw();
+            });
+        }
+        if (`$.fn.DataTable && `$('#filtersTable').length > 0) {
+            var filtersTable = initRKTable('#filtersTable', {
+                pageLength: 10, order: [[3, 'desc']],
+                columnDefs: [
+                    { targets: [0,1,2,3], className: 'text-start' },
+                    { targets: 0, width: '20%' }, { targets: 1, width: '40%' }, { targets: 2, width: '15%' },
+                    { targets: 3, width: '25%' }
+                ]
+            });
+            `$('#showAllFilters').prop('checked', false);
+            `$('#showAllFilters').on('change', function() {
+                var isShowAll = this.checked;
+                var paginateControls = `$('#filtersTable').closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info');
+                if (isShowAll) { filtersTable.page.len(-1); paginateControls.hide(); }
+                else { filtersTable.page.len(10); paginateControls.show(); }
+                filtersTable.draw();
+            });
+        }
+    });
     </script>
-</body>
-</html>
 "@
+
+    $html = Get-RKSolutionsReportTemplate `
+        -TenantName $TenantName `
+        -ReportTitle 'Enrollment' `
+        -ReportSlug 'intune-enrollment-overview' `
+        -Eyebrow 'INTUNE ENROLLMENT FLOWS' `
+        -Lede 'Assignment overview across all Intune policy types with group and filter targeting.' `
+        -Tags @('Intune', 'Enrollment', 'Assignments') `
+        -StatsCardsHtml $statsCardsHtml `
+        -BodyContentHtml $bodyContentHtml
+
     $outDir = Split-Path -Parent $OutputPath
     if ($outDir -and -not (Test-Path $outDir)) { New-Item -ItemType Directory -Path $outDir -Force | Out-Null }
     if (-not [System.IO.Path]::HasExtension($OutputPath)) { $OutputPath = $OutputPath + ".html" }
@@ -2063,8 +1897,8 @@ function Get-ArchitectureDiagramFragment {
         foreach ($gd in $DeviceGroupDetails) {
             $encName = [System.Net.WebUtility]::HtmlEncode($gd.DisplayName)
             $encType = [System.Net.WebUtility]::HtmlEncode($gd.GroupType)
-            $ruleCell = if ($gd.MembershipRule) { $gd.MembershipRule } else { "-" }
-            $groupTableRows += "<tr><td class=`"arch-group-cell`">$encName</td><td class=`"arch-group-type`">$encType</td><td class=`"arch-group-rule`">$ruleCell</td></tr>"
+            $ruleCell = if ($gd.MembershipRule -and $gd.MembershipRule -ne "-") { '<code>' + $gd.MembershipRule + '</code>' } else { "-" }
+            $groupTableRows += "<tr><td class=`"arch-group-cell`">$encName</td><td class=`"arch-group-type`">$encType</td><td class=`"arch-group-rule entra-rule`">$ruleCell</td></tr>"
         }
     }
     $autopilotName = if ($autopilotPolicies.Count -gt 0) { [System.Net.WebUtility]::HtmlEncode($autopilotPolicies[0]) } else { "- None -" }
@@ -2082,7 +1916,7 @@ function Get-ArchitectureDiagramFragment {
 "@ }
     [void]$sb.AppendLine('<div class="arch-flow">')
     [void]$sb.AppendLine(@"
-<div class="arch-step arch-step-device" style="--arch-fill:#0f766e;">
+<div class="arch-step arch-step-device" style="--arch-fill:#ea580c;">
 <div class="arch-step-title">Device</div>
 <div class="arch-group-table-wrap">
 <table class="arch-group-table">
@@ -2094,7 +1928,7 @@ function Get-ArchitectureDiagramFragment {
 "@)
     [void]$sb.AppendLine('<div class="arch-arrow" aria-hidden="true"><i class="fas fa-chevron-right"></i></div>')
     [void]$sb.AppendLine(@"
-<div class="arch-step arch-step-memberof" style="--arch-fill:#115e59;">
+<div class="arch-step arch-step-memberof" style="--arch-fill:#c2410c;">
 <div class="arch-step-title">Entra ID Groups</div>
 <div class="arch-group-table-wrap">
 <table class="arch-group-table">
@@ -2116,14 +1950,14 @@ function Get-ArchitectureDiagramFragment {
         [void]$sb.AppendLine('<div class="arch-arrow" aria-hidden="true"><i class="fas fa-chevron-right"></i></div>')
     }
     [void]$sb.AppendLine(@"
-<div class="arch-step arch-step-autopilot-esp" style="--arch-fill:#0f766e;">
+<div class="arch-step arch-step-autopilot-esp" style="--arch-fill:#ea580c;">
 <div class="arch-autopilot-esp-inner">
-<div class="arch-esp-block" style="--arch-fill:#0f766e;">
+<div class="arch-esp-block" style="--arch-fill:#ea580c;">
 <div class="arch-step-title">Autopilot Profile</div>
 <div class="arch-step-sub">$autopilotName</div>
 </div>
 <div class="arch-arrow-down" aria-hidden="true"><i class="fas fa-chevron-down"></i></div>
-<div class="arch-esp-block" style="--arch-fill:#115e59;">
+<div class="arch-esp-block" style="--arch-fill:#c2410c;">
 <div class="arch-step-title">Enrollment Status Page</div>
 <div class="arch-step-sub">$espName</div>
 </div>
@@ -2339,7 +2173,8 @@ function Get-AppliedFlowHtmlFragment {
             $gEnc = [System.Net.WebUtility]::HtmlEncode($gtr[0])
             $tEnc = [System.Net.WebUtility]::HtmlEncode($gtr[1])
             $rEnc = [System.Net.WebUtility]::HtmlEncode($gtr[2])
-            [void]$sb.AppendLine('<div class="policy-item policy-item-4col" style="grid-template-columns: 2fr 2fr 1fr 2fr;"><div class="policy-name">' + $pEnc + '</div><div class="policy-assignment">' + $gEnc + '</div><div class="policy-type">' + $tEnc + '</div><div class="policy-filter">' + $rEnc + '</div></div>')
+            $rDisplay = if ($rEnc -and $rEnc -ne '-' -and $rEnc -ne 'No Filter') { '<code>' + $rEnc + '</code>' } else { $rEnc }
+            [void]$sb.AppendLine('<div class="policy-item policy-item-4col" style="grid-template-columns: 2fr 2fr 1fr 2fr;"><div class="policy-name">' + $pEnc + '</div><div class="policy-assignment">' + $gEnc + '</div><div class="policy-type">' + $tEnc + '</div><div class="policy-filter entra-rule">' + $rDisplay + '</div></div>')
         }
         [void]$sb.AppendLine('</div>')
         $sb.ToString()
@@ -2516,11 +2351,12 @@ $espRestHtml
                 $gEnc = [System.Net.WebUtility]::HtmlEncode($gtr[0])
                 $tEnc = [System.Net.WebUtility]::HtmlEncode($gtr[1])
                 $rEnc = [System.Net.WebUtility]::HtmlEncode($gtr[2])
+                $rDisplay = if ($rEnc -and $rEnc -ne '-' -and $rEnc -ne 'No Filter') { '<code>' + $rEnc + '</code>' } else { $rEnc }
                 $cloudPCProvisioningDeviceGroupsHtml += '<div class="policy-item policy-item-devicegroups" style="grid-template-columns: 2fr 2fr 1fr 3fr;">'
                 $cloudPCProvisioningDeviceGroupsHtml += '<div class="policy-name"><span class="flow-field-label">Policy name</span><br><span class="flow-field-value">' + $pEnc + '</span></div>'
                 $cloudPCProvisioningDeviceGroupsHtml += '<div class="policy-assignment"><span class="flow-field-label">Group name</span><br><span class="flow-field-value">' + $gEnc + '</span></div>'
                 $cloudPCProvisioningDeviceGroupsHtml += '<div class="policy-type"><span class="flow-field-label">Type</span><br><span class="flow-field-value">' + $tEnc + '</span></div>'
-                $cloudPCProvisioningDeviceGroupsHtml += '<div class="policy-filter entra-rule"><span class="flow-field-label">Membership rule</span><br><span class="flow-field-value">' + $rEnc + '</span></div>'
+                $cloudPCProvisioningDeviceGroupsHtml += '<div class="policy-filter entra-rule"><span class="flow-field-label">Membership rule</span><br><span class="flow-field-value">' + $rDisplay + '</span></div>'
                 $cloudPCProvisioningDeviceGroupsHtml += '</div>'
             }
             $cloudPCProvisioningDeviceGroupsHtml = $cloudPCTableHeader + $cloudPCProvisioningDeviceGroupsHtml
@@ -2582,11 +2418,12 @@ $espRestHtml
                 $gEnc = [System.Net.WebUtility]::HtmlEncode($gtr[0])
                 $tEnc = [System.Net.WebUtility]::HtmlEncode($gtr[1])
                 $rEnc = [System.Net.WebUtility]::HtmlEncode($gtr[2])
+                $rDisplay = if ($rEnc -and $rEnc -ne '-' -and $rEnc -ne 'No Filter') { '<code>' + $rEnc + '</code>' } else { $rEnc }
                 $cloudPCUserSettingsDeviceGroupsHtml += '<div class="policy-item policy-item-devicegroups" style="grid-template-columns: 2fr 2fr 1fr 3fr;">'
                 $cloudPCUserSettingsDeviceGroupsHtml += '<div class="policy-name"><span class="flow-field-label">Policy name</span><br><span class="flow-field-value">' + $pEnc + '</span></div>'
                 $cloudPCUserSettingsDeviceGroupsHtml += '<div class="policy-assignment"><span class="flow-field-label">Group name</span><br><span class="flow-field-value">' + $gEnc + '</span></div>'
                 $cloudPCUserSettingsDeviceGroupsHtml += '<div class="policy-type"><span class="flow-field-label">Type</span><br><span class="flow-field-value">' + $tEnc + '</span></div>'
-                $cloudPCUserSettingsDeviceGroupsHtml += '<div class="policy-filter entra-rule"><span class="flow-field-label">Membership rule</span><br><span class="flow-field-value">' + $rEnc + '</span></div>'
+                $cloudPCUserSettingsDeviceGroupsHtml += '<div class="policy-filter entra-rule"><span class="flow-field-label">Membership rule</span><br><span class="flow-field-value">' + $rDisplay + '</span></div>'
                 $cloudPCUserSettingsDeviceGroupsHtml += '</div>'
             }
             $cloudPCUserSettingsDeviceGroupsHtml = $cloudPCUserSettingsTableHeader + $cloudPCUserSettingsDeviceGroupsHtml
@@ -2632,7 +2469,7 @@ $userTable
         foreach ($gd in $DeviceGroupDetails) {
             $name = if ($gd.DisplayName) { $gd.DisplayName } else { "-" }
             $gType = if ($gd.GroupType) { $gd.GroupType } else { "Static" }
-            $ruleHtml = if ($gd.MembershipRule) { $gd.MembershipRule } else { "-" }
+            $ruleHtml = if ($gd.MembershipRule -and $gd.MembershipRule -ne "-") { '<code>' + $gd.MembershipRule + '</code>' } else { "-" }
             $encName = [System.Net.WebUtility]::HtmlEncode($name)
             $encType = [System.Net.WebUtility]::HtmlEncode($gType)
             $entraGroupListHtml += '<div class="policy-item policy-item-devicegroups" style="grid-template-columns: 2fr 1fr 3fr;">'
@@ -2732,224 +2569,279 @@ function New-DeviceVisualizationHtmlReport {
     )
     if (-not $AppliedFlowHtml) { $AppliedFlowHtml = Get-AppliedFlowHtmlFragment -EvaluatedAssignments $EvaluatedAssignments -DeviceName $DeviceName -DeviceGroupDetails $DeviceGroupDetails -DevicePlatform $DevicePlatform -IsCloudPC:$IsCloudPC -DeviceGroupIds $DeviceGroupIds -UserGroupIds $UserGroupIds }
     $architectureFragment = Get-ArchitectureDiagramFragment -EvaluatedAssignments $EvaluatedAssignments -DeviceName $DeviceName -DeviceGroupDetails $DeviceGroupDetails -IntuneDeviceId $IntuneDeviceId -EntraDeviceId $EntraDeviceId -DevicePlatform $DevicePlatform -IsCloudPC:$IsCloudPC -DeviceGroupIds $DeviceGroupIds -UserGroupIds $UserGroupIds
-    $overviewTabNav = ""
-    $overviewTabPane = ""
-    $diagramTabActive = "active"
-    $diagramPaneActive = "show active"
-    $architectureTabNav = ""
+
+    # Calculate stats
+    $applied = $EvaluatedAssignments | Where-Object { $_.AppliesToDevice -eq $true }
+    $appliedCount = if ($applied) { ($applied | Select-Object -Property PolicyName -Unique).Count } else { 0 }
+    $totalPolicies = if ($EvaluatedAssignments) { ($EvaluatedAssignments | Select-Object -Property PolicyName -Unique).Count } else { 0 }
+    $groupCount = if ($DeviceGroupDetails) { $DeviceGroupDetails.Count } else { 0 }
+    $excludedCount = $totalPolicies - $appliedCount
+
+    $statsCardsHtml = @"
+            <div class="rk-stat-tile t-rust">
+                <div class="rk-stat-eyebrow">APPLIED POLICIES</div>
+                <div class="rk-stat-number">$appliedCount</div>
+                <div class="rk-stat-caption">Policies targeting this device</div>
+            </div>
+            <div class="rk-stat-tile t-olive">
+                <div class="rk-stat-eyebrow">TOTAL POLICIES</div>
+                <div class="rk-stat-number">$totalPolicies</div>
+                <div class="rk-stat-caption">All evaluated policies</div>
+            </div>
+            <div class="rk-stat-tile t-steel">
+                <div class="rk-stat-eyebrow">GROUP MEMBERSHIPS</div>
+                <div class="rk-stat-number">$groupCount</div>
+                <div class="rk-stat-caption">Device group memberships</div>
+            </div>
+            <div class="rk-stat-tile t-rose">
+                <div class="rk-stat-eyebrow">NOT APPLIED</div>
+                <div class="rk-stat-number">$excludedCount</div>
+                <div class="rk-stat-caption">Excluded or not targeted</div>
+            </div>
+"@
+
+    # Build tab navigation for overview + diagram
+    $overviewTabHtml = ""
+    $overviewPanelHtml = ""
+    $diagramTabClass = "rk-tab active"
+    $diagramPanelClass = "rk-panel active"
     if ($AssignmentOverviewFragment) {
-        $overviewTabNav = "<li class=`"nav-item`"><button class=`"nav-link active`" id=`"overview-tab`" data-bs-toggle=`"tab`" data-bs-target=`"#overview`" type=`"button`" role=`"tab`"><i class=`"fas fa-chart-pie me-2`"></i>Assignment Overview</button></li>"
-        $overviewTabPane = "<div class=`"tab-pane fade show active`" id=`"overview`" role=`"tabpanel`">" + $AssignmentOverviewFragment + "</div>"
-        $diagramTabActive = ""
-        $diagramPaneActive = ""
-    }
-    $reportDate = Get-Date -Format 'MMMM dd, yyyy HH:mm'
-    $titleDevice = [System.Net.WebUtility]::HtmlEncode($DeviceName)
-    $bannerDevice = [System.Net.WebUtility]::HtmlEncode($DeviceName)
-    $tenantDisplay = [System.Net.WebUtility]::HtmlEncode($TenantName) + " · " + $reportDate
-    $htmlTemplate = @'
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>Intune Device Visualization - __PH_TITLE_DEVICE__</title>
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.3.0/css/bootstrap.min.css">
-<link rel="stylesheet" href="https://cdn.datatables.net/1.13.6/css/dataTables.bootstrap5.min.css">
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.1/css/buttons.bootstrap5.min.css">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-<style>
-:root{--primary-color:#0078d4;--bg-color:#e2e8f0;--card-bg:#eef2f7;--text-color:#1e293b;--text-secondary:#64748b;--border-color:#cbd5e1;--gradient-primary:linear-gradient(135deg,#0078d4 0%,#107c10 100%);}
-[data-theme="dark"]{--bg-color:#0d0d0d;--card-bg:#1a1a1a;--text-color:#e5e5e5;--text-secondary:#a3a3a3;--border-color:#404040;--bg-secondary:#1a1a1a;--bg-tertiary:#262626;}
-body{background:var(--bg-color);color:var(--text-color);min-height:100vh;}
-.app-container{max-width:1200px;margin:0 auto;padding:20px;}
-.main-tabs-nav{display:flex;width:100%;}
-.main-tabs-nav .nav-item{flex:1;text-align:center;}
-.main-tabs-nav .nav-link{width:100%;text-align:center;}
-.dashboard-header{background:linear-gradient(180deg,#1e293b 0%,#334155 100%);color:#fff;padding:2rem;text-align:center;box-shadow:0 4px 24px rgba(0,0,0,0.08);border-bottom:3px solid #475569;}
-.overview-tiles-row .summary-card{min-height:100px;padding:0.75rem 1rem;display:flex;flex-direction:column;justify-content:center;align-items:center;}
-.overview-tiles-row .summary-card .card-icon{width:36px;height:36px;font-size:1rem;margin:0 auto 0.4rem;}
-.overview-tiles-row .summary-card .card-title{font-size:1.5rem;margin:0.2rem 0;}
-.overview-tiles-row .summary-card .card-text{min-height:2em;font-size:0.8rem;display:flex;align-items:center;justify-content:center;text-align:center;}
-.device-banner{background:var(--card-bg);border:1px solid var(--border-color,#e5e7eb);border-radius:8px;padding:1rem;margin-bottom:1rem;}
-.summary-card{background:var(--card-bg);border-radius:12px;padding:1.5rem;text-align:center;}
-.modern-table-container{margin:1rem 0;border-radius:12px;overflow:hidden;}
-.modern-table-header{background:linear-gradient(180deg,#1e293b 0%,#334155 100%);padding:1rem;color:#fff;}
-.modern-table-header h5,.modern-table-header small{color:#fff;}
-.modern-table-header small{opacity:0.88;font-size:0.875rem;}
-.nav-tabs .nav-link{font-weight:500;}
-.nav-tabs .nav-link.active{background:#334155;color:#fff;border-color:#334155;}
-[data-theme="dark"] .nav-tabs .nav-link{background:var(--bg-tertiary);color:var(--text-secondary);border-color:var(--border-color);}
-[data-theme="dark"] .nav-tabs .nav-link:hover{background:#333;color:var(--text-color);border-color:var(--border-color);}
-[data-theme="dark"] .nav-tabs .nav-link.active{background:#333;color:var(--text-color);border-color:var(--border-color);}
-[data-theme="dark"] .table,[data-theme="dark"] .modern-table{background:var(--card-bg);color:var(--text-color);border-color:var(--border-color);}
-[data-theme="dark"] .table thead th,[data-theme="dark"] .modern-table thead th{background:var(--bg-tertiary);color:var(--text-color);border-color:var(--border-color);}
-[data-theme="dark"] .table tbody td,[data-theme="dark"] .modern-table tbody td{background:var(--card-bg);color:var(--text-color);border-color:var(--border-color);}
-[data-theme="dark"] .table tbody tr:hover td,[data-theme="dark"] .modern-table tbody tr:hover td{background:rgba(255,255,255,0.05);}
-[data-theme="dark"] .table-striped tbody tr:nth-of-type(odd) td{background:var(--bg-tertiary);}
-[data-theme="dark"] .dataTables_wrapper{color:var(--text-color);background:var(--card-bg);border-color:var(--border-color);}
-[data-theme="dark"] .modern-table-container .table-responsive,[data-theme="dark"] .modern-table-body{background:var(--card-bg);}
-[data-theme="dark"] .dataTables_filter input,[data-theme="dark"] .dataTables_length select{background:var(--bg-tertiary);color:var(--text-color);border-color:var(--border-color);}
-[data-theme="dark"] .dataTables_info{color:var(--text-secondary);}
-[data-theme="dark"] .dataTables_paginate .page-link{background:var(--card-bg);color:var(--text-color);border-color:var(--border-color);}
-[data-theme="dark"] .dataTables_paginate .page-link:hover{background:var(--bg-tertiary);color:var(--text-color);}
-[data-theme="dark"] .dataTables_paginate .page-item.active .page-link{background:var(--bg-tertiary);border-color:var(--border-color);color:var(--text-color);}
-[data-theme="dark"] .dataTables_paginate .page-item.disabled .page-link{background:var(--card-bg);color:var(--text-secondary);}
-[data-theme="dark"] .dt-button{background:var(--bg-tertiary);color:var(--text-color);border-color:var(--border-color);}
-[data-theme="dark"] .dt-button:hover{background:#333;color:var(--text-color);}
-[data-theme="dark"] .modern-table-container{background:var(--card-bg);border-color:var(--border-color);}
-[data-theme="dark"] .modern-table-header{background:var(--bg-tertiary);color:var(--text-color);}
-[data-theme="dark"] .device-banner{border-color:var(--border-color);}
-.alert-info{background-color:#e7f3ff;border-color:#b3d9ff;color:#004085;}
-.alert-info code{background-color:rgba(0,0,0,0.05);padding:2px 6px;border-radius:3px;font-family:'Cascadia Code','Source Code Pro',Menlo,Consolas,monospace;}
-.alert-info a{color:#004085;font-weight:600;}
-.alert-info a:hover{color:#002752;}
-[data-theme="dark"] .alert-info{background-color:#1a3a52;border-color:#2c6089;color:#a8d1ff;}
-[data-theme="dark"] .alert-info code{background-color:rgba(255,255,255,0.1);}
-[data-theme="dark"] .alert-info a{color:#a8d1ff;}
-[data-theme="dark"] .alert-info a:hover{color:#d4e9ff;}
-[data-theme="dark"] .dashboard-header{background:linear-gradient(180deg,#171717 0%,#262626 100%);border-bottom-color:var(--border-color);box-shadow:none;}
-.assignment-filters-modern{background:linear-gradient(180deg,var(--card-bg) 0%,#e8ecf1 100%);border-bottom:1px solid var(--border-color);padding:1rem 1.25rem;}
-.assignment-filters-modern .assignment-filters-inner{display:flex;flex-wrap:wrap;align-items:flex-end;gap:1rem;}
-.assignment-filters-modern .filter-group{display:flex;flex-direction:column;gap:0.25rem;}
-.assignment-filters-modern .filter-label{font-size:0.75rem;font-weight:600;text-transform:uppercase;letter-spacing:0.03em;color:var(--text-secondary,#64748b);margin:0;}
-.assignment-filters-modern .filter-select{min-width:140px;padding:0.5rem 0.75rem;border-radius:8px;border:1px solid var(--border-color);background:var(--card-bg);font-size:0.875rem;color:var(--text-color);transition:border-color 0.2s,box-shadow 0.2s;}
-.assignment-filters-modern .filter-select:focus{border-color:#475569;outline:none;box-shadow:0 0 0 3px rgba(71,85,105,0.2);}
-.assignment-filters-modern .filter-dropdown-btn{min-width:140px;text-align:left;}
-.assignment-filters-modern .filter-checkbox-dropdown{max-height:260px;overflow-y:auto;padding:0.25rem;}
-.assignment-filters-modern .filter-checkbox-dropdown .dropdown-item{white-space:nowrap;cursor:pointer;display:flex;align-items:center;gap:0.5rem;}
-.assignment-filters-modern .filter-checkbox-dropdown .dropdown-item input{margin:0;cursor:pointer;}
-.assignment-filters-modern .filter-checkbox-dropdown label{margin:0;cursor:pointer;width:100%;}
-.assignment-filters-modern .filter-reset-btn{display:inline-flex;align-items:center;gap:0.35rem;padding:0.5rem 0.9rem;border-radius:8px;border:1px solid var(--border-color);background:var(--card-bg);font-size:0.875rem;color:var(--text-secondary);cursor:pointer;transition:all 0.2s;height:2.15rem;}
-.assignment-filters-modern .filter-reset-btn:hover{background:#e2e8f0;border-color:#cbd5e1;color:#475569;}
-[data-theme="dark"] .assignment-filters-modern{background:linear-gradient(180deg,var(--bg-tertiary) 0%,var(--card-bg) 100%);border-color:var(--border-color);}
-[data-theme="dark"] .assignment-filters-modern .filter-label{color:var(--text-secondary);}
-[data-theme="dark"] .assignment-filters-modern .filter-select{background:var(--card-bg);color:var(--text-color);border-color:var(--border-color);}
-[data-theme="dark"] .assignment-filters-modern .filter-select:focus{border-color:#737373;box-shadow:0 0 0 3px rgba(115,115,115,0.2);}
-[data-theme="dark"] .assignment-filters-modern .filter-reset-btn{background:var(--bg-tertiary);border-color:var(--border-color);color:var(--text-secondary);}
-[data-theme="dark"] .assignment-filters-modern .filter-reset-btn:hover{background:#333;color:var(--text-color);}
-[data-theme="dark"] .assignment-filters-modern .filter-dropdown-btn{background:var(--card-bg);border-color:var(--border-color);color:var(--text-color);}
-[data-theme="dark"] .assignment-filters-modern .filter-dropdown-btn:hover,[data-theme="dark"] .assignment-filters-modern .filter-dropdown-btn:focus,[data-theme="dark"] .assignment-filters-modern .filter-dropdown-btn.show{background:var(--bg-tertiary);border-color:var(--border-color);color:var(--text-color);}
-[data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown{background:var(--card-bg);border-color:var(--border-color);}
-[data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown .dropdown-item{color:var(--text-color);}
-[data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown .dropdown-item:hover{background:var(--bg-tertiary);color:var(--text-color);}
-[data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown label{color:var(--text-color);}
-[data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown input.filter-cb{accent-color:#a3a3a3;}
-[data-theme="dark"] .summary-card{background:var(--card-bg);border-color:var(--border-color);color:var(--text-color) !important;}
-[data-theme="dark"] .summary-card .card-title,[data-theme="dark"] .summary-card div.card-title{color:var(--text-color) !important;}
-[data-theme="dark"] .summary-card .text-muted,[data-theme="dark"] .summary-card p.text-muted{color:var(--text-secondary) !important;}
-[data-theme="dark"] .text-muted{color:var(--text-secondary);}
-[data-theme="dark"] .row .summary-card,.row .summary-card *{color:inherit;}
-[data-theme="dark"] .row .summary-card .card-title{color:var(--text-color) !important;}
-[data-theme="dark"] .row .summary-card .text-muted,.row .summary-card p{color:var(--text-secondary) !important;}
-html[data-theme="dark"] #viz .summary-card,html[data-theme="dark"] #viz .summary-card .card-title,html[data-theme="dark"] #viz .summary-card div,html[data-theme="dark"] #viz .summary-card p{color:var(--text-color) !important;}
-html[data-theme="dark"] #viz .summary-card p.text-muted,html[data-theme="dark"] #viz .summary-card .text-muted{color:var(--text-secondary) !important;}
-[data-theme="dark"] .overview-container{background:linear-gradient(135deg,var(--bg-color) 0%,var(--card-bg) 100%);border-color:var(--border-color);}
-[data-theme="dark"] .overview-header{background:var(--bg-tertiary);color:var(--text-color);}
-[data-theme="dark"] .overview-header h2{color:var(--text-color);}
-[data-theme="dark"] .overview-header p{color:var(--text-secondary);opacity:1;}
-.overview-container{background:linear-gradient(135deg,var(--card-bg) 0%,#e8ecf1 100%);border-radius:16px;padding:2rem;margin:1rem 0;}
-.overview-header{text-align:center;margin-bottom:2rem;background:linear-gradient(180deg,#1e293b 0%,#334155 100%);color:#fff;margin-left:-2rem;margin-right:-2rem;margin-top:-2rem;padding:2rem 2rem 1.5rem;border-radius:16px 16px 0 0;border-bottom:2px solid rgba(255,255,255,0.06);}
-.overview-header h2{font-size:1.75rem;font-weight:700;margin-bottom:0.5rem;color:#fff;letter-spacing:-0.02em;}
-.overview-header p{font-size:1rem;color:rgba(255,255,255,0.9);margin:0;}
-.summary-card .card-icon{width:50px;height:50px;border-radius:12px;display:flex;align-items:center;justify-content:center;margin:0 auto 0.75rem;font-size:1.25rem;color:#fff;}
-.summary-card.border-primary .card-icon{background:linear-gradient(135deg,#0078d4,#106ebe);}
-.summary-card.border-success .card-icon{background:linear-gradient(135deg,#107c10,#0e6e0e);}
-.summary-card.border-warning .card-icon{background:linear-gradient(135deg,#ffc107,#e0a800);}
-.summary-card.border-danger .card-icon{background:linear-gradient(135deg,#d83b01,#c13401);}
-.device-theme-toggle{position:fixed;top:10px;right:10px;z-index:1050;display:flex;align-items:center;gap:6px;background:var(--card-bg);padding:6px 10px;border-radius:30px;box-shadow:0 4px 12px rgba(0,0,0,0.1);border:1px solid var(--border-color,#e5e7eb);}
-.device-theme-toggle .theme-icon{font-size:12px;color:var(--text-color);}
-.device-theme-switch{position:relative;display:inline-block;width:40px;height:20px;}
-.device-theme-switch input{opacity:0;width:0;height:0;}
-.device-theme-slider{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background:#cbd5e1;transition:.4s;border-radius:20px;}
-.device-theme-slider:before{position:absolute;content:"";height:16px;width:16px;left:2px;bottom:2px;background:#fff;transition:.4s;border-radius:50%;box-shadow:0 1px 2px rgba(0,0,0,0.2);}
-.device-theme-switch input:checked + .device-theme-slider{background:#334155;}
-.device-theme-switch input:checked + .device-theme-slider:before{transform:translateX(20px);}
-[data-theme="dark"] .device-theme-toggle{border-color:var(--border-color);}
+        $overviewTabHtml = '<button class="rk-tab active" data-target="panel-overview">Assignment Overview</button>'
+        $overviewPanelHtml = @"
+    <div id="panel-overview" class="rk-panel active">
+        <div class="rk-card">
+            <div class="rk-card-body">
+$AssignmentOverviewFragment
+            </div>
+        </div>
+    </div>
+"@
+        $diagramTabClass = "rk-tab"
+        $diagramPanelClass = "rk-panel"
+    }
+
+    $deviceEnc = [System.Net.WebUtility]::HtmlEncode($DeviceName)
+
+    # Build body content with tabs, architecture diagram, and flow
+    $bodyContentHtml = @"
+    <!-- Tab Navigation -->
+    <div class="rk-tabs">
+        $overviewTabHtml
+        <button class="$diagramTabClass" data-target="panel-diagram">Enrollment Flow</button>
+    </div>
+
+    $overviewPanelHtml
+
+    <div id="panel-diagram" class="$diagramPanelClass">
+        <div class="rk-card">
+            <div class="rk-card-header"><span>Architecture Overview</span></div>
+            <div class="rk-card-body">
+                <div class="arch-diagram-wrapper arch-diagram-html arch-flow-horizontal">$architectureFragment</div>
+            </div>
+        </div>
+
+        <div class="rk-card">
+            <div class="rk-card-header"><span>Enrollment Flow &mdash; $deviceEnc</span></div>
+            <div class="rk-card-body">
+                <div class="flow-diagram-wrapper">$AppliedFlowHtml</div>
+            </div>
+        </div>
+    </div>
+
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
+    <script type="module">
+    import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs';
+    const isDarkTheme = () => document.documentElement.getAttribute('data-theme') === 'dark';
+    function initMermaidTheme() {
+        const isDark = isDarkTheme();
+        mermaid.initialize({
+            startOnLoad: false,
+            theme: isDark ? 'dark' : 'base',
+            themeVariables: isDark ? {
+                primaryColor: '#ea580c', primaryTextColor: '#fff', primaryBorderColor: '#c2410c',
+                lineColor: '#94a3b8', secondaryColor: '#4a2e10', tertiaryColor: '#1a1a1a',
+                background: '#0d0d0d', mainBkg: '#1a1a1a', secondBkg: '#262626',
+                fontSize: '16px', fontFamily: 'Segoe UI, system-ui, sans-serif'
+            } : {
+                primaryColor: '#ea580c', primaryTextColor: '#fff', primaryBorderColor: '#c2410c',
+                lineColor: '#64748b', secondaryColor: '#ccfbf1', tertiaryColor: '#ffffff',
+                background: '#ffffff', mainBkg: '#f8fafc', secondBkg: '#e8ecf1',
+                fontSize: '16px', fontFamily: 'Segoe UI, system-ui, sans-serif'
+            },
+            flowchart: { useMaxWidth: true, htmlLabels: true, curve: 'basis', padding: 20 },
+            securityLevel: 'loose'
+        });
+    }
+    initMermaidTheme();
+    window.mermaid = mermaid;
+    </script>
+    <script>
+    `$(document).ready(function() {
+        if (`$.fn.DataTable && `$('#allAssignmentsTable').length > 0) {
+            var `$allTbl = `$('#allAssignmentsTable');
+            var preCategories = [], preTargets = [], preFilters = [];
+            function normFilter(s) { return String(s||'').replace(/\s*\((?:Include|Exclude)$$/i, '').trim() || String(s||''); }
+            `$allTbl.find('tbody tr').each(function() {
+                var `$row = `$(this);
+                var `$cells = `$row.find('td');
+                if (`$cells.length >= 4) {
+                    var c = `$.trim(`$cells.eq(1).text()); if (c && preCategories.indexOf(c) === -1) preCategories.push(c);
+                    var t = `$.trim(`$cells.eq(2).text()); if (t && preTargets.indexOf(t) === -1) preTargets.push(t);
+                    var f = normFilter(`$.trim(`$cells.eq(3).text())); if (f && preFilters.indexOf(f) === -1) preFilters.push(f);
+                }
+            });
+            preCategories.sort(); preTargets.sort(); preFilters.sort();
+            var at = initRKTable('#allAssignmentsTable', {
+                pageLength: 25, order: [[1,'asc'],[0,'asc']],
+                initComplete: function() {
+                    var api = this.api();
+                    function escOv(v){ return (v||'').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;'); }
+                    function getOvChecked(menuId){ return `$('#'+menuId+' input.filter-cb:checked').map(function(){ return `$(this).attr('data-value'); }).get(); }
+                    function updateOvBtn(btnId, menuId, label){ var n = getOvChecked(menuId).length; `$('#'+btnId).text(n ? label + ' (' + n + ')' : 'Select...'); }
+                    function normalizeFilterName(v) { var s = String(v||''); return s.replace(/\s*\((?:Include|Exclude)\)$$/i, '').trim() || s; }
+                    function fillOvDropdownFromArray(menuId, btnId, values, label) {
+                        var menu = `$('#'+menuId); if (!menu.length) return; menu.empty();
+                        `$.each(values, function(i,v){ menu.append('<label class="dropdown-item"><input type="checkbox" class="filter-cb" data-value="'+escOv(v)+'"> '+escOv(v)+'</label>'); });
+                        menu.find('input.filter-cb').on('change', function(e){ e.stopPropagation(); updateOvBtn(btnId, menuId, label); api.draw(); });
+                        menu.on('click', function(e){ e.stopPropagation(); });
+                        updateOvBtn(btnId, menuId, label);
+                    }
+                    fillOvDropdownFromArray('overviewFilterCategoryMenu','overviewFilterCategoryBtn', preCategories, 'Category');
+                    fillOvDropdownFromArray('overviewFilterTargetMenu','overviewFilterTargetBtn', preTargets, 'Target');
+                    fillOvDropdownFromArray('overviewFilterFilterMenu','overviewFilterFilterBtn', preFilters, 'Filter');
+                    var overviewSearchFn = function(settings, data, dataIndex) {
+                        if (settings.nTable && settings.nTable.id !== 'allAssignmentsTable') return true;
+                        if (`$('#overviewFilterHideNotAssigned').length && `$('#overviewFilterHideNotAssigned').val() === 'hide' && data[2] === 'Not Assigned') return false;
+                        var searchStr = ''; try { var searchApi = new `$.fn.dataTable.Api(settings); searchStr = (searchApi.search() || '').trim(); } catch (e) {}
+                        if (searchStr) { var found = false; for (var i = 0; i < data.length; i++) { if (data[i] && data[i].toString().toLowerCase().indexOf(searchStr.toLowerCase()) !== -1) { found = true; break; } } if (!found) return false; }
+                        var c = getOvChecked('overviewFilterCategoryMenu'); if (c.length && `$.inArray(data[1], c) === -1) return false;
+                        var t = getOvChecked('overviewFilterTargetMenu'); if (t.length && `$.inArray(data[2], t) === -1) return false;
+                        var rowFilterNorm = normalizeFilterName(data[3]); var f = getOvChecked('overviewFilterFilterMenu'); if (f.length && `$.inArray(rowFilterNorm, f) === -1) return false;
+                        return true;
+                    };
+                    `$.fn.dataTable.ext.search.push(overviewSearchFn);
+                    var hideNotAssigned = `$('#overviewFilterHideNotAssigned');
+                    if (hideNotAssigned.length) hideNotAssigned.on('change', function(){ api.draw(); });
+                    var resetBtn = `$('#overviewFiltersReset');
+                    if (resetBtn.length) resetBtn.on('click', function(){
+                        `$('#overviewFilterCategoryMenu,#overviewFilterTargetMenu,#overviewFilterFilterMenu').find('input.filter-cb').prop('checked', false);
+                        updateOvBtn('overviewFilterCategoryBtn','overviewFilterCategoryMenu','Category'); updateOvBtn('overviewFilterTargetBtn','overviewFilterTargetMenu','Target'); updateOvBtn('overviewFilterFilterBtn','overviewFilterFilterMenu','Filter');
+                        hideNotAssigned.val('');
+                        api.draw();
+                    });
+                }
+            });
+            `$('#showAllAssignments').prop('checked', false);
+            `$('#showAllAssignments').on('change', function() {
+                var dt = `$('#allAssignmentsTable').DataTable();
+                var paginateControls = `$('#allAssignmentsTable').closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info');
+                if (this.checked) { dt.page.len(-1); paginateControls.hide(); } else { dt.page.len(25); paginateControls.show(); }
+                dt.draw();
+            });
+        }
+        if (`$.fn.DataTable && `$('#filtersTable').length > 0) {
+            var ft = initRKTable('#filtersTable', {
+                pageLength: 10, order: [[3,'desc']]
+            });
+            `$('#showAllFilters').prop('checked', false);
+            `$('#showAllFilters').on('change', function() {
+                var paginateControls = `$('#filtersTable').closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info');
+                if (this.checked) { ft.page.len(-1); paginateControls.hide(); } else { ft.page.len(10); paginateControls.show(); }
+                ft.draw();
+            });
+        }
+    });
+    </script>
+"@
+
+    # Custom CSS for architecture diagram and flow visualization (preserved from original)
+    $customCss = @"
+/* --- Flow & Architecture Diagram CSS --- */
 .flow-diagram{display:flex;flex-direction:column;flex-wrap:nowrap;align-items:stretch;gap:1rem;padding:1.5rem;font-size:1rem;line-height:1.5;width:100%;max-width:100%;}
 .flow-container{width:100%;max-width:100%;}
 .flow-node{flex-shrink:0;}
-.flow-device{background:linear-gradient(180deg,#0f766e 0%,#115e59 100%);color:#fff;padding:1rem 1.5rem;border-radius:12px;min-width:160px;max-width:100%;align-self:center;text-align:left;}
-.flow-arrow{color:#0d9488;font-size:1.5rem;flex-shrink:0;align-self:center;display:flex;justify-content:center;}
+.flow-device{background:linear-gradient(135deg,var(--accent),#c2410c);color:#fff;padding:1rem 1.5rem;border-radius:12px;min-width:160px;max-width:100%;align-self:center;text-align:left;}
+.flow-arrow{color:var(--accent);font-size:1.5rem;flex-shrink:0;align-self:center;display:flex;justify-content:center;}
 .flow-device-label{display:block;font-size:0.75rem;text-transform:uppercase;letter-spacing:0.05em;opacity:0.9;margin-bottom:0.35rem;}
 .flow-device-name{display:block;font-weight:600;font-size:1.1rem;word-break:break-word;}
-.flow-step{background:var(--card-bg);border:1px solid var(--border-color,#e5e7eb);border-radius:12px;margin-bottom:1rem;overflow:hidden;box-shadow:0 2px 8px rgba(0,0,0,0.06);}
-.flow-step .step-header{display:flex;align-items:center;gap:0.5rem;padding:0.75rem 1rem;font-weight:600;font-size:1rem;color:#fff;background:linear-gradient(180deg,#0f766e 0%,#115e59 100%);}
+.flow-step{background:var(--bg-elevated);border:1px solid var(--border);border-radius:12px;margin-bottom:1rem;overflow:hidden;box-shadow:0 2px 8px rgba(0,0,0,0.06);}
+.flow-step .step-header{display:flex;align-items:center;gap:0.5rem;padding:0.75rem 1rem;font-weight:600;font-size:1rem;color:#fff;background:linear-gradient(135deg,var(--accent),#c2410c);}
 .flow-step .step-content{padding:1rem;}
 .flow-step .step-toggle{display:inline-flex;align-items:center;gap:0.4rem;margin-bottom:0.75rem;}
 .flow-step .step-toggle i{transition:transform 0.2s ease;}
 .flow-step .step-toggle[aria-expanded="true"] i{transform:rotate(180deg);}
-.step-name{font-weight:600;font-size:0.9rem;margin-bottom:0.5rem;color:var(--text-color);}
-.policy-category{background:var(--card-bg);border:1px solid var(--border-color,#e5e7eb);border-radius:8px;padding:1rem;margin-bottom:0.75rem;}
-.policy-category h5{color:var(--text-color);margin-bottom:0.6rem;font-size:0.9rem;font-weight:600;display:flex;justify-content:space-between;align-items:center;}
-.policy-count{background:#0f766e;color:#fff;padding:4px 10px;border-radius:20px;font-size:0.7rem;font-weight:600;}
-.policy-table-header{display:grid;gap:0.75rem;padding:0.75rem 1rem;background:var(--bg-color);border:1px solid var(--border-color,#e5e7eb);border-radius:8px;margin-bottom:0.5rem;font-size:0.7rem;font-weight:700;color:var(--text-color);text-transform:uppercase;letter-spacing:0.5px;}
-.policy-item{display:grid;gap:0.75rem;padding:0.6rem 1rem;background:var(--card-bg);border:1px solid var(--border-color,#e5e7eb);border-radius:6px;margin-bottom:0.5rem;font-size:0.8rem;}
+.step-name{font-weight:600;font-size:0.9rem;margin-bottom:0.5rem;color:var(--text-body);}
+.policy-category{background:var(--bg-elevated);border:1px solid var(--border);border-radius:8px;padding:1rem;margin-bottom:0.75rem;}
+.policy-category h5{color:var(--text-body);margin-bottom:0.6rem;font-size:0.9rem;font-weight:600;display:flex;justify-content:space-between;align-items:center;}
+.policy-count{background:var(--accent);color:#fff;padding:4px 10px;border-radius:20px;font-size:0.7rem;font-weight:600;}
+.policy-table-header{display:grid;gap:0.75rem;padding:0.75rem 1rem;background:var(--bg-base);border:1px solid var(--border);border-radius:8px;margin-bottom:0.5rem;font-size:0.7rem;font-weight:700;color:var(--text-body);text-transform:uppercase;letter-spacing:0.5px;}
+.policy-item{display:grid;gap:0.75rem;padding:0.6rem 1rem;background:var(--bg-elevated);border:1px solid var(--border);border-radius:6px;margin-bottom:0.5rem;font-size:0.8rem;}
 .policy-item:hover{background:rgba(0,0,0,0.02);}
 .policy-item-stacked{display:flex;flex-direction:column;gap:0.75rem;grid-template-columns:none !important;}
 .policy-item-stacked .flow-field{margin-bottom:0.25rem;}
 .policy-item-stacked .flow-field:last-child{margin-bottom:0;}
-.flow-field-label{font-size:0.7rem;font-weight:700;text-transform:uppercase;letter-spacing:0.05em;color:var(--text-secondary,#6c757d);margin-bottom:0.2rem;}
-.flow-field-value{font-size:0.9rem;color:var(--text-color);word-wrap:break-word;overflow-wrap:break-word;}
+.flow-field-label{font-size:0.7rem;font-weight:700;text-transform:uppercase;letter-spacing:0.05em;color:var(--text-muted);margin-bottom:0.2rem;}
+.flow-field-value{font-size:0.9rem;color:var(--text-body);word-wrap:break-word;overflow-wrap:break-word;}
 .flow-field-value.entra-rule{font-family:ui-monospace,'Cascadia Code','Source Code Pro',Menlo,Consolas,monospace;font-size:0.75rem;word-break:break-all;background:rgba(0,0,0,0.06);padding:0.4rem 0.5rem;border-radius:4px;line-height:1.4;}
 .flow-field-value.entra-rule code{background:rgba(0,0,0,0.1);padding:0.15rem 0.4rem;border-radius:3px;font-size:0.7rem;}
-.policy-name{font-weight:600;color:var(--text-color);word-wrap:break-word;overflow-wrap:break-word;}
-.policy-assignment{font-weight:500;color:#0f766e;line-height:1.4;}
-.policy-filter{font-size:0.8rem;color:var(--text-secondary,#6c757d);line-height:1.4;word-wrap:break-word;}
+.policy-name{font-weight:600;color:var(--text-body);word-wrap:break-word;overflow-wrap:break-word;}
+.policy-assignment{font-weight:500;color:var(--accent);line-height:1.4;}
+.policy-filter{font-size:0.8rem;color:var(--text-muted);line-height:1.4;word-wrap:break-word;}
 .entra-group-row .entra-rule{font-family:ui-monospace,monospace;font-size:0.75rem;word-break:break-all;}
 .entra-group-row .entra-rule code{background:rgba(0,0,0,0.06);padding:0.15rem 0.4rem;border-radius:4px;font-size:0.75rem;}
 [data-theme="dark"] .entra-group-row .entra-rule code{background:rgba(255,255,255,0.1);}
 .autopilot-config-section,.esp-config-section{margin-top:0.75rem;}
-.config-toggle{font-size:0.8rem;border-color:var(--border-color,#e5e7eb);color:var(--text-color);}
-.config-toggle:hover{background:#0f766e;border-color:#0f766e;color:#fff;}
+.config-toggle{font-size:0.8rem;border-color:var(--border);color:var(--text-body);}
+.config-toggle:hover{background:var(--accent);border-color:var(--accent);color:#fff;}
 .config-toggle i{transition:transform 0.2s ease;}
 .config-toggle[aria-expanded="true"] i{transform:rotate(180deg);}
-.config-toggle[aria-expanded="true"]{background:#0f766e;border-color:#0f766e;color:#fff;}
-.flow-step .step-toggle.btn-outline-primary,.flow-step .btn-outline-primary.step-toggle{border-color:#0f766e;color:#0f766e;}
-.flow-step .step-toggle.btn-outline-primary:hover,.flow-step .btn-outline-primary.step-toggle:hover{background:#0f766e;border-color:#0f766e;color:#fff;}
-.autopilot-settings{background:rgba(0,0,0,0.03);border:1px solid var(--border-color,#e5e7eb);border-radius:6px;padding:0.75rem 1rem;margin-top:0.5rem;font-size:0.85rem;}
-.autopilot-settings dt{font-weight:600;color:var(--text-color);margin:0.4rem 0 0.1rem 0;}
-.autopilot-settings dd{margin:0 0 0.25rem 0;color:var(--text-secondary,#6c757d);}
+.config-toggle[aria-expanded="true"]{background:var(--accent);border-color:var(--accent);color:#fff;}
+.flow-step .step-toggle.btn-outline-primary,.flow-step .btn-outline-primary.step-toggle{border-color:var(--accent);color:var(--accent);}
+.flow-step .step-toggle.btn-outline-primary:hover,.flow-step .btn-outline-primary.step-toggle:hover{background:var(--accent);border-color:var(--accent);color:#fff;}
+.autopilot-settings{background:rgba(0,0,0,0.03);border:1px solid var(--border);border-radius:6px;padding:0.75rem 1rem;margin-top:0.5rem;font-size:0.85rem;}
+.autopilot-settings dt{font-weight:600;color:var(--text-body);margin:0.4rem 0 0.1rem 0;}
+.autopilot-settings dd{margin:0 0 0.25rem 0;color:var(--text-muted);}
 .autopilot-settings dd:last-child{margin-bottom:0;}
 .esp-app-list{margin:0.25rem 0 0 0;padding-left:1.25rem;}
 .esp-app-list li{margin-bottom:0.15rem;}
-.flow-step-twocol .flow-col-header{font-weight:600;font-size:0.9rem;margin-bottom:0.5rem;color:var(--text-color);}
-.flow-step-twocol .flow-col-device,.flow-step-twocol .flow-col-user{background:rgba(0,0,0,0.02);border-radius:8px;padding:1rem;border:1px solid var(--border-color,#e5e7eb);}
-[data-theme="dark"] .flow-step-twocol .flow-col-device,[data-theme="dark"] .flow-step-twocol .flow-col-user{background:rgba(255,255,255,0.04);border-color:var(--border-color);}
-[data-theme="dark"] .flow-step{background:var(--card-bg);border-color:var(--border-color);}
-[data-theme="dark"] .flow-step .step-header{background:var(--bg-tertiary);color:var(--text-color);}
-[data-theme="dark"] .flow-device{background:var(--bg-tertiary);color:var(--text-color);}
-[data-theme="dark"] .flow-arrow{color:var(--text-secondary);}
-[data-theme="dark"] .flow-step-twocol .flow-col-header{color:var(--text-color);}
-[data-theme="dark"] .step-name{color:var(--text-color);}
-[data-theme="dark"] .policy-category{background:var(--card-bg);border-color:var(--border-color);}
-[data-theme="dark"] .policy-category h5{color:var(--text-color);}
-[data-theme="dark"] .policy-table-header{background:var(--bg-tertiary);border-color:var(--border-color);color:var(--text-color);}
-[data-theme="dark"] .policy-item{background:var(--bg-tertiary);border-color:var(--border-color);}
+.flow-step-twocol .flow-col-header{font-weight:600;font-size:0.9rem;margin-bottom:0.5rem;color:var(--text-body);}
+.flow-step-twocol .flow-col-device,.flow-step-twocol .flow-col-user{background:rgba(0,0,0,0.02);border-radius:8px;padding:1rem;border:1px solid var(--border);}
+[data-theme="dark"] .flow-step-twocol .flow-col-device,[data-theme="dark"] .flow-step-twocol .flow-col-user{background:rgba(255,255,255,0.04);border-color:var(--border);}
+[data-theme="dark"] .flow-step{background:var(--bg-elevated);border-color:var(--border);}
+[data-theme="dark"] .flow-step .step-header{background:var(--bg-warm);color:var(--text-body);}
+[data-theme="dark"] .flow-device{background:var(--bg-warm);color:var(--text-body);}
+[data-theme="dark"] .flow-arrow{color:var(--text-muted);}
+[data-theme="dark"] .flow-step-twocol .flow-col-header{color:var(--text-body);}
+[data-theme="dark"] .step-name{color:var(--text-body);}
+[data-theme="dark"] .policy-category{background:var(--bg-elevated);border-color:var(--border);}
+[data-theme="dark"] .policy-category h5{color:var(--text-body);}
+[data-theme="dark"] .policy-table-header{background:var(--bg-warm);border-color:var(--border);color:var(--text-body);}
+[data-theme="dark"] .policy-item{background:var(--bg-warm);border-color:var(--border);}
 [data-theme="dark"] .policy-item:hover{background:rgba(255,255,255,0.05);}
-[data-theme="dark"] .policy-name{color:var(--text-color);}
+[data-theme="dark"] .policy-name{color:var(--text-body);}
 [data-theme="dark"] .policy-assignment{color:#a3a3a3;}
-[data-theme="dark"] .policy-filter{color:var(--text-secondary);}
-[data-theme="dark"] .flow-field-label{color:var(--text-secondary);}
-[data-theme="dark"] .flow-field-value{color:var(--text-color);}
+[data-theme="dark"] .policy-filter{color:var(--text-muted);}
+[data-theme="dark"] .flow-field-label{color:var(--text-muted);}
+[data-theme="dark"] .flow-field-value{color:var(--text-body);}
 [data-theme="dark"] .flow-field-value.entra-rule{background:rgba(255,255,255,0.05);}
 [data-theme="dark"] .flow-field-value.entra-rule code{background:rgba(255,255,255,0.1);}
-[data-theme="dark"] .policy-empty .policy-empty-msg,[data-theme="dark"] .policy-empty-msg.text-muted{color:var(--text-secondary) !important;}
-[data-theme="dark"] .autopilot-settings{background:rgba(0,0,0,0.2);border-color:var(--border-color);}
-[data-theme="dark"] .autopilot-settings dt{color:var(--text-color);}
-[data-theme="dark"] .autopilot-settings dd{color:var(--text-secondary);}
+[data-theme="dark"] .policy-empty .policy-empty-msg,[data-theme="dark"] .policy-empty-msg.text-muted{color:var(--text-muted) !important;}
+[data-theme="dark"] .autopilot-settings{background:rgba(0,0,0,0.2);border-color:var(--border);}
+[data-theme="dark"] .autopilot-settings dt{color:var(--text-body);}
+[data-theme="dark"] .autopilot-settings dd{color:var(--text-muted);}
 .flow-diagram-wrapper{overflow-y:auto;overflow-x:auto;padding:0.5rem 0;}
 @media (max-width:576px){.flow-step-twocol .row{flex-direction:column;}}
-.arch-diagram-wrapper{background:linear-gradient(180deg,var(--bg-color) 0%,#cbd5e1 100%);border:1px solid var(--border-color);border-radius:16px;padding:2rem;margin:1rem 0;overflow:auto;min-height:520px;}
+.arch-diagram-wrapper{background:linear-gradient(180deg,var(--bg-base) 0%,#cbd5e1 100%);border:1px solid var(--border);border-radius:16px;padding:2rem;margin:1rem 0;overflow:auto;min-height:520px;}
 .arch-flow-horizontal .arch-diagram-wrapper{min-height:auto;padding:1rem 1rem;}
 .arch-diagram-svg{width:100%;height:auto;display:block;}
 .arch-diagram-svg .arch-box{filter:drop-shadow(0 2px 6px rgba(0,0,0,0.15));}
 .arch-diagram-svg .arch-box:hover{filter:drop-shadow(0 4px 12px rgba(0,0,0,0.2));}
-[data-theme="dark"] .arch-diagram-wrapper{background:linear-gradient(180deg,var(--bg-color) 0%,var(--card-bg) 100%);border-color:var(--border-color);}
+[data-theme="dark"] .arch-diagram-wrapper{background:linear-gradient(180deg,var(--bg-base) 0%,var(--bg-elevated) 100%);border-color:var(--border);}
 [data-theme="dark"] .arch-diagram-svg .arch-box{filter:drop-shadow(0 2px 8px rgba(0,0,0,0.4));}
-#architecture h4,#architecture h4 i{color:var(--text-color) !important;}
-#architecture .text-muted,#architecture p.text-muted{color:var(--text-secondary) !important;}
-[data-theme="dark"] #diagram .p-4 > p.text-muted{color:var(--text-color) !important;}
-#architecture .p-4{color:var(--text-color);}
+#architecture h4,#architecture h4 i{color:var(--text-body) !important;}
+#architecture .text-muted,#architecture p.text-muted{color:var(--text-muted) !important;}
+[data-theme="dark"] #diagram .p-4 > p.text-muted{color:var(--text-body) !important;}
+#architecture .p-4{color:var(--text-body);}
 .arch-diagram-html .arch-flow{display:flex;flex-direction:column;align-items:center;gap:0;max-width:860px;margin:0 auto;}
 .arch-flow-horizontal .arch-flow{flex-direction:row;align-items:flex-start;flex-wrap:nowrap;gap:0;max-width:100%;margin:0;padding:0.5rem 0;overflow-x:auto;overflow-y:visible;justify-content:flex-start;}
 .arch-flow-horizontal .arch-step{flex:0 0 auto;min-width:90px;max-width:140px;padding:0.5rem 0.35rem;}
@@ -2983,7 +2875,7 @@ html[data-theme="dark"] #viz .summary-card p.text-muted,html[data-theme="dark"]
 .arch-diagram-html .arch-step{background:var(--arch-fill);color:#fff;border-radius:12px;padding:1rem 1.5rem;min-width:280px;max-width:100%;text-align:center;box-shadow:0 2px 8px rgba(0,0,0,0.15);border:1px solid rgba(255,255,255,0.3);}
 .arch-diagram-html .arch-step-title{font-weight:600;font-size:1rem;}
 .arch-diagram-html .arch-step-sub{font-size:0.875rem;opacity:0.95;margin-top:0.25rem;word-break:break-word;}
-.arch-diagram-html .arch-arrow{color:var(--text-secondary,#64748b);font-size:1.25rem;padding:0.35rem 0;}
+.arch-diagram-html .arch-arrow{color:var(--text-muted);font-size:1.25rem;padding:0.35rem 0;}
 .arch-diagram-html .arch-step-device,.arch-diagram-html .arch-step-memberof{text-align:left;min-width:100%;width:100%;max-width:860px;}
 .arch-diagram-html .arch-step-device .arch-step-title,.arch-diagram-html .arch-step-memberof .arch-step-title{text-align:center;}
 .arch-diagram-html .arch-step-device .arch-group-table-wrap,.arch-diagram-html .arch-step-memberof .arch-group-table-wrap{margin-left:0;margin-right:0;width:100%;min-width:100%;}
@@ -3037,200 +2929,69 @@ html[data-theme="dark"] #viz .summary-card p.text-muted,html[data-theme="dark"]
 .arch-flow-horizontal .arch-diagram-html .arch-inner-title{font-size:0.8rem;}
 .arch-flow-horizontal .arch-diagram-html .arch-inner-sub{font-size:0.75rem;margin-top:0;}
 .arch-flow-horizontal .arch-diagram-html .arch-step-enrollment .arch-step-title{padding:0.5rem 0.6rem;}
-[data-theme="dark"] .arch-diagram-html .arch-arrow{color:var(--text-secondary);}
+[data-theme="dark"] .arch-diagram-html .arch-arrow{color:var(--text-muted);}
 [data-theme="dark"] .arch-flow-horizontal .arch-diagram-html .arch-step-memberof .arch-group-table td:nth-child(3){background:rgba(255,255,255,0.05);}
-</style>
-</head>
-<body>
-<div class="device-theme-toggle" title="Toggle dark/light mode (follows system when auto)">
-<div class="theme-icon"><i class="fas fa-sun"></i></div>
-<label class="device-theme-switch">
-<input type="checkbox" id="deviceThemeToggle" aria-label="Dark mode">
-<span class="device-theme-slider"></span>
-</label>
-<div class="theme-icon"><i class="fas fa-moon"></i></div>
-</div>
-<div class="app-container">
-<div class="dashboard-header"><h1><i class="fas fa-laptop me-2"></i>Intune Device Visualization</h1><p class="mb-0">__PH_TENANT_DATE__</p></div>
-<div class="device-banner"><strong>Device:</strong> __PH_DEVICE_BANNER__</div>
-<ul class="nav nav-tabs main-tabs-nav" id="mainTabs" role="tablist">
-__PH_OVERVIEW_NAV__
-<li class="nav-item"><button class="nav-link __PH_DIAGRAM_TAB_ACTIVE__" id="diagram-tab" data-bs-toggle="tab" data-bs-target="#diagram" type="button" role="tab">Enrollment flow</button></li>
-__PH_ARCHITECTURE_NAV__
-</ul>
-<div class="tab-content" id="mainTabContent">
-__PH_OVERVIEW_PANE__
-<div class="tab-pane fade __PH_DIAGRAM_PANE_ACTIVE__" id="diagram" role="tabpanel">
-<div class="p-4 w-100">
-<h4 class="mb-3"><i class="fas fa-drafting-compass me-2"></i>Architecture overview</h4>
-<p class="text-muted mb-4">High-level view of identity, management, policies, and assignments for this device.</p>
-<h5 class="mb-3">Autopilot Enrollment</h5>
-<div class="arch-diagram-wrapper arch-diagram-html arch-flow-horizontal">__PH_ARCHITECTURE__</div>
-<h4 class="mt-5 mb-3"><i class="fas fa-project-diagram me-2"></i>Enrollment flow</h4>
-<p class="text-muted mb-4">Policies and assignments applied to this device at each stage.</p>
-<div class="flow-diagram-wrapper">__PH_APPLIED_FLOW__</div>
-</div>
-</div>
-</div>
-</div>
-<script src="https://code.jquery.com/jquery-3.7.0.js"></script>
-<script src="https://cdn.datatables.net/1.13.6/js/jquery.dataTables.min.js"></script>
-<script src="https://cdn.datatables.net/1.13.6/js/dataTables.bootstrap5.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/2.4.1/js/dataTables.buttons.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.bootstrap5.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.html5.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
-<script type="module">
-import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs';
-const isDarkTheme = () => document.documentElement.getAttribute('data-theme') === 'dark';
-function initMermaid() {
-  const isDark = isDarkTheme();
-  mermaid.initialize({
-    startOnLoad: false,
-    theme: isDark ? 'dark' : 'base',
-    themeVariables: isDark ? {
-      primaryColor: '#0d9488',
-      primaryTextColor: '#fff',
-      primaryBorderColor: '#14b8a6',
-      lineColor: '#94a3b8',
-      secondaryColor: '#134e4a',
-      tertiaryColor: '#1a1a1a',
-      background: '#0d0d0d',
-      mainBkg: '#1a1a1a',
-      secondBkg: '#262626',
-      fontSize: '16px',
-      fontFamily: 'Segoe UI, system-ui, sans-serif'
-    } : {
-      primaryColor: '#0f766e',
-      primaryTextColor: '#fff',
-      primaryBorderColor: '#115e59',
-      lineColor: '#64748b',
-      secondaryColor: '#ccfbf1',
-      tertiaryColor: '#ffffff',
-      background: '#ffffff',
-      mainBkg: '#f8fafc',
-      secondBkg: '#e8ecf1',
-      fontSize: '16px',
-      fontFamily: 'Segoe UI, system-ui, sans-serif'
-    },
-    flowchart: {
-      useMaxWidth: true,
-      htmlLabels: true,
-      curve: 'basis',
-      padding: 20
-    },
-    securityLevel: 'loose'
-  });
-}
-initMermaid();
-window.mermaid = mermaid;
-</script>
-<script>
-document.addEventListener('DOMContentLoaded', function() {
-  var themeToggle = document.getElementById('deviceThemeToggle');
-  var prefersDark = window.matchMedia('(prefers-color-scheme: dark)');
-  function applyTheme(isDark) {
-    document.documentElement.setAttribute('data-theme', isDark ? 'dark' : 'light');
-    if (themeToggle) themeToggle.checked = isDark;
-  }
-  var saved = localStorage.getItem('theme');
-  if (saved === 'dark' || saved === 'light') {
-    applyTheme(saved === 'dark');
-  } else {
-    applyTheme(prefersDark.matches);
-  }
-  if (themeToggle) themeToggle.addEventListener('change', function() {
-    var isDark = this.checked;
-    document.documentElement.setAttribute('data-theme', isDark ? 'dark' : 'light');
-    localStorage.setItem('theme', isDark ? 'dark' : 'light');
-  });
-  prefersDark.addEventListener('change', function(e) {
-    if (localStorage.getItem('theme') === null) {
-      applyTheme(e.matches);
-    }
-  });
-  if (jQuery && jQuery.fn.DataTable && jQuery('#allAssignmentsTable').length > 0) {
-    var $allTbl = jQuery('#allAssignmentsTable');
-    var preCategories = [], preTargets = [], preFilters = [];
-    function normFilter(s) { return String(s||'').replace(/\s*\((?:Include|Exclude)$/i, '').trim() || String(s||''); }
-    $allTbl.find('tbody tr').each(function() {
-      var $row = jQuery(this);
-      var $cells = $row.find('td');
-      if ($cells.length >= 4) {
-        var c = jQuery.trim($cells.eq(1).text()); if (c && preCategories.indexOf(c) === -1) preCategories.push(c);
-        var t = jQuery.trim($cells.eq(2).text()); if (t && preTargets.indexOf(t) === -1) preTargets.push(t);
-        var f = normFilter(jQuery.trim($cells.eq(3).text())); if (f && preFilters.indexOf(f) === -1) preFilters.push(f);
-      }
-    });
-    preCategories.sort(); preTargets.sort(); preFilters.sort();
-    var at = $allTbl.DataTable({
-      responsive: true, pageLength: 25, order: [[1,'asc'],[0,'asc']], dom: 'Bfrtip', buttons: ['copy','csv','excel','pdf','print'],
-      initComplete: function() {
-        var api = this.api();
-        function escOv(v){ return (v||'').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;'); }
-        function getOvChecked(menuId){ return jQuery('#'+menuId+' input.filter-cb:checked').map(function(){ return jQuery(this).attr('data-value'); }).get(); }
-        function updateOvBtn(btnId, menuId, label){ var n = getOvChecked(menuId).length; jQuery('#'+btnId).text(n ? label + ' (' + n + ')' : 'Select...'); }
-        function normalizeFilterName(v) { var s = String(v||''); return s.replace(/\s*\((?:Include|Exclude)\)$/i, '').trim() || s; }
-        function fillOvDropdownFromArray(menuId, btnId, values, label) {
-          var menu = jQuery('#'+menuId); if (!menu.length) return; menu.empty();
-          jQuery.each(values, function(i,v){ menu.append('<label class="dropdown-item"><input type="checkbox" class="filter-cb" data-value="'+escOv(v)+'"> '+escOv(v)+'</label>'); });
-          menu.find('input.filter-cb').on('change', function(e){ e.stopPropagation(); updateOvBtn(btnId, menuId, label); api.draw(); });
-          menu.on('click', function(e){ e.stopPropagation(); });
-          updateOvBtn(btnId, menuId, label);
-        }
-        fillOvDropdownFromArray('overviewFilterCategoryMenu','overviewFilterCategoryBtn', preCategories, 'Category');
-        fillOvDropdownFromArray('overviewFilterTargetMenu','overviewFilterTargetBtn', preTargets, 'Target');
-        fillOvDropdownFromArray('overviewFilterFilterMenu','overviewFilterFilterBtn', preFilters, 'Filter');
-        var overviewSearchFn = function(settings, data, dataIndex) {
-          if (settings.nTable && settings.nTable.id !== 'allAssignmentsTable') return true;
-          if (jQuery('#overviewFilterHideNotAssigned').length && jQuery('#overviewFilterHideNotAssigned').val() === 'hide' && data[2] === 'Not Assigned') return false;
-          var searchStr = ''; try { var searchApi = new jQuery.fn.dataTable.Api(settings); searchStr = (searchApi.search() || '').trim(); } catch (e) {}
-          if (searchStr) { var found = false; for (var i = 0; i < data.length; i++) { if (data[i] && data[i].toString().toLowerCase().indexOf(searchStr.toLowerCase()) !== -1) { found = true; break; } } if (!found) return false; }
-          var c = getOvChecked('overviewFilterCategoryMenu'); if (c.length && jQuery.inArray(data[1], c) === -1) return false;
-          var t = getOvChecked('overviewFilterTargetMenu'); if (t.length && jQuery.inArray(data[2], t) === -1) return false;
-          var rowFilterNorm = normalizeFilterName(data[3]); var f = getOvChecked('overviewFilterFilterMenu'); if (f.length && jQuery.inArray(rowFilterNorm, f) === -1) return false;
-          return true;
-        };
-        jQuery.fn.dataTable.ext.search.push(overviewSearchFn);
-        var hideNotAssigned = jQuery('#overviewFilterHideNotAssigned');
-        if (hideNotAssigned.length) hideNotAssigned.on('change', function(){ api.draw(); });
-        var resetBtn = jQuery('#overviewFiltersReset');
-        if (resetBtn.length) resetBtn.on('click', function(){
-          jQuery('#overviewFilterCategoryMenu,#overviewFilterTargetMenu,#overviewFilterFilterMenu').find('input.filter-cb').prop('checked', false);
-          updateOvBtn('overviewFilterCategoryBtn','overviewFilterCategoryMenu','Category'); updateOvBtn('overviewFilterTargetBtn','overviewFilterTargetMenu','Target'); updateOvBtn('overviewFilterFilterBtn','overviewFilterFilterMenu','Filter');
-          hideNotAssigned.val('');
-          api.draw();
-        });
-      }
-    });
-    jQuery('#showAllAssignments').prop('checked', false);
-    jQuery('#showAllAssignments').on('change', function() {
-      var dt = jQuery('#allAssignmentsTable').DataTable();
-      var paginateControls = jQuery('#allAssignmentsTable').closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info');
-      if (this.checked) { dt.page.len(-1); paginateControls.hide(); } else { dt.page.len(25); paginateControls.show(); }
-      dt.draw();
-    });
-  }
-});
-if (jQuery && jQuery.fn.DataTable) {
-  if (jQuery('#filtersTable').length > 0) {
-    var ft = jQuery('#filtersTable').DataTable({responsive:true,pageLength:10,order:[[3,'desc']],dom:'Bfrtip',buttons:['copy','csv','excel','pdf','print']});
-    jQuery('#showAllFilters').prop('checked', false);
-    jQuery('#showAllFilters').on('change', function() {
-      var paginateControls = jQuery('#filtersTable').closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info');
-      if (this.checked) { ft.page.len(-1); paginateControls.hide(); } else { ft.page.len(10); paginateControls.show(); }
-      ft.draw();
-    });
-  }
-}
-</script>
-</body>
-</html>
-'@
+/* --- Overview container (used by Get-AssignmentOverviewTabFragment) --- */
+.overview-container{background:var(--bg-elevated);border-radius:14px;padding:2rem;margin:1rem 0;}
+.overview-container::before{content:'';position:absolute;top:0;left:0;right:0;height:3px;background:var(--accent);}
+.overview-header{text-align:center;margin-bottom:2rem;background:var(--bg-warm);color:var(--text);margin-left:-2rem;margin-right:-2rem;margin-top:-2rem;padding:2rem 2rem 1.5rem;border-radius:14px 14px 0 0;border-bottom:1px dashed var(--border-dashed);}
+.overview-header h2{font-family:'Geist',-apple-system,sans-serif;font-size:1.75rem;font-weight:800;margin-bottom:0.5rem;color:var(--text);letter-spacing:-0.02em;}
+.overview-header p{font-family:'Geist',-apple-system,sans-serif;font-size:1rem;color:var(--text-muted);margin:0;}
+.summary-card{background:var(--bg-elevated);border:1px solid var(--border);border-radius:14px;padding:1.5rem;text-align:center;}
+.summary-card .card-icon{width:50px;height:50px;border-radius:12px;display:flex;align-items:center;justify-content:center;margin:0 auto 0.75rem;font-size:1.25rem;color:#fff;}
+.summary-card.border-primary .card-icon{background:var(--tile-steel);}
+.summary-card.border-danger .card-icon{background:var(--tile-rose);}
+.overview-tiles-row .summary-card{min-height:100px;padding:0.75rem 1rem;display:flex;flex-direction:column;justify-content:center;align-items:center;}
+.overview-tiles-row .summary-card .card-icon{width:36px;height:36px;font-size:1rem;margin:0 auto 0.4rem;}
+.overview-tiles-row .summary-card .card-title{font-family:'Geist',-apple-system,sans-serif;font-size:1.5rem;font-weight:800;margin:0.2rem 0;color:var(--text);}
+.overview-tiles-row .summary-card .card-text{min-height:2em;font-size:0.8rem;display:flex;align-items:center;justify-content:center;text-align:center;color:var(--text-muted);}
+/* --- Modern table (used by overview fragment) --- */
+.modern-table-container{background:var(--bg-elevated);border-radius:14px;overflow:hidden;border:1px solid var(--border);margin:1rem 0;}
+.modern-table-header{background:var(--bg-warm);padding:1rem 1.25rem;border-bottom:1px dashed var(--border-dashed);color:var(--text);}
+.modern-table-header h5{margin:0;font-family:'Geist Mono',ui-monospace,monospace;font-size:0.78rem;font-weight:600;letter-spacing:0.08em;text-transform:uppercase;color:var(--text-body);}
+.modern-table-header small{color:var(--text-muted);font-size:0.75rem;}
+.modern-table-body{padding:0;}
+.modern-table{margin:0;}
+.modern-table thead th{background:var(--bg-warm);border:none;font-weight:600;font-size:0.75rem;padding:0.75rem;text-transform:uppercase;letter-spacing:0.5px;color:var(--text-body);}
+.modern-table tbody tr{border-bottom:1px solid var(--border);transition:background-color 0.2s;}
+.modern-table tbody tr:hover{background-color:var(--accent-soft);}
+.modern-table tbody td{padding:0.75rem;border:none;vertical-align:middle;color:var(--text-body);}
+/* --- Assignment filters bar (used by overview fragment) --- */
+.assignment-filters-modern{background:var(--bg-elevated);border-bottom:1px solid var(--border);padding:1rem 1.25rem;}
+.assignment-filters-modern .assignment-filters-inner{display:flex;flex-wrap:wrap;align-items:flex-end;gap:1rem;}
+.assignment-filters-modern .filter-group{display:flex;flex-direction:column;gap:0.25rem;}
+.assignment-filters-modern .filter-label{font-size:0.68rem;font-weight:600;text-transform:uppercase;letter-spacing:0.1em;color:var(--text-muted);margin:0;font-family:'Geist Mono',ui-monospace,monospace;}
+.assignment-filters-modern .filter-select{min-width:140px;padding:0.5rem 0.75rem;border-radius:6px;border:1px solid var(--input-border);background:var(--input-bg);font-size:0.78rem;color:var(--input-color);font-family:'Geist Mono',ui-monospace,monospace;}
+.assignment-filters-modern .filter-dropdown-btn{min-width:140px;text-align:left;font-family:'Geist Mono',ui-monospace,monospace;font-size:0.78rem;}
+.assignment-filters-modern .filter-checkbox-dropdown{max-height:260px;overflow-y:auto;padding:0.25rem;}
+.assignment-filters-modern .filter-checkbox-dropdown .dropdown-item{white-space:nowrap;cursor:pointer;display:flex;align-items:center;gap:0.5rem;}
+.assignment-filters-modern .filter-checkbox-dropdown .dropdown-item input{margin:0;cursor:pointer;}
+.assignment-filters-modern .filter-checkbox-dropdown label{margin:0;cursor:pointer;width:100%;}
+.assignment-filters-modern .filter-reset-btn{display:inline-flex;align-items:center;gap:0.35rem;padding:0.5rem 0.9rem;border-radius:6px;border:1px solid var(--button-border);background:var(--button-bg);font-size:0.78rem;color:var(--button-color);cursor:pointer;height:2.15rem;font-family:'Geist Mono',ui-monospace,monospace;}
+.assignment-filters-modern .filter-reset-btn:hover{background:var(--button-hover-bg);}
+[data-theme="dark"] .assignment-filters-modern .filter-dropdown-btn{background:var(--input-bg);border-color:var(--input-border);color:var(--input-color);}
+[data-theme="dark"] .assignment-filters-modern .filter-dropdown-btn:hover,[data-theme="dark"] .assignment-filters-modern .filter-dropdown-btn:focus,[data-theme="dark"] .assignment-filters-modern .filter-dropdown-btn.show{background:var(--bg-warm);border-color:var(--border);color:var(--text-body);}
+[data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown{background:var(--bg-elevated);border-color:var(--border);}
+[data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown .dropdown-item{color:var(--text-body);}
+[data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown .dropdown-item:hover{background:var(--bg-warm);color:var(--text-body);}
+[data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown label{color:var(--text-body);}
+[data-theme="dark"] .assignment-filters-modern .filter-checkbox-dropdown input.filter-cb{accent-color:var(--accent);}
+"@
+
+    $html = Get-RKSolutionsReportTemplate `
+        -TenantName $TenantName `
+        -ReportTitle 'Enrollment' `
+        -ReportSlug 'intune-enrollment-device' `
+        -Eyebrow 'DEVICE ENROLLMENT FLOW' `
+        -Lede 'Device-specific enrollment flow with policy assignments, group membership, and filter evaluation.' `
+        -Tags @('Intune', 'Device', 'Enrollment') `
+        -StatsCardsHtml $statsCardsHtml `
+        -BodyContentHtml $bodyContentHtml `
+        -CustomCss $customCss
+
     $outDir = Split-Path -Parent $OutputPath
     if ($outDir -and -not (Test-Path $outDir)) { New-Item -ItemType Directory -Path $outDir -Force | Out-Null }
     if (-not [System.IO.Path]::HasExtension($OutputPath)) { $OutputPath = $OutputPath + ".html" }
-    $html = $htmlTemplate.Replace('__PH_TITLE_DEVICE__', $titleDevice).Replace('__PH_TENANT_DATE__', $tenantDisplay).Replace('__PH_DEVICE_BANNER__', $bannerDevice).Replace('__PH_OVERVIEW_NAV__', $overviewTabNav).Replace('__PH_OVERVIEW_PANE__', $overviewTabPane).Replace('__PH_DIAGRAM_TAB_ACTIVE__', $diagramTabActive).Replace('__PH_DIAGRAM_PANE_ACTIVE__', $diagramPaneActive).Replace('__PH_APPLIED_FLOW__', $AppliedFlowHtml).Replace('__PH_ARCHITECTURE_NAV__', $architectureTabNav).Replace('__PH_ARCHITECTURE__', $architectureFragment)
     [System.IO.File]::WriteAllText($OutputPath, $html, [System.Text.UTF8Encoding]::new($false))
     $OutputPath
 }
diff --git a/module/Private/Invoke-GraphRequestWithPaging.ps1 b/module/Private/Invoke-GraphRequestWithPaging.ps1
index 1ed4ed1..ef87907 100644
--- a/module/Private/Invoke-GraphRequestWithPaging.ps1
+++ b/module/Private/Invoke-GraphRequestWithPaging.ps1
@@ -33,7 +33,10 @@ function Invoke-GraphRequestWithPaging {
             }
         } while (-not $success -and $retryCount -lt $MaxRetries)
         if (-not $success) { break }
-        if ($results.Count -gt 10000) { break }
+        if ($results.Count -gt 10000) {
+            Write-Warning "Invoke-GraphRequestWithPaging: Results truncated at 10,000 items for URI: $Uri"
+            break
+        }
     } while ($currentUri)
     $results.ToArray()
 }
diff --git a/module/Private/M365License.ps1 b/module/Private/M365License.ps1
index f0e9a82..564192f 100644
--- a/module/Private/M365License.ps1
+++ b/module/Private/M365License.ps1
@@ -4,13 +4,13 @@ function New-HTMLReport {
     param(
         [Parameter(Mandatory = $true)]
         [string]$Organization,
-        
+
         [Parameter(Mandatory = $true)]
         [array]$Report,
-        
+
         [Parameter(Mandatory = $true)]
         [array]$SubscriptionOverview,
-        
+
         [Parameter(Mandatory = $false)]
         [string]$ExportPath
     )
@@ -31,1495 +31,30 @@ function New-HTMLReport {
     $inheritedLicenses = ($Report | Where-Object { $_.AssignmentType -eq "Inherited" }).Count
     $bothLicenses = ($Report | Where-Object { $_.AssignmentType -eq "Both" }).Count
     $DisabledUsersWithLicenses = ($Report | Where-Object { $_.AccountEnabled -eq "No" }).Count
-    
-    # Create HTML Template with DataTables
-    $htmlTemplate = @'
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>$Organization M365 Licensing Report</title>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.3.0/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://cdn.datatables.net/1.13.6/css/dataTables.bootstrap5.min.css">
-    <link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.1/css/buttons.bootstrap5.min.css">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-    <script src="https://code.jquery.com/jquery-3.7.0.js"></script>
-    <script src="https://cdn.datatables.net/1.13.6/js/jquery.dataTables.min.js"></script>
-    <script src="https://cdn.datatables.net/1.13.6/js/dataTables.bootstrap5.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.4.1/js/dataTables.buttons.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.bootstrap5.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/pdfmake.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/vfs_fonts.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.html5.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.print.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.colVis.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
-    <style>
-        :root {
-            /* Light mode variables (default) */
-            --primary-color: #0078d4;
-            --secondary-color: #2b88d8;
-            --direct-color: #0078d4;
-            --inherited-color: #107c10;
-            --both-color: #5c2d91;
-            --Disabled-color: #d83b01;
-            --bg-color: #f8f9fa;
-            --card-bg: #ffffff;
-            --text-color: #333333;
-            --table-header-bg: #f5f5f5;
-            --table-header-color: #333333;
-            --table-stripe-bg: rgba(0,0,0,0.02);
-            --table-hover-bg: rgba(0,0,0,0.04);
-            --table-border-color: #dee2e6;
-            --filter-tag-bg: #e9ecef;
-            --filter-tag-color: #495057;
-            --filter-bg: white;
-            --btn-outline-color: #6c757d;
-            --border-color: #dee2e6;
-            --toggle-bg: #ccc;
-            --button-bg: #f8f9fa;
-            --button-color: #333;
-            --button-border: #ddd;
-            --button-hover-bg: #e9ecef;
-            --footer-text: white;
-            --input-bg: #fff;
-            --input-color: #333;
-            --input-border: #ced4da;
-            --input-focus-border: #86b7fe;
-            --input-focus-shadow: rgba(13, 110, 253, 0.25);
-            --datatable-even-row-bg: #fff;
-            --datatable-odd-row-bg: rgba(0,0,0,0.02);
-        }
-        
-        [data-theme="dark"] {
-            /* Dark mode variables */
-            --primary-color: #0078d4;
-            --secondary-color: #2b88d8;
-            --direct-color: #0078d4;
-            --inherited-color: #107c10;
-            --both-color: #5c2d91;
-            --Disabled-color: #d83b01;
-            --bg-color: #121212;
-            --card-bg: #1e1e1e;
-            --text-color: #e0e0e0;
-            --table-header-bg: #333333;
-            --table-header-color: #e0e0e0;
-            --table-stripe-bg: rgba(255,255,255,0.03);
-            --table-hover-bg: rgba(255,255,255,0.05);
-            --table-border-color: #444444;
-            --filter-tag-bg: #2d2d2d;
-            --filter-tag-color: #d0d0d0;
-            --filter-bg: #252525;
-            --btn-outline-color: #adb5bd;
-            --border-color: #444444;
-            --toggle-bg: #555555;
-            --button-bg: #2a2a2a;
-            --button-color: #e0e0e0;
-            --button-border: #444;
-            --button-hover-bg: #3a3a3a;
-            --footer-text: white;
-            --input-bg: #2a2a2a;
-            --input-color: #e0e0e0;
-            --input-border: #444444;
-            --input-focus-border: #0078d4;
-            --input-focus-shadow: rgba(0, 120, 212, 0.25);
-            --datatable-even-row-bg: #1e1e1e;
-            --datatable-odd-row-bg: #252525;
-        }
-        
-        body {
-            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-            margin: 0;
-            padding: 0;
-            background-color: var(--bg-color);
-            color: var(--text-color);
-            min-height: 100vh;
-            display: flex;
-            flex-direction: column;
-            transition: background-color 0.3s ease, color 0.3s ease;
-        }
-        
-        .container-fluid {
-            max-width: 1600px;
-            padding: 20px;
-            flex: 1;
-        }
-        
-        .dashboard-header {
-            padding: 20px 0;
-            margin-bottom: 30px;
-            border-bottom: 1px solid rgba(128,128,128,0.2);
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-        }
-        
-        .dashboard-title {
-            display: flex;
-            align-items: center;
-            gap: 15px;
-        }
-        
-        .dashboard-title h1 {
-            margin: 0;
-            font-size: 1.8rem;
-            font-weight: 600;
-            color: var(--primary-color);
-        }
-        
-        .logo {
-            height: 45px;
-            width: 45px;
-        }
-        
-        .report-date {
-            font-size: 0.9rem;
-            color: var(--text-color);
-            opacity: 0.8;
-        }
-        
-        .card {
-            border: none;
-            border-radius: 10px;
-            box-shadow: 0 4px 12px rgba(0,0,0,0.05);
-            margin-bottom: 25px;
-            transition: transform 0.2s, box-shadow 0.2s, background-color 0.3s ease;
-            overflow: hidden;
-            background-color: var(--card-bg);
-        }
-        
-        .card:hover {
-            transform: translateY(-5px);
-            box-shadow: 0 8px 16px rgba(0,0,0,0.1);
-        }
-        
-        .card-header {
-            background-color: var(--primary-color);
-            color: white;
-            font-weight: 600;
-            padding: 15px 20px;
-            border-bottom: none;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            gap: 10px;
-        }
-        
-        .card-header i {
-            font-size: 1.2rem;
-        }
-        
-        .card-body {
-            padding: 20px;
-        }
-        
-        .stats-card {
-            height: 100%;
-            text-align: center;
-            padding: 25px 15px;
-            border-radius: 10px;
-            color: white;
-            position: relative;
-            overflow: hidden;
-            min-height: 160px;
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            align-items: center;
-            cursor: pointer;
-            transition: all 0.3s;
-        }
-        
-        .stats-card.Enabled {
-            box-shadow: 0 0 0 4px rgba(255,255,255,0.6), 0 8px 16px rgba(0,0,0,0.2);
-            transform: scale(1.05);
-        }
-        
-        .stats-card::before {
-            content: '';
-            position: absolute;
-            top: -20px;
-            right: -20px;
-            width: 100px;
-            height: 100px;
-            border-radius: 50%;
-            background-color: rgba(255,255,255,0.1);
-            z-index: 0;
-        }
-        
-        .stats-card i {
-            font-size: 2.5rem;
-            margin-bottom: 15px;
-            position: relative;
-            z-index: 1;
-        }
-        
-        .stats-card h3 {
-            font-size: 1rem;
-            font-weight: 500;
-            margin-bottom: 10px;
-            position: relative;
-            z-index: 1;
-        }
-        
-        .stats-card .number {
-            font-size: 2.2rem;
-            font-weight: 700;
-            position: relative;
-            z-index: 1;
-        }
-        
-        .direct-bg {
-            background: linear-gradient(135deg, var(--direct-color), #2b88d8);
-        }
-        
-        .inherited-bg {
-            background: linear-gradient(135deg, var(--inherited-color), #2a9d2a);
-        }
-        
-        .both-bg {
-            background: linear-gradient(135deg, var(--both-color), #7b4db2);
-        }
-        
-        .Disabled-bg {
-            background: linear-gradient(135deg, var(--Disabled-color), #f25c05);
-        }
-        
-        /* DataTables Dark Mode Overrides */
-        table.dataTable {
-            border-collapse: collapse !important;
-            width: 100% !important;
-            color: var(--text-color) !important;
-            border-color: var(--table-border-color) !important;
-        }
-        
-        .table {
-            color: var(--text-color) !important;
-            border-color: var(--table-border-color) !important;
-        }
-        
-        .table-striped>tbody>tr:nth-of-type(odd) {
-            background-color: var(--datatable-odd-row-bg) !important;
-        }
-        
-        .table-striped>tbody>tr:nth-of-type(even) {
-            background-color: var(--datatable-even-row-bg) !important;
-        }
-        
-        .table thead th {
-            background-color: var(--table-header-bg) !important;
-            color: var(--table-header-color) !important;
-            font-weight: 600;
-            border-top: none;
-            padding: 12px;
-            border-color: var(--table-border-color) !important;
-        }
-        
-        .table tbody td {
-            padding: 12px;
-            vertical-align: middle;
-            border-color: var(--table-border-color) !important;
-            color: var(--text-color) !important;
-        }
-        
-        .table.table-bordered {
-            border-color: var(--table-border-color) !important;
-        }
-        
-        .table-bordered td, .table-bordered th {
-            border-color: var(--table-border-color) !important;
-        }
-        
-        .table-hover tbody tr:hover {
-            background-color: var(--table-hover-bg) !important;
-        }
-        
-        .badge {
-            padding: 6px 10px;
-            font-weight: 500;
-            border-radius: 6px;
-        }
-        
-        .badge-direct {
-            background-color: var(--direct-color);
-            color: white;
-        }
-        
-        .badge-inherited {
-            background-color: var(--inherited-color);
-            color: white;
-        }
-        
-        .badge-both {
-            background-color: var(--both-color);
-            color: white;
-        }
-        
-        .badge-Disabled {
-            background-color: var(--Disabled-color);
-            color: white;
-        }
-        
-        .dataTables_wrapper .dataTables_length, 
-        .dataTables_wrapper .dataTables_filter, 
-        .dataTables_wrapper .dataTables_info, 
-        .dataTables_wrapper .dataTables_processing, 
-        .dataTables_wrapper .dataTables_paginate {
-            color: var(--text-color) !important;
-        }
-        
-        .dataTables_wrapper .dataTables_paginate .paginate_button {
-            padding: 0.3em 0.8em;
-            border-radius: 4px;
-            margin: 0 3px;
-            color: var(--text-color) !important;
-            border: 1px solid var(--border-color) !important;
-            background-color: var(--button-bg) !important;
-        }
-        
-        .dataTables_wrapper .dataTables_paginate .paginate_button.current {
-            background: var(--primary-color) !important;
-            border-color: var(--primary-color) !important;
-            color: white !important;
-        }
-        
-        .dataTables_wrapper .dataTables_paginate .paginate_button:hover {
-            background: var(--button-hover-bg) !important;
-            border-color: var(--border-color) !important;
-            color: var(--text-color) !important;
-        }
-        
-        .dataTables_wrapper .dataTables_length select,
-        .dataTables_wrapper .dataTables_filter input {
-            border: 1px solid var(--input-border);
-            background-color: var(--input-bg);
-            color: var(--input-color);
-            border-radius: 4px;
-            padding: 5px 10px;
-        }
-        
-        .dataTables_wrapper .dataTables_filter input:focus {
-            border-color: var(--input-focus-border);
-            box-shadow: 0 0 0 0.25rem var(--input-focus-shadow);
-        }
-        
-        .dataTables_info {
-            padding-top: 10px;
-            color: var(--text-color);
-        }
-        
-        footer {
-            background-color: var(--primary-color);
-            color: var(--footer-text);
-            text-align: center;
-            padding: 15px 0;
-            margin-top: auto;
-        }
-        
-        footer p {
-            margin: 0;
-            font-weight: 500;
-        }
-        
-        .filter-buttons {
-            display: flex;
-            flex-wrap: wrap;
-            gap: 10px;
-            margin-bottom: 20px;
-        }
-        
-        .filter-button {
-            padding: 8px 16px;
-            border-radius: 20px;
-            border: none;
-            cursor: pointer;
-            font-weight: 500;
-            transition: all 0.2s;
-            display: flex;
-            align-items: center;
-            gap: 8px;
-        }
-        
-        .filter-button:hover {
-            opacity: 0.9;
-        }
-        
-        .filter-button.Enabled {
-            box-shadow: 0 0 0 2px rgba(128,128,128,0.2);
-        }
-        
-        .filter-button-direct {
-            background-color: var(--direct-color);
-            color: white;
-        }
-        
-        .filter-button-inherited {
-            background-color: var(--inherited-color);
-            color: white;
-        }
-        
-        .filter-button-both {
-            background-color: var(--both-color);
-            color: white;
-        }
-        
-        .filter-button-Disabled {
-            background-color: var(--Disabled-color);
-            color: white;
-        }
-        
-        .filter-button-all {
-            background-color: var(--btn-outline-color);
-            color: white;
-        }
-        
-        .toggle-container {
-            display: flex;
-            align-items: center;
-            gap: 10px;
-            margin-bottom: 15px;
-        }
-        
-        .toggle-switch {
-            position: relative;
-            display: inline-block;
-            width: 60px;
-            height: 30px;
-        }
-        
-        .toggle-switch input {
-            opacity: 0;
-            width: 0;
-            height: 0;
-        }
-        
-        .toggle-slider {
-            position: absolute;
-            cursor: pointer;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-            background-color: var(--toggle-bg);
-            transition: .4s;
-            border-radius: 34px;
-        }
-        
-        .toggle-slider:before {
-            position: absolute;
-            content: "";
-            height: 22px;
-            width: 22px;
-            left: 4px;
-            bottom: 4px;
-            background-color: white;
-            transition: .4s;
-            border-radius: 50%;
-        }
-        
-        input:checked + .toggle-slider {
-            background-color: var(--primary-color);
-        }
-        
-        input:checked + .toggle-slider:before {
-            transform: translateX(30px);
-        }
-        
-        .license-filter-container {
-            margin: 15px 0;
-            display: flex;
-            gap: 10px;
-            flex-wrap: wrap;
-        }
-        
-        .license-badge {
-            padding: 6px 12px;
-            border-radius: 20px;
-            background-color: var(--filter-tag-bg);
-            color: var(--filter-tag-color);
-            cursor: pointer;
-            transition: all 0.2s;
-            font-size: 0.85rem;
-        }
-        
-        .license-badge.Enabled {
-            background-color: var(--primary-color);
-            color: white;
-        }
-        
-        @media (max-width: 768px) {
-            .dashboard-header {
-                flex-direction: column;
-                align-items: flex-start;
-                gap: 10px;
-            }
-            
-            .stats-card {
-                min-height: 140px;
-            }
-            
-            .filter-buttons {
-                flex-direction: column;
-            }
-        }
-        
-        /* Export buttons styling */
-        div.dt-buttons {
-            margin-bottom: 1rem;
-        }
-        
-        button.dt-button {
-            background-color: var(--button-bg) !important;
-            border-color: var(--button-border) !important;
-            color: var(--button-color) !important;
-            font-weight: 500 !important;
-            padding: 8px 16px !important;
-            border-radius: 4px !important;
-            margin-right: 8px !important;
-        }
-        
-        button.dt-button:hover {
-            background-color: var(--button-hover-bg) !important;
-            border-color: var(--border-color) !important;
-        }
-        
-        button.dt-button.Enabled {
-            background-color: var(--primary-color) !important;
-            border-color: var(--primary-color) !important;
-            color: white !important;
-        }
-        
-        .filter-section {
-            background-color: var(--filter-bg);
-            padding: 15px;
-            border-radius: 8px;
-            box-shadow: 0 2px 8px rgba(0,0,0,0.05);
-            margin-bottom: 20px;
-            transition: background-color 0.3s ease;
-        }
-        
-        .filter-section h5 {
-            color: var(--primary-color);
-            margin-bottom: 12px;
-            font-weight: 600;
-        }
-        
-        .filter-tags {
-            display: flex;
-            flex-wrap: wrap;
-            gap: 8px;
-            margin-top: 8px;
-        }
-        
-        .filter-tag {
-            background-color: var(--filter-tag-bg);
-            padding: 4px 12px;
-            border-radius: 16px;
-            font-size: 0.85rem;
-            color: var(--filter-tag-color);
-            display: flex;
-            align-items: center;
-            gap: 6px;
-            transition: background-color 0.3s ease, color 0.3s ease;
-        }
-        
-        .filter-tag i {
-            cursor: pointer;
-            color: var(--filter-tag-color);
-        }
-        
-        .filter-tag i:hover {
-            color: var(--Disabled-color);
-        }
-        
-        .custom-search {
-            display: flex;
-            gap: 10px;
-            margin-bottom: 15px;
-        }
-        
-        .custom-search input {
-            flex: 1;
-            padding: 8px 12px;
-            border: 1px solid var(--border-color);
-            background-color: var(--bg-color);
-            color: var(--text-color);
-            border-radius: 4px;
-        }
-        
-        .custom-search button {
-            background-color: var(--primary-color);
-            color: white;
-            border: none;
-            border-radius: 4px;
-            padding: 8px 16px;
-            cursor: pointer;
-        }
-        
-        .Enabled-filters-container {
-            margin-bottom: 15px;
-        }
-        
-        /* Show all entries toggle */
-        .show-all-container {
-            display: flex;
-            align-items: center;
-            gap: 12px;
-            background-color: transparent;
-            padding: 0;
-            border: none;
-            margin-left: 15px;
-        }
-        
-        .show-all-text {
-            font-weight: 500;
-            margin: 0;
-            color: white;
-            font-size: 0.85rem;
-        }
-        
-        /* Custom DataTable controls wrapper */
-        .datatable-header {
-            display: flex;
-            align-items: center;
-            flex-wrap: wrap;
-            margin-bottom: 1rem;
-        }
-        
-        .datatable-controls {
-            display: flex;
-            align-items: center;
-            gap: 15px;
-            flex-wrap: wrap;
-        }
-        
-        /* Theme toggle styles */
-        .theme-toggle {
-            position: fixed;
-            top: 20px;
-            right: 20px;
-            z-index: 1000;
-            display: flex;
-            align-items: center;
-            gap: 10px;
-            background-color: var(--card-bg);
-            padding: 8px 12px;
-            border-radius: 30px;
-            box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-            transition: background-color 0.3s ease;
-        }
-        
-        .theme-toggle-switch {
-            position: relative;
-            display: inline-block;
-            width: 50px;
-            height: 26px;
-        }
-        
-        .theme-toggle-switch input {
-            opacity: 0;
-            width: 0;
-            height: 0;
-        }
-        
-        .theme-toggle-slider {
-            position: absolute;
-            cursor: pointer;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-            background-color: var(--toggle-bg);
-            transition: .4s;
-            border-radius: 34px;
-        }
-        
-        .theme-toggle-slider:before {
-            position: absolute;
-            content: "";
-            height: 18px;
-            width: 18px;
-            left: 4px;
-            bottom: 4px;
-            background-color: white;
-            transition: .4s;
-            border-radius: 50%;
-        }
-        
-        input:checked + .theme-toggle-slider {
-            background-color: var(--primary-color);
-        }
-        
-        input:checked + .theme-toggle-slider:before {
-            transform: translateX(24px);
-        }
-        
-        .theme-icon {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            font-size: 16px;
-            color: var(--text-color);
-        }
-        
-        /* Form elements for dark mode */
-        .form-select, .form-control {
-            background-color: var(--input-bg) !important;
-            color: var(--input-color) !important;
-            border-color: var(--input-border) !important;
-        }
-        
-        .form-select:focus, .form-control:focus {
-            border-color: var(--input-focus-border) !important;
-            box-shadow: 0 0 0 0.25rem var(--input-focus-shadow) !important;
-        }
-        
-        .form-label {
-            color: var(--text-color);
-        }
-        
-        .btn-outline-secondary {
-            color: var(--text-color);
-            border-color: var(--border-color);
-            background-color: transparent;
-        }
-        
-        .btn-outline-secondary:hover {
-            background-color: var(--filter-tag-bg);
-            color: var(--text-color);
-        }
-        
-        /* Override for dropdown menus and selects */
-        .form-select option {
-            background-color: var(--input-bg);
-            color: var(--input-color);
-        }
-        
-        /* Fix DataTables odd/even row striping */
-        table.dataTable.stripe tbody tr.odd, 
-        table.dataTable.display tbody tr.odd {
-            background-color: var(--datatable-odd-row-bg) !important;
-        }
-        
-        table.dataTable.stripe tbody tr.even, 
-        table.dataTable.display tbody tr.even {
-            background-color: var(--datatable-even-row-bg) !important;
-        }
-        
-        /* Fix DataTables background color for hovered rows */
-        table.dataTable.hover tbody tr:hover, 
-        table.dataTable.display tbody tr:hover {
-            background-color: var(--table-hover-bg) !important;
-        }
-        
-        /* Fix DataTables border colors */
-        table.dataTable.border-bottom,
-        table.dataTable.border-top,
-        table.dataTable thead th,
-        table.dataTable tfoot th,
-        table.dataTable thead td,
-        table.dataTable tfoot td {
-            border-color: var(--table-border-color) !important;
-        }
-        
-        /* Bootstrap 5 DataTables specific overrides */
-        .table-striped>tbody>tr:nth-of-type(odd)>* {
-            --bs-table-accent-bg: var(--datatable-odd-row-bg) !important;
-            color: var(--text-color) !important;
-        }
-        
-        .table>:not(caption)>*>* {
-            background-color: var(--card-bg) !important;
-            color: var(--text-color) !important;
-        }
-        
-        .table-striped>tbody>tr {
-            background-color: var(--datatable-even-row-bg) !important;
-        }
-        
-        /* Direct cell background colors */
-        .table tbody tr td {
-            background-color: transparent !important;
-        }
-        
-        /* Force Bootstrap Tables to use the correct colors */
-        .table-striped>tbody>tr:nth-of-type(odd) {
-            --bs-table-accent-bg: var(--datatable-odd-row-bg) !important;
-        }
-    </style>
-</head>
-<body>
-    <!-- Dark Mode Toggle -->
-    <div class="theme-toggle">
-        <div class="theme-icon">
-            <i class="fas fa-sun"></i>
-        </div>
-        <label class="theme-toggle-switch">
-            <input type="checkbox" id="themeToggle">
-            <span class="theme-toggle-slider"></span>
-        </label>
-        <div class="theme-icon">
-            <i class="fas fa-moon"></i>
-        </div>
-    </div>
-    
-    <div class="container-fluid">
-        <div class="dashboard-header">
-            <div class="dashboard-title">
-                <svg class="logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
-                    <path fill="#ff5722" d="M6 6H22V22H6z" transform="rotate(-180 14 14)"/>
-                    <path fill="#4caf50" d="M26 6H42V22H26z" transform="rotate(-180 34 14)"/>
-                    <path fill="#ffc107" d="M6 26H22V42H6z" transform="rotate(-180 14 34)"/>
-                    <path fill="#03a9f4" d="M26 26H42V42H26z" transform="rotate(-180 34 34)"/>
-                </svg>
-                <h1>$Organization M365 Licensing Report</h1>
-            </div>
-            <div class="report-date">
-                <i class="fas fa-calendar-alt me-2"></i> Report generated on: $ReportDate
-            </div>
-        </div>
-        
-        <div class="row mb-4">
-            <div class="col-md-3 mb-3">
-                <div class="stats-card direct-bg" id="directFilter">
-                    <i class="fas fa-user-tag"></i>
-                    <h3>Direct Licenses</h3>
-                    <div class="number">$directLicenses</div>
-                </div>
-            </div>
-            <div class="col-md-3 mb-3">
-                <div class="stats-card inherited-bg" id="inheritedFilter">
-                    <i class="fas fa-users-cog"></i>
-                    <h3>Inherited Licenses</h3>
-                    <div class="number">$inheritedLicenses</div>
-                </div>
-            </div>
-            <div class="col-md-3 mb-3">
-                <div class="stats-card both-bg" id="bothFilter">
-                    <i class="fas fa-user-shield"></i>
-                    <h3>Both (Direct + Inherited)</h3>
-                    <div class="number">$bothLicenses</div>
-                </div>
-            </div>
-            <div class="col-md-3 mb-3">
-                <div class="stats-card Disabled-bg" id="DisabledFilter">
-                    <i class="fas fa-user-slash"></i>
-                    <h3>Disabled Users with Licenses</h3>
-                    <div class="number">$DisabledUsersWithLicenses</div>
-                </div>
-            </div>
-        </div>
-        
-        <div class="filter-section">
-            <h5><i class="fas fa-filter me-2"></i>Filter Options</h5>
-            
-            <div class="row">
-                <div class="col-md-6">
-                    <div class="mb-3">
-                        <label for="accountStatusFilter" class="form-label">Account Status</label>
-                        <select id="accountStatusFilter" class="form-select">
-                            <option value="">All Accounts</option>
-                            <option value="Enabled">Enabled Accounts</option>
-                            <option value="Disabled">Disabled Accounts</option>
-                        </select>
-                    </div>
-                </div>
-                <div class="col-md-6">
-                    <div class="mb-3">
-                        <label for="assignmentTypeFilter" class="form-label">Assignment Type</label>
-                        <select id="assignmentTypeFilter" class="form-select">
-                            <option value="">All Types</option>
-                            <option value="Direct">Direct</option>
-                            <option value="Inherited">Inherited</option>
-                            <option value="Both">Both</option>
-                        </select>
-                    </div>
-                </div>
-            </div>
-            
-            <div class="mb-3">
-                <label for="licenseNameFilter" class="form-label">License Name</label>
-                <input type="text" id="licenseNameFilter" class="form-control" placeholder="Search for license names...">
-            </div>
-            
-            <div class="mb-3">
-                <label class="form-label">Quick Filters</label>
-                <div class="filter-buttons">
-                    <button class="filter-button filter-button-all" data-filter="all"><i class="fas fa-globe"></i> Show All</button>
-                    <button class="filter-button filter-button-direct" data-filter="direct"><i class="fas fa-user-tag"></i> Direct Only</button>
-                    <button class="filter-button filter-button-inherited" data-filter="inherited"><i class="fas fa-users-cog"></i> Inherited Only</button>
-                    <button class="filter-button filter-button-both" data-filter="both"><i class="fas fa-user-shield"></i> Both</button>
-                    <button class="filter-button filter-button-Disabled" data-filter="Disabled"><i class="fas fa-user-slash"></i> Disabled Users</button>
-                </div>
-            </div>
-            
-            <div class="Enabled-filters-container">
-                <div class="d-flex justify-content-between align-items-center">
-                    <label class="form-label mb-0">Enabled Filters:</label>
-                    <button id="clearAllFilters" class="btn btn-sm btn-outline-secondary">Clear All</button>
-                </div>
-                <div class="filter-tags" id="EnabledFilters">
-                    <!-- Enabled filters will be displayed here -->
-                </div>
-            </div>
-        </div>
-        
-        <div class="card">
-            <div class="card-header">
-                <div>
-                    <i class="fas fa-id-card"></i> License Assignment
-                </div>
-                <div class="show-all-container">
-                    <label class="toggle-switch">
-                        <input type="checkbox" id="licensesShowAllToggle">
-                        <span class="toggle-slider"></span>
-                    </label>
-                    <p class="show-all-text">Show all entries</p>
-                </div>
-            </div>
-            <div class="card-body">
-                <div class="table-responsive">
-                    <table id="licensesTable" class="table table-striped table-bordered" style="width:100%">
-                        <thead>
-                            <tr>
-                                <th>Display Name</th>
-                                <th>User Principal Name</th>
-                                <th>Account Status</th>
-                                <th>Last Successful Sign In</th>
-                                <th>License</th>
-                                <th>Assignment Type</th>
-                                <th>Inheritance Details</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {{TABLE_DATA}}
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-        
-        <div class="card">
-            <div class="card-header">
-                <div>
-                    <i class="fas fa-project-diagram"></i> Subscription Overview
-                </div>
-                <div class="show-all-container">
-                    <label class="toggle-switch">
-                        <input type="checkbox" id="subscriptionShowAllToggle">
-                        <span class="toggle-slider"></span>
-                    </label>
-                    <p class="show-all-text">Show all entries</p>
-                </div>
-            </div>
-            <div class="card-body">
-                <div class="table-responsive">
-                    <table id="subscriptionTable" class="table table-striped table-bordered" style="width:100%">
-                        <thead>
-                            <tr>
-                                <th>Subscription</th>
-                                <th>Created Date</th>
-                                <th>End Date</th>
-                                <th>License Status</th>
-                                <th>Consumed Units</th>
-                                <th>Total Licenses</th>
-                                <th>Available Licenses</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {{SUBSCRIPTION_DATA}}
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-    
-    <footer>
-        <p>Generated by Roy Klooster - RK Solutions</p>
-    </footer>
-    
-    <script>
-        // Initialize DataTables
-        $(document).ready(function() {
-            // Theme toggling functionality
-            const themeToggle = document.getElementById('themeToggle');
-            const prefersDarkScheme = window.matchMedia('(prefers-color-scheme: dark)');
-            
-            // Function to update table colors for dark mode
-            function updateTableColors() {
-                // Force all table cells to have the correct background
-                if (document.documentElement.getAttribute('data-theme') === 'dark') {
-                    // Dark mode
-                    $('table.dataTable tbody tr').css('background-color', 'var(--datatable-even-row-bg)');
-                    $('table.dataTable tbody tr:nth-child(odd)').css('background-color', 'var(--datatable-odd-row-bg)');
-                    $('table.dataTable tbody td').css('color', 'var(--text-color)');
-                    $('table.dataTable thead th').css({
-                        'background-color': 'var(--table-header-bg)',
-                        'color': 'var(--table-header-color)'
-                    });
-                } else {
-                    // Light mode
-                    $('table.dataTable tbody tr').css('background-color', 'var(--datatable-even-row-bg)');
-                    $('table.dataTable tbody tr:nth-child(odd)').css('background-color', 'var(--datatable-odd-row-bg)');
-                    $('table.dataTable tbody td').css('color', 'var(--text-color)');
-                    $('table.dataTable thead th').css({
-                        'background-color': 'var(--table-header-bg)',
-                        'color': 'var(--table-header-color)'
-                    });
-                }
-            }
-            
-            // Check for saved user preference, or use system preference
-            const savedTheme = localStorage.getItem('theme');
-            if (savedTheme === 'dark' || (!savedTheme && prefersDarkScheme.matches)) {
-                document.documentElement.setAttribute('data-theme', 'dark');
-                themeToggle.checked = true;
-            }
-            
-            // Add event listener for theme toggle
-            themeToggle.addEventListener('change', function() {
-                if (this.checked) {
-                    document.documentElement.setAttribute('data-theme', 'dark');
-                    localStorage.setItem('theme', 'dark');
-                } else {
-                    document.documentElement.setAttribute('data-theme', 'light');
-                    localStorage.setItem('theme', 'light');
-                }
-                
-                // Apply the table color changes after theme switch
-                setTimeout(updateTableColors, 50);
-            });
-            
-            // Initialize DataTable for licenses
-            const licensesTable = $('#licensesTable').DataTable({
-                dom: 'Bfrtip',
-                buttons: [
-                    {
-                        extend: 'collection',
-                        text: '<i class="fas fa-download"></i> Export',
-                        buttons: [
-                            {
-                                extend: 'excel',
-                                text: '<i class="fas fa-file-excel"></i> Excel',
-                                exportOptions: {
-                                    columns: ':visible'
-                                }
-                            },
-                            {
-                                extend: 'csv',
-                                text: '<i class="fas fa-file-csv"></i> CSV',
-                                exportOptions: {
-                                    columns: ':visible'
-                                }
-                            },
-                            {
-                                extend: 'pdf',
-                                text: '<i class="fas fa-file-pdf"></i> PDF',
-                                exportOptions: {
-                                    columns: ':visible'
-                                }
-                            },
-                            {
-                                extend: 'print',
-                                text: '<i class="fas fa-print"></i> Print',
-                                exportOptions: {
-                                    columns: ':visible'
-                                }
-                            }
-                        ]
-                    },
-                    {
-                        extend: 'colvis',
-                        text: '<i class="fas fa-columns"></i> Columns'
-                    }
-                ],
-                paging: true,
-                searching: true,
-                ordering: true,
-                info: true,
-                responsive: true,
-                lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
-                order: [[0, 'asc']],
-                language: {
-                    search: "<i class='fas fa-search'></i> _INPUT_",
-                    searchPlaceholder: "Search records...",
-                    lengthMenu: "Show _MENU_ entries",
-                    info: "Showing _START_ to _END_ of _TOTAL_ entries",
-                    paginate: {
-                        first: "<i class='fas fa-angle-double-left'></i>",
-                        last: "<i class='fas fa-angle-double-right'></i>",
-                        next: "<i class='fas fa-angle-right'></i>",
-                        previous: "<i class='fas fa-angle-left'></i>"
-                    }
-                },
-                drawCallback: function() {
-                    // Enforce the correct colors after DataTables redraws
-                    updateTableColors();
-                }
-            });
-            
-            // Initialize DataTable for subscriptions
-            const subscriptionTable = $('#subscriptionTable').DataTable({
-                dom: 'Bfrtip',
-                buttons: [
-                    {
-                        extend: 'collection',
-                        text: '<i class="fas fa-download"></i> Export',
-                        buttons: [
-                            {
-                                extend: 'excel',
-                                text: '<i class="fas fa-file-excel"></i> Excel',
-                                exportOptions: {
-                                    columns: ':visible'
-                                }
-                            },
-                            {
-                                extend: 'csv',
-                                text: '<i class="fas fa-file-csv"></i> CSV',
-                                exportOptions: {
-                                    columns: ':visible'
-                                }
-                            },
-                            {
-                                extend: 'pdf',
-                                text: '<i class="fas fa-file-pdf"></i> PDF',
-                                exportOptions: {
-                                    columns: ':visible'
-                                }
-                            },
-                            {
-                                extend: 'print',
-                                text: '<i class="fas fa-print"></i> Print',
-                                exportOptions: {
-                                    columns: ':visible'
-                                }
-                            }
-                        ]
-                    },
-                    {
-                        extend: 'colvis',
-                        text: '<i class="fas fa-columns"></i> Columns'
-                    }
-                ],
-                paging: true,
-                searching: true,
-                ordering: true,
-                info: true,
-                responsive: true,
-                lengthMenu: [[10, 25, 50, -1], [10, 25, 50, "All"]],
-                language: {
-                    search: "<i class='fas fa-search'></i> _INPUT_",
-                    searchPlaceholder: "Search records...",
-                    lengthMenu: "Show _MENU_ entries",
-                    info: "Showing _START_ to _END_ of _TOTAL_ entries",
-                    paginate: {
-                        first: "<i class='fas fa-angle-double-left'></i>",
-                        last: "<i class='fas fa-angle-double-right'></i>",
-                        next: "<i class='fas fa-angle-right'></i>",
-                        previous: "<i class='fas fa-angle-left'></i>"
-                    }
-                },
-                drawCallback: function() {
-                    // Enforce the correct colors after DataTables redraws
-                    updateTableColors();
-                }
-            });
-            
-            // Apply initial table colors
-            setTimeout(updateTableColors, 100);
-            
-            // Show all toggle functionality for licenses table
-            $('#licensesShowAllToggle').on('change', function() {
-                if ($(this).is(':checked')) {
-                    licensesTable.page.len(-1).draw();
-                } else {
-                    licensesTable.page.len(10).draw();
-                }
-            });
-            
-            // Show all toggle functionality for subscription table
-            $('#subscriptionShowAllToggle').on('change', function() {
-                if ($(this).is(':checked')) {
-                    subscriptionTable.page.len(-1).draw();
-                } else {
-                    subscriptionTable.page.len(10).draw();
-                }
-            });
-            
-            // Custom filtering function
-            $.fn.dataTable.ext.search.push(
-                function(settings, data, dataIndex) {
-                    // Only apply to licenses table
-                    if (settings.nTable.id !== 'licensesTable') {
-                        return true;
-                    }
-                    
-                    // Get filter values
-                    const accountStatus = $('#accountStatusFilter').val();
-                    const assignmentType = $('#assignmentTypeFilter').val();
-                    const licenseNameFilter = $('#licenseNameFilter').val().toLowerCase();
-                    
-                    // Get row data - Updated column indices after adding "Last Successful Sign In"
-                    const rowAccountStatus = data[2]; // Account Status column
-                    const rowAssignmentType = data[5]; // Assignment Type column (was 4, now 5)
-                    const rowLicenseName = data[4].toLowerCase(); // License Name column (was 3, now 4)
-                    
-                    // Filter by account status
-                    if (accountStatus && accountStatus === 'Enabled' && !rowAccountStatus.includes('Enabled')) {
-                        return false;
-                    }
-                    if (accountStatus && accountStatus === 'Disabled' && !rowAccountStatus.includes('Disabled')) {
-                        return false;
-                    }
-                    
-                    // Filter by assignment type
-                    if (assignmentType && !rowAssignmentType.includes(assignmentType)) {
-                        return false;
-                    }
-                    
-                    // Filter by license name
-                    if (licenseNameFilter && !rowLicenseName.includes(licenseNameFilter)) {
-                        return false;
-                    }
-                    
-                    return true;
-                }
-            );
-            
-            // Stats card filtering
-            $('#directFilter').on('click', function() {
-                $('#assignmentTypeFilter').val('Direct');
-                updateEnabledFilters('Assignment Type', 'Direct');
-                applyFilters();
-                toggleStatsCardEnabled('directFilter');
-            });
-            
-            $('#inheritedFilter').on('click', function() {
-                $('#assignmentTypeFilter').val('Inherited');
-                updateEnabledFilters('Assignment Type', 'Inherited');
-                applyFilters();
-                toggleStatsCardEnabled('inheritedFilter');
-            });
-            
-            $('#bothFilter').on('click', function() {
-                $('#assignmentTypeFilter').val('Both');
-                updateEnabledFilters('Assignment Type', 'Both');
-                applyFilters();
-                toggleStatsCardEnabled('bothFilter');
-            });
-            
-            $('#DisabledFilter').on('click', function() {
-                $('#accountStatusFilter').val('Disabled');
-                updateEnabledFilters('Account Status', 'Disabled');
-                applyFilters();
-                toggleStatsCardEnabled('DisabledFilter');
-            });
-            
-            // Button filtering
-            $('.filter-button').on('click', function() {
-                const filterType = $(this).data('filter');
-                
-                // Clear all filter button Enabled states
-                $('.filter-button').removeClass('Enabled');
-                $(this).addClass('Enabled');
-                
-                // Reset filters
-                $('#accountStatusFilter').val('');
-                $('#assignmentTypeFilter').val('');
-                $('#licenseNameFilter').val('');
-                clearEnabledFilters();
-                
-                // Apply selected filter
-                switch(filterType) {
-                    case 'direct':
-                        $('#assignmentTypeFilter').val('Direct');
-                        updateEnabledFilters('Assignment Type', 'Direct');
-                        toggleStatsCardEnabled('directFilter');
-                        break;
-                    case 'inherited':
-                        $('#assignmentTypeFilter').val('Inherited');
-                        updateEnabledFilters('Assignment Type', 'Inherited');
-                        toggleStatsCardEnabled('inheritedFilter');
-                        break;
-                    case 'both':
-                        $('#assignmentTypeFilter').val('Both');
-                        updateEnabledFilters('Assignment Type', 'Both');
-                        toggleStatsCardEnabled('bothFilter');
-                        break;
-                    case 'Disabled':
-                        $('#accountStatusFilter').val('Disabled');
-                        updateEnabledFilters('Account Status', 'Disabled');
-                        toggleStatsCardEnabled('DisabledFilter');
-                        break;
-                    case 'all':
-                    default:
-                        // Reset all filters
-                        $('.stats-card').removeClass('Enabled');
-                        break;
-                }
-                
-                applyFilters();
-            });
-            
-            // Apply filters when select boxes change
-            $('#accountStatusFilter, #assignmentTypeFilter').on('change', function() {
-                const filterType = $(this).attr('id');
-                const filterValue = $(this).val();
-                
-                if (filterValue) {
-                    if (filterType === 'accountStatusFilter') {
-                        updateEnabledFilters('Account Status', filterValue);
-                    } else if (filterType === 'assignmentTypeFilter') {
-                        updateEnabledFilters('Assignment Type', filterValue);
-                    }
-                } else {
-                    if (filterType === 'accountStatusFilter') {
-                        removeEnabledFilter('Account Status');
-                    } else if (filterType === 'assignmentTypeFilter') {
-                        removeEnabledFilter('Assignment Type');
-                    }
-                }
-                
-                applyFilters();
-            });
-            
-            // Apply filter when license name input changes
-            $('#licenseNameFilter').on('input', function() {
-                const filterValue = $(this).val();
-                
-                if (filterValue) {
-                    updateEnabledFilters('License Name', filterValue);
-                } else {
-                    removeEnabledFilter('License Name');
-                }
-                
-                applyFilters();
-            });
-            
-            // Clear all filters button
-            $('#clearAllFilters').on('click', function() {
-                $('#accountStatusFilter').val('');
-                $('#assignmentTypeFilter').val('');
-                $('#licenseNameFilter').val('');
-                $('.filter-button').removeClass('Enabled');
-                $('.stats-card').removeClass('Enabled');
-                clearEnabledFilters();
-                applyFilters();
-            });
-            
-            // Function to apply all filters
-            function applyFilters() {
-                licensesTable.draw();
-            }
-            
-            // Function to toggle stats card Enabled state
-            function toggleStatsCardEnabled(cardId) {
-                $('.stats-card').removeClass('Enabled');
-                $('#' + cardId).addClass('Enabled');
-            }
-            
-            // Function to update Enabled filters
-            function updateEnabledFilters(filterType, filterValue) {
-                // Remove existing filter of the same type
-                removeEnabledFilter(filterType);
-                
-                // Add new filter tag
-                const filterTag = `
-                    <div class="filter-tag" data-filter-type="${filterType}">
-                        <span>${filterType}: ${filterValue}</span>
-                        <i class="fas fa-times-circle remove-filter" data-filter-type="${filterType}"></i>
-                    </div>
-                `;
-                
-                $('#EnabledFilters').append(filterTag);
-                
-                // Add click handler to remove filter
-                $('.remove-filter').off('click').on('click', function() {
-                    const filterTypeToRemove = $(this).data('filter-type');
-                    
-                    if (filterTypeToRemove === 'Account Status') {
-                        $('#accountStatusFilter').val('');
-                    } else if (filterTypeToRemove === 'Assignment Type') {
-                        $('#assignmentTypeFilter').val('');
-                    } else if (filterTypeToRemove === 'License Name') {
-                        $('#licenseNameFilter').val('');
-                    }
-                    
-                    $(this).closest('.filter-tag').remove();
-                    
-                    // Remove Enabled state from stat cards and filter buttons
-                    if (filterTypeToRemove === 'Account Status' && $('#DisabledFilter').hasClass('Enabled')) {
-                        $('#DisabledFilter').removeClass('Enabled');
-                    } else if (filterTypeToRemove === 'Assignment Type') {
-                        $('#directFilter, #inheritedFilter, #bothFilter').removeClass('Enabled');
-                    }
-                    
-                    $('.filter-button').removeClass('Enabled');
-                    
-                    applyFilters();
-                });
-            }
-            
-            // Function to remove Enabled filter by type
-            function removeEnabledFilter(filterType) {
-                $('.filter-tag[data-filter-type="' + filterType + '"]').remove();
-            }
-            
-            // Function to clear all Enabled filters
-            function clearEnabledFilters() {
-                $('#EnabledFilters').empty();
-            }
-            
-            // Force dark mode to take effect on page elements
-            $(window).on('load', function() {
-                setTimeout(updateTableColors, 200);
-            });
-            
-            // Re-apply styles after DataTables operations
-            licensesTable.on('draw.dt', function() {
-                setTimeout(updateTableColors, 50);
-            });
-            
-            subscriptionTable.on('draw.dt', function() {
-                setTimeout(updateTableColors, 50);
-            });
-        });
-    </script>
-</body>
-</html>
-'@
 
     # Generate table rows for user licenses
     $tableRows = ""
     foreach ($item in $Report) {
         $accountStatusClass = if ($item.AccountEnabled -eq "No") { 'class="table-danger"' } else { '' }
-        
-        $assignmentTypeBadge = switch ($item.AssignmentType) {
-            "Direct" { '<span class="badge badge-direct">Direct</span>' }
-            "Inherited" { '<span class="badge badge-inherited">Inherited</span>' }
-            "Both" { '<span class="badge badge-both">Both</span>' }
-            default { '<span class="badge bg-secondary">Unknown</span>' }
-        }
-        
+
+        $assignmentTypeText = [System.Net.WebUtility]::HtmlEncode($item.AssignmentType)
+
         $accountStatus = if ($item.AccountEnabled -eq "Yes") {
-            '<span class="badge bg-success">Enabled</span>'
+            '<span class="rk-badge rk-badge-ok">Enabled</span>'
         }
         else {
-            '<span class="badge badge-Disabled">Disabled</span>'
+            '<span class="rk-badge rk-badge-error">Disabled</span>'
         }
-        
+
         $tableRows += @"
     <tr $accountStatusClass>
-        <td>$($item.DisplayName)</td>
-        <td>$($item.UserPrincipalName)</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.DisplayName))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.UserPrincipalName))</td>
         <td>$accountStatus</td>
-        <td>$($item.LastSuccessfulSignIn)</td>
-        <td>$($item.AssignedLicensesFriendlyName)</td>
-        <td>$assignmentTypeBadge</td>
-        <td>$($item.Inheritance)</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.LastSuccessfulSignIn))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignedLicensesFriendlyName))</td>
+        <td>$assignmentTypeText</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.Inheritance))</td>
     </tr>
 "@
     }
@@ -1527,35 +62,35 @@ function New-HTMLReport {
     # Generate table rows for subscription overview
     $subscriptionRows = ""
     foreach ($item in $SubscriptionOverview) {
-        $availabilityPercentage = if ($item.TotalLicenses -ne 0) { 
-            [Math]::Round(($item.AvailableLicenses / $item.TotalLicenses) * 100) 
+        $availabilityPercentage = if ($item.TotalLicenses -ne 0) {
+            [Math]::Round(($item.AvailableLicenses / $item.TotalLicenses) * 100)
         }
-        else { 
-            0 
+        else {
+            0
         }
-        
+
         $availabilityBadge = if ($availabilityPercentage -lt 10) {
-            '<span class="badge bg-danger">' + $item.AvailableLicenses + ' (' + $availabilityPercentage + '%)</span>'
+            '<span class="rk-badge rk-badge-error">' + $item.AvailableLicenses + ' (' + $availabilityPercentage + '%)</span>'
         }
         elseif ($availabilityPercentage -lt 20) {
-            '<span class="badge bg-warning text-dark">' + $item.AvailableLicenses + ' (' + $availabilityPercentage + '%)</span>'
+            '<span class="rk-badge rk-badge-warn">' + $item.AvailableLicenses + ' (' + $availabilityPercentage + '%)</span>'
         }
         else {
-            '<span class="badge bg-success">' + $item.AvailableLicenses + ' (' + $availabilityPercentage + '%)</span>'
+            '<span class="rk-badge rk-badge-ok">' + $item.AvailableLicenses + ' (' + $availabilityPercentage + '%)</span>'
         }
-        
+
         $licenseStatusBadge = if ($item.LicenseStatus -eq "Enabled") {
-            '<span class="badge bg-success">Enabled</span>'
+            '<span class="rk-badge rk-badge-ok">Enabled</span>'
         }
         else {
-            '<span class="badge bg-danger">Disabled</span>'
+            '<span class="rk-badge rk-badge-error">Disabled</span>'
         }
-        
+
         $subscriptionRows += @"
     <tr>
-        <td>$($item.FriendlyName)</td>
-        <td>$($item.CreatedDate)</td>
-        <td>$($item.EndDate)</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.FriendlyName))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.CreatedDate))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.EndDate))</td>
         <td>$licenseStatusBadge</td>
         <td>$($item.ConsumedUnits)</td>
         <td>$($item.TotalLicenses)</td>
@@ -1564,2087 +99,330 @@ function New-HTMLReport {
 "@
     }
 
-    # Get current date for report
-    $currentDate = Get-Date -Format "dd-MM-yyyy HH:mm"
-
-    # Replace placeholders in template with actual values
-    $htmlContent = $htmlTemplate.Replace('$Organization', $Organization)
-    $htmlContent = $htmlContent.Replace('$ReportDate', $currentDate)
-    $htmlContent = $htmlContent.Replace('$directLicenses', $directLicenses)
-    $htmlContent = $htmlContent.Replace('$inheritedLicenses', $inheritedLicenses)
-    $htmlContent = $htmlContent.Replace('$bothLicenses', $bothLicenses)
-    $htmlContent = $htmlContent.Replace('$DisabledUsersWithLicenses', $DisabledUsersWithLicenses)
-    $htmlContent = $htmlContent.Replace('{{TABLE_DATA}}', $tableRows)
-    $htmlContent = $htmlContent.Replace('{{SUBSCRIPTION_DATA}}', $subscriptionRows)
+    # Generate table rows for disabled users (users with AccountEnabled = No that have licenses)
+    $disabledUsersRows = ""
+    $disabledUsers = $Report | Where-Object { $_.AccountEnabled -eq "No" }
+    foreach ($item in $disabledUsers) {
+        $assignmentTypeText = [System.Net.WebUtility]::HtmlEncode($item.AssignmentType)
 
-    # Add additional CSS for dark mode pagination
-    $darkModePaginationCss = @"
-    <style>
-        /* Dark mode pagination buttons */
-        [data-theme="dark"] .page-link {
-            background-color: var(--button-bg) !important;
-            color: var(--text-color) !important;
-            border-color: var(--border-color) !important;
-        }
-        
-        [data-theme="dark"] .page-item.Enabled .page-link {
-            background-color: var(--primary-color) !important;
-            color: white !important;
-            border-color: var(--primary-color) !important;
-        }
-        
-        [data-theme="dark"] .page-item.disabled .page-link {
-            background-color: var(--card-bg) !important;
-            color: #6c757d !important;
-            border-color: var(--border-color) !important;
-        }
-        
-        [data-theme="dark"] .dataTables_paginate .paginate_button {
-            background-color: var(--button-bg) !important;
-            color: var(--text-color) !important;
-            border-color: var(--border-color) !important;
-        }
-        
-        [data-theme="dark"] .dataTables_paginate .paginate_button.current, 
-        [data-theme="dark"] .dataTables_paginate .paginate_button.current:hover {
-            background: var(--primary-color) !important;
-            color: white !important;
-            border-color: var(--primary-color) !important;
-        }
-        
-        [data-theme="dark"] .dataTables_paginate .paginate_button:hover {
-            background: var(--button-hover-bg) !important;
-            color: var(--text-color) !important;
-            border-color: var(--button-border) !important;
-        }
-        
-        [data-theme="dark"] .dataTables_paginate .paginate_button.disabled, 
-        [data-theme="dark"] .dataTables_paginate .paginate_button.disabled:hover {
-            background-color: var(--card-bg) !important;
-            color: #6c757d !important;
-            border-color: var(--border-color) !important;
-            opacity: 0.6;
-        }
-    </style>
+        $disabledUsersRows += @"
+    <tr>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.DisplayName))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.UserPrincipalName))</td>
+        <td><span class="rk-badge rk-badge-error">Disabled</span></td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.LastSuccessfulSignIn))</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.AssignedLicensesFriendlyName))</td>
+        <td>$assignmentTypeText</td>
+        <td>$([System.Net.WebUtility]::HtmlEncode($item.Inheritance))</td>
+    </tr>
 "@
-    
-    # Insert the dark mode pagination CSS before the </head> tag
-    $htmlContent = $htmlContent.Replace('</head>', "$darkModePaginationCss`n</head>")
+    }
 
-    # Export to HTML file
-    $htmlContent | Out-File -FilePath $ExportPath -Encoding utf8
+    # Get current date for report
+    $CurrentDate = (Get-Date).ToString('yyyy-MM-dd HH:mm:ss')
+
+    # Build stat tiles HTML
+    $statsCardsHtml = @"
+            <div class="rk-stat-tile t-rust">
+                <div class="rk-stat-eyebrow">DIRECT</div>
+                <div class="rk-stat-number">$directLicenses</div>
+                <div class="rk-stat-caption">Direct license assignments</div>
+            </div>
+            <div class="rk-stat-tile t-olive">
+                <div class="rk-stat-eyebrow">INHERITED</div>
+                <div class="rk-stat-number">$inheritedLicenses</div>
+                <div class="rk-stat-caption">Group-based assignments</div>
+            </div>
+            <div class="rk-stat-tile t-steel">
+                <div class="rk-stat-eyebrow">BOTH</div>
+                <div class="rk-stat-number">$bothLicenses</div>
+                <div class="rk-stat-caption">Direct + Inherited</div>
+            </div>
+            <div class="rk-stat-tile t-rose">
+                <div class="rk-stat-eyebrow">DISABLED</div>
+                <div class="rk-stat-number">$DisabledUsersWithLicenses</div>
+                <div class="rk-stat-caption">Disabled users with licenses</div>
+            </div>
+"@
 
-    # Set script-scoped variable for email attachment
-    $script:ExportPath = $ExportPath
+    # Build body content HTML (tabs + panels + filter containers + tables + script)
+    $bodyContentHtml = @"
+    <!-- Tab Navigation -->
+    <div class="rk-tabs">
+        <button class="rk-tab active" data-target="panel-license-assignment">License Assignment</button>
+        <button class="rk-tab" data-target="panel-subscription-overview">Subscription Overview</button>
+        <button class="rk-tab" data-target="panel-disabled-users">Disabled Users</button>
+    </div>
 
-    Write-Host "All actions completed successfully." -ForegroundColor Cyan
-    Write-Host "Report saved to: $ExportPath" -ForegroundColor Cyan
+    <!-- License Assignment Panel -->
+    <div id="panel-license-assignment" class="rk-panel active">
+        <div class="rk-filter-bar">
+            <span>Filters:</span>
+            <select id="accountStatusFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Accounts</option>
+                <option value="Enabled">Enabled</option>
+                <option value="Disabled">Disabled</option>
+            </select>
+            <select id="assignmentTypeFilter" class="form-select" style="max-width:180px;">
+                <option value="">All Types</option>
+                <option value="Direct">Direct</option>
+                <option value="Inherited">Inherited</option>
+                <option value="Both">Both</option>
+            </select>
+            <select id="licenseNameFilter" class="form-select" style="max-width:220px;">
+                <option value="">All Licenses</option>
+            </select>
+            <button class="rk-filter-chip" onclick="clearLicenseFilters()">Clear</button>
+        </div>
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>License Assignment</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="licensesShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="licensesTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Display Name</th>
+                            <th>User Principal Name</th>
+                            <th>Account Status</th>
+                            <th>Last Successful Sign In</th>
+                            <th>License</th>
+                            <th>Assignment Type</th>
+                            <th>Inheritance Details</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $tableRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
 
-    # Open the HTML file (cross-platform: Invoke-Item uses default handler; fallback so script does not fail in headless env)
-    if (-not $SendEmail) {
-        try {
-            Invoke-Item $ExportPath -ErrorAction Stop
-        } catch {
-            Write-Host "Report saved to: $ExportPath (could not open automatically)." -ForegroundColor Yellow
-        }
-    }
-}
-
-function Get-LicenseIdentifiers {
-    $header = 'Product_Display_Name', 'String_Id', 'GUID', 'Service_Plan_Name', 'Service_Plan_Id', 'Service_Plans_Included_Friendly_Names'
-    $params = @{
-        Method = 'Get'
-        Uri    = "https://download.microsoft.com/download/e/3/e/e3e9faf2-f28b-490a-9ada-c6089a1fc5b0/Product%20names%20and%20service%20plan%20identifiers%20for%20licensing.csv"
-    }
-    $Identifiers = Invoke-RestMethod @params | ConvertFrom-Csv -Header $header |
-    ForEach-Object {
-        [PSCustomObject]@{
-            GUID                 = $_.GUID
-            String_Id            = $_.String_Id
-            Product_Display_Name = $_.Product_Display_Name
-        }
-    }
-    return $Identifiers | Select-Object -Skip 1
-}
-
-
-function Invoke-M365LicenseReportCore {
-    param(
-        [Parameter(Mandatory=$false)] [switch] $SendEmail,
-        [Parameter(Mandatory=$false)] [string[]] $Recipient,
-        [Parameter(Mandatory=$false)] [string] $From,
-        [Parameter(Mandatory=$false)] [string] $ExportPath
-    )
-        # CODE
-
-        # Get Organization Name
-        $Organization = Invoke-MgGraphRequest -Uri "beta/organization" -OutputType PSObject | Select-Object -Expand Value | Select-Object -ExpandProperty DisplayName
-
-        # Get product identifiers
-        $Identifiers = Get-LicenseIdentifiers
-
-        # Select all SKUs with friendly display name
-        [array]$SKU_friendly = $Identifiers | Select-Object GUID, String_Id, Product_Display_Name -Unique
-
-        # NEW CLOUD LICENSING API: Get allotments with subscription details in one call (Beta API)
-        # This replaces the previous two separate calls to subscribedSkus and directory/subscriptions
-        Write-Host "INFO: Retrieving allotment and subscription data using Cloud Licensing API..." -ForegroundColor Cyan
-
-        try {
-            # Try new Cloud Licensing API first
-            # Note: subscriptions is included by default, no need to expand
-            [Array]$allotments = Invoke-GraphRequestWithPaging -Uri "beta/admin/cloudLicensing/allotments?`$select=id,allottedUnits,consumedUnits,skuId,skuPartNumber,assignableTo,subscriptions"
-
-            if (-not $allotments -or $allotments.Count -eq 0) {
-                throw "Allotments API returned empty results"
-            }
-
-            $useCloudLicensingAPI = $true
-            Write-Host "INFO: Successfully retrieved data from Cloud Licensing API" -ForegroundColor Green
-
-            # Diagnostic: Show what properties are available in first subscription (if verbose)
-            if ($VerbosePreference -eq 'Continue' -and $allotments.Count -gt 0) {
-                $firstAllotment = $allotments[0]
-                if ($firstAllotment.subscriptions -and $firstAllotment.subscriptions.Count -gt 0) {
-                    $firstSub = $firstAllotment.subscriptions[0]
-                    Write-Verbose "Subscription properties available: $($firstSub.PSObject.Properties.Name -join ', ')"
-                }
-            }
-
-            # Always show diagnostic info about subscription structure (helps with troubleshooting)
-            Write-Host "INFO: Found $($allotments.Count) allotments" -ForegroundColor Cyan
-            $totalSubscriptions = ($allotments | ForEach-Object { if ($_.subscriptions) { $_.subscriptions.Count } else { 0 } } | Measure-Object -Sum).Sum
-            Write-Host "INFO: Total subscriptions across all allotments: $totalSubscriptions" -ForegroundColor Cyan
-
-            # Supplementary call to get dates from legacy API if needed
-            # The allotments API includes startDate and nextLifecycleDate, but we fetch
-            # from legacy API as a fallback in case subscription IDs don't match perfectly
-            Write-Host "INFO: Retrieving subscription dates as fallback..." -ForegroundColor Cyan
-            [Array]$LegacySubscriptions = Invoke-MgGraphRequest -Uri "beta/directory/subscriptions?`$select=id,createdDateTime,nextLifecycleDateTime,skuId" -OutputType PSObject |
-                Select-Object -ExpandProperty Value
-
-            # Create lookup table for quick access to both created and end dates
-            $subscriptionDateLookup = @{}
-            foreach ($legacySub in $LegacySubscriptions) {
-                if ($legacySub.id) {
-                    $subscriptionDateLookup[$legacySub.id] = @{
-                        CreatedDate = $legacySub.createdDateTime
-                        EndDate = $legacySub.nextLifecycleDateTime
-                    }
-                }
-            }
-
-            Write-Host "INFO: Created lookup table with $($subscriptionDateLookup.Count) subscription dates" -ForegroundColor Cyan
-            if ($VerbosePreference -eq 'Continue' -and $subscriptionDateLookup.Count -gt 0) {
-                Write-Verbose "Sample lookup IDs: $(($subscriptionDateLookup.Keys | Select-Object -First 3) -join ', ')"
-                $firstId = $subscriptionDateLookup.Keys | Select-Object -First 1
-                if ($firstId) {
-                    Write-Verbose "Sample data for ID $firstId - CreatedDate: $($subscriptionDateLookup[$firstId].CreatedDate), EndDate: $($subscriptionDateLookup[$firstId].EndDate)"
-                }
-            }
-
-            # Show how many subscriptions have end dates
-            $subsWithEndDates = ($LegacySubscriptions | Where-Object { $_.nextLifecycleDateTime }).Count
-            $subsWithoutEndDates = $LegacySubscriptions.Count - $subsWithEndDates
-            Write-Host "INFO: Subscriptions with end dates: $subsWithEndDates, without end dates: $subsWithoutEndDates" -ForegroundColor Cyan
-        }
-        catch {
-            # Fallback to legacy API if Cloud Licensing API fails
-            Write-Host "WARNING: Cloud Licensing API failed, falling back to legacy API. Error: $($_.Exception.Message)" -ForegroundColor Yellow
-            $useCloudLicensingAPI = $false
-
-            # Legacy API calls
-            [Array]$Skus = Invoke-MgGraphRequest -Uri "Beta/subscribedSkus" -OutputType PSObject |
-            Select-Object -ExpandProperty Value
-            [Array]$Subscriptions = Invoke-MgGraphRequest -Uri "beta/directory/subscriptions" -OutputType PSObject |
-            Select-Object -ExpandProperty Value
-        }
-
-        # Create an overview of subscriptions with their end date
-        $SubscriptionOverview = @()
-
-        if ($useCloudLicensingAPI) {
-            # NEW: Process allotments from Cloud Licensing API
-            $datesFoundCount = 0
-            $datesNotFoundCount = 0
-
-            # Group allotments by SKU to combine duplicate licenses
-            $allotmentsBySkuId = @{}
-
-            foreach ($allotment in $allotments) {
-                # Get friendly name
-                $friendlyName = $SKU_friendly | Where-Object { $_.GUID -eq $allotment.skuId } |
-                    Select-Object -ExpandProperty Product_Display_Name -ErrorAction SilentlyContinue
-
-                if (-not $friendlyName) {
-                    $friendlyName = if ($allotment.skuPartNumber) { $allotment.skuPartNumber } else { "Unknown License ($($allotment.skuId))" }
-                }
-
-                # Initialize SKU group if not exists
-                if (-not $allotmentsBySkuId.ContainsKey($allotment.skuId)) {
-                    $allotmentsBySkuId[$allotment.skuId] = @{
-                        FriendlyName = $friendlyName
-                        SKUPartNumber = $allotment.skuPartNumber
-                        AssignableTo = $allotment.assignableTo
-                        TotalLicenses = 0
-                        ConsumedUnits = 0
-                        CreatedDates = @()
-                        EndDates = @()
-                        SubscriptionIds = @()
-                    }
-                }
-
-                # Aggregate license counts
-                $allotmentsBySkuId[$allotment.skuId].TotalLicenses += if ($allotment.allottedUnits) { $allotment.allottedUnits } else { 0 }
-                $allotmentsBySkuId[$allotment.skuId].ConsumedUnits += if ($allotment.consumedUnits) { $allotment.consumedUnits } else { 0 }
-
-                # Process subscriptions to collect dates
-                if ($allotment.subscriptions -and $allotment.subscriptions.Count -gt 0) {
-                    foreach ($subscription in $allotment.subscriptions) {
-                        if ($subscription.id) {
-                            $allotmentsBySkuId[$allotment.skuId].SubscriptionIds += $subscription.id
-                        }
-
-                        # Resolve created/start date
-                        $subCreated = $null
-                        if ($subscription.startDate) { $subCreated = $subscription.startDate }
-                        elseif ($subscription.createdDateTime) { $subCreated = $subscription.createdDateTime }
-                        elseif ($subscription.createdDate) { $subCreated = $subscription.createdDate }
-                        elseif ($subscriptionDateLookup -and $subscription.id -and $subscriptionDateLookup.ContainsKey($subscription.id)) {
-                            $subCreated = $subscriptionDateLookup[$subscription.id].CreatedDate
-                        }
-
-                        if ($subCreated) {
-                            $datesFoundCount++
-                            $d = try { [DateTime]$subCreated } catch { $null }
-                            if ($d) {
-                                $allotmentsBySkuId[$allotment.skuId].CreatedDates += $d
-                            }
-                        } else {
-                            $datesNotFoundCount++
-                        }
-
-                        # Resolve end/lifecycle date
-                        $subEnd = $null
-                        if ($subscription.nextLifecycleDate) { $subEnd = $subscription.nextLifecycleDate }
-                        elseif ($subscription.nextLifecycleDateTime) { $subEnd = $subscription.nextLifecycleDateTime }
-                        elseif ($subscription.endDate) { $subEnd = $subscription.endDate }
-                        elseif ($subscription.expiryDate) { $subEnd = $subscription.expiryDate }
-                        elseif ($subscriptionDateLookup -and $subscription.id -and $subscriptionDateLookup.ContainsKey($subscription.id)) {
-                            $subEnd = $subscriptionDateLookup[$subscription.id].EndDate
-                        }
-
-                        if ($subEnd -and $subEnd -ne "No end date found") {
-                            $e = try { [DateTime]$subEnd } catch { $null }
-                            if ($e) {
-                                $allotmentsBySkuId[$allotment.skuId].EndDates += $e
-                            }
-                        }
-                    }
-                }
-            }
-
-            # Now create subscription overview with one row per SKU
-            foreach ($skuId in $allotmentsBySkuId.Keys) {
-                $skuData = $allotmentsBySkuId[$skuId]
-
-                # Get earliest created date
-                $createdDate = if ($skuData.CreatedDates.Count -gt 0) {
-                    ($skuData.CreatedDates | Measure-Object -Minimum).Minimum
-                } else { $null }
-
-                $formattedCreatedDate = if ($createdDate) {
-                    try { Get-Date $createdDate -Format "dd-MM-yyyy HH:mm" }
-                    catch { $createdDate.ToString() }
-                } else { "Unknown" }
-
-                # Get latest end date
-                $endDate = if ($skuData.EndDates.Count -gt 0) {
-                    ($skuData.EndDates | Measure-Object -Maximum).Maximum
-                } else { $null }
-
-                if (-not $endDate) {
-                    $endDate = "No end date found"
-                }
-
-                $formattedEndDate = if ($endDate -ne "No end date found") {
-                    try { Get-Date $endDate -Format "dd-MM-yyyy HH:mm" }
-                    catch { $endDate }
-                } else { $endDate }
-
-                # Determine license status
-                $licenseStatus = "Enabled"
-                if ($endDate -ne "No end date found") {
-                    try {
-                        $dateObj = [DateTime]$endDate
-                        $licenseStatus = if ($dateObj -gt (Get-Date)) { "Enabled" } else { "Disabled" }
-                    } catch {
-                        $licenseStatus = "Unknown"
-                    }
-                }
-
-                $availableLicenses = $skuData.TotalLicenses - $skuData.ConsumedUnits
-
-                $SubscriptionOverview += [PSCustomObject]@{
-                    SubscriptionId    = ($skuData.SubscriptionIds | Select-Object -First 1)
-                    FriendlyName      = $skuData.FriendlyName
-                    SKUPartNumber     = $skuData.SKUPartNumber
-                    CreatedDate       = $formattedCreatedDate
-                    EndDate           = $formattedEndDate
-                    LicenseStatus     = $licenseStatus
-                    ConsumedUnits     = $skuData.ConsumedUnits
-                    TotalLicenses     = $skuData.TotalLicenses
-                    AvailableLicenses = $availableLicenses
-                    AssignableTo      = $skuData.AssignableTo
-                }
-            }
-
-            # Show summary of date matching
-            Write-Host "INFO: Created dates - Found: $datesFoundCount, Not Found: $datesNotFoundCount" -ForegroundColor Cyan
-        }
-        else {
-            # LEGACY: Process subscriptions from old API
-            foreach ($subscription in $Subscriptions) {
-                $sku = $Skus | Where-Object { $_.SkuId -eq $subscription.SkuId }
-                $friendlyName = $SKU_friendly | Where-Object { $_.GUID -eq $sku.SkuId } |
-                Select-Object -ExpandProperty Product_Display_Name -ErrorAction SilentlyContinue
-
-                if (-not $friendlyName) {
-                    $friendlyName = "Unknown License ($($sku.SkuId))"
-                }
-
-                $endDate = if ($null -eq $subscription.NextLifecycleDateTime) {
-                    "No end date found"
-                } else {
-                    $subscription.NextLifecycleDateTime
-                }
-
-                # Format dates
-                $formattedCreatedDate = if ($subscription.CreatedDateTime -is [DateTime]) {
-                    Get-Date $subscription.CreatedDateTime -Format "dd-MM-yyyy HH:mm"
-                } elseif ($subscription.CreatedDateTime) {
-                    try {
-                        Get-Date $subscription.CreatedDateTime -Format "dd-MM-yyyy HH:mm"
-                    } catch {
-                        $subscription.CreatedDateTime
-                    }
-                } else {
-                    "Unknown"
-                }
-
-                $formattedEndDate = if ($endDate -is [DateTime]) {
-                    Get-Date $endDate -Format "dd-MM-yyyy HH:mm"
-                } elseif ($endDate -and $endDate -ne "No end date found") {
-                    try {
-                        Get-Date $endDate -Format "dd-MM-yyyy HH:mm"
-                    } catch {
-                        $endDate
-                    }
-                } else {
-                    $endDate
-                }
-
-                # Determine license status
-                $licenseStatus = if ($endDate -eq "No end date found") {
-                    "Enabled"
-                } elseif ($endDate -is [DateTime] -and $endDate -gt (Get-Date)) {
-                    "Enabled"
-                } elseif ($endDate -ne "No end date found") {
-                    try {
-                        $dateObj = [DateTime]$endDate
-                        if ($dateObj -gt (Get-Date)) {
-                            "Enabled"
-                        } else {
-                            "Disabled"
-                        }
-                    } catch {
-                        "Unknown"
-                    }
-                } else {
-                    "Unknown"
-                }
-
-                # Calculate available licenses
-                $totalLicenses = if ($subscription.TotalLicenses) { $subscription.TotalLicenses } else { 0 }
-                $consumedUnits = if ($sku.ConsumedUnits) { $sku.ConsumedUnits } else { 0 }
-                $availableLicenses = $totalLicenses - $consumedUnits
-
-                $SubscriptionOverview += [PSCustomObject]@{
-                    SubscriptionId    = $subscription.Id
-                    FriendlyName      = $friendlyName
-                    CreatedDate       = $formattedCreatedDate
-                    EndDate           = $formattedEndDate
-                    LicenseStatus     = $licenseStatus
-                    ConsumedUnits     = $consumedUnits
-                    TotalLicenses     = $totalLicenses
-                    AvailableLicenses = $availableLicenses
-                }
-            }
-        }
-
-        # Output the overview
-        Write-Host "INFO: Generating subscription overview..." -ForegroundColor Cyan
-
-        # Get all users with licenses - using paging to ensure all results are retrieved
-        Write-Host "INFO: Retrieving user license data..." -ForegroundColor Cyan
-        $users = Invoke-GraphRequestWithPaging -Uri "beta/users?`$select=UserPrincipalName,LicenseAssignmentStates,DisplayName,AccountEnabled,AssignedLicenses,signInActivity&`$top=999"
-
-        # Get all groups with their licenses
-        Write-Host "INFO: Retrieving group license data..." -ForegroundColor Cyan
-        $Groups = Invoke-GraphRequestWithPaging -Uri "beta/groups?`$select=id,displayName,assignedLicenses&`$top=999"
-        $groupsWithLicenses = @()
-
-        # Loop through each group and check if it has any licenses assigned
-        Write-Host "INFO: Checking groups for licenses..." -ForegroundColor Cyan
-        foreach ($group in $Groups) {
-            if ($group.assignedLicenses -and $group.assignedLicenses.Count -gt 0) {
-                $groupData = [PSCustomObject]@{
-                    ObjectId    = $group.id
-                    DisplayName = $group.displayName
-                    Licenses    = $group.assignedLicenses
-                }
-                $groupsWithLicenses += $groupData
-            }
-        }
-
-        # Initialize the report array
-        $Report = @()
-
-        # Process user license data
-        $totalUsers = $users.Count
-        $currentIndex = 0
-
-        foreach ($user in $users) {
-            $currentIndex++
-            Write-Progress -Activity "Processing users" -Status "Processing $currentIndex of $totalUsers" -PercentComplete (($currentIndex / $totalUsers) * 100)
-    
-            # Skip users with no license assignment states
-            if (-not $user.LicenseAssignmentStates) {
-                continue
-            }
-    
-            # Group licenses by SkuId to detect both direct and inherited assignments
-            $licensesBySkuId = @{}
-    
-            foreach ($license in $user.LicenseAssignmentStates) {
-                $SkuId = $license.SkuId
-                $AssignedByGroup = $license.AssignedByGroup
-        
-                if (-not $licensesBySkuId.ContainsKey($SkuId)) {
-                    $licensesBySkuId[$SkuId] = @{
-                        DirectAssignment = $false
-                        GroupAssignments = @()
-                    }
-                }
-        
-                if ($null -eq $AssignedByGroup) {
-                    $licensesBySkuId[$SkuId].DirectAssignment = $true
-                }
-                else {
-                    $licensesBySkuId[$SkuId].GroupAssignments += $AssignedByGroup
-                }
-            }
-    
-            # Process each unique license
-            foreach ($SkuId in $licensesBySkuId.Keys) {
-                $licenseInfo = $licensesBySkuId[$SkuId]
-                $isDirect = $licenseInfo.DirectAssignment
-                $isInherited = ($licenseInfo.GroupAssignments.Count -gt 0)
-        
-                # Determine assignment type
-                $assignmentType = if ($isDirect -and $isInherited) {
-                    "Both"
-                }
-                elseif ($isDirect) {
-                    "Direct"
-                }
-                elseif ($isInherited) {
-                    "Inherited"
-                }
-                else {
-                    "Unknown"
-                }
-        
-                # Get friendly name for the license
-                $friendlyName = $SKU_friendly | Where-Object { $_.GUID -eq $SkuId } |
-                Select-Object -ExpandProperty Product_Display_Name -ErrorAction SilentlyContinue
-                
-                if (-not $friendlyName) {
-                    $friendlyName = "Unknown License ($SkuId)"
-                }
-        
-                # Get group names if inherited
-                $groupNames = ""
-                if ($isInherited) {
-                    $groupNamesList = @()
-                    foreach ($groupId in $licenseInfo.GroupAssignments) {
-                        $group = $groupsWithLicenses | Where-Object { $_.ObjectId -eq $groupId }
-                        if ($group) {
-                            $groupNamesList += $group.DisplayName
-                        }
-                        else {
-                            $groupNamesList += "Unknown Group ($groupId)"
-                        }
-                    }
-                    $groupNames = $groupNamesList -join ", "
-                }
-        
-                # Determine inheritance description
-                if ($isDirect -and -not $groupNames) {
-                    $inheritance = "Direct"
-                }
-                elseif (-not $isDirect -and $groupNames) {
-                    $inheritance = $groupNames
-                }
-                elseif ($isDirect -and $groupNames) {
-                    $inheritance = "Direct, $groupNames"
-                }
-                else {
-                    $inheritance = "Unknown"
-                }
-
-                # Last Login Activity (robust handling of null/invalid values)
-                $lastSignIn = ConvertTo-DateString -Value $user.signInActivity.lastSignInDateTime
-                if ($lastSignIn -eq "No sign-in activity" -or $lastSignIn -eq "Invalid date value") {
-                    $lastSignIn = ConvertTo-DateString -Value $user.signInActivity.lastSuccessfulSignInDateTime
-                }
-        
-                # Create the license data object
-                $licenseData = [PSCustomObject]@{
-                    UserPrincipalName            = $user.UserPrincipalName
-                    DisplayName                  = $user.DisplayName
-                    AccountEnabled               = if ($user.AccountEnabled) { "Yes" } else { "No" }
-                    LastSuccessfulSignIn = $lastSignIn
-                    AssignedLicenses             = $SkuId
-                    AssignedLicensesFriendlyName = $friendlyName
-                    Inheritance                  = $inheritance
-                    AssignmentType               = $assignmentType
-                    IsDirect                     = $isDirect
-                    IsInherited                  = $isInherited
-                }
-                
-                # Add to the report
-                $Report += $licenseData
-            }
-        }
-
-
-        # Calculate metrics for summary boxes
-        $script:directLicenses = ($Report | Where-Object { $_.IsDirect -eq $true -and $_.IsInherited -eq $false }).Count
-        $script:inheritedLicenses = ($Report | Where-Object { $_.IsInherited -eq $true -and $_.IsDirect -eq $false }).Count
-        $script:bothLicenses = ($Report | Where-Object { $_.IsDirect -eq $true -and $_.IsInherited -eq $true }).Count
-        $script:DisabledUsersWithLicenses = ($Report | Where-Object { $_.AccountEnabled -eq "No" } | Select-Object -Unique UserPrincipalName).Count
-
-        # Output summary information
-        Write-Host "INFO: License Summary:" -ForegroundColor Cyan
-        Write-Host "Total users processed: $totalUsers" -ForegroundColor White
-        Write-Host "Users with licenses: $($Report | Select-Object -Unique UserPrincipalName | Measure-Object | Select-Object -ExpandProperty Count)" -ForegroundColor White
-        Write-Host "Direct license assignments: $script:directLicenses" -ForegroundColor White
-        Write-Host "Inherited license assignments: $script:inheritedLicenses" -ForegroundColor White
-        Write-Host "Both direct and inherited: $script:bothLicenses" -ForegroundColor White
-        Write-Host "Disabled users with licenses: $script:DisabledUsersWithLicenses" -ForegroundColor White
-
-        # Export to HTML
-        New-HTMLReport -Organization $Organization -Report $Report -SubscriptionOverview $SubscriptionOverview -ExportPath $ExportPath
-
-        # Send email with the report
-        $emailSent = $false
-        if ($SendEmail) {
-            $emailSent =         # CODE
-
-        # Get Organization Name
-        $Organization = Invoke-MgGraphRequest -Uri "beta/organization" -OutputType PSObject | Select-Object -Expand Value | Select-Object -ExpandProperty DisplayName
-
-        # Get product identifiers
-        $Identifiers = Get-LicenseIdentifiers
-
-        # Select all SKUs with friendly display name
-        [array]$SKU_friendly = $Identifiers | Select-Object GUID, String_Id, Product_Display_Name -Unique
-
-        # NEW CLOUD LICENSING API: Get allotments with subscription details in one call (Beta API)
-        # This replaces the previous two separate calls to subscribedSkus and directory/subscriptions
-        Write-Host "INFO: Retrieving allotment and subscription data using Cloud Licensing API..." -ForegroundColor Cyan
-
-        try {
-            # Try new Cloud Licensing API first
-            # Note: subscriptions is included by default, no need to expand
-            [Array]$allotments = Invoke-GraphRequestWithPaging -Uri "beta/admin/cloudLicensing/allotments?`$select=id,allottedUnits,consumedUnits,skuId,skuPartNumber,assignableTo,subscriptions"
-
-            if (-not $allotments -or $allotments.Count -eq 0) {
-                throw "Allotments API returned empty results"
-            }
-
-            $useCloudLicensingAPI = $true
-            Write-Host "INFO: Successfully retrieved data from Cloud Licensing API" -ForegroundColor Green
-
-            # Diagnostic: Show what properties are available in first subscription (if verbose)
-            if ($VerbosePreference -eq 'Continue' -and $allotments.Count -gt 0) {
-                $firstAllotment = $allotments[0]
-                if ($firstAllotment.subscriptions -and $firstAllotment.subscriptions.Count -gt 0) {
-                    $firstSub = $firstAllotment.subscriptions[0]
-                    Write-Verbose "Subscription properties available: $($firstSub.PSObject.Properties.Name -join ', ')"
-                }
-            }
-
-            # Always show diagnostic info about subscription structure (helps with troubleshooting)
-            Write-Host "INFO: Found $($allotments.Count) allotments" -ForegroundColor Cyan
-            $totalSubscriptions = ($allotments | ForEach-Object { if ($_.subscriptions) { $_.subscriptions.Count } else { 0 } } | Measure-Object -Sum).Sum
-            Write-Host "INFO: Total subscriptions across all allotments: $totalSubscriptions" -ForegroundColor Cyan
-
-            # Supplementary call to get dates from legacy API if needed
-            # The allotments API includes startDate and nextLifecycleDate, but we fetch
-            # from legacy API as a fallback in case subscription IDs don't match perfectly
-            Write-Host "INFO: Retrieving subscription dates as fallback..." -ForegroundColor Cyan
-            [Array]$LegacySubscriptions = Invoke-MgGraphRequest -Uri "beta/directory/subscriptions?`$select=id,createdDateTime,nextLifecycleDateTime,skuId" -OutputType PSObject |
-                Select-Object -ExpandProperty Value
-
-            # Create lookup table for quick access to both created and end dates
-            $subscriptionDateLookup = @{}
-            foreach ($legacySub in $LegacySubscriptions) {
-                if ($legacySub.id) {
-                    $subscriptionDateLookup[$legacySub.id] = @{
-                        CreatedDate = $legacySub.createdDateTime
-                        EndDate = $legacySub.nextLifecycleDateTime
-                    }
-                }
-            }
-
-            Write-Host "INFO: Created lookup table with $($subscriptionDateLookup.Count) subscription dates" -ForegroundColor Cyan
-            if ($VerbosePreference -eq 'Continue' -and $subscriptionDateLookup.Count -gt 0) {
-                Write-Verbose "Sample lookup IDs: $(($subscriptionDateLookup.Keys | Select-Object -First 3) -join ', ')"
-                $firstId = $subscriptionDateLookup.Keys | Select-Object -First 1
-                if ($firstId) {
-                    Write-Verbose "Sample data for ID $firstId - CreatedDate: $($subscriptionDateLookup[$firstId].CreatedDate), EndDate: $($subscriptionDateLookup[$firstId].EndDate)"
-                }
-            }
-
-            # Show how many subscriptions have end dates
-            $subsWithEndDates = ($LegacySubscriptions | Where-Object { $_.nextLifecycleDateTime }).Count
-            $subsWithoutEndDates = $LegacySubscriptions.Count - $subsWithEndDates
-            Write-Host "INFO: Subscriptions with end dates: $subsWithEndDates, without end dates: $subsWithoutEndDates" -ForegroundColor Cyan
-        }
-        catch {
-            # Fallback to legacy API if Cloud Licensing API fails
-            Write-Host "WARNING: Cloud Licensing API failed, falling back to legacy API. Error: $($_.Exception.Message)" -ForegroundColor Yellow
-            $useCloudLicensingAPI = $false
-
-            # Legacy API calls
-            [Array]$Skus = Invoke-MgGraphRequest -Uri "Beta/subscribedSkus" -OutputType PSObject |
-            Select-Object -ExpandProperty Value
-            [Array]$Subscriptions = Invoke-MgGraphRequest -Uri "beta/directory/subscriptions" -OutputType PSObject |
-            Select-Object -ExpandProperty Value
-        }
-
-        # Create an overview of subscriptions with their end date
-        $SubscriptionOverview = @()
-
-        if ($useCloudLicensingAPI) {
-            # NEW: Process allotments from Cloud Licensing API
-            $datesFoundCount = 0
-            $datesNotFoundCount = 0
-
-            # Group allotments by SKU to combine duplicate licenses
-            $allotmentsBySkuId = @{}
-
-            foreach ($allotment in $allotments) {
-                # Get friendly name
-                $friendlyName = $SKU_friendly | Where-Object { $_.GUID -eq $allotment.skuId } |
-                    Select-Object -ExpandProperty Product_Display_Name -ErrorAction SilentlyContinue
-
-                if (-not $friendlyName) {
-                    $friendlyName = if ($allotment.skuPartNumber) { $allotment.skuPartNumber } else { "Unknown License ($($allotment.skuId))" }
-                }
-
-                # Initialize SKU group if not exists
-                if (-not $allotmentsBySkuId.ContainsKey($allotment.skuId)) {
-                    $allotmentsBySkuId[$allotment.skuId] = @{
-                        FriendlyName = $friendlyName
-                        SKUPartNumber = $allotment.skuPartNumber
-                        AssignableTo = $allotment.assignableTo
-                        TotalLicenses = 0
-                        ConsumedUnits = 0
-                        CreatedDates = @()
-                        EndDates = @()
-                        SubscriptionIds = @()
-                    }
-                }
-
-                # Aggregate license counts
-                $allotmentsBySkuId[$allotment.skuId].TotalLicenses += if ($allotment.allottedUnits) { $allotment.allottedUnits } else { 0 }
-                $allotmentsBySkuId[$allotment.skuId].ConsumedUnits += if ($allotment.consumedUnits) { $allotment.consumedUnits } else { 0 }
-
-                # Process subscriptions to collect dates
-                if ($allotment.subscriptions -and $allotment.subscriptions.Count -gt 0) {
-                    foreach ($subscription in $allotment.subscriptions) {
-                        if ($subscription.id) {
-                            $allotmentsBySkuId[$allotment.skuId].SubscriptionIds += $subscription.id
-                        }
-
-                        # Resolve created/start date
-                        $subCreated = $null
-                        if ($subscription.startDate) { $subCreated = $subscription.startDate }
-                        elseif ($subscription.createdDateTime) { $subCreated = $subscription.createdDateTime }
-                        elseif ($subscription.createdDate) { $subCreated = $subscription.createdDate }
-                        elseif ($subscriptionDateLookup -and $subscription.id -and $subscriptionDateLookup.ContainsKey($subscription.id)) {
-                            $subCreated = $subscriptionDateLookup[$subscription.id].CreatedDate
-                        }
-
-                        if ($subCreated) {
-                            $datesFoundCount++
-                            $d = try { [DateTime]$subCreated } catch { $null }
-                            if ($d) {
-                                $allotmentsBySkuId[$allotment.skuId].CreatedDates += $d
-                            }
-                        } else {
-                            $datesNotFoundCount++
-                        }
-
-                        # Resolve end/lifecycle date
-                        $subEnd = $null
-                        if ($subscription.nextLifecycleDate) { $subEnd = $subscription.nextLifecycleDate }
-                        elseif ($subscription.nextLifecycleDateTime) { $subEnd = $subscription.nextLifecycleDateTime }
-                        elseif ($subscription.endDate) { $subEnd = $subscription.endDate }
-                        elseif ($subscription.expiryDate) { $subEnd = $subscription.expiryDate }
-                        elseif ($subscriptionDateLookup -and $subscription.id -and $subscriptionDateLookup.ContainsKey($subscription.id)) {
-                            $subEnd = $subscriptionDateLookup[$subscription.id].EndDate
-                        }
-
-                        if ($subEnd -and $subEnd -ne "No end date found") {
-                            $e = try { [DateTime]$subEnd } catch { $null }
-                            if ($e) {
-                                $allotmentsBySkuId[$allotment.skuId].EndDates += $e
-                            }
-                        }
-                    }
-                }
-            }
-
-            # Now create subscription overview with one row per SKU
-            foreach ($skuId in $allotmentsBySkuId.Keys) {
-                $skuData = $allotmentsBySkuId[$skuId]
-
-                # Get earliest created date
-                $createdDate = if ($skuData.CreatedDates.Count -gt 0) {
-                    ($skuData.CreatedDates | Measure-Object -Minimum).Minimum
-                } else { $null }
-
-                $formattedCreatedDate = if ($createdDate) {
-                    try { Get-Date $createdDate -Format "dd-MM-yyyy HH:mm" }
-                    catch { $createdDate.ToString() }
-                } else { "Unknown" }
-
-                # Get latest end date
-                $endDate = if ($skuData.EndDates.Count -gt 0) {
-                    ($skuData.EndDates | Measure-Object -Maximum).Maximum
-                } else { $null }
-
-                if (-not $endDate) {
-                    $endDate = "No end date found"
-                }
-
-                $formattedEndDate = if ($endDate -ne "No end date found") {
-                    try { Get-Date $endDate -Format "dd-MM-yyyy HH:mm" }
-                    catch { $endDate }
-                } else { $endDate }
-
-                # Determine license status
-                $licenseStatus = "Enabled"
-                if ($endDate -ne "No end date found") {
-                    try {
-                        $dateObj = [DateTime]$endDate
-                        $licenseStatus = if ($dateObj -gt (Get-Date)) { "Enabled" } else { "Disabled" }
-                    } catch {
-                        $licenseStatus = "Unknown"
-                    }
-                }
-
-                $availableLicenses = $skuData.TotalLicenses - $skuData.ConsumedUnits
-
-                $SubscriptionOverview += [PSCustomObject]@{
-                    SubscriptionId    = ($skuData.SubscriptionIds | Select-Object -First 1)
-                    FriendlyName      = $skuData.FriendlyName
-                    SKUPartNumber     = $skuData.SKUPartNumber
-                    CreatedDate       = $formattedCreatedDate
-                    EndDate           = $formattedEndDate
-                    LicenseStatus     = $licenseStatus
-                    ConsumedUnits     = $skuData.ConsumedUnits
-                    TotalLicenses     = $skuData.TotalLicenses
-                    AvailableLicenses = $availableLicenses
-                    AssignableTo      = $skuData.AssignableTo
-                }
-            }
-
-            # Show summary of date matching
-            Write-Host "INFO: Created dates - Found: $datesFoundCount, Not Found: $datesNotFoundCount" -ForegroundColor Cyan
-        }
-        else {
-            # LEGACY: Process subscriptions from old API
-            foreach ($subscription in $Subscriptions) {
-                $sku = $Skus | Where-Object { $_.SkuId -eq $subscription.SkuId }
-                $friendlyName = $SKU_friendly | Where-Object { $_.GUID -eq $sku.SkuId } |
-                Select-Object -ExpandProperty Product_Display_Name -ErrorAction SilentlyContinue
-
-                if (-not $friendlyName) {
-                    $friendlyName = "Unknown License ($($sku.SkuId))"
-                }
-
-                $endDate = if ($null -eq $subscription.NextLifecycleDateTime) {
-                    "No end date found"
-                } else {
-                    $subscription.NextLifecycleDateTime
-                }
-
-                # Format dates
-                $formattedCreatedDate = if ($subscription.CreatedDateTime -is [DateTime]) {
-                    Get-Date $subscription.CreatedDateTime -Format "dd-MM-yyyy HH:mm"
-                } elseif ($subscription.CreatedDateTime) {
-                    try {
-                        Get-Date $subscription.CreatedDateTime -Format "dd-MM-yyyy HH:mm"
-                    } catch {
-                        $subscription.CreatedDateTime
-                    }
-                } else {
-                    "Unknown"
-                }
-
-                $formattedEndDate = if ($endDate -is [DateTime]) {
-                    Get-Date $endDate -Format "dd-MM-yyyy HH:mm"
-                } elseif ($endDate -and $endDate -ne "No end date found") {
-                    try {
-                        Get-Date $endDate -Format "dd-MM-yyyy HH:mm"
-                    } catch {
-                        $endDate
-                    }
-                } else {
-                    $endDate
-                }
-
-                # Determine license status
-                $licenseStatus = if ($endDate -eq "No end date found") {
-                    "Enabled"
-                } elseif ($endDate -is [DateTime] -and $endDate -gt (Get-Date)) {
-                    "Enabled"
-                } elseif ($endDate -ne "No end date found") {
-                    try {
-                        $dateObj = [DateTime]$endDate
-                        if ($dateObj -gt (Get-Date)) {
-                            "Enabled"
-                        } else {
-                            "Disabled"
-                        }
-                    } catch {
-                        "Unknown"
-                    }
-                } else {
-                    "Unknown"
-                }
-
-                # Calculate available licenses
-                $totalLicenses = if ($subscription.TotalLicenses) { $subscription.TotalLicenses } else { 0 }
-                $consumedUnits = if ($sku.ConsumedUnits) { $sku.ConsumedUnits } else { 0 }
-                $availableLicenses = $totalLicenses - $consumedUnits
-
-                $SubscriptionOverview += [PSCustomObject]@{
-                    SubscriptionId    = $subscription.Id
-                    FriendlyName      = $friendlyName
-                    CreatedDate       = $formattedCreatedDate
-                    EndDate           = $formattedEndDate
-                    LicenseStatus     = $licenseStatus
-                    ConsumedUnits     = $consumedUnits
-                    TotalLicenses     = $totalLicenses
-                    AvailableLicenses = $availableLicenses
-                }
-            }
-        }
-
-        # Output the overview
-        Write-Host "INFO: Generating subscription overview..." -ForegroundColor Cyan
-
-        # Get all users with licenses - using paging to ensure all results are retrieved
-        Write-Host "INFO: Retrieving user license data..." -ForegroundColor Cyan
-        $users = Invoke-GraphRequestWithPaging -Uri "beta/users?`$select=UserPrincipalName,LicenseAssignmentStates,DisplayName,AccountEnabled,AssignedLicenses,signInActivity&`$top=999"
-
-        # Get all groups with their licenses
-        Write-Host "INFO: Retrieving group license data..." -ForegroundColor Cyan
-        $Groups = Invoke-GraphRequestWithPaging -Uri "beta/groups?`$select=id,displayName,assignedLicenses&`$top=999"
-        $groupsWithLicenses = @()
-
-        # Loop through each group and check if it has any licenses assigned
-        Write-Host "INFO: Checking groups for licenses..." -ForegroundColor Cyan
-        foreach ($group in $Groups) {
-            if ($group.assignedLicenses -and $group.assignedLicenses.Count -gt 0) {
-                $groupData = [PSCustomObject]@{
-                    ObjectId    = $group.id
-                    DisplayName = $group.displayName
-                    Licenses    = $group.assignedLicenses
-                }
-                $groupsWithLicenses += $groupData
-            }
-        }
-
-        # Initialize the report array
-        $Report = @()
-
-        # Process user license data
-        $totalUsers = $users.Count
-        $currentIndex = 0
-
-        foreach ($user in $users) {
-            $currentIndex++
-            Write-Progress -Activity "Processing users" -Status "Processing $currentIndex of $totalUsers" -PercentComplete (($currentIndex / $totalUsers) * 100)
-    
-            # Skip users with no license assignment states
-            if (-not $user.LicenseAssignmentStates) {
-                continue
-            }
-    
-            # Group licenses by SkuId to detect both direct and inherited assignments
-            $licensesBySkuId = @{}
-    
-            foreach ($license in $user.LicenseAssignmentStates) {
-                $SkuId = $license.SkuId
-                $AssignedByGroup = $license.AssignedByGroup
-        
-                if (-not $licensesBySkuId.ContainsKey($SkuId)) {
-                    $licensesBySkuId[$SkuId] = @{
-                        DirectAssignment = $false
-                        GroupAssignments = @()
-                    }
-                }
-        
-                if ($null -eq $AssignedByGroup) {
-                    $licensesBySkuId[$SkuId].DirectAssignment = $true
-                }
-                else {
-                    $licensesBySkuId[$SkuId].GroupAssignments += $AssignedByGroup
-                }
-            }
-    
-            # Process each unique license
-            foreach ($SkuId in $licensesBySkuId.Keys) {
-                $licenseInfo = $licensesBySkuId[$SkuId]
-                $isDirect = $licenseInfo.DirectAssignment
-                $isInherited = ($licenseInfo.GroupAssignments.Count -gt 0)
-        
-                # Determine assignment type
-                $assignmentType = if ($isDirect -and $isInherited) {
-                    "Both"
-                }
-                elseif ($isDirect) {
-                    "Direct"
-                }
-                elseif ($isInherited) {
-                    "Inherited"
-                }
-                else {
-                    "Unknown"
-                }
-        
-                # Get friendly name for the license
-                $friendlyName = $SKU_friendly | Where-Object { $_.GUID -eq $SkuId } |
-                Select-Object -ExpandProperty Product_Display_Name -ErrorAction SilentlyContinue
-                
-                if (-not $friendlyName) {
-                    $friendlyName = "Unknown License ($SkuId)"
-                }
-        
-                # Get group names if inherited
-                $groupNames = ""
-                if ($isInherited) {
-                    $groupNamesList = @()
-                    foreach ($groupId in $licenseInfo.GroupAssignments) {
-                        $group = $groupsWithLicenses | Where-Object { $_.ObjectId -eq $groupId }
-                        if ($group) {
-                            $groupNamesList += $group.DisplayName
-                        }
-                        else {
-                            $groupNamesList += "Unknown Group ($groupId)"
-                        }
-                    }
-                    $groupNames = $groupNamesList -join ", "
-                }
-        
-                # Determine inheritance description
-                if ($isDirect -and -not $groupNames) {
-                    $inheritance = "Direct"
-                }
-                elseif (-not $isDirect -and $groupNames) {
-                    $inheritance = $groupNames
-                }
-                elseif ($isDirect -and $groupNames) {
-                    $inheritance = "Direct, $groupNames"
-                }
-                else {
-                    $inheritance = "Unknown"
-                }
-
-                # Last Login Activity (robust handling of null/invalid values)
-                $lastSignIn = ConvertTo-DateString -Value $user.signInActivity.lastSignInDateTime
-                if ($lastSignIn -eq "No sign-in activity" -or $lastSignIn -eq "Invalid date value") {
-                    $lastSignIn = ConvertTo-DateString -Value $user.signInActivity.lastSuccessfulSignInDateTime
-                }
-        
-                # Create the license data object
-                $licenseData = [PSCustomObject]@{
-                    UserPrincipalName            = $user.UserPrincipalName
-                    DisplayName                  = $user.DisplayName
-                    AccountEnabled               = if ($user.AccountEnabled) { "Yes" } else { "No" }
-                    LastSuccessfulSignIn = $lastSignIn
-                    AssignedLicenses             = $SkuId
-                    AssignedLicensesFriendlyName = $friendlyName
-                    Inheritance                  = $inheritance
-                    AssignmentType               = $assignmentType
-                    IsDirect                     = $isDirect
-                    IsInherited                  = $isInherited
-                }
-                
-                # Add to the report
-                $Report += $licenseData
-            }
-        }
-
-
-        # Calculate metrics for summary boxes
-        $script:directLicenses = ($Report | Where-Object { $_.IsDirect -eq $true -and $_.IsInherited -eq $false }).Count
-        $script:inheritedLicenses = ($Report | Where-Object { $_.IsInherited -eq $true -and $_.IsDirect -eq $false }).Count
-        $script:bothLicenses = ($Report | Where-Object { $_.IsDirect -eq $true -and $_.IsInherited -eq $true }).Count
-        $script:DisabledUsersWithLicenses = ($Report | Where-Object { $_.AccountEnabled -eq "No" } | Select-Object -Unique UserPrincipalName).Count
-
-        # Output summary information
-        Write-Host "INFO: License Summary:" -ForegroundColor Cyan
-        Write-Host "Total users processed: $totalUsers" -ForegroundColor White
-        Write-Host "Users with licenses: $($Report | Select-Object -Unique UserPrincipalName | Measure-Object | Select-Object -ExpandProperty Count)" -ForegroundColor White
-        Write-Host "Direct license assignments: $script:directLicenses" -ForegroundColor White
-        Write-Host "Inherited license assignments: $script:inheritedLicenses" -ForegroundColor White
-        Write-Host "Both direct and inherited: $script:bothLicenses" -ForegroundColor White
-        Write-Host "Disabled users with licenses: $script:DisabledUsersWithLicenses" -ForegroundColor White
-
-        # Export to HTML
-        New-HTMLReport -Organization $Organization -Report $Report -SubscriptionOverview $SubscriptionOverview -ExportPath $ExportPath
-
-        # Send email with the report
-        $emailSent = $false
-        if ($SendEmail) {
-            $subject = "$Organization - Microsoft 365 License Assignment Report"
-            $bodyHtml = "<html><body style='font-family: Segoe UI, Arial, sans-serif;'><h2>Microsoft 365 License Assignment Report</h2><p>Attached is the latest Microsoft 365 license assignment report for $Organization.</p><p>Open the attached HTML in a browser for the full report.</p><p style='color:#666;'>Generated by RKSolutions - please do not reply.</p></body></html>"
-            $emailSent = Send-EmailWithAttachment -Recipient $Recipient -AttachmentPath $script:ExportPath -From $From -Subject $subject -BodyHtml $bodyHtml
-
-            if ($emailSent) {
-                Write-Host "INFO: Email sent successfully." -ForegroundColor Green
-            }
-            else {
-                Write-Host "ERROR: Failed to send email." -ForegroundColor Red
-            }
-        }
-        else {
-            Write-Host "INFO: Email sending is disabled. Set -SendEmail to $true to enable." -ForegroundColor Yellow
-        }
-
-        # Clean up the report file
-        if ($SendEmail -and $emailSent) {
-            if (Test-Path -Path $script:ExportPath) {
-                Remove-Item -Path $script:ExportPath -Force
-                Write-Host "INFO: Temporary report file deleted." -ForegroundColor Green
-            } else {
-                Write-Host "INFO: No temporary report file found to delete." -ForegroundColor Yellow
-            }
-        }
-
-        # Get Organization Name
-        $Organization = Invoke-MgGraphRequest -Uri "beta/organization" -OutputType PSObject | Select-Object -Expand Value | Select-Object -ExpandProperty DisplayName
-
-        # Get product identifiers
-        $Identifiers = Get-LicenseIdentifiers
-
-        # Select all SKUs with friendly display name
-        [array]$SKU_friendly = $Identifiers | Select-Object GUID, String_Id, Product_Display_Name -Unique
-
-        # NEW CLOUD LICENSING API: Get allotments with subscription details in one call (Beta API)
-        # This replaces the previous two separate calls to subscribedSkus and directory/subscriptions
-        Write-Host "INFO: Retrieving allotment and subscription data using Cloud Licensing API..." -ForegroundColor Cyan
-
-        try {
-            # Try new Cloud Licensing API first
-            # Note: subscriptions is included by default, no need to expand
-            [Array]$allotments = Invoke-GraphRequestWithPaging -Uri "beta/admin/cloudLicensing/allotments?`$select=id,allottedUnits,consumedUnits,skuId,skuPartNumber,assignableTo,subscriptions"
-
-            if (-not $allotments -or $allotments.Count -eq 0) {
-                throw "Allotments API returned empty results"
-            }
-
-            $useCloudLicensingAPI = $true
-            Write-Host "INFO: Successfully retrieved data from Cloud Licensing API" -ForegroundColor Green
-
-            # Diagnostic: Show what properties are available in first subscription (if verbose)
-            if ($VerbosePreference -eq 'Continue' -and $allotments.Count -gt 0) {
-                $firstAllotment = $allotments[0]
-                if ($firstAllotment.subscriptions -and $firstAllotment.subscriptions.Count -gt 0) {
-                    $firstSub = $firstAllotment.subscriptions[0]
-                    Write-Verbose "Subscription properties available: $($firstSub.PSObject.Properties.Name -join ', ')"
-                }
-            }
-
-            # Always show diagnostic info about subscription structure (helps with troubleshooting)
-            Write-Host "INFO: Found $($allotments.Count) allotments" -ForegroundColor Cyan
-            $totalSubscriptions = ($allotments | ForEach-Object { if ($_.subscriptions) { $_.subscriptions.Count } else { 0 } } | Measure-Object -Sum).Sum
-            Write-Host "INFO: Total subscriptions across all allotments: $totalSubscriptions" -ForegroundColor Cyan
-
-            # Supplementary call to get dates from legacy API if needed
-            # The allotments API includes startDate and nextLifecycleDate, but we fetch
-            # from legacy API as a fallback in case subscription IDs don't match perfectly
-            Write-Host "INFO: Retrieving subscription dates as fallback..." -ForegroundColor Cyan
-            [Array]$LegacySubscriptions = Invoke-MgGraphRequest -Uri "beta/directory/subscriptions?`$select=id,createdDateTime,nextLifecycleDateTime,skuId" -OutputType PSObject |
-                Select-Object -ExpandProperty Value
-
-            # Create lookup table for quick access to both created and end dates
-            $subscriptionDateLookup = @{}
-            foreach ($legacySub in $LegacySubscriptions) {
-                if ($legacySub.id) {
-                    $subscriptionDateLookup[$legacySub.id] = @{
-                        CreatedDate = $legacySub.createdDateTime
-                        EndDate = $legacySub.nextLifecycleDateTime
-                    }
-                }
-            }
-
-            Write-Host "INFO: Created lookup table with $($subscriptionDateLookup.Count) subscription dates" -ForegroundColor Cyan
-            if ($VerbosePreference -eq 'Continue' -and $subscriptionDateLookup.Count -gt 0) {
-                Write-Verbose "Sample lookup IDs: $(($subscriptionDateLookup.Keys | Select-Object -First 3) -join ', ')"
-                $firstId = $subscriptionDateLookup.Keys | Select-Object -First 1
-                if ($firstId) {
-                    Write-Verbose "Sample data for ID $firstId - CreatedDate: $($subscriptionDateLookup[$firstId].CreatedDate), EndDate: $($subscriptionDateLookup[$firstId].EndDate)"
-                }
-            }
-
-            # Show how many subscriptions have end dates
-            $subsWithEndDates = ($LegacySubscriptions | Where-Object { $_.nextLifecycleDateTime }).Count
-            $subsWithoutEndDates = $LegacySubscriptions.Count - $subsWithEndDates
-            Write-Host "INFO: Subscriptions with end dates: $subsWithEndDates, without end dates: $subsWithoutEndDates" -ForegroundColor Cyan
-        }
-        catch {
-            # Fallback to legacy API if Cloud Licensing API fails
-            Write-Host "WARNING: Cloud Licensing API failed, falling back to legacy API. Error: $($_.Exception.Message)" -ForegroundColor Yellow
-            $useCloudLicensingAPI = $false
-
-            # Legacy API calls
-            [Array]$Skus = Invoke-MgGraphRequest -Uri "Beta/subscribedSkus" -OutputType PSObject |
-            Select-Object -ExpandProperty Value
-            [Array]$Subscriptions = Invoke-MgGraphRequest -Uri "beta/directory/subscriptions" -OutputType PSObject |
-            Select-Object -ExpandProperty Value
-        }
-
-        # Create an overview of subscriptions with their end date
-        $SubscriptionOverview = @()
-
-        if ($useCloudLicensingAPI) {
-            # NEW: Process allotments from Cloud Licensing API
-            $datesFoundCount = 0
-            $datesNotFoundCount = 0
-
-            # Group allotments by SKU to combine duplicate licenses
-            $allotmentsBySkuId = @{}
-
-            foreach ($allotment in $allotments) {
-                # Get friendly name
-                $friendlyName = $SKU_friendly | Where-Object { $_.GUID -eq $allotment.skuId } |
-                    Select-Object -ExpandProperty Product_Display_Name -ErrorAction SilentlyContinue
-
-                if (-not $friendlyName) {
-                    $friendlyName = if ($allotment.skuPartNumber) { $allotment.skuPartNumber } else { "Unknown License ($($allotment.skuId))" }
-                }
-
-                # Initialize SKU group if not exists
-                if (-not $allotmentsBySkuId.ContainsKey($allotment.skuId)) {
-                    $allotmentsBySkuId[$allotment.skuId] = @{
-                        FriendlyName = $friendlyName
-                        SKUPartNumber = $allotment.skuPartNumber
-                        AssignableTo = $allotment.assignableTo
-                        TotalLicenses = 0
-                        ConsumedUnits = 0
-                        CreatedDates = @()
-                        EndDates = @()
-                        SubscriptionIds = @()
-                    }
-                }
-
-                # Aggregate license counts
-                $allotmentsBySkuId[$allotment.skuId].TotalLicenses += if ($allotment.allottedUnits) { $allotment.allottedUnits } else { 0 }
-                $allotmentsBySkuId[$allotment.skuId].ConsumedUnits += if ($allotment.consumedUnits) { $allotment.consumedUnits } else { 0 }
-
-                # Process subscriptions to collect dates
-                if ($allotment.subscriptions -and $allotment.subscriptions.Count -gt 0) {
-                    foreach ($subscription in $allotment.subscriptions) {
-                        if ($subscription.id) {
-                            $allotmentsBySkuId[$allotment.skuId].SubscriptionIds += $subscription.id
-                        }
-
-                        # Resolve created/start date
-                        $subCreated = $null
-                        if ($subscription.startDate) { $subCreated = $subscription.startDate }
-                        elseif ($subscription.createdDateTime) { $subCreated = $subscription.createdDateTime }
-                        elseif ($subscription.createdDate) { $subCreated = $subscription.createdDate }
-                        elseif ($subscriptionDateLookup -and $subscription.id -and $subscriptionDateLookup.ContainsKey($subscription.id)) {
-                            $subCreated = $subscriptionDateLookup[$subscription.id].CreatedDate
-                        }
-
-                        if ($subCreated) {
-                            $datesFoundCount++
-                            $d = try { [DateTime]$subCreated } catch { $null }
-                            if ($d) {
-                                $allotmentsBySkuId[$allotment.skuId].CreatedDates += $d
-                            }
-                        } else {
-                            $datesNotFoundCount++
-                        }
-
-                        # Resolve end/lifecycle date
-                        $subEnd = $null
-                        if ($subscription.nextLifecycleDate) { $subEnd = $subscription.nextLifecycleDate }
-                        elseif ($subscription.nextLifecycleDateTime) { $subEnd = $subscription.nextLifecycleDateTime }
-                        elseif ($subscription.endDate) { $subEnd = $subscription.endDate }
-                        elseif ($subscription.expiryDate) { $subEnd = $subscription.expiryDate }
-                        elseif ($subscriptionDateLookup -and $subscription.id -and $subscriptionDateLookup.ContainsKey($subscription.id)) {
-                            $subEnd = $subscriptionDateLookup[$subscription.id].EndDate
-                        }
-
-                        if ($subEnd -and $subEnd -ne "No end date found") {
-                            $e = try { [DateTime]$subEnd } catch { $null }
-                            if ($e) {
-                                $allotmentsBySkuId[$allotment.skuId].EndDates += $e
-                            }
-                        }
-                    }
-                }
-            }
-
-            # Now create subscription overview with one row per SKU
-            foreach ($skuId in $allotmentsBySkuId.Keys) {
-                $skuData = $allotmentsBySkuId[$skuId]
-
-                # Get earliest created date
-                $createdDate = if ($skuData.CreatedDates.Count -gt 0) {
-                    ($skuData.CreatedDates | Measure-Object -Minimum).Minimum
-                } else { $null }
-
-                $formattedCreatedDate = if ($createdDate) {
-                    try { Get-Date $createdDate -Format "dd-MM-yyyy HH:mm" }
-                    catch { $createdDate.ToString() }
-                } else { "Unknown" }
-
-                # Get latest end date
-                $endDate = if ($skuData.EndDates.Count -gt 0) {
-                    ($skuData.EndDates | Measure-Object -Maximum).Maximum
-                } else { $null }
-
-                if (-not $endDate) {
-                    $endDate = "No end date found"
-                }
-
-                $formattedEndDate = if ($endDate -ne "No end date found") {
-                    try { Get-Date $endDate -Format "dd-MM-yyyy HH:mm" }
-                    catch { $endDate }
-                } else { $endDate }
-
-                # Determine license status
-                $licenseStatus = "Enabled"
-                if ($endDate -ne "No end date found") {
-                    try {
-                        $dateObj = [DateTime]$endDate
-                        $licenseStatus = if ($dateObj -gt (Get-Date)) { "Enabled" } else { "Disabled" }
-                    } catch {
-                        $licenseStatus = "Unknown"
-                    }
-                }
-
-                $availableLicenses = $skuData.TotalLicenses - $skuData.ConsumedUnits
-
-                $SubscriptionOverview += [PSCustomObject]@{
-                    SubscriptionId    = ($skuData.SubscriptionIds | Select-Object -First 1)
-                    FriendlyName      = $skuData.FriendlyName
-                    SKUPartNumber     = $skuData.SKUPartNumber
-                    CreatedDate       = $formattedCreatedDate
-                    EndDate           = $formattedEndDate
-                    LicenseStatus     = $licenseStatus
-                    ConsumedUnits     = $skuData.ConsumedUnits
-                    TotalLicenses     = $skuData.TotalLicenses
-                    AvailableLicenses = $availableLicenses
-                    AssignableTo      = $skuData.AssignableTo
-                }
-            }
-
-            # Show summary of date matching
-            Write-Host "INFO: Created dates - Found: $datesFoundCount, Not Found: $datesNotFoundCount" -ForegroundColor Cyan
-        }
-        else {
-            # LEGACY: Process subscriptions from old API
-            foreach ($subscription in $Subscriptions) {
-                $sku = $Skus | Where-Object { $_.SkuId -eq $subscription.SkuId }
-                $friendlyName = $SKU_friendly | Where-Object { $_.GUID -eq $sku.SkuId } |
-                Select-Object -ExpandProperty Product_Display_Name -ErrorAction SilentlyContinue
-
-                if (-not $friendlyName) {
-                    $friendlyName = "Unknown License ($($sku.SkuId))"
-                }
-
-                $endDate = if ($null -eq $subscription.NextLifecycleDateTime) {
-                    "No end date found"
-                } else {
-                    $subscription.NextLifecycleDateTime
-                }
-
-                # Format dates
-                $formattedCreatedDate = if ($subscription.CreatedDateTime -is [DateTime]) {
-                    Get-Date $subscription.CreatedDateTime -Format "dd-MM-yyyy HH:mm"
-                } elseif ($subscription.CreatedDateTime) {
-                    try {
-                        Get-Date $subscription.CreatedDateTime -Format "dd-MM-yyyy HH:mm"
-                    } catch {
-                        $subscription.CreatedDateTime
-                    }
-                } else {
-                    "Unknown"
-                }
-
-                $formattedEndDate = if ($endDate -is [DateTime]) {
-                    Get-Date $endDate -Format "dd-MM-yyyy HH:mm"
-                } elseif ($endDate -and $endDate -ne "No end date found") {
-                    try {
-                        Get-Date $endDate -Format "dd-MM-yyyy HH:mm"
-                    } catch {
-                        $endDate
-                    }
-                } else {
-                    $endDate
-                }
-
-                # Determine license status
-                $licenseStatus = if ($endDate -eq "No end date found") {
-                    "Enabled"
-                } elseif ($endDate -is [DateTime] -and $endDate -gt (Get-Date)) {
-                    "Enabled"
-                } elseif ($endDate -ne "No end date found") {
-                    try {
-                        $dateObj = [DateTime]$endDate
-                        if ($dateObj -gt (Get-Date)) {
-                            "Enabled"
-                        } else {
-                            "Disabled"
-                        }
-                    } catch {
-                        "Unknown"
-                    }
-                } else {
-                    "Unknown"
-                }
-
-                # Calculate available licenses
-                $totalLicenses = if ($subscription.TotalLicenses) { $subscription.TotalLicenses } else { 0 }
-                $consumedUnits = if ($sku.ConsumedUnits) { $sku.ConsumedUnits } else { 0 }
-                $availableLicenses = $totalLicenses - $consumedUnits
-
-                $SubscriptionOverview += [PSCustomObject]@{
-                    SubscriptionId    = $subscription.Id
-                    FriendlyName      = $friendlyName
-                    CreatedDate       = $formattedCreatedDate
-                    EndDate           = $formattedEndDate
-                    LicenseStatus     = $licenseStatus
-                    ConsumedUnits     = $consumedUnits
-                    TotalLicenses     = $totalLicenses
-                    AvailableLicenses = $availableLicenses
-                }
-            }
-        }
-
-        # Output the overview
-        Write-Host "INFO: Generating subscription overview..." -ForegroundColor Cyan
-
-        # Get all users with licenses - using paging to ensure all results are retrieved
-        Write-Host "INFO: Retrieving user license data..." -ForegroundColor Cyan
-        $users = Invoke-GraphRequestWithPaging -Uri "beta/users?`$select=UserPrincipalName,LicenseAssignmentStates,DisplayName,AccountEnabled,AssignedLicenses,signInActivity&`$top=999"
-
-        # Get all groups with their licenses
-        Write-Host "INFO: Retrieving group license data..." -ForegroundColor Cyan
-        $Groups = Invoke-GraphRequestWithPaging -Uri "beta/groups?`$select=id,displayName,assignedLicenses&`$top=999"
-        $groupsWithLicenses = @()
-
-        # Loop through each group and check if it has any licenses assigned
-        Write-Host "INFO: Checking groups for licenses..." -ForegroundColor Cyan
-        foreach ($group in $Groups) {
-            if ($group.assignedLicenses -and $group.assignedLicenses.Count -gt 0) {
-                $groupData = [PSCustomObject]@{
-                    ObjectId    = $group.id
-                    DisplayName = $group.displayName
-                    Licenses    = $group.assignedLicenses
-                }
-                $groupsWithLicenses += $groupData
-            }
-        }
-
-        # Initialize the report array
-        $Report = @()
-
-        # Process user license data
-        $totalUsers = $users.Count
-        $currentIndex = 0
-
-        foreach ($user in $users) {
-            $currentIndex++
-            Write-Progress -Activity "Processing users" -Status "Processing $currentIndex of $totalUsers" -PercentComplete (($currentIndex / $totalUsers) * 100)
-    
-            # Skip users with no license assignment states
-            if (-not $user.LicenseAssignmentStates) {
-                continue
-            }
-    
-            # Group licenses by SkuId to detect both direct and inherited assignments
-            $licensesBySkuId = @{}
-    
-            foreach ($license in $user.LicenseAssignmentStates) {
-                $SkuId = $license.SkuId
-                $AssignedByGroup = $license.AssignedByGroup
-        
-                if (-not $licensesBySkuId.ContainsKey($SkuId)) {
-                    $licensesBySkuId[$SkuId] = @{
-                        DirectAssignment = $false
-                        GroupAssignments = @()
-                    }
-                }
-        
-                if ($null -eq $AssignedByGroup) {
-                    $licensesBySkuId[$SkuId].DirectAssignment = $true
-                }
-                else {
-                    $licensesBySkuId[$SkuId].GroupAssignments += $AssignedByGroup
-                }
-            }
-    
-            # Process each unique license
-            foreach ($SkuId in $licensesBySkuId.Keys) {
-                $licenseInfo = $licensesBySkuId[$SkuId]
-                $isDirect = $licenseInfo.DirectAssignment
-                $isInherited = ($licenseInfo.GroupAssignments.Count -gt 0)
-        
-                # Determine assignment type
-                $assignmentType = if ($isDirect -and $isInherited) {
-                    "Both"
-                }
-                elseif ($isDirect) {
-                    "Direct"
-                }
-                elseif ($isInherited) {
-                    "Inherited"
-                }
-                else {
-                    "Unknown"
-                }
-        
-                # Get friendly name for the license
-                $friendlyName = $SKU_friendly | Where-Object { $_.GUID -eq $SkuId } |
-                Select-Object -ExpandProperty Product_Display_Name -ErrorAction SilentlyContinue
-                
-                if (-not $friendlyName) {
-                    $friendlyName = "Unknown License ($SkuId)"
-                }
-        
-                # Get group names if inherited
-                $groupNames = ""
-                if ($isInherited) {
-                    $groupNamesList = @()
-                    foreach ($groupId in $licenseInfo.GroupAssignments) {
-                        $group = $groupsWithLicenses | Where-Object { $_.ObjectId -eq $groupId }
-                        if ($group) {
-                            $groupNamesList += $group.DisplayName
-                        }
-                        else {
-                            $groupNamesList += "Unknown Group ($groupId)"
-                        }
-                    }
-                    $groupNames = $groupNamesList -join ", "
-                }
-        
-                # Determine inheritance description
-                if ($isDirect -and -not $groupNames) {
-                    $inheritance = "Direct"
-                }
-                elseif (-not $isDirect -and $groupNames) {
-                    $inheritance = $groupNames
-                }
-                elseif ($isDirect -and $groupNames) {
-                    $inheritance = "Direct, $groupNames"
-                }
-                else {
-                    $inheritance = "Unknown"
-                }
-
-                # Last Login Activity (robust handling of null/invalid values)
-                $lastSignIn = ConvertTo-DateString -Value $user.signInActivity.lastSignInDateTime
-                if ($lastSignIn -eq "No sign-in activity" -or $lastSignIn -eq "Invalid date value") {
-                    $lastSignIn = ConvertTo-DateString -Value $user.signInActivity.lastSuccessfulSignInDateTime
-                }
-        
-                # Create the license data object
-                $licenseData = [PSCustomObject]@{
-                    UserPrincipalName            = $user.UserPrincipalName
-                    DisplayName                  = $user.DisplayName
-                    AccountEnabled               = if ($user.AccountEnabled) { "Yes" } else { "No" }
-                    LastSuccessfulSignIn = $lastSignIn
-                    AssignedLicenses             = $SkuId
-                    AssignedLicensesFriendlyName = $friendlyName
-                    Inheritance                  = $inheritance
-                    AssignmentType               = $assignmentType
-                    IsDirect                     = $isDirect
-                    IsInherited                  = $isInherited
-                }
-                
-                # Add to the report
-                $Report += $licenseData
-            }
-        }
-
-
-        # Calculate metrics for summary boxes
-        $script:directLicenses = ($Report | Where-Object { $_.IsDirect -eq $true -and $_.IsInherited -eq $false }).Count
-        $script:inheritedLicenses = ($Report | Where-Object { $_.IsInherited -eq $true -and $_.IsDirect -eq $false }).Count
-        $script:bothLicenses = ($Report | Where-Object { $_.IsDirect -eq $true -and $_.IsInherited -eq $true }).Count
-        $script:DisabledUsersWithLicenses = ($Report | Where-Object { $_.AccountEnabled -eq "No" } | Select-Object -Unique UserPrincipalName).Count
-
-        # Output summary information
-        Write-Host "INFO: License Summary:" -ForegroundColor Cyan
-        Write-Host "Total users processed: $totalUsers" -ForegroundColor White
-        Write-Host "Users with licenses: $($Report | Select-Object -Unique UserPrincipalName | Measure-Object | Select-Object -ExpandProperty Count)" -ForegroundColor White
-        Write-Host "Direct license assignments: $script:directLicenses" -ForegroundColor White
-        Write-Host "Inherited license assignments: $script:inheritedLicenses" -ForegroundColor White
-        Write-Host "Both direct and inherited: $script:bothLicenses" -ForegroundColor White
-        Write-Host "Disabled users with licenses: $script:DisabledUsersWithLicenses" -ForegroundColor White
-
-        # Export to HTML
-        New-HTMLReport -Organization $Organization -Report $Report -SubscriptionOverview $SubscriptionOverview -ExportPath $ExportPath
-
-        # Send email with the report
-        $emailSent = $false
-        if ($SendEmail) {
-            $subject = "$Organization - Microsoft 365 License Assignment Report"
-            $bodyHtml = "<html><body style='font-family: Segoe UI, Arial, sans-serif;'><h2>Microsoft 365 License Assignment Report</h2><p>Attached is the latest Microsoft 365 license assignment report for $Organization.</p><p>Open the attached HTML in a browser for the full report.</p><p style='color:#666;'>Generated by RKSolutions - please do not reply.</p></body></html>"
-            $emailSent = Send-EmailWithAttachment -Recipient $Recipient -AttachmentPath $script:ExportPath -From $From -Subject $subject -BodyHtml $bodyHtml
-
-            if ($emailSent) {
-                Write-Host "INFO: Email sent successfully." -ForegroundColor Green
-            }
-            else {
-                Write-Host "ERROR: Failed to send email." -ForegroundColor Red
-            }
-        }
-        else {
-            Write-Host "INFO: Email sending is disabled. Set -SendEmail to $true to enable." -ForegroundColor Yellow
-        }
-
-        # Clean up the report file
-        if ($SendEmail -and $emailSent) {
-            if (Test-Path -Path $script:ExportPath) {
-                Remove-Item -Path $script:ExportPath -Force
-                Write-Host "INFO: Temporary report file deleted." -ForegroundColor Green
-            } else {
-                Write-Host "INFO: No temporary report file found to delete." -ForegroundColor Yellow
-            }
-        }
-
-        # Get Organization Name
-        $Organization = Invoke-MgGraphRequest -Uri "beta/organization" -OutputType PSObject | Select-Object -Expand Value | Select-Object -ExpandProperty DisplayName
-
-        # Get product identifiers
-        $Identifiers = Get-LicenseIdentifiers
-
-        # Select all SKUs with friendly display name
-        [array]$SKU_friendly = $Identifiers | Select-Object GUID, String_Id, Product_Display_Name -Unique
-
-        # NEW CLOUD LICENSING API: Get allotments with subscription details in one call (Beta API)
-        # This replaces the previous two separate calls to subscribedSkus and directory/subscriptions
-        Write-Host "INFO: Retrieving allotment and subscription data using Cloud Licensing API..." -ForegroundColor Cyan
-
-        try {
-            # Try new Cloud Licensing API first
-            # Note: subscriptions is included by default, no need to expand
-            [Array]$allotments = Invoke-GraphRequestWithPaging -Uri "beta/admin/cloudLicensing/allotments?`$select=id,allottedUnits,consumedUnits,skuId,skuPartNumber,assignableTo,subscriptions"
-
-            if (-not $allotments -or $allotments.Count -eq 0) {
-                throw "Allotments API returned empty results"
-            }
-
-            $useCloudLicensingAPI = $true
-            Write-Host "INFO: Successfully retrieved data from Cloud Licensing API" -ForegroundColor Green
-
-            # Diagnostic: Show what properties are available in first subscription (if verbose)
-            if ($VerbosePreference -eq 'Continue' -and $allotments.Count -gt 0) {
-                $firstAllotment = $allotments[0]
-                if ($firstAllotment.subscriptions -and $firstAllotment.subscriptions.Count -gt 0) {
-                    $firstSub = $firstAllotment.subscriptions[0]
-                    Write-Verbose "Subscription properties available: $($firstSub.PSObject.Properties.Name -join ', ')"
-                }
-            }
-
-            # Always show diagnostic info about subscription structure (helps with troubleshooting)
-            Write-Host "INFO: Found $($allotments.Count) allotments" -ForegroundColor Cyan
-            $totalSubscriptions = ($allotments | ForEach-Object { if ($_.subscriptions) { $_.subscriptions.Count } else { 0 } } | Measure-Object -Sum).Sum
-            Write-Host "INFO: Total subscriptions across all allotments: $totalSubscriptions" -ForegroundColor Cyan
-
-            # Supplementary call to get dates from legacy API if needed
-            # The allotments API includes startDate and nextLifecycleDate, but we fetch
-            # from legacy API as a fallback in case subscription IDs don't match perfectly
-            Write-Host "INFO: Retrieving subscription dates as fallback..." -ForegroundColor Cyan
-            [Array]$LegacySubscriptions = Invoke-MgGraphRequest -Uri "beta/directory/subscriptions?`$select=id,createdDateTime,nextLifecycleDateTime,skuId" -OutputType PSObject |
-                Select-Object -ExpandProperty Value
-
-            # Create lookup table for quick access to both created and end dates
-            $subscriptionDateLookup = @{}
-            foreach ($legacySub in $LegacySubscriptions) {
-                if ($legacySub.id) {
-                    $subscriptionDateLookup[$legacySub.id] = @{
-                        CreatedDate = $legacySub.createdDateTime
-                        EndDate = $legacySub.nextLifecycleDateTime
-                    }
-                }
-            }
-
-            Write-Host "INFO: Created lookup table with $($subscriptionDateLookup.Count) subscription dates" -ForegroundColor Cyan
-            if ($VerbosePreference -eq 'Continue' -and $subscriptionDateLookup.Count -gt 0) {
-                Write-Verbose "Sample lookup IDs: $(($subscriptionDateLookup.Keys | Select-Object -First 3) -join ', ')"
-                $firstId = $subscriptionDateLookup.Keys | Select-Object -First 1
-                if ($firstId) {
-                    Write-Verbose "Sample data for ID $firstId - CreatedDate: $($subscriptionDateLookup[$firstId].CreatedDate), EndDate: $($subscriptionDateLookup[$firstId].EndDate)"
-                }
-            }
-
-            # Show how many subscriptions have end dates
-            $subsWithEndDates = ($LegacySubscriptions | Where-Object { $_.nextLifecycleDateTime }).Count
-            $subsWithoutEndDates = $LegacySubscriptions.Count - $subsWithEndDates
-            Write-Host "INFO: Subscriptions with end dates: $subsWithEndDates, without end dates: $subsWithoutEndDates" -ForegroundColor Cyan
-        }
-        catch {
-            # Fallback to legacy API if Cloud Licensing API fails
-            Write-Host "WARNING: Cloud Licensing API failed, falling back to legacy API. Error: $($_.Exception.Message)" -ForegroundColor Yellow
-            $useCloudLicensingAPI = $false
-
-            # Legacy API calls
-            [Array]$Skus = Invoke-MgGraphRequest -Uri "Beta/subscribedSkus" -OutputType PSObject |
-            Select-Object -ExpandProperty Value
-            [Array]$Subscriptions = Invoke-MgGraphRequest -Uri "beta/directory/subscriptions" -OutputType PSObject |
-            Select-Object -ExpandProperty Value
-        }
-
-        # Create an overview of subscriptions with their end date
-        $SubscriptionOverview = @()
-
-        if ($useCloudLicensingAPI) {
-            # NEW: Process allotments from Cloud Licensing API
-            $datesFoundCount = 0
-            $datesNotFoundCount = 0
-
-            # Group allotments by SKU to combine duplicate licenses
-            $allotmentsBySkuId = @{}
-
-            foreach ($allotment in $allotments) {
-                # Get friendly name
-                $friendlyName = $SKU_friendly | Where-Object { $_.GUID -eq $allotment.skuId } |
-                    Select-Object -ExpandProperty Product_Display_Name -ErrorAction SilentlyContinue
-
-                if (-not $friendlyName) {
-                    $friendlyName = if ($allotment.skuPartNumber) { $allotment.skuPartNumber } else { "Unknown License ($($allotment.skuId))" }
-                }
-
-                # Initialize SKU group if not exists
-                if (-not $allotmentsBySkuId.ContainsKey($allotment.skuId)) {
-                    $allotmentsBySkuId[$allotment.skuId] = @{
-                        FriendlyName = $friendlyName
-                        SKUPartNumber = $allotment.skuPartNumber
-                        AssignableTo = $allotment.assignableTo
-                        TotalLicenses = 0
-                        ConsumedUnits = 0
-                        CreatedDates = @()
-                        EndDates = @()
-                        SubscriptionIds = @()
-                    }
-                }
-
-                # Aggregate license counts
-                $allotmentsBySkuId[$allotment.skuId].TotalLicenses += if ($allotment.allottedUnits) { $allotment.allottedUnits } else { 0 }
-                $allotmentsBySkuId[$allotment.skuId].ConsumedUnits += if ($allotment.consumedUnits) { $allotment.consumedUnits } else { 0 }
-
-                # Process subscriptions to collect dates
-                if ($allotment.subscriptions -and $allotment.subscriptions.Count -gt 0) {
-                    foreach ($subscription in $allotment.subscriptions) {
-                        if ($subscription.id) {
-                            $allotmentsBySkuId[$allotment.skuId].SubscriptionIds += $subscription.id
-                        }
-
-                        # Resolve created/start date
-                        $subCreated = $null
-                        if ($subscription.startDate) { $subCreated = $subscription.startDate }
-                        elseif ($subscription.createdDateTime) { $subCreated = $subscription.createdDateTime }
-                        elseif ($subscription.createdDate) { $subCreated = $subscription.createdDate }
-                        elseif ($subscriptionDateLookup -and $subscription.id -and $subscriptionDateLookup.ContainsKey($subscription.id)) {
-                            $subCreated = $subscriptionDateLookup[$subscription.id].CreatedDate
-                        }
-
-                        if ($subCreated) {
-                            $datesFoundCount++
-                            $d = try { [DateTime]$subCreated } catch { $null }
-                            if ($d) {
-                                $allotmentsBySkuId[$allotment.skuId].CreatedDates += $d
-                            }
-                        } else {
-                            $datesNotFoundCount++
-                        }
-
-                        # Resolve end/lifecycle date
-                        $subEnd = $null
-                        if ($subscription.nextLifecycleDate) { $subEnd = $subscription.nextLifecycleDate }
-                        elseif ($subscription.nextLifecycleDateTime) { $subEnd = $subscription.nextLifecycleDateTime }
-                        elseif ($subscription.endDate) { $subEnd = $subscription.endDate }
-                        elseif ($subscription.expiryDate) { $subEnd = $subscription.expiryDate }
-                        elseif ($subscriptionDateLookup -and $subscription.id -and $subscriptionDateLookup.ContainsKey($subscription.id)) {
-                            $subEnd = $subscriptionDateLookup[$subscription.id].EndDate
-                        }
-
-                        if ($subEnd -and $subEnd -ne "No end date found") {
-                            $e = try { [DateTime]$subEnd } catch { $null }
-                            if ($e) {
-                                $allotmentsBySkuId[$allotment.skuId].EndDates += $e
-                            }
-                        }
-                    }
-                }
-            }
-
-            # Now create subscription overview with one row per SKU
-            foreach ($skuId in $allotmentsBySkuId.Keys) {
-                $skuData = $allotmentsBySkuId[$skuId]
-
-                # Get earliest created date
-                $createdDate = if ($skuData.CreatedDates.Count -gt 0) {
-                    ($skuData.CreatedDates | Measure-Object -Minimum).Minimum
-                } else { $null }
-
-                $formattedCreatedDate = if ($createdDate) {
-                    try { Get-Date $createdDate -Format "dd-MM-yyyy HH:mm" }
-                    catch { $createdDate.ToString() }
-                } else { "Unknown" }
-
-                # Get latest end date
-                $endDate = if ($skuData.EndDates.Count -gt 0) {
-                    ($skuData.EndDates | Measure-Object -Maximum).Maximum
-                } else { $null }
-
-                if (-not $endDate) {
-                    $endDate = "No end date found"
-                }
-
-                $formattedEndDate = if ($endDate -ne "No end date found") {
-                    try { Get-Date $endDate -Format "dd-MM-yyyy HH:mm" }
-                    catch { $endDate }
-                } else { $endDate }
-
-                # Determine license status
-                $licenseStatus = "Enabled"
-                if ($endDate -ne "No end date found") {
-                    try {
-                        $dateObj = [DateTime]$endDate
-                        $licenseStatus = if ($dateObj -gt (Get-Date)) { "Enabled" } else { "Disabled" }
-                    } catch {
-                        $licenseStatus = "Unknown"
-                    }
-                }
-
-                $availableLicenses = $skuData.TotalLicenses - $skuData.ConsumedUnits
-
-                $SubscriptionOverview += [PSCustomObject]@{
-                    SubscriptionId    = ($skuData.SubscriptionIds | Select-Object -First 1)
-                    FriendlyName      = $skuData.FriendlyName
-                    SKUPartNumber     = $skuData.SKUPartNumber
-                    CreatedDate       = $formattedCreatedDate
-                    EndDate           = $formattedEndDate
-                    LicenseStatus     = $licenseStatus
-                    ConsumedUnits     = $skuData.ConsumedUnits
-                    TotalLicenses     = $skuData.TotalLicenses
-                    AvailableLicenses = $availableLicenses
-                    AssignableTo      = $skuData.AssignableTo
-                }
-            }
-
-            # Show summary of date matching
-            Write-Host "INFO: Created dates - Found: $datesFoundCount, Not Found: $datesNotFoundCount" -ForegroundColor Cyan
-        }
-        else {
-            # LEGACY: Process subscriptions from old API
-            foreach ($subscription in $Subscriptions) {
-                $sku = $Skus | Where-Object { $_.SkuId -eq $subscription.SkuId }
-                $friendlyName = $SKU_friendly | Where-Object { $_.GUID -eq $sku.SkuId } |
-                Select-Object -ExpandProperty Product_Display_Name -ErrorAction SilentlyContinue
-
-                if (-not $friendlyName) {
-                    $friendlyName = "Unknown License ($($sku.SkuId))"
-                }
-
-                $endDate = if ($null -eq $subscription.NextLifecycleDateTime) {
-                    "No end date found"
-                } else {
-                    $subscription.NextLifecycleDateTime
-                }
-
-                # Format dates
-                $formattedCreatedDate = if ($subscription.CreatedDateTime -is [DateTime]) {
-                    Get-Date $subscription.CreatedDateTime -Format "dd-MM-yyyy HH:mm"
-                } elseif ($subscription.CreatedDateTime) {
-                    try {
-                        Get-Date $subscription.CreatedDateTime -Format "dd-MM-yyyy HH:mm"
-                    } catch {
-                        $subscription.CreatedDateTime
-                    }
-                } else {
-                    "Unknown"
-                }
-
-                $formattedEndDate = if ($endDate -is [DateTime]) {
-                    Get-Date $endDate -Format "dd-MM-yyyy HH:mm"
-                } elseif ($endDate -and $endDate -ne "No end date found") {
-                    try {
-                        Get-Date $endDate -Format "dd-MM-yyyy HH:mm"
-                    } catch {
-                        $endDate
-                    }
-                } else {
-                    $endDate
-                }
-
-                # Determine license status
-                $licenseStatus = if ($endDate -eq "No end date found") {
-                    "Enabled"
-                } elseif ($endDate -is [DateTime] -and $endDate -gt (Get-Date)) {
-                    "Enabled"
-                } elseif ($endDate -ne "No end date found") {
-                    try {
-                        $dateObj = [DateTime]$endDate
-                        if ($dateObj -gt (Get-Date)) {
-                            "Enabled"
-                        } else {
-                            "Disabled"
-                        }
-                    } catch {
-                        "Unknown"
-                    }
-                } else {
-                    "Unknown"
-                }
-
-                # Calculate available licenses
-                $totalLicenses = if ($subscription.TotalLicenses) { $subscription.TotalLicenses } else { 0 }
-                $consumedUnits = if ($sku.ConsumedUnits) { $sku.ConsumedUnits } else { 0 }
-                $availableLicenses = $totalLicenses - $consumedUnits
+    <!-- Subscription Overview Panel -->
+    <div id="panel-subscription-overview" class="rk-panel">
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>Subscription Overview</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="subscriptionShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="subscriptionTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Subscription</th>
+                            <th>Created Date</th>
+                            <th>End Date</th>
+                            <th>License Status</th>
+                            <th>Consumed Units</th>
+                            <th>Total Licenses</th>
+                            <th>Available Licenses</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $subscriptionRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
 
-                $SubscriptionOverview += [PSCustomObject]@{
-                    SubscriptionId    = $subscription.Id
-                    FriendlyName      = $friendlyName
-                    CreatedDate       = $formattedCreatedDate
-                    EndDate           = $formattedEndDate
-                    LicenseStatus     = $licenseStatus
-                    ConsumedUnits     = $consumedUnits
-                    TotalLicenses     = $totalLicenses
-                    AvailableLicenses = $availableLicenses
+    <!-- Disabled Users Panel -->
+    <div id="panel-disabled-users" class="rk-panel">
+        <div class="rk-card">
+            <div class="rk-card-header">
+                <span>Disabled Users with Licenses</span>
+                <div class="rk-show-all">
+                    <label class="rk-toggle-switch">
+                        <input type="checkbox" id="disabledUsersShowAllToggle">
+                        <span class="rk-toggle-slider"></span>
+                    </label>
+                    <span>Show all</span>
+                </div>
+            </div>
+            <div class="rk-card-body">
+                <table id="disabledUsersTable" class="table table-bordered" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Display Name</th>
+                            <th>User Principal Name</th>
+                            <th>Account Status</th>
+                            <th>Last Successful Sign In</th>
+                            <th>License</th>
+                            <th>Assignment Type</th>
+                            <th>Inheritance Details</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        $disabledUsersRows
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <script>
+    `$(document).ready(function() {
+        // Initialize all tables using the shared helper
+        var licensesTable = initRKTable('#licensesTable');
+        var subscriptionTable = initRKTable('#subscriptionTable');
+        var disabledUsersTable = initRKTable('#disabledUsersTable');
+
+        // Populate license name filter dropdown
+        function populateLicenseFilter() {
+            var values = [...new Set(licensesTable.column(4).data().toArray())].sort();
+            var select = `$('#licenseNameFilter');
+            values.forEach(function(value) {
+                if (value && value.toString().trim() !== '') {
+                    // Strip HTML tags for display
+                    var text = value.replace(/<[^>]*>/g, '').trim();
+                    if (text) {
+                        select.append($('<option>').val(text).text(text));
+                    }
                 }
-            }
+            });
         }
 
-        # Output the overview
-        Write-Host "INFO: Generating subscription overview..." -ForegroundColor Cyan
+        // Custom filtering for the licenses table
+        `$.fn.dataTable.ext.search.push(function(settings, data, dataIndex) {
+            if (settings.nTable.id !== 'licensesTable') return true;
 
-        # Get all users with licenses - using paging to ensure all results are retrieved
-        Write-Host "INFO: Retrieving user license data..." -ForegroundColor Cyan
-        $users = Invoke-GraphRequestWithPaging -Uri "beta/users?`$select=UserPrincipalName,LicenseAssignmentStates,DisplayName,AccountEnabled,AssignedLicenses,signInActivity&`$top=999"
+            var accountStatus = `$('#accountStatusFilter').val();
+            var assignmentType = `$('#assignmentTypeFilter').val();
+            var licenseName = `$('#licenseNameFilter').val();
 
-        # Get all groups with their licenses
-        Write-Host "INFO: Retrieving group license data..." -ForegroundColor Cyan
-        $Groups = Invoke-GraphRequestWithPaging -Uri "beta/groups?`$select=id,displayName,assignedLicenses&`$top=999"
-        $groupsWithLicenses = @()
+            var rowAccountStatus = data[2];
+            var rowAssignmentType = data[5];
+            var rowLicenseName = data[4];
 
-        # Loop through each group and check if it has any licenses assigned
-        Write-Host "INFO: Checking groups for licenses..." -ForegroundColor Cyan
-        foreach ($group in $Groups) {
-            if ($group.assignedLicenses -and $group.assignedLicenses.Count -gt 0) {
-                $groupData = [PSCustomObject]@{
-                    ObjectId    = $group.id
-                    DisplayName = $group.displayName
-                    Licenses    = $group.assignedLicenses
-                }
-                $groupsWithLicenses += $groupData
-            }
-        }
+            if (accountStatus && rowAccountStatus.indexOf(accountStatus) === -1) return false;
+            if (assignmentType && rowAssignmentType.indexOf(assignmentType) === -1) return false;
+            if (licenseName && rowLicenseName.indexOf(licenseName) === -1) return false;
 
-        # Initialize the report array
-        $Report = @()
+            return true;
+        });
 
-        # Process user license data
-        $totalUsers = $users.Count
-        $currentIndex = 0
+        // Apply filters on change
+        `$('#accountStatusFilter, #assignmentTypeFilter, #licenseNameFilter').on('change', function() {
+            licensesTable.draw();
+        });
 
-        foreach ($user in $users) {
-            $currentIndex++
-            Write-Progress -Activity "Processing users" -Status "Processing $currentIndex of $totalUsers" -PercentComplete (($currentIndex / $totalUsers) * 100)
-    
-            # Skip users with no license assignment states
-            if (-not $user.LicenseAssignmentStates) {
-                continue
-            }
-    
-            # Group licenses by SkuId to detect both direct and inherited assignments
-            $licensesBySkuId = @{}
-    
-            foreach ($license in $user.LicenseAssignmentStates) {
-                $SkuId = $license.SkuId
-                $AssignedByGroup = $license.AssignedByGroup
-        
-                if (-not $licensesBySkuId.ContainsKey($SkuId)) {
-                    $licensesBySkuId[$SkuId] = @{
-                        DirectAssignment = $false
-                        GroupAssignments = @()
-                    }
-                }
-        
-                if ($null -eq $AssignedByGroup) {
-                    $licensesBySkuId[$SkuId].DirectAssignment = $true
-                }
-                else {
-                    $licensesBySkuId[$SkuId].GroupAssignments += $AssignedByGroup
-                }
-            }
-    
-            # Process each unique license
-            foreach ($SkuId in $licensesBySkuId.Keys) {
-                $licenseInfo = $licensesBySkuId[$SkuId]
-                $isDirect = $licenseInfo.DirectAssignment
-                $isInherited = ($licenseInfo.GroupAssignments.Count -gt 0)
-        
-                # Determine assignment type
-                $assignmentType = if ($isDirect -and $isInherited) {
-                    "Both"
-                }
-                elseif ($isDirect) {
-                    "Direct"
-                }
-                elseif ($isInherited) {
-                    "Inherited"
-                }
-                else {
-                    "Unknown"
-                }
-        
-                # Get friendly name for the license
-                $friendlyName = $SKU_friendly | Where-Object { $_.GUID -eq $SkuId } |
-                Select-Object -ExpandProperty Product_Display_Name -ErrorAction SilentlyContinue
-                
-                if (-not $friendlyName) {
-                    $friendlyName = "Unknown License ($SkuId)"
-                }
-        
-                # Get group names if inherited
-                $groupNames = ""
-                if ($isInherited) {
-                    $groupNamesList = @()
-                    foreach ($groupId in $licenseInfo.GroupAssignments) {
-                        $group = $groupsWithLicenses | Where-Object { $_.ObjectId -eq $groupId }
-                        if ($group) {
-                            $groupNamesList += $group.DisplayName
-                        }
-                        else {
-                            $groupNamesList += "Unknown Group ($groupId)"
-                        }
-                    }
-                    $groupNames = $groupNamesList -join ", "
-                }
-        
-                # Determine inheritance description
-                if ($isDirect -and -not $groupNames) {
-                    $inheritance = "Direct"
-                }
-                elseif (-not $isDirect -and $groupNames) {
-                    $inheritance = $groupNames
-                }
-                elseif ($isDirect -and $groupNames) {
-                    $inheritance = "Direct, $groupNames"
-                }
-                else {
-                    $inheritance = "Unknown"
-                }
+        // Clear filters
+        window.clearLicenseFilters = function() {
+            `$('#accountStatusFilter, #assignmentTypeFilter, #licenseNameFilter').val('');
+            licensesTable.search('').columns().search('').draw();
+        };
 
-                # Last Login Activity (robust handling of null/invalid values)
-                $lastSignIn = ConvertTo-DateString -Value $user.signInActivity.lastSignInDateTime
-                if ($lastSignIn -eq "No sign-in activity" -or $lastSignIn -eq "Invalid date value") {
-                    $lastSignIn = ConvertTo-DateString -Value $user.signInActivity.lastSuccessfulSignInDateTime
-                }
-        
-                # Create the license data object
-                $licenseData = [PSCustomObject]@{
-                    UserPrincipalName            = $user.UserPrincipalName
-                    DisplayName                  = $user.DisplayName
-                    AccountEnabled               = if ($user.AccountEnabled) { "Yes" } else { "No" }
-                    LastSuccessfulSignIn = $lastSignIn
-                    AssignedLicenses             = $SkuId
-                    AssignedLicensesFriendlyName = $friendlyName
-                    Inheritance                  = $inheritance
-                    AssignmentType               = $assignmentType
-                    IsDirect                     = $isDirect
-                    IsInherited                  = $isInherited
-                }
-                
-                # Add to the report
-                $Report += $licenseData
-            }
-        }
+        // Show all toggle for licenses table
+        `$('#licensesShowAllToggle').on('change', function() {
+            licensesTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
 
+        // Show all toggle for subscription table
+        `$('#subscriptionShowAllToggle').on('change', function() {
+            subscriptionTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
 
-        # Calculate metrics for summary boxes
-        $script:directLicenses = ($Report | Where-Object { $_.IsDirect -eq $true -and $_.IsInherited -eq $false }).Count
-        $script:inheritedLicenses = ($Report | Where-Object { $_.IsInherited -eq $true -and $_.IsDirect -eq $false }).Count
-        $script:bothLicenses = ($Report | Where-Object { $_.IsDirect -eq $true -and $_.IsInherited -eq $true }).Count
-        $script:DisabledUsersWithLicenses = ($Report | Where-Object { $_.AccountEnabled -eq "No" } | Select-Object -Unique UserPrincipalName).Count
+        // Show all toggle for disabled users table
+        `$('#disabledUsersShowAllToggle').on('change', function() {
+            disabledUsersTable.page.len(`$(this).is(':checked') ? -1 : 10).draw();
+        });
 
-        # Output summary information
-        Write-Host "INFO: License Summary:" -ForegroundColor Cyan
-        Write-Host "Total users processed: $totalUsers" -ForegroundColor White
-        Write-Host "Users with licenses: $($Report | Select-Object -Unique UserPrincipalName | Measure-Object | Select-Object -ExpandProperty Count)" -ForegroundColor White
-        Write-Host "Direct license assignments: $script:directLicenses" -ForegroundColor White
-        Write-Host "Inherited license assignments: $script:inheritedLicenses" -ForegroundColor White
-        Write-Host "Both direct and inherited: $script:bothLicenses" -ForegroundColor White
-        Write-Host "Disabled users with licenses: $script:DisabledUsersWithLicenses" -ForegroundColor White
+        // Populate filters after tables are initialized
+        setTimeout(function() {
+            populateLicenseFilter();
+        }, 100);
+    });
+    </script>
+"@
 
-        # Export to HTML
-        New-HTMLReport -Organization $Organization -Report $Report -SubscriptionOverview $SubscriptionOverview -ExportPath $ExportPath
+    # Report-specific CSS
+    $customCss = @"
+    .rk-filter-bar .form-select {
+        font-family: 'Geist Mono', ui-monospace, monospace;
+        font-size: 0.75rem;
+        padding: 4px 8px;
+        border-radius: 6px;
+    }
+    .table-danger td {
+        background-color: rgba(192, 57, 43, 0.08) !important;
+    }
+    [data-theme="dark"] .table-danger td {
+        background-color: rgba(224, 96, 80, 0.1) !important;
+    }
+"@
 
-        # Send email with the report
-        $emailSent = $false
-        if ($SendEmail) {
-            $subject = "$Organization - Microsoft 365 License Assignment Report"
-            $bodyHtml = "<html><body style='font-family: Segoe UI, Arial, sans-serif;'><h2>Microsoft 365 License Assignment Report</h2><p>Attached is the latest Microsoft 365 license assignment report for $Organization.</p><p>Open the attached HTML in a browser for the full report.</p><p style='color:#666;'>Generated by RKSolutions - please do not reply.</p></body></html>"
-            $emailSent = Send-EmailWithAttachment -Recipient $Recipient -AttachmentPath $script:ExportPath -From $From -Subject $subject -BodyHtml $bodyHtml
+    # Generate the full HTML report using the shared template
+    $htmlContent = Get-RKSolutionsReportTemplate `
+        -TenantName $Organization `
+        -ReportTitle 'License' `
+        -ReportSlug 'm365-licenses' `
+        -Eyebrow 'M365 LICENSE ASSIGNMENT' `
+        -Lede 'License assignment overview including direct, inherited, and disabled user assignments.' `
+        -StatsCardsHtml $statsCardsHtml `
+        -BodyContentHtml $bodyContentHtml `
+        -CustomCss $customCss `
+        -ReportDate $CurrentDate `
+        -Tags @('M365', 'Licensing', 'Entra ID')
 
-            if ($emailSent) {
-                Write-Host "INFO: Email sent successfully." -ForegroundColor Green
-            }
-            else {
-                Write-Host "ERROR: Failed to send email." -ForegroundColor Red
-            }
+    # Export to HTML file
+    $htmlContent | Out-File -FilePath $ExportPath -Encoding utf8
+
+    # Set script-scoped variable for email attachment
+    $script:ExportPath = $ExportPath
+
+    Write-Host "All actions completed successfully." -ForegroundColor Cyan
+    Write-Host "Report saved to: $ExportPath" -ForegroundColor Cyan
+
+    # Open the HTML file (cross-platform: Invoke-Item uses default handler; fallback so script does not fail in headless env)
+    if (-not $SendEmail) {
+        try {
+            Invoke-Item $ExportPath -ErrorAction Stop
+        } catch {
+            Write-Host "Report saved to: $ExportPath (could not open automatically)." -ForegroundColor Yellow
         }
-        else {
-            Write-Host "INFO: Email sending is disabled. Set -SendEmail to $true to enable." -ForegroundColor Yellow
+    }
+}
+
+function Get-LicenseIdentifiers {
+    $header = 'Product_Display_Name', 'String_Id', 'GUID', 'Service_Plan_Name', 'Service_Plan_Id', 'Service_Plans_Included_Friendly_Names'
+    $params = @{
+        Method = 'Get'
+        Uri    = "https://download.microsoft.com/download/e/3/e/e3e9faf2-f28b-490a-9ada-c6089a1fc5b0/Product%20names%20and%20service%20plan%20identifiers%20for%20licensing.csv"
+    }
+    $Identifiers = Invoke-RestMethod @params | ConvertFrom-Csv -Header $header |
+    ForEach-Object {
+        [PSCustomObject]@{
+            GUID                 = $_.GUID
+            String_Id            = $_.String_Id
+            Product_Display_Name = $_.Product_Display_Name
         }
+    }
+    return $Identifiers | Select-Object -Skip 1
+}
 
-        # Clean up the report file
-        if ($SendEmail -and $emailSent) {
-            if (Test-Path -Path $script:ExportPath) {
-                Remove-Item -Path $script:ExportPath -Force
-                Write-Host "INFO: Temporary report file deleted." -ForegroundColor Green
-            } else {
-                Write-Host "INFO: No temporary report file found to delete." -ForegroundColor Yellow
-            }
-        }subject -BodyHtml         # CODE
+
+function Invoke-M365LicenseReportCore {
+    param(
+        [Parameter(Mandatory=$false)] [switch] $SendEmail,
+        [Parameter(Mandatory=$false)] [string[]] $Recipient,
+        [Parameter(Mandatory=$false)] [string] $From,
+        [Parameter(Mandatory=$false)] [string] $ExportPath
+    )
+        # CODE
 
         # Get Organization Name
         $Organization = Invoke-MgGraphRequest -Uri "beta/organization" -OutputType PSObject | Select-Object -Expand Value | Select-Object -ExpandProperty DisplayName
@@ -3730,7 +508,7 @@ function Invoke-M365LicenseReportCore {
         }
 
         # Create an overview of subscriptions with their end date
-        $SubscriptionOverview = @()
+        $SubscriptionOverview = [System.Collections.Generic.List[PSObject]]::new()
 
         if ($useCloudLicensingAPI) {
             # NEW: Process allotments from Cloud Licensing API
@@ -3854,7 +632,7 @@ function Invoke-M365LicenseReportCore {
 
                 $availableLicenses = $skuData.TotalLicenses - $skuData.ConsumedUnits
 
-                $SubscriptionOverview += [PSCustomObject]@{
+                $SubscriptionOverview.Add([PSCustomObject]@{
                     SubscriptionId    = ($skuData.SubscriptionIds | Select-Object -First 1)
                     FriendlyName      = $skuData.FriendlyName
                     SKUPartNumber     = $skuData.SKUPartNumber
@@ -3865,7 +643,7 @@ function Invoke-M365LicenseReportCore {
                     TotalLicenses     = $skuData.TotalLicenses
                     AvailableLicenses = $availableLicenses
                     AssignableTo      = $skuData.AssignableTo
-                }
+                })
             }
 
             # Show summary of date matching
@@ -3938,7 +716,7 @@ function Invoke-M365LicenseReportCore {
                 $consumedUnits = if ($sku.ConsumedUnits) { $sku.ConsumedUnits } else { 0 }
                 $availableLicenses = $totalLicenses - $consumedUnits
 
-                $SubscriptionOverview += [PSCustomObject]@{
+                $SubscriptionOverview.Add([PSCustomObject]@{
                     SubscriptionId    = $subscription.Id
                     FriendlyName      = $friendlyName
                     CreatedDate       = $formattedCreatedDate
@@ -3947,7 +725,7 @@ function Invoke-M365LicenseReportCore {
                     ConsumedUnits     = $consumedUnits
                     TotalLicenses     = $totalLicenses
                     AvailableLicenses = $availableLicenses
-                }
+                })
             }
         }
 
@@ -3976,8 +754,8 @@ function Invoke-M365LicenseReportCore {
             }
         }
 
-        # Initialize the report array
-        $Report = @()
+        # Initialize the report collection
+        $Report = [System.Collections.Generic.List[PSObject]]::new()
 
         # Process user license data
         $totalUsers = $users.Count
@@ -3986,26 +764,26 @@ function Invoke-M365LicenseReportCore {
         foreach ($user in $users) {
             $currentIndex++
             Write-Progress -Activity "Processing users" -Status "Processing $currentIndex of $totalUsers" -PercentComplete (($currentIndex / $totalUsers) * 100)
-    
+
             # Skip users with no license assignment states
             if (-not $user.LicenseAssignmentStates) {
                 continue
             }
-    
+
             # Group licenses by SkuId to detect both direct and inherited assignments
             $licensesBySkuId = @{}
-    
+
             foreach ($license in $user.LicenseAssignmentStates) {
                 $SkuId = $license.SkuId
                 $AssignedByGroup = $license.AssignedByGroup
-        
+
                 if (-not $licensesBySkuId.ContainsKey($SkuId)) {
                     $licensesBySkuId[$SkuId] = @{
                         DirectAssignment = $false
                         GroupAssignments = @()
                     }
                 }
-        
+
                 if ($null -eq $AssignedByGroup) {
                     $licensesBySkuId[$SkuId].DirectAssignment = $true
                 }
@@ -4013,13 +791,13 @@ function Invoke-M365LicenseReportCore {
                     $licensesBySkuId[$SkuId].GroupAssignments += $AssignedByGroup
                 }
             }
-    
+
             # Process each unique license
             foreach ($SkuId in $licensesBySkuId.Keys) {
                 $licenseInfo = $licensesBySkuId[$SkuId]
                 $isDirect = $licenseInfo.DirectAssignment
                 $isInherited = ($licenseInfo.GroupAssignments.Count -gt 0)
-        
+
                 # Determine assignment type
                 $assignmentType = if ($isDirect -and $isInherited) {
                     "Both"
@@ -4033,15 +811,15 @@ function Invoke-M365LicenseReportCore {
                 else {
                     "Unknown"
                 }
-        
+
                 # Get friendly name for the license
                 $friendlyName = $SKU_friendly | Where-Object { $_.GUID -eq $SkuId } |
                 Select-Object -ExpandProperty Product_Display_Name -ErrorAction SilentlyContinue
-                
+
                 if (-not $friendlyName) {
                     $friendlyName = "Unknown License ($SkuId)"
                 }
-        
+
                 # Get group names if inherited
                 $groupNames = ""
                 if ($isInherited) {
@@ -4057,7 +835,7 @@ function Invoke-M365LicenseReportCore {
                     }
                     $groupNames = $groupNamesList -join ", "
                 }
-        
+
                 # Determine inheritance description
                 if ($isDirect -and -not $groupNames) {
                     $inheritance = "Direct"
@@ -4077,7 +855,7 @@ function Invoke-M365LicenseReportCore {
                 if ($lastSignIn -eq "No sign-in activity" -or $lastSignIn -eq "Invalid date value") {
                     $lastSignIn = ConvertTo-DateString -Value $user.signInActivity.lastSuccessfulSignInDateTime
                 }
-        
+
                 # Create the license data object
                 $licenseData = [PSCustomObject]@{
                     UserPrincipalName            = $user.UserPrincipalName
@@ -4091,9 +869,9 @@ function Invoke-M365LicenseReportCore {
                     IsDirect                     = $isDirect
                     IsInherited                  = $isInherited
                 }
-                
+
                 # Add to the report
-                $Report += $licenseData
+                $Report.Add($licenseData)
             }
         }
 
@@ -4131,28 +909,7 @@ function Invoke-M365LicenseReportCore {
             }
         }
         else {
-            Write-Host "INFO: Email sending is disabled. Set -SendEmail to $true to enable." -ForegroundColor Yellow
-        }
-
-        # Clean up the report file
-        if ($SendEmail -and $emailSent) {
-            if (Test-Path -Path $script:ExportPath) {
-                Remove-Item -Path $script:ExportPath -Force
-                Write-Host "INFO: Temporary report file deleted." -ForegroundColor Green
-            } else {
-                Write-Host "INFO: No temporary report file found to delete." -ForegroundColor Yellow
-            }
-        }body
-
-            if ($emailSent) {
-                Write-Host "INFO: Email sent successfully." -ForegroundColor Green
-            }
-            else {
-                Write-Host "ERROR: Failed to send email." -ForegroundColor Red
-            }
-        }
-        else {
-            Write-Host "INFO: Email sending is disabled. Set -SendEmail to $true to enable." -ForegroundColor Yellow
+            Write-Host "INFO: Email sending is disabled. Set -SendEmail to `$true to enable." -ForegroundColor Yellow
         }
 
         # Clean up the report file
diff --git a/module/Private/Send-EmailWithAttachment.ps1 b/module/Private/Send-EmailWithAttachment.ps1
index a70675e..06ed749 100644
--- a/module/Private/Send-EmailWithAttachment.ps1
+++ b/module/Private/Send-EmailWithAttachment.ps1
@@ -68,7 +68,14 @@ function Send-EmailWithAttachment {
     }
 
     $sendMailUri = 'https://graph.microsoft.com/v1.0/me/sendMail'
-    if ($From) { $sendMailUri = "https://graph.microsoft.com/v1.0/users/$From/sendMail" }
+    if ($From) {
+        if ($From -notmatch '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$' -and
+            $From -notmatch '^[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}$') {
+            Write-Error "Invalid -From value '$From'. Must be an email address or user object ID."
+            return $false
+        }
+        $sendMailUri = "https://graph.microsoft.com/v1.0/users/$From/sendMail"
+    }
 
     try {
         $jsonBody = ConvertTo-Json -InputObject $mailRequestBody -Depth 20
diff --git a/module/Public/Connect-RKGraph.ps1 b/module/Public/Connect-RKGraph.ps1
index 33bc7b0..5c1f460 100644
--- a/module/Public/Connect-RKGraph.ps1
+++ b/module/Public/Connect-RKGraph.ps1
@@ -31,7 +31,9 @@ function Connect-RKGraph {
             'PrivilegedEligibilitySchedule.Read.AzureADGroup',
             'Mail.Send',
             'CloudLicensing.Read',
-            'CloudPC.Read.All'
+            'CloudPC.Read.All',
+            'CustomSecAttributeAssignment.Read.All',
+            'CustomSecAttributeDefinition.Read.All'
         ),
         [Parameter(Mandatory = $true, ParameterSetName = 'ClientSecret')]
         [Parameter(Mandatory = $true, ParameterSetName = 'Certificate')]
diff --git a/module/Public/Get-CustomSecurityAttributesReport.ps1 b/module/Public/Get-CustomSecurityAttributesReport.ps1
new file mode 100644
index 0000000..e39d7be
--- /dev/null
+++ b/module/Public/Get-CustomSecurityAttributesReport.ps1
@@ -0,0 +1,101 @@
+<#
+.SYNOPSIS
+    Generates an interactive HTML report of custom security attributes across users, devices, and enterprise apps.
+    Connect first with Connect-RKGraph; this cmdlet uses the existing connection.
+.DESCRIPTION
+    Queries Microsoft Graph for custom security attributes assigned to users, devices, and service principals.
+    Auto-discovers attribute sets or accepts a specific set. Generates an interactive report with:
+    - Overview tab with coverage matrix (which entities have which attribute sets)
+    - Dynamic tabs per attribute set with sub-sections for users, devices, and enterprise apps
+    - DataTables with search, export (Excel/CSV/PDF), column visibility, and dark/light theme toggle
+.PARAMETER AttributeSet
+    Specific attribute set to report on. If not specified, auto-discovers and reports on all attribute sets.
+.PARAMETER SendEmail
+    Send the report as an email attachment via Microsoft Graph Mail.Send.
+.PARAMETER Recipient
+    Email addresses to send the report to. Required when -SendEmail is used.
+.PARAMETER From
+    Sender email address. If omitted, sends as the currently authenticated user.
+.PARAMETER ExportPath
+    Full path for the HTML report file. Defaults to current directory.
+.PARAMETER DebugMode
+    Enable verbose debug output.
+.EXAMPLE
+    Get-CustomSecurityAttributesReport
+    Auto-discovers all attribute sets and generates a full report.
+.EXAMPLE
+    Get-CustomSecurityAttributesReport -AttributeSet "ComplianceData"
+    Report on a specific attribute set only.
+.EXAMPLE
+    Get-CustomSecurityAttributesReport -SendEmail -Recipient "admin@contoso.com"
+    Generate report and email it.
+#>
+function Get-CustomSecurityAttributesReport {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory = $false)]
+        [string]$AttributeSet,
+
+        [Parameter(Mandatory = $false)]
+        [switch]$SendEmail,
+
+        [Parameter(Mandatory = $false)]
+        [string[]]$Recipient,
+
+        [Parameter(Mandatory = $false)]
+        [string]$From,
+
+        [Parameter(Mandatory = $false)]
+        [string]$ExportPath,
+
+        [Parameter(Mandatory = $false)]
+        [switch]$DebugMode
+    )
+
+    $ErrorActionPreference = 'Stop'
+    try {
+        $ctx = Get-MgContext -ErrorAction SilentlyContinue
+        if (-not $ctx) { throw 'Not connected to Microsoft Graph. Run Connect-RKGraph first.' }
+
+        # Get tenant information
+        $tenantInfo = Invoke-MgGraphRequest -Uri 'v1.0/organization' -Method Get -OutputType PSObject
+        $tenantName = $tenantInfo.value[0].displayName
+
+        # Fetch attribute data across all entity types
+        $dataParams = @{ DebugMode = $DebugMode }
+        if ($AttributeSet) { $dataParams['AttributeSet'] = $AttributeSet }
+        $reportData = Get-CustomSecurityAttributeData @dataParams
+
+        $totalEntities = $reportData.Counts.Users + $reportData.Counts.Devices + $reportData.Counts.Apps
+        if ($totalEntities -eq 0) {
+            Write-Host 'No entities found with custom security attributes.' -ForegroundColor Yellow
+            return
+        }
+
+        Write-Host "Found $($reportData.Counts.Users) user(s), $($reportData.Counts.Devices) device(s), $($reportData.Counts.Apps) app(s) with attributes." -ForegroundColor Green
+
+        # Generate HTML report
+        $htmlPath = New-CustomSecurityAttributesHTMLReport -TenantName $tenantName -ReportData $reportData -ExportPath $ExportPath
+
+        # Send email if requested
+        if ($SendEmail -and $Recipient) {
+            $subject = "$tenantName - Custom Security Attributes Report"
+            $bodyHtml = @"
+<html><body style="font-family: 'Source Serif 4', Georgia, serif;">
+<h2>Custom Security Attributes Report</h2>
+<p>Attached is the latest Custom Security Attributes report for <strong>$tenantName</strong>.</p>
+<p>Open the attached HTML in a browser for the interactive dashboard.</p>
+<p style='color:#787468;'>Generated by RKSolutions - please do not reply.</p>
+</body></html>
+"@
+            $emailSent = Send-EmailWithAttachment -Recipient $Recipient -AttachmentPath $htmlPath -From $From -Subject $subject -BodyHtml $bodyHtml
+            if ($emailSent) { Write-Host 'INFO: Email sent successfully.' -ForegroundColor Green } else { Write-Host 'ERROR: Failed to send email.' -ForegroundColor Red }
+        }
+
+        if ($SendEmail -and (Test-Path -Path $htmlPath)) {
+            Remove-Item -Path $htmlPath -Force
+            Write-Host 'INFO: Temporary report file deleted.' -ForegroundColor Green
+        }
+    }
+    catch { Write-Error "Error: $_"; throw $_ }
+}
diff --git a/module/Public/Get-IntuneAnomaliesReport.ps1 b/module/Public/Get-IntuneAnomaliesReport.ps1
index d60a669..cb67841 100644
--- a/module/Public/Get-IntuneAnomaliesReport.ps1
+++ b/module/Public/Get-IntuneAnomaliesReport.ps1
@@ -31,7 +31,7 @@ try {
 
     $Report_ApplicationFailureReport = Get-ApplicationFailures
     $Report_DevicesWithMultipleUsers = $DeviceData | Where-Object { $_.usersLoggedOnCount -gt 1 -and $_.EnrollmentProfile -in $UserDrivenAutopilotProfiles.displayName } | Select-Object Customer, DeviceName, PrimaryUser, EnrollmentProfile, usersLoggedOnCount, usersLoggedOnIds
-    $Report_OperationSystemEdtionOverview = $DeviceData | Select-Object Customer, DeviceName, PrimaryUser, OperatingSystemEdition, OSFriendlyname
+    $Report_OperatingSystemEditionOverview = $DeviceData | Select-Object Customer, DeviceName, PrimaryUser, OperatingSystemEdition, OSFriendlyname
     $Report_NotEncryptedDevices = $DeviceData | Where-Object { $_.Encrypted -eq $false } | Select-Object Customer, DeviceName, PrimaryUser, Serialnumber, DeviceManufacturer, DeviceModel
     $Report_DevicesWithoutAutopilotHash = $DeviceData | Where-Object { $_.DeviceHashUploaded -eq $false } | Select-Object Customer, DeviceName, PrimaryUser, Serialnumber, DeviceManufacturer, DeviceModel
     $Report_InactiveDevices = $DeviceData | Where-Object { $_.LastContact -lt (Get-Date).AddDays(-90) } | Select-Object Customer, DeviceName, PrimaryUser, Serialnumber, DeviceManufacturer, DeviceModel, LastContact
@@ -52,15 +52,16 @@ try {
         }
     }
 
-    New-IntuneAnomaliesHTMLReport -TenantName $tenantname -Report_ApplicationFailureReport $Report_ApplicationFailureReport -Report_DevicesWithMultipleUsers $Report_DevicesWithMultipleUsers -Report_NotEncryptedDevices $Report_NotEncryptedDevices -Report_DevicesWithoutAutopilotHash $Report_DevicesWithoutAutopilotHash -Report_InactiveDevices $Report_InactiveDevices -Report_NoncompliantDevices $Report_NoncompliantDevices -Report_OperationSystemEdtionOverview $Report_OperationSystemEdtionOverview -Report_DisabledPrimaryUsers $Report_DisabledPrimaryUsers -ExportPath $ExportPath
+    New-IntuneAnomaliesHTMLReport -TenantName $tenantname -Report_ApplicationFailureReport $Report_ApplicationFailureReport -Report_DevicesWithMultipleUsers $Report_DevicesWithMultipleUsers -Report_NotEncryptedDevices $Report_NotEncryptedDevices -Report_DevicesWithoutAutopilotHash $Report_DevicesWithoutAutopilotHash -Report_InactiveDevices $Report_InactiveDevices -Report_NoncompliantDevices $Report_NoncompliantDevices -Report_OperatingSystemEditionOverview $Report_OperatingSystemEditionOverview -Report_DisabledPrimaryUsers $Report_DisabledPrimaryUsers -ExportPath $ExportPath
 
+    $emailSent = $false
     if ($SendEmail -and $Recipient) {
         $subject = "$tenantname - Intune Anomalies Report"
         $bodyHtml = "<html><body style=`"font-family: Segoe UI, Arial, sans-serif;`"><h2>Intune Anomalies Report</h2><p>Attached is the latest Intune anomalies report for <strong>$tenantname</strong>.</p><p>Open the attached HTML in a browser for the interactive dashboard.</p><p style='color:#666;'>Generated by RKSolutions - please do not reply.</p></body></html>"
         $emailSent = Send-EmailWithAttachment -Recipient $Recipient -AttachmentPath $script:ExportPath -From $From -Subject $subject -BodyHtml $bodyHtml
         if ($emailSent) { Write-Host 'INFO: Email sent successfully.' -ForegroundColor Green } else { Write-Host 'ERROR: Failed to send email.' -ForegroundColor Red }
     }
-    if ($SendEmail -and (Test-Path -Path $script:ExportPath)) { Remove-Item -Path $script:ExportPath -Force; Write-Host 'INFO: Temporary report file deleted.' -ForegroundColor Green }
+    if ($SendEmail -and $emailSent -and (Test-Path -Path $script:ExportPath)) { Remove-Item -Path $script:ExportPath -Force; Write-Host 'INFO: Temporary report file deleted.' -ForegroundColor Green }
 }
 catch { Write-Error "Error: $_"; throw $_ }
 finally {
diff --git a/module/Public/Get-IntuneEnrollmentFlowsReport.ps1 b/module/Public/Get-IntuneEnrollmentFlowsReport.ps1
index a963354..652e331 100644
--- a/module/Public/Get-IntuneEnrollmentFlowsReport.ps1
+++ b/module/Public/Get-IntuneEnrollmentFlowsReport.ps1
@@ -177,9 +177,13 @@ try {
     Write-Host "Device visualization report saved: $generated" -ForegroundColor Green
 
     if ($MermaidOverview) {
-        $mmdPath = [System.IO.Path]::ChangeExtension($generated, '.mmd')
-        [System.IO.File]::WriteAllText($mmdPath, $mermaidDiagram, [System.Text.UTF8Encoding]::new($false))
-        Write-Host "Mermaid file saved: $mmdPath" -ForegroundColor Green
+        if ([string]::IsNullOrWhiteSpace($mermaidDiagram)) {
+            Write-Warning "Mermaid diagram content is empty; skipping .mmd export."
+        } else {
+            $mmdPath = [System.IO.Path]::ChangeExtension($generated, '.mmd')
+            [System.IO.File]::WriteAllText($mmdPath, $mermaidDiagram, [System.Text.UTF8Encoding]::new($false))
+            Write-Host "Mermaid file saved: $mmdPath" -ForegroundColor Green
+        }
     }
 
     if ($ExportToCsv) {
diff --git a/module/RKSolutions.psd1 b/module/RKSolutions.psd1
index 44be347..a1e0185 100644
--- a/module/RKSolutions.psd1
+++ b/module/RKSolutions.psd1
@@ -1,12 +1,12 @@
 @{
     RootModule        = 'RKSolutions.psm1'
-    ModuleVersion     = '1.0.1'
+    ModuleVersion     = '1.1.0'
     GUID              = 'a1b2c3d4-e5f6-7890-abcd-ef1234567890'
     Author            = 'Roy Klooster'
     CompanyName       = 'RK Solutions'
     Copyright         = '(c) 2026 Roy Klooster - RK Solutions. All rights reserved.'
-    Description       = 'PowerShell module consolidating Intune Enrollment Flows, Intune Anomalies, Entra Admin Roles, and M365 License Assignment reports. Connects to Microsoft Graph and generates HTML/CSV reports.'
-    PowerShellVersion = '5.1'
+    Description       = 'PowerShell module consolidating Intune Enrollment Flows, Intune Anomalies, Entra Admin Roles, M365 License Assignment, and Custom Security Attributes reports. Connects to Microsoft Graph and generates interactive HTML reports with the Carbon Ember design system.'
+    PowerShellVersion = '7.0'
     RequiredModules   = @('Microsoft.Graph.Authentication')
     FunctionsToExport = @(
         'Connect-RKGraph',
@@ -14,17 +14,19 @@
         'Get-IntuneEnrollmentFlowsReport',
         'Get-IntuneAnomaliesReport',
         'Get-EntraAdminRolesReport',
-        'Get-M365LicenseAssignmentReport'
+        'Get-M365LicenseAssignmentReport',
+        'Get-CustomSecurityAttributesReport'
     )
     CmdletsToExport   = @()
     VariablesToExport = @()
     AliasesToExport   = @()
     PrivateData       = @{
         PSData = @{
-            Tags         = @('RKSolutions', 'Microsoft365', 'MicrosoftIntune', 'MicrosoftEntraID', 'MicrosoftGraph', 'DeviceManagement', 'Reporting')
+            Tags         = @('RKSolutions', 'Microsoft365', 'MicrosoftIntune', 'MicrosoftEntraID', 'MicrosoftGraph', 'DeviceManagement', 'Reporting', 'CustomSecurityAttributes')
             LicenseUri   = 'https://opensource.org/licenses/MIT'
             ProjectUri   = 'https://github.com/royklo/RKSolutions-Module'
             ReleaseNotes = @'
+1.1.0 - Rebranded all HTML reports with Carbon Ember design (Geist/Geist Mono typography, pill-style tabs, neutral dark theme). Added Get-CustomSecurityAttributesReport with multi-entity support (users, devices, enterprise apps), dynamic attribute set discovery, and coverage metrics. Fixed XSS vulnerabilities in HTML output. Added equal-width tabs, dark mode pagination, and locked DataTable column widths. Added skuFamily for OS edition detection, Windows 11 25H2 support. Added CustomSecAttributeAssignment.Read.All and CustomSecAttributeDefinition.Read.All scopes.
 1.0.1 - Requires PowerShell 7.0 or higher. Fixed encoding issues for Windows compatibility. Improved error messaging when running on unsupported PowerShell versions.
 1.0.0 - Initial module release. Consolidates Intune Enrollment Flows, Intune Anomalies, Entra Admin Roles, and M365 License Assignment reports into a single module.
 '@
diff --git a/module/RKSolutions.psm1 b/module/RKSolutions.psm1
index 5057b84..311a0cb 100644
--- a/module/RKSolutions.psm1
+++ b/module/RKSolutions.psm1
@@ -31,14 +31,15 @@ if (Test-Path $privatePath) {
         'Invoke-RKSolutionsWithConnection.ps1',
         'Invoke-GraphRequestWithPaging.ps1',
         'Send-EmailWithAttachment.ps1',
-        'ConvertTo-DateString.ps1'
+        'ConvertTo-DateString.ps1',
+        'Get-RKSolutionsReportTemplate.ps1'
     )
     foreach ($name in $sharedOrder) {
         $fp = Join-Path $privatePath $name
         if (Test-Path $fp) { . $fp }
     }
     # Report-specific private scripts (order matters if they depend on each other)
-    $domainOrder = @('IntuneEnrollmentFlows.ps1', 'IntuneAnomalies.ps1', 'EntraAdminRoles.ps1', 'M365License.ps1')
+    $domainOrder = @('IntuneEnrollmentFlows.ps1', 'IntuneAnomalies.ps1', 'EntraAdminRoles.ps1', 'M365License.ps1', 'CustomSecurityAttributes.ps1')
     foreach ($name in $domainOrder) {
         $fp = Join-Path $privatePath $name
         if (Test-Path $fp) { . $fp }
@@ -58,5 +59,6 @@ Export-ModuleMember -Function @(
     'Get-IntuneEnrollmentFlowsReport',
     'Get-IntuneAnomaliesReport',
     'Get-EntraAdminRolesReport',
-    'Get-M365LicenseAssignmentReport'
+    'Get-M365LicenseAssignmentReport',
+    'Get-CustomSecurityAttributesReport'
 )