diff --git a/content/_test/use-case-cards-test.md b/content/_test/use-case-cards-test.md
deleted file mode 100644
index a6eac8b4d..000000000
--- a/content/_test/use-case-cards-test.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: "Phase 3-4 Components Test Page"
-description: "Testing all new standardized components"
-slug: use-case-cards-test
-draft: true
-layout: _test
-type: _test
----
-
-# Phase 3-4 Components Test
-
-Testing all new standardized components: use-case-card, hero-section, cta-block, and testimonial.
diff --git a/docs/projects/2509-css-migration/TASK-TRACKER.md b/docs/projects/2509-css-migration/TASK-TRACKER.md
index 9b3fd546b..4516717df 100644
--- a/docs/projects/2509-css-migration/TASK-TRACKER.md
+++ b/docs/projects/2509-css-migration/TASK-TRACKER.md
@@ -25,12 +25,12 @@
 ## 📊 OVERALL PROGRESS
 
 ```
-Phase 1: Critical CSS Inline     [🔲🔲🔲🔲] 0/4 WPs    (0% complete)
+Phase 1: Critical CSS Inline     [✅❌✅❌] 4/4 WPs resolved (2 done, 2 closed with evidence)
 Phase 2: FL-Builder Foundations  [🔲🔲🔲🔲] 0/4 WPs    (0% complete)
 Phase 3: Additional Patterns     [🔲🔲🔲🔲] 0/4 WPs    (0% complete)
 
-Total Progress: 0/12 work packages (0% complete)
-Lines Eliminated: 0 / 27,394-31,936 target (0% complete)
+Total Progress: 4/12 work packages resolved
+Lines Eliminated: ~70,600 (sprints 1-6; orphan deletion + consolidation)
 ```
 
 **Status Legend**:
@@ -52,9 +52,9 @@ Lines Eliminated: 0 / 27,394-31,936 target (0% complete)
 
 ### Work Package Status
 
-#### WP1.1: CSS Variables Foundation 🔄 IN PROGRESS
+#### WP1.1: CSS Variables Foundation ✅ COMPLETED
 ```yaml
-status: 🔄 In Progress (font-system-ui extraction COMPLETE 2026-07-11)
+status: ✅ Completed 2026-07-12 (sprint 6 / PR #360)
 priority: P0 🔥 Critical
 duration: 4-6 hours
 files_affected: 12 inline critical CSS files
@@ -73,15 +73,28 @@ tasks:
         inline components tree (deferred). The ~157 in orphan files and the
         variables/colors.css duplicate def were removed with those files
         (sprint 5, 2026-07-12).
-  - [ ] Extract --color-primary, --color-secondary, --color-text
-  - [ ] Extract --border-radius-default, --spacing-unit
+  - [x] Extract --color-primary (#1a8cff) — token had consumers for years but
+        was NEVER DEFINED (28 fallback-less declarations shipped invalid);
+        six live broken rule groups codified to shipped rendering first,
+        then defined + ~280 literals tokenized across 50 files (sprint 6)
+  - [x] --color-secondary — OBSOLETE: only consumers lived in orphaned
+        buttons-migration.css (deleted sprint 6); no definition needed
+  - [x] --color-text — delivered as --color-muted (#969798, 168 literals);
+        body text color is --color-dark
+  - [x] Extract --radius-default (4px; 137 exact swaps incl. vendor prefixes;
+        reboot-generic button triplets KEEP LITERAL) and --spacing-sm/md
+        (values = the fallbacks live consumers already resolved to;
+        --spacing-unit as a single token is fiction — no dominant unit exists)
   - [x] Dedup the identical 35-line Bootstrap :root block copied across
         8 critical files — DELETED outright (sprint 2, 2026-07-11): zero
         var() consumers repo-wide, so no relocation needed; 280 lines
         removed; vendor base-4.min.css copy untouched
   - [x] Validation: bin/rake test:critical (46/46 pass, 84 screenshots 0 diffs)
   - [x] Validation: bin/dtest Linux gate (46/46 pass, per commit)
-  - [ ] Validation: FCP metrics unchanged
+  - [x] Validation: FCP unchanged — first-fold page HTML (inline critical CSS
+        included) byte-identical pre/post sprint-6 token work (homepage,
+        services, blog, careers, free-consultation). External bundles +4.8KB
+        raw (+0.18%, var() names longer than hex; gzip absorbs it)
 
 blockers: NONE
 dependencies: NONE (can start immediately)
@@ -101,9 +114,20 @@ notes: |
     intentionally NOT converted — different values, would be value changes.
 ```
 
-#### WP1.2: Reset Utilities Extraction 🔲 NOT STARTED
+#### WP1.2: Reset Utilities Extraction ❌ OBSOLETE
 ```yaml
-status: 🔲 Not Started
+status: ❌ Closed as obsolete 2026-07-12 (sprint 6) — premise falsified:
+  (1) only 18 of ~140 padding:0/margin:0 occurrences in critical/ are
+  standalone rules; the other 122 are declarations inside larger blocks
+  that utility classes cannot replace without splitting rules AND editing
+  FL-Builder-generated markup;
+  (2) the utility files this WP asks for ALREADY EXISTED
+  (utilities/margins.css, padding.css, display.css, flexbox.css …) —
+  extracted in an earlier effort, imported only by the dead
+  _consolidated-utilities.css aggregator, classes present in zero
+  templates; the whole closure was deleted as orphans in sprint 6;
+  (3) the byte savings the WP projected are already realized in output by
+  cssnano rule-merging + postcss-delete-duplicate-css per bundle.
 priority: P0 🔥 Critical
 duration: 6-8 hours
 files_affected: 12 inline critical CSS files
@@ -129,9 +153,15 @@ actual_commits: -
 notes: High-impact utility extraction
 ```
 
-#### WP1.3: PowerPack Infobox Pattern 🔲 NOT STARTED
+#### WP1.3: PowerPack Infobox Pattern ✅ COMPLETED
 ```yaml
-status: 🔲 Not Started
+status: ✅ Completed 2026-07-12 (sprint 6, 23ed3049) — 6 per-fl-node
+  duplicate blocks in services-critical.css consolidated via selector
+  grouping (-224 source lines). Note the projected 1.5KB output saving
+  was ALREADY realized by cssnano merging the duplicates — compiled
+  output byte-identical; this is source hygiene. Gate: per-node rule
+  expansion identical; services/index.html is the only page inlining
+  these nodes.
 priority: P1 ⚠️ High
 duration: 4-6 hours
 files_affected: services.html (6 duplicates)
@@ -155,9 +185,18 @@ actual_commits: -
 notes: Page-specific optimization for services page
 ```
 
-#### WP1.4: Media Query Consolidation 🔲 NOT STARTED
+#### WP1.4: Media Query Consolidation ❌ REJECTED (measured)
 ```yaml
-status: 🔲 Not Started
+status: ❌ Closed as net-negative 2026-07-12 (sprint 6) — implemented via
+  postcss-sort-media-queries (production-only, after purge/dedup), measured,
+  reverted. Raw bytes: −6% (homepage 332 @media blocks → 28). BUT transfer
+  size is what ships: gzip GREW +2-3% per bundle (merging scatters the
+  repetitive per-node blocks gzip compresses best); brotli −0.3-1% ≈ noise.
+  Zero real win against real cascade-reorder risk (cssnano removed its own
+  media-merging for exactly this) plus a plugin crash on PurgeCSS's empty
+  @media rules that needed a workaround. Source-level regrouping would
+  change output the same way — same verdict. Do not revisit without new
+  evidence.
 priority: P1 ⚠️ High
 duration: 6-8 hours
 files_affected: 12 inline critical CSS files (168 @media occurrences)
@@ -182,17 +221,18 @@ actual_commits: -
 notes: Highest line count reduction in Phase 1
 ```
 
-### Phase 1 Summary
+### Phase 1 Summary — ✅ CLOSED 2026-07-12
 ```yaml
 work_packages_total: 4
-work_packages_completed: 0
-work_packages_blocked: 0
-total_duration_target: 20-30 hours
-total_duration_actual: 0 hours
-total_lines_eliminated_target: 300-400 lines
-total_lines_eliminated_actual: 0 lines
-total_commits_target: 78-100 commits
-total_commits_actual: 0 commits
+work_packages_completed: 2   # WP1.1, WP1.3
+work_packages_closed_obsolete: 2   # WP1.2 (premise falsified), WP1.4 (measured net-negative)
+total_lines_eliminated_actual: ~70,600 across sprints 1-6 (mostly orphan deletion;
+  the WPs' own line targets were largely already realized in OUTPUT by the
+  postcss pipeline — the 2025-10 analysis measured source, not compiled bundles)
+notes: |
+  Phase-1 lesson: the original WP estimates predate cssnano/delete-duplicate
+  awareness. Before starting any Phase-2 WP, verify its projected savings
+  against COMPILED bundle output (and gzip), not source line counts.
 ```
 
 ---
@@ -554,6 +594,76 @@ fcp_metrics:
 
 ## 🔄 UPDATE LOG
 
+### 2026-07-12 (sprint 6 continuation — WP1 / Phase 1 closed)
+- **Landed** (same branch/PR #360, 7 more commits): Phase 1 fully resolved.
+  1. 23ed3049 — WP1.3 done: 6 duplicated infobox blocks in
+     services-critical.css consolidated by selector grouping (-224 lines;
+     output byte-identical — cssnano had already merged them).
+  2. 06207988 — 16 MORE orphans deleted (audit finding): components
+     buttons-migration/c-navigation/c-gravity-forms/navigation-migration
+     + dead _consolidated-utilities.css aggregator closure (12 utility
+     files incl. the very margins/padding utilities WP1.2 asked for).
+  3. d4370857 — components tree #121212 → var(--color-dark) (15 swaps);
+     foundation @imported at top of components.css; --spacing-sm/md
+     defined at live fallback values. TRAP DOCUMENTED: prepending the
+     foundation via the baseof resource slice put :root before
+     components.css's @imports → CSS invalidated them → the whole
+     components inline bundle silently vanished (caught by swap gate).
+  4. d3b049e3 — --color-primary (#1a8cff) DEFINED for the first time
+     (28 fallback-less consumers had shipped invalid for years; 6 live
+     groups codified to shipped rendering first: inherit/transparent/
+     currentColor) + ~280 literals tokenized across 50 files.
+  5. 20b4896b — --color-muted (#969798, ~168 swaps) + --radius-default
+     (4px, 137 swaps) defined + rolled out; reboot-generic button radius
+     triplets KEEP LITERAL (dedup-twin re-appearance in all 13 bundles).
+  6. WP1.2 closed obsolete, WP1.4 closed net-negative (see WP sections
+     for evidence; WP1.4: raw −6% but gzip +2-3% — transfer size LOST).
+- **Gate additions (reusable)**: swap-gate.sh (symmetric rule-level diff,
+  generic :root-def strip, inline-bundle extraction) + mq-fingerprint.pl
+  (viewport fingerprint: last-wins winner per selector/property from
+  active @media contexts at each breakpoint width — proves computed
+  equivalence for merge-product churn, twin re-splits, shorthand↔longhand).
+- **FCP evidence**: first-fold page HTML byte-identical pre/post token
+  work; external bundles +4.8KB raw (+0.18%), gzip-neutral.
+- **Quality**: per commit — swap gate + fingerprint where bytes moved +
+  test:critical 46/46 + dtest 46/46. Zero visual regressions.
+
+### 2026-07-12 (sprint 6 — swarm-verified cleanup)
+- **Landed** (branch css-migration/wp1.1-sprint-6, stacked on sprint-5,
+  4 commits): executed via swarm — two read-only verification agents
+  (deletion-manifest builder + header-race analyst), all mutations
+  sequential in the main loop under the standard gate.
+  1. e39ac043 — nav -active menu state removed (analyst option c). The
+     partialCached race means active-state NEVER worked (frozen from
+     first-rendered page; steady state = nothing highlighted) and was a
+     screenshot-flake source. Zero visual change: all 780 pages carrying
+     the inline nav bundle diff by exactly the two removed dead .-active
+     rules (verified per page). Alternative option b (make it work: key
+     header-content cache by computed active-menu id, 9 entries, ~1-2h,
+     baseline churn on section pages) documented for Paul.
+  2. b2cce936 — draft-only _test apparatus deleted: content/_test/,
+     layouts/_test/single.html + its 3 orphan partials
+     (components/hero-section, use-case-card, testimonial).
+     **CORRECTION to sprint-5 follow-up**: component-bundle.css is LIVE
+     (blog-list-css-resources.html:19 + free-consultation:7) — it and its
+     @imported component CSS (c-hero-sections, c-cta-blocks, c-pp-*) stay.
+  3. 616a94de — 6 more zero-loader CSS files deleted (swarm sweep):
+     accessibility-focus, bem-404-conversion, bem-home-page-minimal,
+     cta-backgrounds, fl-foundation, mobile-fixes. No resources.Match
+     globs exist in the theme, so loader counts are exhaustive.
+     bem-home-page-minimal carried the dead --cta-button-bg token —
+     that sprint-4 repoint follow-up dissolves.
+  4. 6166f561 — 3 zero-caller data partials deleted:
+     partials/data/{authors,testimonials,company}-cached.html.
+- **Gate**: per commit — converged production build diffed against the
+  prior commit's converged build (bundles + inline styles byte-identical,
+  zero non-noise HTML diffs) + test:critical 46/46 + dtest 46/46.
+  Zero rollbacks.
+- **Remaining follow-ups**: inline components tree tokenization (~19
+  literals); --jt-text-color/--jt-text-primary repoint (Paul);
+  fl-common-modules.css reboot purge (own sprint); WP1.2; optional
+  option-b nav active-state revival (Paul).
+
 ### 2026-07-12 (sprint 5 — orphan cleanup)
 - **Landed** (branch css-migration/wp1.1-sprint-5, one bundled PR, 6 commits,
   28 files, +24/-67,517):
diff --git a/themes/beaver/assets/css/2949-layout.css b/themes/beaver/assets/css/2949-layout.css
index 51cbe195f..406cb36d4 100644
--- a/themes/beaver/assets/css/2949-layout.css
+++ b/themes/beaver/assets/css/2949-layout.css
@@ -324,9 +324,9 @@
 }
 
 .fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
@@ -1838,7 +1838,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-mpwqa7z986ix .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-mpwqa7z986ix .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-mpwqa7z986ix .fl-rich-text, .fl-builder-content .fl-node-mpwqa7z986ix .fl-rich-text *:not(b, strong) {
@@ -2049,7 +2049,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-btqf62hv1lro .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-btqf62hv1lro .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-btqf62hv1lro .fl-rich-text, .fl-builder-content .fl-node-btqf62hv1lro .fl-rich-text *:not(b, strong) {
@@ -3510,7 +3510,7 @@ body .pp-post-feed-meta {
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text *:not(b, strong) {
@@ -4498,7 +4498,7 @@ body .pp-post-feed-meta {
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text *:not(b, strong) {
@@ -5114,35 +5114,35 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']):focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield select:focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:focus {
@@ -5376,7 +5376,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
   padding: 7px 15px;
   background-color: rgba(26, 140, 255, 0.1) !important;
   border-radius: 21px;
-  color: #1A8CFF;
+  color: var(--color-primary);
   transition: all 0.3s ease-in-out;
   margin-bottom: 8px;
 }
diff --git a/themes/beaver/assets/css/3021-layout.css b/themes/beaver/assets/css/3021-layout.css
index eb21ca65f..a41ad5d5f 100644
--- a/themes/beaver/assets/css/3021-layout.css
+++ b/themes/beaver/assets/css/3021-layout.css
@@ -286,9 +286,9 @@
 }
 
 .fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
@@ -2579,7 +2579,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-a8slipjo6r9d .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-a8slipjo6r9d .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-a8slipjo6r9d .fl-rich-text, .fl-builder-content .fl-node-a8slipjo6r9d .fl-rich-text *:not(b, strong) {
@@ -2806,7 +2806,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-37jime6o5w12 .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-37jime6o5w12 .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-37jime6o5w12 .fl-rich-text, .fl-builder-content .fl-node-37jime6o5w12 .fl-rich-text *:not(b, strong) {
@@ -4591,7 +4591,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text *:not(b, strong) {
@@ -5579,7 +5579,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text *:not(b, strong) {
@@ -6195,35 +6195,35 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']):focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield select:focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:focus {
diff --git a/themes/beaver/assets/css/3027-layout.css b/themes/beaver/assets/css/3027-layout.css
index 86ba481bf..1a0e42e58 100644
--- a/themes/beaver/assets/css/3027-layout.css
+++ b/themes/beaver/assets/css/3027-layout.css
@@ -322,9 +322,9 @@
 }
 
 .fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
@@ -998,7 +998,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-f29vwky6nx4s a:hover {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-f29vwky6nx4s {
@@ -1689,7 +1689,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-q62bxsf1m4k3 .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-q62bxsf1m4k3 .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-q62bxsf1m4k3 .fl-rich-text, .fl-builder-content .fl-node-q62bxsf1m4k3 .fl-rich-text *:not(b, strong) {
@@ -3156,7 +3156,7 @@ body .pp-post-feed-meta {
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text *:not(b, strong) {
@@ -4144,7 +4144,7 @@ body .pp-post-feed-meta {
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text *:not(b, strong) {
@@ -4763,35 +4763,35 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']):focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield select:focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:focus {
@@ -5025,7 +5025,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
   padding: 7px 15px;
   background-color: rgba(26, 140, 255, 0.1) !important;
   border-radius: 21px;
-  color: #1A8CFF;
+  color: var(--color-primary);
   transition: all 0.3s ease-in-out;
   margin-bottom: 8px;
 }
diff --git a/themes/beaver/assets/css/3059-layout.css b/themes/beaver/assets/css/3059-layout.css
index 430e932c4..f1e8eb9e9 100644
--- a/themes/beaver/assets/css/3059-layout.css
+++ b/themes/beaver/assets/css/3059-layout.css
@@ -321,9 +321,9 @@
 }
 
 .fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
diff --git a/themes/beaver/assets/css/3082-layout.css b/themes/beaver/assets/css/3082-layout.css
index 524c408f3..a337236b4 100644
--- a/themes/beaver/assets/css/3082-layout.css
+++ b/themes/beaver/assets/css/3082-layout.css
@@ -321,9 +321,9 @@
 }
 
 .fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
@@ -2315,12 +2315,12 @@ body .pp-post-feed-meta {
 
 .fl-node-z9jw2gxm5ev0 .pp-content-grid-pagination li a.page-numbers, .fl-node-z9jw2gxm5ev0 .pp-content-grid-pagination li span.page-numbers {
   background-color: rgba(255, 255, 255, 0);
-  color: #1a8cff;
+  color: var(--color-primary);
   margin-right: 5px;
 }
 
 .fl-node-z9jw2gxm5ev0 .pp-content-grid-pagination li a.page-numbers:hover, .fl-node-z9jw2gxm5ev0 .pp-content-grid-pagination li span.current, .fl-node-z9jw2gxm5ev0 .pp-content-grid-pagination li span[aria-current] {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #ffffff;
 }
 
@@ -2331,14 +2331,14 @@ body .pp-post-feed-meta {
 
 .fl-node-z9jw2gxm5ev0 .pp-content-grid-load-more a {
   background-color: rgba(255, 255, 255, 0);
-  color: #1a8cff;
+  color: var(--color-primary);
   text-align: center;
   text-decoration: none;
   transition: all 0.2s ease-in-out;
 }
 
 .fl-node-z9jw2gxm5ev0 .pp-content-grid-load-more a:hover {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #ffffff;
 }
 
@@ -2725,7 +2725,7 @@ body .pp-post-feed-meta {
   border-style: solid;
   border-width: 0;
   background-clip: border-box;
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
   border-top-width: 1px;
   border-right-width: 1px;
   border-bottom-width: 1px;
@@ -2948,7 +2948,7 @@ body .pp-post-feed-meta {
 
 .fl-node-nj7igdpblkay .pp-content-post-carousel .owl-theme .owl-dots .owl-dot span {
   opacity: 1;
-  background: #969798;
+  background: var(--color-muted);
   width: 10px;
   height: 10px;
   border-radius: 100px;
@@ -2956,7 +2956,7 @@ body .pp-post-feed-meta {
 }
 
 .fl-node-nj7igdpblkay .pp-content-post-carousel .owl-theme .owl-dots .owl-dot.active span, .fl-node-nj7igdpblkay .pp-content-post-carousel .owl-theme .owl-dots .owl-dot:hover span {
-  background: #1a8cff;
+  background: var(--color-primary);
   opacity: 1;
   box-shadow: none;
 }
@@ -3214,7 +3214,7 @@ body .pp-post-feed-meta {
 }
 
 .fl-builder-content .fl-node-c83w0r7k2b6s .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-c83w0r7k2b6s .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-c83w0r7k2b6s .fl-rich-text, .fl-builder-content .fl-node-c83w0r7k2b6s .fl-rich-text *:not(b, strong) {
@@ -3444,7 +3444,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text *:not(b, strong) {
@@ -4432,7 +4432,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-2jbfoa50irmx .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-2jbfoa50irmx .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-2jbfoa50irmx .fl-rich-text, .fl-builder-content .fl-node-2jbfoa50irmx .fl-rich-text *:not(b, strong) {
@@ -5041,35 +5041,35 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-node-jumarfbx1lcn .pp-gf-content .gform_wrapper .gfield input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-jumarfbx1lcn .pp-gf-content .gform_wrapper .gfield input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-jumarfbx1lcn .pp-gf-content .gform_wrapper .gfield input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-jumarfbx1lcn .pp-gf-content .gform_wrapper .gfield input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-jumarfbx1lcn .pp-gf-content .gform_wrapper .gfield textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-jumarfbx1lcn .pp-gf-content .gform_wrapper .gfield textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-jumarfbx1lcn .pp-gf-content .gform_wrapper .gfield textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-jumarfbx1lcn .pp-gf-content .gform_wrapper .gfield textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-jumarfbx1lcn .pp-gf-content .gform_wrapper .gfield input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']):focus, .fl-node-jumarfbx1lcn .pp-gf-content .gform_wrapper .gfield select:focus, .fl-node-jumarfbx1lcn .pp-gf-content .gform_wrapper .gfield textarea:focus {
@@ -5288,7 +5288,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
   padding: 7px 15px;
   background-color: rgba(26, 140, 255, 0.1) !important;
   border-radius: 21px;
-  color: #1A8CFF;
+  color: var(--color-primary);
   transition: all 0.3s ease-in-out;
   margin-bottom: 8px;
 }
@@ -5368,7 +5368,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
   padding: 7px 15px;
   background-color: rgba(26, 140, 255, 0.1) !important;
   border-radius: 21px;
-  color: #1A8CFF;
+  color: var(--color-primary);
   transition: all 0.3s ease-in-out;
   margin-bottom: 8px;
 }
diff --git a/themes/beaver/assets/css/3086-layout2.css b/themes/beaver/assets/css/3086-layout2.css
index bed954bf3..800526f07 100644
--- a/themes/beaver/assets/css/3086-layout2.css
+++ b/themes/beaver/assets/css/3086-layout2.css
@@ -321,9 +321,9 @@
 }
 
 .fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
@@ -1464,7 +1464,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-4h3i0s82lbyx .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-4h3i0s82lbyx .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-4h3i0s82lbyx .fl-rich-text, .fl-builder-content .fl-node-4h3i0s82lbyx .fl-rich-text *:not(b, strong) {
@@ -3139,7 +3139,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-31rjgest75um .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-31rjgest75um .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-31rjgest75um .fl-rich-text, .fl-builder-content .fl-node-31rjgest75um .fl-rich-text *:not(b, strong) {
@@ -4137,12 +4137,12 @@ body .pp-post-feed-meta {
 
 .fl-node-t2084qdhsoz6 .pp-content-grid-pagination li a.page-numbers, .fl-node-t2084qdhsoz6 .pp-content-grid-pagination li span.page-numbers {
   background-color: #ffffff;
-  color: #1a8cff;
+  color: var(--color-primary);
   margin-right: 5px;
 }
 
 .fl-node-t2084qdhsoz6 .pp-content-grid-pagination li a.page-numbers:hover, .fl-node-t2084qdhsoz6 .pp-content-grid-pagination li span.current, .fl-node-t2084qdhsoz6 .pp-content-grid-pagination li span[aria-current] {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #ffffff;
 }
 
@@ -4153,14 +4153,14 @@ body .pp-post-feed-meta {
 
 .fl-node-t2084qdhsoz6 .pp-content-grid-load-more a {
   background-color: #ffffff;
-  color: #1a8cff;
+  color: var(--color-primary);
   text-align: center;
   text-decoration: none;
   transition: all 0.2s ease-in-out;
 }
 
 .fl-node-t2084qdhsoz6 .pp-content-grid-load-more a:hover {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #ffffff;
 }
 
@@ -4554,7 +4554,7 @@ body .pp-post-feed-meta {
   border-style: solid;
   border-width: 0;
   background-clip: border-box;
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
   border-top-width: 1px;
   border-right-width: 1px;
   border-bottom-width: 1px;
@@ -4864,35 +4864,35 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-node-erl54g069p1u .pp-gf-content .gform_wrapper .gfield input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-erl54g069p1u .pp-gf-content .gform_wrapper .gfield input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-erl54g069p1u .pp-gf-content .gform_wrapper .gfield input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-erl54g069p1u .pp-gf-content .gform_wrapper .gfield input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-erl54g069p1u .pp-gf-content .gform_wrapper .gfield textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-erl54g069p1u .pp-gf-content .gform_wrapper .gfield textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-erl54g069p1u .pp-gf-content .gform_wrapper .gfield textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-erl54g069p1u .pp-gf-content .gform_wrapper .gfield textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-erl54g069p1u .pp-gf-content .gform_wrapper .gfield input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']):focus, .fl-node-erl54g069p1u .pp-gf-content .gform_wrapper .gfield select:focus, .fl-node-erl54g069p1u .pp-gf-content .gform_wrapper .gfield textarea:focus {
@@ -5129,7 +5129,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 
 .fl-node-t2084qdhsoz6 .career-detail h4 {
   font-size: 14px;
-  color: #1A8CFF;
+  color: var(--color-primary);
   margin: 0 0 10px 0;
 }
 
diff --git a/themes/beaver/assets/css/3114-layout.css b/themes/beaver/assets/css/3114-layout.css
index a515e3b03..fff0e54df 100644
--- a/themes/beaver/assets/css/3114-layout.css
+++ b/themes/beaver/assets/css/3114-layout.css
@@ -328,9 +328,9 @@
 }
 
 .fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
@@ -1727,35 +1727,35 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']):focus, .fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield select:focus, .fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield textarea:focus {
@@ -1916,7 +1916,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-builder-content .fl-node-hsl7934fxqjw .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-hsl7934fxqjw .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-hsl7934fxqjw .fl-rich-text, .fl-builder-content .fl-node-hsl7934fxqjw .fl-rich-text *:not(b, strong) {
@@ -2055,7 +2055,7 @@ span.pp-accordion-button-icon {
 }
 
 .fl-node-lokc5ru7ftaj .pp-accordion-item .pp-accordion-button:hover, .fl-node-lokc5ru7ftaj .pp-accordion-item.pp-accordion-item-active .pp-accordion-button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #ffffff;
 }
 
@@ -2135,7 +2135,7 @@ span.pp-accordion-button-icon {
 }
 
 .fl-node-hwc8puan960k .pp-accordion-item .pp-accordion-button:hover, .fl-node-hwc8puan960k .pp-accordion-item.pp-accordion-item-active .pp-accordion-button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #ffffff;
 }
 
diff --git a/themes/beaver/assets/css/404.css b/themes/beaver/assets/css/404.css
index ae03dfd5f..f01004ba1 100644
--- a/themes/beaver/assets/css/404.css
+++ b/themes/beaver/assets/css/404.css
@@ -353,7 +353,7 @@
 .fl-builder-content a.fl-button,
 .fl-builder-content a.fl-button:visited {
   border-radius: 25px;
-  -moz-border-radius: 4px;
+  -moz-border-radius: var(--radius-default);
   -webkit-border-radius: 25px;
   display: inline-block;
   font-size: 16px;
@@ -1136,7 +1136,7 @@ img.mfp-img {
   transition-timing-function: ease;
   transition-duration: 0.15s;
   transition-property: transform;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 .pp-advanced-menu-mobile-toggle
   .pp-hamburger
@@ -1732,7 +1732,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
   .pp-toggle-none
   li.focus
   .pp-menu-toggle:before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 .fl-node-menu
   .pp-advanced-menu
@@ -1758,7 +1758,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
   li
   a:focus
   .pp-menu-toggle:before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 .fl-node-menu .menu > li > a:hover,
 .fl-node-menu .menu > li > a:focus,
@@ -1766,7 +1766,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 .fl-node-menu .menu > li.focus > .pp-has-submenu-container > a,
 .fl-node-menu .menu > li.current-menu-item > a,
 .fl-node-menu .menu > li.current-menu-item > .pp-has-submenu-container > a {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-node-menu
   .pp-advanced-menu
@@ -1800,7 +1800,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
   li.current-menu-item
   > .pp-has-submenu-container
   .pp-menu-toggle:before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 .fl-node-menu .menu .pp-has-submenu .sub-menu {
   display: none;
@@ -1841,7 +1841,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 .fl-node-menu .sub-menu > li > .pp-has-submenu-container > a:focus,
 .fl-node-menu .sub-menu > li.current-menu-item > a,
 .fl-node-menu .sub-menu > li.current-menu-item > .pp-has-submenu-container > a {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-node-menu
   .pp-advanced-menu
@@ -1867,7 +1867,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
   .sub-menu
   li:hover
   .pp-menu-toggle:before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 .fl-node-menu .pp-advanced-menu .pp-menu-toggle:before {
   content: "";
@@ -2554,7 +2554,7 @@ body:not(.single-fl-theme-layout)
   color: #ffffff;
 }
 .fl-builder-content .fl-node-ntfp1iza9jy8 a {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-builder-content .fl-node-ntfp1iza9jy8 a:hover {
   color: #ffffff;
@@ -2601,7 +2601,7 @@ body:not(.single-fl-theme-layout)
   }
 }
 .fl-builder-content .fl-node-5dcip6gnz2at a {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-builder-content .fl-node-5dcip6gnz2at a:hover {
   color: #ffffff;
@@ -2629,7 +2629,7 @@ body:not(.single-fl-theme-layout)
   }
 }
 .fl-builder-content .fl-node-7p1us6kjlz9d a {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-builder-content .fl-node-7p1us6kjlz9d a:hover {
   color: #ffffff;
@@ -2657,7 +2657,7 @@ body:not(.single-fl-theme-layout)
   }
 }
 .fl-builder-content .fl-node-fxtbmly0wvq4 a {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-builder-content .fl-node-fxtbmly0wvq4 a:hover {
   color: #ffffff;
@@ -2775,7 +2775,7 @@ body:not(.single-fl-theme-layout)
 }
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text,
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text * {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-rich-text,
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-rich-text *:not(b, strong) {
@@ -3301,7 +3301,7 @@ body:not(.single-fl-theme-layout)
 .fl-builder-content .fl-node-c9g2sra65u04 a.fl-button:visited,
 .fl-builder-content .fl-node-c9g2sra65u04 a.fl-button *,
 .fl-builder-content .fl-node-c9g2sra65u04 a.fl-button:visited * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-builder-content .fl-node-c9g2sra65u04 a.fl-button:hover,
 .fl-builder-content .fl-node-c9g2sra65u04 a.fl-button:hover span.fl-button-text,
@@ -4759,10 +4759,10 @@ body .pp-post-feed-meta {
   text-decoration: none;
 }
 .fl-node-5nxtj94i8khs .post-terms ul li a:hover {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-node-5nxtj94i8khs .pp-content-grid-post-title:hover a {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-node-5nxtj94i8khs .pp-content-grid-post-image {
   padding: 0;
@@ -4831,6 +4831,6 @@ body .pp-post-feed-meta {
     "Segoe UI Emoji",
     "Segoe UI Symbol",
     "Noto Color Emoji";
-  color: #969798;
+  color: var(--color-muted);
   margin-bottom: 0;
 }
diff --git a/themes/beaver/assets/css/586.css b/themes/beaver/assets/css/586.css
index 6f996ee34..ef9289788 100644
--- a/themes/beaver/assets/css/586.css
+++ b/themes/beaver/assets/css/586.css
@@ -50,7 +50,7 @@ body a, body .fl-button, body .pp-button, body button, body input[type="submit"]
   display: block;
   width: 100%;
   height: 40px;
-  background-color: #1A8CFF;
+  background-color: var(--color-primary);
   position: absolute;
   bottom: 0;
   left: 0;
@@ -66,7 +66,7 @@ body a, body .fl-button, body .pp-button, body button, body input[type="submit"]
   display: block;
   width: 100%;
   height: 40px;
-  background-color: #1A8CFF;
+  background-color: var(--color-primary);
   position: absolute;
   bottom: 0;
   left: 0;
@@ -131,7 +131,7 @@ body a, body .fl-button, body .pp-button, body button, body input[type="submit"]
   width: 18px;
   height: 18px;
   border: 1px solid #DEDEDE;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
   top: 0px;
 }
 
@@ -151,10 +151,10 @@ body a, body .fl-button, body .pp-button, body button, body input[type="submit"]
   top: 0;
   width: 18px;
   height: 18px;
-  border: 2px solid #1A8CFF;
-  background-color: #1A8CFF;
+  border: 2px solid var(--color-primary);
+  background-color: var(--color-primary);
   z-index: 0;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 
 .gform_wrapper form .gform_body .gform_fields .gfield .ginput_container.ginput_container_checkbox .gfield_checkbox .gchoice input:checked + label:before {
@@ -217,9 +217,9 @@ body a, body .fl-button, body .pp-button, body button, body input[type="submit"]
 }
 
 .gform_wrapper form .gform_body .gform_fields .gfield .ginput_container.ginput_container_radio .gfield_radio .gchoice input:checked + label, .gform_wrapper form .gform_body .gform_fields .gfield .ginput_container.ginput_container_radio .gfield_radio .gchoice input:focus + label {
-  background: #1A8CFF !important;
+  background: var(--color-primary) !important;
   color: #FFF;
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 .gform_wrapper form .gform_body .gform_fields .gfield .ginput_container.ginput_container_radio .gfield_radio .gchoice label {
@@ -233,7 +233,7 @@ body a, body .fl-button, body .pp-button, body button, body input[type="submit"]
 }
 
 .gform_wrapper form .gform_body .gform_fields .gfield .ginput_container.ginput_container_radio .gfield_radio .gchoice label:hover {
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 @media (max-width: 860px) {
@@ -310,7 +310,7 @@ footer .footer-menu.careers-text .fl-rich-text p:last-child a strong {
   color: #FFF;
   font-size: 10px;
   padding: 3px 6px;
-  background-color: #1A8CFF;
+  background-color: var(--color-primary);
   border-radius: 10px;
   display: inline-block;
   margin-left: 5px;
@@ -356,11 +356,11 @@ footer .footer-menu.careers-text .fl-rich-text p:last-child a strong {
 }
 
 .jt-service-box:hover .pp-infobox-description .pp-infobox-button .pp-more-link {
-  color: #1A8CFF !important;
+  color: var(--color-primary) !important;
 }
 
 .jt-service-box:hover .pp-infobox-description .pp-infobox-button .pp-more-link i {
-  color: #1A8CFF !important;
+  color: var(--color-primary) !important;
 }
 
 .jt-case-study > .fl-col-content {
@@ -394,7 +394,7 @@ footer .footer-menu.careers-text .fl-rich-text p:last-child a strong {
 }
 
 .jt-case-study > .fl-col-content:hover {
-  border-color: #1A8CFF !important;
+  border-color: var(--color-primary) !important;
 }
 
 .jt-case-study.jt-case-study--light li {
@@ -402,7 +402,7 @@ footer .footer-menu.careers-text .fl-rich-text p:last-child a strong {
 }
 
 .jt-case-study.jt-case-study--light li a {
-  color: #1A8CFF !important;
+  color: var(--color-primary) !important;
   font-weight: 700 !important;
 }
 
@@ -461,7 +461,7 @@ footer .footer-menu.careers-text .fl-rich-text p:last-child a strong {
 
 .jt-tabs .pp-tabs .pp-tabs-panels .pp-tabs-panel .pp-tabs-panel-content div a {
   padding: 12px 25px;
-  background-color: #1A8CFF;
+  background-color: var(--color-primary);
   color: #FFF;
   border-radius: 25px;
   font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
@@ -601,7 +601,7 @@ footer .footer-menu.careers-text .fl-rich-text p:last-child a strong {
 
 /* Blog */
 .blog-archive-search .pp-post-filters-wrapper .pp-post-filters-toggle {
-  background-color: #1A8CFF;
+  background-color: var(--color-primary);
   padding: 9px 20px;
   border-radius: 21px;
   margin-bottom: 20px;
@@ -893,8 +893,8 @@ footer .footer-menu.careers-text .fl-rich-text p:last-child a strong {
 }
 
 .uk-toc ul li.active a {
-  border-left-color: #1A8CFF;
-  color: #1A8CFF !important;
+  border-left-color: var(--color-primary);
+  color: var(--color-primary) !important;
 }
 
 /* Client Details */
@@ -1084,7 +1084,7 @@ footer .footer-menu.careers-text .fl-rich-text p:last-child a strong {
   margin-right: 10px;
   background: rgba(26, 141, 255, 0.1);
   border: unset;
-  color: #1A8CFF;
+  color: var(--color-primary);
   padding: 10px 12px;
   font-weight: 500;
   font-size: 14px;
diff --git a/themes/beaver/assets/css/590-layout.css b/themes/beaver/assets/css/590-layout.css
index 679436114..1b9f8bc7c 100644
--- a/themes/beaver/assets/css/590-layout.css
+++ b/themes/beaver/assets/css/590-layout.css
@@ -933,7 +933,7 @@
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text *:not(b, strong) {
@@ -1842,7 +1842,7 @@
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text *:not(b, strong) {
@@ -2458,35 +2458,35 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']):focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield select:focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:focus {
@@ -5407,7 +5407,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-gzqkfypea6jx .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-gzqkfypea6jx .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-gzqkfypea6jx .fl-rich-text, .fl-builder-content .fl-node-gzqkfypea6jx .fl-rich-text *:not(b, strong) {
@@ -5760,7 +5760,7 @@ img.mfp-img {
 }
 
 .fl-node-dxali8vntcr0 .pp-infobox .pp-more-link:hover {
-  color: #1a8cff;
+  color: var(--color-primary);
   background-color: rgba(255, 0, 0, 0);
 }
 
@@ -5770,7 +5770,7 @@ img.mfp-img {
 }
 
 .fl-node-dxali8vntcr0 .pp-infobox .pp-more-link:hover .pp-button-icon {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-dxali8vntcr0 .pp-infobox .pp-more-link .pp-button-icon-left {
@@ -5958,7 +5958,7 @@ img.mfp-img {
 }
 
 .fl-node-075ztwhd3cxn .pp-infobox .pp-more-link:hover {
-  color: #1a8cff;
+  color: var(--color-primary);
   background-color: rgba(255, 0, 0, 0);
 }
 
@@ -5968,7 +5968,7 @@ img.mfp-img {
 }
 
 .fl-node-075ztwhd3cxn .pp-infobox .pp-more-link:hover .pp-button-icon {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-075ztwhd3cxn .pp-infobox .pp-more-link .pp-button-icon-left {
@@ -6156,7 +6156,7 @@ img.mfp-img {
 }
 
 .fl-node-lajty926uxf5 .pp-infobox .pp-more-link:hover {
-  color: #1a8cff;
+  color: var(--color-primary);
   background-color: rgba(255, 0, 0, 0);
 }
 
@@ -6166,7 +6166,7 @@ img.mfp-img {
 }
 
 .fl-node-lajty926uxf5 .pp-infobox .pp-more-link:hover .pp-button-icon {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-lajty926uxf5 .pp-infobox .pp-more-link .pp-button-icon-left {
@@ -6374,7 +6374,7 @@ img.mfp-img {
 }
 
 .fl-node-do5fjakv8b29 .pp-infobox .pp-more-link:hover {
-  color: #1a8cff;
+  color: var(--color-primary);
   background-color: rgba(255, 0, 0, 0);
 }
 
@@ -6384,7 +6384,7 @@ img.mfp-img {
 }
 
 .fl-node-do5fjakv8b29 .pp-infobox .pp-more-link:hover .pp-button-icon {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-do5fjakv8b29 .pp-infobox .pp-more-link .pp-button-icon-left {
@@ -6572,7 +6572,7 @@ img.mfp-img {
 }
 
 .fl-node-3eq5kcmfz0an .pp-infobox .pp-more-link:hover {
-  color: #1a8cff;
+  color: var(--color-primary);
   background-color: rgba(255, 0, 0, 0);
 }
 
@@ -6582,7 +6582,7 @@ img.mfp-img {
 }
 
 .fl-node-3eq5kcmfz0an .pp-infobox .pp-more-link:hover .pp-button-icon {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-3eq5kcmfz0an .pp-infobox .pp-more-link .pp-button-icon-left {
@@ -6830,7 +6830,7 @@ img.mfp-img {
 }
 
 .fl-node-v3gpr4klqmob .pp-infobox .pp-more-link:hover {
-  color: #1a8cff;
+  color: var(--color-primary);
   background-color: rgba(255, 0, 0, 0);
 }
 
@@ -6840,7 +6840,7 @@ img.mfp-img {
 }
 
 .fl-node-v3gpr4klqmob .pp-infobox .pp-more-link:hover .pp-button-icon {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-v3gpr4klqmob .pp-infobox .pp-more-link .pp-button-icon-left {
@@ -6938,7 +6938,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-4r2tb7ypensf .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-4r2tb7ypensf .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-4r2tb7ypensf .fl-rich-text, .fl-builder-content .fl-node-4r2tb7ypensf .fl-rich-text *:not(b, strong) {
@@ -7170,7 +7170,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-fly7i4ba56vm .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-fly7i4ba56vm .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-fly7i4ba56vm .fl-rich-text, .fl-builder-content .fl-node-fly7i4ba56vm .fl-rich-text *:not(b, strong) {
@@ -8643,7 +8643,7 @@ body .pp-post-feed-meta {
 }
 
 .fl-builder-content .fl-node-yhi0uwsxjfr7 .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-yhi0uwsxjfr7 .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-yhi0uwsxjfr7 .fl-rich-text, .fl-builder-content .fl-node-yhi0uwsxjfr7 .fl-rich-text *:not(b, strong) {
@@ -9585,7 +9585,7 @@ body .pp-post-feed-meta {
 }
 
 .fl-builder-content .fl-node-qyvt504hwa8m .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-qyvt504hwa8m .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-qyvt504hwa8m .fl-rich-text, .fl-builder-content .fl-node-qyvt504hwa8m .fl-rich-text *:not(b, strong) {
@@ -10609,7 +10609,7 @@ body .pp-post-feed-meta {
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text *:not(b, strong) {
@@ -11518,7 +11518,7 @@ body .pp-post-feed-meta {
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text *:not(b, strong) {
@@ -12134,35 +12134,35 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']):focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield select:focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:focus {
diff --git a/themes/beaver/assets/css/701-layout.css b/themes/beaver/assets/css/701-layout.css
index a0f35c081..49f13013b 100644
--- a/themes/beaver/assets/css/701-layout.css
+++ b/themes/beaver/assets/css/701-layout.css
@@ -325,9 +325,9 @@
 }
 
 .fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
@@ -1602,7 +1602,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-ows5td8cbip3 .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-ows5td8cbip3 .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-ows5td8cbip3 .fl-rich-text, .fl-builder-content .fl-node-ows5td8cbip3 .fl-rich-text *:not(b, strong) {
@@ -1621,7 +1621,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-6d9equxbio2h .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-6d9equxbio2h .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-6d9equxbio2h .fl-rich-text, .fl-builder-content .fl-node-6d9equxbio2h .fl-rich-text *:not(b, strong) {
@@ -1640,7 +1640,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-wju40a395zbl .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-wju40a395zbl .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-wju40a395zbl .fl-rich-text, .fl-builder-content .fl-node-wju40a395zbl .fl-rich-text *:not(b, strong) {
@@ -2489,7 +2489,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-nb2thxdw075q .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-nb2thxdw075q .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-nb2thxdw075q .fl-rich-text, .fl-builder-content .fl-node-nb2thxdw075q .fl-rich-text *:not(b, strong) {
@@ -2633,7 +2633,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text *:not(b, strong) {
@@ -3621,7 +3621,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text *:not(b, strong) {
@@ -4240,35 +4240,35 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']):focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield select:focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:focus {
diff --git a/themes/beaver/assets/css/706-layout.css b/themes/beaver/assets/css/706-layout.css
index 4a9a4b211..a45744841 100644
--- a/themes/beaver/assets/css/706-layout.css
+++ b/themes/beaver/assets/css/706-layout.css
@@ -325,9 +325,9 @@
 }
 
 .fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
@@ -1714,35 +1714,35 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-node-dzu3licn9ow5 .pp-gf-content .gform_wrapper .gfield input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-dzu3licn9ow5 .pp-gf-content .gform_wrapper .gfield input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-dzu3licn9ow5 .pp-gf-content .gform_wrapper .gfield input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-dzu3licn9ow5 .pp-gf-content .gform_wrapper .gfield input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-dzu3licn9ow5 .pp-gf-content .gform_wrapper .gfield textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-dzu3licn9ow5 .pp-gf-content .gform_wrapper .gfield textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-dzu3licn9ow5 .pp-gf-content .gform_wrapper .gfield textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-dzu3licn9ow5 .pp-gf-content .gform_wrapper .gfield textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-dzu3licn9ow5 .pp-gf-content .gform_wrapper .gfield input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']):focus, .fl-node-dzu3licn9ow5 .pp-gf-content .gform_wrapper .gfield select:focus, .fl-node-dzu3licn9ow5 .pp-gf-content .gform_wrapper .gfield textarea:focus {
@@ -1904,7 +1904,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-builder-content .fl-node-aqltr65gjmz4 .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-aqltr65gjmz4 .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-aqltr65gjmz4 .fl-rich-text, .fl-builder-content .fl-node-aqltr65gjmz4 .fl-rich-text *:not(b, strong) {
@@ -2043,7 +2043,7 @@ span.pp-accordion-button-icon {
 }
 
 .fl-node-bsgr4vwu32cn .pp-accordion-item .pp-accordion-button:hover, .fl-node-bsgr4vwu32cn .pp-accordion-item.pp-accordion-item-active .pp-accordion-button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #ffffff;
 }
 
@@ -2123,7 +2123,7 @@ span.pp-accordion-button-icon {
 }
 
 .fl-node-qupih6a9xymw .pp-accordion-item .pp-accordion-button:hover, .fl-node-qupih6a9xymw .pp-accordion-item.pp-accordion-item-active .pp-accordion-button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #ffffff;
 }
 
diff --git a/themes/beaver/assets/css/737-layout.css b/themes/beaver/assets/css/737-layout.css
index cbdd5202c..deda91d41 100644
--- a/themes/beaver/assets/css/737-layout.css
+++ b/themes/beaver/assets/css/737-layout.css
@@ -325,9 +325,9 @@
 }
 
 .fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
@@ -1632,7 +1632,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-5auhpfbjkslc .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-5auhpfbjkslc .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-5auhpfbjkslc .fl-rich-text, .fl-builder-content .fl-node-5auhpfbjkslc .fl-rich-text *:not(b, strong) {
@@ -2031,7 +2031,7 @@ img.mfp-img {
 }
 
 .fl-node-0pigeztak1xl .pp-infobox .pp-more-link {
-  color: #1a8cff;
+  color: var(--color-primary);
   background-color: rgba(255, 0, 0, 0);
   text-decoration: none;
   text-align: center;
@@ -2045,7 +2045,7 @@ img.mfp-img {
 
 .fl-node-0pigeztak1xl .pp-infobox .pp-more-link .pp-button-icon {
   font-size: 22px;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-0pigeztak1xl .pp-infobox .pp-more-link:hover .pp-button-icon {
@@ -2282,7 +2282,7 @@ img.mfp-img {
 }
 
 .fl-node-ugiypbhnvlfw .pp-infobox .pp-more-link {
-  color: #1a8cff;
+  color: var(--color-primary);
   background-color: rgba(255, 0, 0, 0);
   text-decoration: none;
   text-align: center;
@@ -2296,7 +2296,7 @@ img.mfp-img {
 
 .fl-node-ugiypbhnvlfw .pp-infobox .pp-more-link .pp-button-icon {
   font-size: 22px;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-ugiypbhnvlfw .pp-infobox .pp-more-link:hover .pp-button-icon {
@@ -2533,7 +2533,7 @@ img.mfp-img {
 }
 
 .fl-node-h2wjp3zb7afk .pp-infobox .pp-more-link {
-  color: #1a8cff;
+  color: var(--color-primary);
   background-color: rgba(255, 0, 0, 0);
   text-decoration: none;
   text-align: center;
@@ -2547,7 +2547,7 @@ img.mfp-img {
 
 .fl-node-h2wjp3zb7afk .pp-infobox .pp-more-link .pp-button-icon {
   font-size: 22px;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-h2wjp3zb7afk .pp-infobox .pp-more-link:hover .pp-button-icon {
@@ -2804,7 +2804,7 @@ img.mfp-img {
 }
 
 .fl-node-nwx7eiysakvl .pp-infobox .pp-more-link {
-  color: #1a8cff;
+  color: var(--color-primary);
   background-color: rgba(255, 0, 0, 0);
   text-decoration: none;
   text-align: center;
@@ -2818,7 +2818,7 @@ img.mfp-img {
 
 .fl-node-nwx7eiysakvl .pp-infobox .pp-more-link .pp-button-icon {
   font-size: 22px;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-nwx7eiysakvl .pp-infobox .pp-more-link:hover .pp-button-icon {
@@ -3055,7 +3055,7 @@ img.mfp-img {
 }
 
 .fl-node-a5khmr6nto3z .pp-infobox .pp-more-link {
-  color: #1a8cff;
+  color: var(--color-primary);
   background-color: rgba(255, 0, 0, 0);
   text-decoration: none;
   text-align: center;
@@ -3069,7 +3069,7 @@ img.mfp-img {
 
 .fl-node-a5khmr6nto3z .pp-infobox .pp-more-link .pp-button-icon {
   font-size: 22px;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-a5khmr6nto3z .pp-infobox .pp-more-link:hover .pp-button-icon {
@@ -3306,7 +3306,7 @@ img.mfp-img {
 }
 
 .fl-node-2ufxtslray80 .pp-infobox .pp-more-link {
-  color: #1a8cff;
+  color: var(--color-primary);
   background-color: rgba(255, 0, 0, 0);
   text-decoration: none;
   text-align: center;
@@ -3320,7 +3320,7 @@ img.mfp-img {
 
 .fl-node-2ufxtslray80 .pp-infobox .pp-more-link .pp-button-icon {
   font-size: 22px;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-2ufxtslray80 .pp-infobox .pp-more-link:hover .pp-button-icon {
@@ -3422,7 +3422,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-qilu3d2rcznf .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-qilu3d2rcznf .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-qilu3d2rcznf .fl-rich-text, .fl-builder-content .fl-node-qilu3d2rcznf .fl-rich-text *:not(b, strong) {
@@ -3646,7 +3646,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-qpg38hyjbo4z .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-qpg38hyjbo4z .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-qpg38hyjbo4z .fl-rich-text, .fl-builder-content .fl-node-qpg38hyjbo4z .fl-rich-text *:not(b, strong) {
@@ -4670,7 +4670,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text, .fl-builder-content .fl-node-byg0v6ftixrd .fl-rich-text *:not(b, strong) {
@@ -5658,7 +5658,7 @@ img.mfp-img {
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text *:not(b, strong) {
@@ -6274,35 +6274,35 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']):focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield select:focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:focus {
diff --git a/themes/beaver/assets/css/accessibility-focus.css b/themes/beaver/assets/css/accessibility-focus.css
deleted file mode 100644
index eff6b0bee..000000000
--- a/themes/beaver/assets/css/accessibility-focus.css
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Accessibility Focus Styles
- * Provides WCAG-compliant focus indicators for all interactive elements
- * Skip navigation and screen reader utilities
- */
-
-/* Skip navigation link for accessibility */
-.skip-link {
-  position: absolute;
-  top: -40px;
-  left: 6px;
-  z-index: 999999;
-  color: #fff;
-  background: #000;
-  text-decoration: none;
-  padding: 8px 16px;
-  border-radius: 3px;
-  font-weight: bold;
-  transition: top 0.3s ease;
-}
-
-.skip-link:focus,
-.skip-link:active {
-  top: 6px;
-}
-
-/* Screen reader only text */
-.sr-only {
-  position: absolute !important;
-  clip: rect(1px, 1px, 1px, 1px);
-  clip-path: inset(50%);
-  width: 1px;
-  height: 1px;
-  overflow: hidden;
-}
-
-.sr-only:focus {
-  position: static !important;
-  clip: auto;
-  clip-path: none;
-  width: auto;
-  height: auto;
-  overflow: visible;
-}
-
-/* Focus Visible Support for Older Browsers */
-.js-focus-visible :focus:not(.focus-visible) {
-  outline: none;
-}
-
-/* Default Focus Styles for Interactive Elements */
-a:focus-visible,
-button:focus-visible,
-input:focus-visible,
-textarea:focus-visible,
-select:focus-visible,
-[tabindex]:focus-visible {
-  outline: 2px solid #1a8cff;
-  outline-offset: 2px;
-}
-
-/* Custom Form Control Focus Styles */
-
-/* Custom Checkbox Focus Styles */
-input[type="checkbox"]:focus-visible + label::before,
-input[type="checkbox"]:focus + label::before {
-  outline: 2px solid #1a8cff;
-  outline-offset: 2px;
-  border-radius: 3px;
-}
-
-/* Custom Radio Button Focus Styles */
-input[type="radio"]:focus-visible + label::before,
-input[type="radio"]:focus + label::before {
-  outline: 2px solid #1a8cff;
-  outline-offset: 2px;
-  border-radius: 50%;
-}
-
-/* Gravity Forms Focus Styles */
-.gform_wrapper input[type="checkbox"]:focus-visible + label::before,
-.gform_wrapper input[type="checkbox"]:focus + label::before {
-  outline: 2px solid #1a8cff;
-  outline-offset: 2px;
-  box-shadow: 0 0 0 3px rgba(26, 140, 255, 0.2);
-}
-
-.gform_wrapper input[type="radio"]:focus-visible + label::before,
-.gform_wrapper input[type="radio"]:focus + label::before {
-  outline: 2px solid #1a8cff;
-  outline-offset: 2px;
-  box-shadow: 0 0 0 3px rgba(26, 140, 255, 0.2);
-}
-
-/* Enhanced Focus for Submit Buttons */
-.gform_wrapper input[type="submit"]:focus-visible,
-.gform_wrapper .gform_button:focus-visible {
-  outline: 2px solid #fff;
-  outline-offset: 2px;
-  box-shadow: 0 0 0 4px rgba(26, 140, 255, 0.5);
-}
-
-/* Skip Link Focus Styles */
-.skip-link:focus-visible {
-  position: static;
-  width: auto;
-  height: auto;
-  margin: 0;
-  overflow: visible;
-  clip: unset;
-  outline: 3px solid #1a8cff;
-  outline-offset: 2px;
-  background: #1a8cff;
-  color: #fff;
-  padding: 8px 16px;
-  text-decoration: none;
-  z-index: 100000;
-}
-
-/* Focus Styles for Social Icons */
-.pp-social-icon a:focus-visible {
-  outline: 2px solid #1a8cff;
-  outline-offset: 2px;
-  border-radius: 4px;
-}
-
-/* Focus Styles for Custom Styled Links */
-.fl-button:focus-visible,
-.button:focus-visible {
-  outline: 2px solid #fff;
-  outline-offset: 2px;
-  box-shadow: 0 0 0 4px rgba(26, 140, 255, 0.5);
-}
-
-/* High Contrast Mode Support */
-@media (prefers-contrast: high) {
-  a:focus-visible,
-  button:focus-visible,
-  input:focus-visible,
-  textarea:focus-visible,
-  select:focus-visible,
-  [tabindex]:focus-visible {
-    outline: 3px solid;
-    outline-offset: 2px;
-  }
-}
-
-/* Reduced Motion Support */
-@media (prefers-reduced-motion: reduce) {
-  *:focus-visible {
-    transition: none;
-  }
-}
-
-/* Mobile/Touch Focus Enhancements */
-@media (max-width: 768px) {
-  a:focus-visible,
-  button:focus-visible,
-  input:focus-visible,
-  textarea:focus-visible,
-  select:focus-visible {
-    outline-width: 3px;
-    outline-offset: 3px;
-  }
-}
-
-/* Focus Trap for Modal Content */
-.modal:focus-within {
-  outline: none;
-}
-
-.modal [tabindex]:focus-visible {
-  outline: 2px solid #1a8cff;
-  outline-offset: 2px;
-}
-
-/* Keyboard Navigation Indicators for Dropdowns */
-.dropdown-menu a:focus-visible,
-.sub-menu a:focus-visible {
-  outline: 2px solid #1a8cff;
-  outline-offset: -2px;
-  background-color: rgba(26, 140, 255, 0.1);
-}
\ No newline at end of file
diff --git a/themes/beaver/assets/css/bem-404-conversion.css b/themes/beaver/assets/css/bem-404-conversion.css
deleted file mode 100644
index f89ffff53..000000000
--- a/themes/beaver/assets/css/bem-404-conversion.css
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * BEM Conversion CSS for 404 Page
- * Conservative dual-class approach: keeping fl-node classes while adding semantic BEM
- * Phase 1: Add BEM classes alongside fl-node for safe transition
- * Phase 2: Remove fl-node classes after validation (future task)
- */
-
-/* Error Page Main Container */
-.error-page {
-  /* BEM class for main 404 page container */
-  /* Semantic: Main error page wrapper */
-}
-
-/* Error Page Hero Section */
-.error-page__hero {
-  /* Replaces: fl-node-cydnh3z89fkb */
-  /* Semantic: Main hero row with background layers */
-}
-
-.error-page__hero-content {
-  /* Replaces: fl-node-content (within hero) */
-  /* Semantic: Hero content wrapper */
-}
-
-/* Error Page Main Section (Two-Column Layout) */
-.error-page__main-section {
-  /* Replaces: fl-node-p0fg9w7ec5ut */
-  /* Semantic: Two-column layout for message and image */
-}
-
-/* Error Page Message Column */
-.error-page__message-col {
-  /* Replaces: fl-node-0ptma2d86ugo */
-  /* Semantic: Left column with error message */
-}
-
-/* Error Page Image Column */
-.error-page__image-col {
-  /* Replaces: fl-node-1amo8q937zkf */
-  /* Semantic: Right column with 404 illustration */
-}
-
-/* Error Page Spacer Section */
-.error-page__spacer-section {
-  /* Replaces: fl-node-wngd074viayh */
-  /* Semantic: Spacing section between hero and CTA */
-}
-
-/* Error Page CTA Section */
-.error-page__cta-section {
-  /* Replaces: fl-node-l0ph4ozc7qgv */
-  /* Semantic: Call-to-action section */
-}
-
-/* BEM Mapping Reference for 404 Page
- * This mapping shows the fl-node to BEM class conversion for dual-class approach:
- *
- * fl-page-content → error-page (main container)
- * fl-node-cydnh3z89fkb → error-page__hero (hero section)
- * fl-node-p0fg9w7ec5ut → error-page__main-section (two-column layout)
- * fl-node-0ptma2d86ugo → error-page__message-col (message column)
- * fl-node-1amo8q937zkf → error-page__image-col (image column)
- * fl-node-wngd074viayh → error-page__spacer-section (spacer section)
- * fl-node-l0ph4ozc7qgv → error-page__cta-section (CTA section)
- */
\ No newline at end of file
diff --git a/themes/beaver/assets/css/bem-home-page-minimal.css b/themes/beaver/assets/css/bem-home-page-minimal.css
deleted file mode 100644
index 4448ef713..000000000
--- a/themes/beaver/assets/css/bem-home-page-minimal.css
+++ /dev/null
@@ -1,780 +0,0 @@
-/*
- * Minimal BEM (Block Element Modifier) CSS for Home Page
- * Only semantic class hooks without visual changes
- * These classes provide semantic naming without altering existing FL-builder styles
- */
-
-/* CSS Custom Properties for Future Use */
-:root {
-  --color-primary: #1a8cff;
-  --infobox-spacing: 15px;
-  --infobox-margin: 25px;
-  --form-background: #F5F6F8;
-  --form-field-spacing: 20px;
-  --cta-button-bg: #121212;
-  --cta-button-hover-bg: #24292D;
-  --cta-button-margin: 40px;
-  --cta-section-spacing: 15px;
-  --cta-text-color: #ffffff;
-  --cta-button-border: #060606;
-}
-
-/* ================================================
-   SEMANTIC CLASS HOOKS ONLY
-   No layout, margin, padding, or visual changes
-   ================================================ */
-
-/* Why Us Section - Semantic hook only */
-.c-why-us {
-  /* Migrated styles from FL-node-pym08gf9wr2o */
-}
-
-.c-why-us .fl-row-content {
-  min-width: 0px;
-}
-
-.c-why-us > .fl-row-content-wrap {
-  background-repeat: no-repeat;
-  background-position: center top;
-  background-attachment: scroll;
-  background-size: cover;
-  padding-top: 130px;
-  padding-bottom: 0px;
-}
-
-.c-why-us .fl-builder-bottom-edge-layer {
-  bottom: -0.5%;
-}
-
-.c-why-us .fl-builder-bottom-edge-layer > * {
-  width: 100%;
-  left: calc(50% - 50%);
-  right: auto;
-  height: 7%;
-  top: auto;
-  bottom: 0;
-  transform: scaleX(-1) scaleY(-1);
-}
-
-.c-why-us .fl-builder-bottom-edge-layer .fl-shape-content .fl-shape {
-  fill: #000000;
-}
-
-@media (max-width: 1115px) {
-  .c-why-us.fl-row > .fl-row-content-wrap {
-    padding-top: 50px;
-    padding-bottom: 0px;
-  }
-}
-
-@media (max-width: 860px) {
-  .c-why-us.fl-row > .fl-row-content-wrap {
-    padding-top: 50px;
-    padding-right: 20px;
-    padding-bottom: 0px;
-    padding-left: 20px;
-  }
-
-  /* Mobile CSS variable fallbacks with direct hex values */
-  :root {
-    --infobox-spacing: 12px; /* Reduced for mobile */
-    --infobox-margin: 20px;  /* Reduced for mobile */
-    --form-background: #F5F6F8; /* Same value for mobile consistency */
-    --form-field-spacing: 15px; /* Reduced for mobile */
-    --cta-button-margin: 25px; /* Reduced for mobile */
-    --cta-section-spacing: 12px; /* Reduced for mobile */
-  }
-}
-
-/* Feature Cards - Semantic hooks only */
-.c-feature-card {
-  /* Consolidated styles from all feature card modules */
-}
-
-/* Equal height flex styles for all feature cards */
-.fl-col-group-equal-height .c-feature-card,
-.fl-col-group-equal-height .c-feature-card .fl-module-content,
-.fl-col-group-equal-height .c-feature-card .fl-module-content .pp-infobox-wrap,
-.fl-col-group-equal-height .c-feature-card .fl-module-content .pp-infobox-wrap .pp-infobox,
-.fl-col-group-equal-height .c-feature-card .fl-module-content .pp-infobox-wrap > .pp-infobox-link,
-.fl-col-group-equal-height .c-feature-card .fl-module-content .pp-infobox-wrap > .pp-more-link {
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  flex-shrink: 1;
-  min-width: 1px;
-  max-width: 100%;
-  -webkit-box-flex: 1 1 auto;
-  -moz-box-flex: 1 1 auto;
-  -webkit-flex: 1 1 auto;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-}
-
-.fl-col-group-equal-height .c-feature-card.fl-visible-large,
-.fl-col-group-equal-height .c-feature-card.fl-visible-medium,
-.fl-col-group-equal-height .c-feature-card.fl-visible-mobile {
-  display: none;
-}
-
-.fl-col-group-equal-height .c-feature-card.fl-visible-desktop {
-  display: flex;
-}
-
-/* Alignment variations for equal height cards */
-.fl-col-group-equal-height.fl-col-group-align-center .c-feature-card .fl-module-content .pp-infobox-wrap .pp-infobox {
-  justify-content: center;
-}
-
-.fl-col-group-equal-height.fl-col-group-align-top .c-feature-card .fl-module-content .pp-infobox-wrap .pp-infobox {
-  justify-content: flex-start;
-}
-
-.fl-col-group-equal-height.fl-col-group-align-bottom .c-feature-card .fl-module-content .pp-infobox-wrap .pp-infobox {
-  justify-content: flex-end;
-}
-
-/* Feature card content styling */
-.c-feature-card .pp-infobox .pp-infobox-title-prefix,
-.c-feature-card__title-prefix {
-  display: none;
-}
-
-.c-feature-card .pp-infobox-title-wrapper .pp-infobox-title {
-  margin-top: 25px;
-  margin-bottom: 0px;
-}
-
-.c-feature-card .pp-infobox-description {
-  margin-top: 15px;
-  margin-bottom: 0px;
-}
-
-.c-feature-card .pp-infobox-wrap .pp-infobox {
-  min-height: 300px;
-  padding: 50px 20px;
-  text-align: center;
-}
-
-.c-feature-card .pp-infobox:hover {
-  box-shadow: 0px 15px 40px 0px rgba(17, 17, 17, 0.1);
-}
-
-.c-feature-card .pp-infobox .animated {
-  animation-name: inherit;
-  animation-duration: inherit;
-  animation-timing-function: inherit;
-  animation-iteration-count: inherit;
-  animation-direction: inherit;
-  animation-fill-mode: inherit;
-  animation-delay: inherit;
-}
-
-/* Feature card layout adjustments */
-.c-feature-card .pp-infobox-wrap .layout-3-wrapper,
-.c-feature-card .pp-infobox-wrap .layout-4-wrapper {
-  flex-direction: column;
-}
-
-.c-feature-card .pp-infobox-wrap .layout-1 .pp-heading-wrapper,
-.c-feature-card .pp-infobox-wrap .layout-2 .pp-heading-wrapper {
-  width: 100%;
-  margin-bottom: 15px;
-}
-
-.c-feature-card .pp-infobox-wrap .layout-2 .pp-infobox-description,
-.c-feature-card .pp-infobox-wrap .layout-2 .pp-heading-wrapper {
-  width: 100%;
-  margin-bottom: 15px;
-}
-
-/* Responsive equal height styles for feature cards */
-@media (max-width: 1200px) {
-  .fl-col-group-equal-height .c-feature-card.fl-visible-desktop {
-    display: none;
-  }
-
-  .fl-col-group-equal-height .c-feature-card.fl-visible-large {
-    display: flex;
-  }
-}
-
-@media (max-width: 1115px) {
-  .fl-col-group-equal-height .c-feature-card.fl-visible-desktop {
-    display: none;
-  }
-
-  .fl-col-group-equal-height .c-feature-card.fl-visible-large {
-    display: flex;
-  }
-
-  .fl-col-group-equal-height .c-feature-card.fl-visible-medium {
-    display: none;
-  }
-}
-
-@media (max-width: 860px) {
-  .fl-col-group-equal-height .c-feature-card.fl-visible-desktop {
-    display: none;
-  }
-
-  .fl-col-group-equal-height .c-feature-card.fl-visible-large {
-    display: none;
-  }
-
-  .fl-col-group-equal-height .c-feature-card.fl-visible-medium {
-    display: none;
-  }
-
-  .fl-col-group-equal-height .c-feature-card.fl-visible-mobile {
-    display: flex;
-  }
-
-  .c-feature-card .pp-infobox {
-    min-height: 250px;
-    padding: 40px 15px;
-  }
-
-  .c-feature-card .pp-infobox-wrap .pp-infobox {
-    min-height: 250px;
-    padding: 40px 15px;
-  }
-
-  .c-feature-card .pp-infobox-wrap .layout-2 .pp-infobox-description,
-  .c-feature-card .pp-infobox-wrap .layout-2 .pp-heading-wrapper {
-    width: 100%;
-  }
-
-  .c-feature-card .pp-infobox-wrap .layout-3-wrapper,
-  .c-feature-card .pp-infobox-wrap .layout-4-wrapper {
-    flex-direction: column;
-  }
-}
-
-/* Feature card typography responsive adjustments */
-@media (max-width: 860px) {
-  .c-feature-card .pp-infobox-title-wrapper .pp-infobox-title {
-    font-size: 24px;
-    line-height: 1.4;
-  }
-
-  .fl-builder-content .c-feature-card .pp-infobox-image img {
-    max-width: 60px;
-  }
-}
-
-/* Additional feature card styling (consolidated from all FL-nodes) */
-.c-feature-card .pp-infobox-image {
-  margin-bottom: 25px;
-}
-
-.fl-builder-content .c-feature-card .pp-infobox-image img {
-  max-width: 80px;
-  width: auto;
-  height: auto;
-}
-
-.c-feature-card .pp-infobox:hover .pp-infobox-image img {
-  transform: scale(1.05);
-}
-
-.c-feature-card .pp-infobox-icon-inner span.pp-icon,
-.c-feature-card .pp-infobox-image img {
-  border-radius: 10px;
-  transition: all 0.3s ease;
-}
-
-.c-feature-card .pp-infobox-wrap .layout-3 .pp-icon-wrapper {
-  margin-bottom: 15px;
-}
-
-.c-feature-card .pp-infobox-wrap .layout-4 .pp-icon-wrapper {
-  margin-right: 15px;
-}
-
-/* CTA Section - Semantic hook only */
-.c-cta-section {
-  /* Semantic class for FL-node-3izxuk4et0wy */
-  /* No styles - preserves existing FL-col-group layout */
-}
-
-/* Contact Section - Semantic hook only */
-.c-contact-section {
-  /* Semantic class for FL-node-niok604vy81f */
-  /* No styles - preserves existing FL-col-group layout */
-}
-
-/* Why Us Section Elements - Semantic hooks only */
-.c-why-us__column-group {
-  /* Semantic class for FL-node-e4o7jgbfk6iz */
-  /* No styles - preserves existing FL-col-group layout */
-}
-
-.c-why-us__content-column {
-  /* Semantic class for FL-node-upxq4sk52c3o */
-  /* No styles - preserves existing FL-col layout */
-}
-
-.c-why-us__eyebrow {
-  /* Semantic class for FL-node-yhi0uwsxjfr7 */
-  /* Copied styles from FL-node for safe migration */
-}
-
-.c-why-us__eyebrow .fl-module-content .fl-rich-text,
-.c-why-us__eyebrow .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
-}
-
-.c-why-us__eyebrow .fl-rich-text,
-.c-why-us__eyebrow .fl-rich-text *:not(b, strong) {
-  font-weight: 600;
-}
-
-.c-why-us__heading {
-  /* Semantic class for FL-node-hmwu2rp1s7e5 */
-  /* Copied styles from FL-node for safe migration */
-}
-
-.c-why-us__heading > .fl-module-content {
-  margin-top: 30px;
-  margin-right: 250px;
-}
-
-@media (max-width: 860px) {
-  .c-why-us__heading.fl-module > .fl-module-content {
-    margin-top: 10px;
-    margin-right: 0px;
-  }
-}
-
-.c-why-us__description {
-  /* Semantic class for FL-node-9zbkom73fw82 */
-  /* Copied styles from FL-node for safe migration */
-}
-
-.c-why-us__description > .fl-module-content {
-  margin-top: 15px;
-  margin-bottom: 60px;
-}
-
-@media (max-width: 860px) {
-  .c-why-us__description.fl-module > .fl-module-content {
-    margin-top: 15px;
-    margin-bottom: 0px;
-  }
-}
-
-/* Feature Cards Grid - Semantic hooks only */
-.c-feature-cards__grid {
-  /* Semantic class for FL-node-lfzepx94ws8m */
-  /* No styles - preserves existing FL-col-group nested layout */
-}
-
-.c-feature-cards__item-column {
-  /* Consolidated styles from all feature card columns */
-}
-
-/* First column (FL-node-tr8ya9nhipmj) - 22% width */
-.c-feature-cards__item-column:nth-child(1) {
-  width: 22%;
-}
-
-.c-feature-cards__item-column:nth-child(1) > .fl-col-content {
-  margin-right: 0px;
-}
-
-/* Second column (FL-node-oq86d7v9jk2x) - 28% width */
-.c-feature-cards__item-column:nth-child(2) {
-  width: 28%;
-}
-
-.c-feature-cards__item-column:nth-child(2) > .fl-col-content {
-  margin-right: 25px;
-  margin-left: 50px;
-}
-
-/* Third column (FL-node-oljqy5bpn7fu) - 28% width */
-.c-feature-cards__item-column:nth-child(3) {
-  width: 28%;
-}
-
-.c-feature-cards__item-column:nth-child(3) > .fl-col-content {
-  margin-right: 50px;
-  margin-left: 25px;
-}
-
-/* Fourth column (FL-node-mtgai4swuk6v) - 22% width */
-.c-feature-cards__item-column:nth-child(4) {
-  width: 22%;
-}
-
-.c-feature-cards__item-column:nth-child(4) > .fl-col-content {
-  margin-right: 0px;
-}
-
-/* Mobile responsive for all feature card columns */
-@media (max-width: 860px) {
-  .fl-builder-content .c-feature-cards__item-column {
-    width: 100% !important;
-    max-width: none;
-    clear: none;
-    float: left;
-  }
-
-  .c-feature-cards__item-column.fl-col > .fl-col-content {
-    padding-top: 30px;
-  }
-}
-
-/* CTA Section Elements - Semantic hooks only (Batch 2) */
-.c-cta-section__content-column {
-  /* Migrated styles from FL-node-04h8akisgvow */
-  color: #ffffff;
-  width: 100%;
-}
-
-.fl-builder-content .c-cta-section__content-column *:not(span):not(input):not(textarea):not(select):not(a):not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(.fl-menu-mobile-toggle) {
-  color: #ffffff;
-}
-
-.fl-builder-content .c-cta-section__content-column a {
-  color: #ffffff;
-}
-
-.fl-builder-content .c-cta-section__content-column a:hover {
-  color: #ffffff;
-}
-
-.fl-builder-content .c-cta-section__content-column h1,
-.fl-builder-content .c-cta-section__content-column h2,
-.fl-builder-content .c-cta-section__content-column h3,
-.fl-builder-content .c-cta-section__content-column h4,
-.fl-builder-content .c-cta-section__content-column h5,
-.fl-builder-content .c-cta-section__content-column h6,
-.fl-builder-content .c-cta-section__content-column h1 a,
-.fl-builder-content .c-cta-section__content-column h2 a,
-.fl-builder-content .c-cta-section__content-column h3 a,
-.fl-builder-content .c-cta-section__content-column h4 a,
-.fl-builder-content .c-cta-section__content-column h5 a,
-.fl-builder-content .c-cta-section__content-column h6 a {
-  color: #ffffff;
-}
-
-.c-cta-section__content-column > .fl-col-content {
-  background-repeat: no-repeat;
-  background-position: center center;
-  background-attachment: scroll;
-  background-size: cover;
-  margin-top: 130px;
-  padding-top: 60px;
-  padding-right: 60px;
-  padding-bottom: 60px;
-  padding-left: 60px;
-}
-
-@media (max-width: 992px) {
-  .fl-builder-content .c-cta-section__content-column {
-    width: 100% !important;
-    max-width: none;
-    clear: none;
-    float: left;
-  }
-}
-
-@media (max-width: 860px) {
-  .c-cta-section__content-column.fl-col > .fl-col-content {
-    margin-top: 50px;
-  }
-}
-
-@media (max-width: 768px) {
-  .c-cta-section__content-column.fl-col > .fl-col-content {
-    padding-top: 30px;
-    padding-right: 20px;
-    padding-bottom: 30px;
-    padding-left: 20px;
-  }
-}
-
-.c-cta-section__heading {
-  /* Semantic class for FL-node-pmt8g6z4fiqj */
-  /* Copied styles from FL-node for safe migration */
-}
-
-.c-cta-section__heading.fl-module-heading .fl-heading {
-  font-size: 50px;
-  text-align: center;
-}
-
-@media (max-width: 860px) {
-  .c-cta-section__heading.fl-module-heading .fl-heading {
-    font-size: 30px;
-  }
-}
-
-.c-cta-section__heading > .fl-module-content {
-  margin-right: 100px;
-  margin-left: 100px;
-}
-
-@media (max-width: 1115px) {
-  .c-cta-section__heading.fl-module > .fl-module-content {
-    margin-right: 50px;
-    margin-left: 50px;
-  }
-}
-
-@media (max-width: 860px) {
-  .c-cta-section__heading.fl-module > .fl-module-content {
-    margin-right: 0px;
-    margin-left: 0px;
-  }
-}
-
-.c-cta-section__description {
-  /* Semantic class for FL-node-evzqukyis4x5 */
-  /* Copied styles from FL-node for safe migration */
-}
-
-.c-cta-section__description .fl-rich-text,
-.c-cta-section__description .fl-rich-text *:not(b, strong) {
-  text-align: center;
-}
-
-.c-cta-section__description > .fl-module-content {
-  margin-top: 15px;
-  margin-right: 250px;
-  margin-left: 250px;
-}
-
-@media (max-width: 1115px) {
-  .c-cta-section__description.fl-module > .fl-module-content {
-    margin-right: 50px;
-    margin-left: 50px;
-  }
-}
-
-@media (max-width: 860px) {
-  .c-cta-section__description.fl-module > .fl-module-content {
-    margin-top: 15px;
-    margin-right: 0px;
-    margin-left: 0px;
-  }
-}
-
-.c-cta-section__button {
-  /* Migrated styles from FL-node-n0ztf7v9mspi */
-}
-
-.fl-builder-content .c-cta-section__button a.fl-button,
-.fl-builder-content .c-cta-section__button a.fl-button:visited {
-  background: #121212;
-  text-transform: none;
-  border: 1px solid #060606;
-}
-
-.fl-builder-content .c-cta-section__button a.fl-button:hover {
-  background-color: #24292D;
-  border: 1px solid #181d21;
-}
-
-.c-cta-section__button .fl-button-wrap {
-  text-align: center;
-}
-
-.c-cta-section__button > .fl-module-content {
-  margin-top: 40px;
-}
-
-@media (max-width: 860px) {
-  .c-cta-section__button.fl-module > .fl-module-content {
-    margin-top: 25px;
-  }
-}
-
-/* Contact Section Elements - Semantic hooks only (Batch 2) */
-.c-contact-section__content-column {
-  /* Migrated styles from FL-node-8x91uqrnkeb7 */
-  width: 100%;
-}
-
-.c-contact-section__content-column > .fl-col-content {
-  background-color: #F5F6F8;
-  border-top-left-radius: 20px;
-  border-top-right-radius: 20px;
-  border-bottom-left-radius: 20px;
-  border-bottom-right-radius: 20px;
-  margin-top: 180px;
-  padding-top: 80px;
-  padding-right: 60px;
-  padding-bottom: 120px;
-  padding-left: 60px;
-}
-
-@media (max-width: 992px) {
-  .fl-builder-content .c-contact-section__content-column {
-    width: 100% !important;
-    max-width: none;
-    -webkit-box-flex: 0 1 auto;
-    -moz-box-flex: 0 1 auto;
-    -ms-flex: 0 1 auto;
-    flex: 0 1 auto;
-    display: block;
-  }
-}
-
-@media (max-width: 860px) {
-  .fl-builder-content .c-contact-section__content-column {
-    width: 100% !important;
-    max-width: none;
-    clear: none;
-    float: left;
-  }
-
-  .c-contact-section__content-column.fl-col > .fl-col-content {
-    margin-top: 50px;
-  }
-}
-
-@media (max-width: 768px) {
-  .c-contact-section__content-column.fl-col > .fl-col-content {
-    padding-top: 30px;
-    padding-right: 20px;
-    padding-bottom: 30px;
-    padding-left: 20px;
-  }
-}
-
-.c-contact-section__intro-text {
-  /* Semantic class for FL-node-rujwd9mzxche */
-  /* Copied styles from FL-node for safe migration */
-}
-
-.c-contact-section__intro-text .fl-module-content .fl-rich-text,
-.c-contact-section__intro-text .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
-}
-
-.c-contact-section__intro-text .fl-rich-text,
-.c-contact-section__intro-text .fl-rich-text *:not(b, strong) {
-  font-weight: 600;
-  text-align: center;
-}
-
-.c-contact-section__heading {
-  /* Semantic class for FL-node-fa7hjib92cpv */
-  /* Copied styles from FL-node for safe migration */
-}
-
-.c-contact-section__heading.fl-module-heading .fl-heading {
-  text-align: center;
-}
-
-.c-contact-section__heading > .fl-module-content {
-  margin-top: 20px;
-}
-
-@media (max-width: 860px) {
-  .c-contact-section__heading.fl-module > .fl-module-content {
-    margin-top: 10px;
-  }
-}
-
-.c-contact-section__spacer {
-  /* Semantic class for FL-node-toa2hwegbp4q */
-  /* Copied styles from FL-node for safe migration */
-}
-
-.c-contact-section__spacer .pp-spacer-module {
-  height: 60px;
-  width: 100%;
-}
-
-@media only screen and (max-width: 1115px) {
-  .c-contact-section__spacer .pp-spacer-module {
-    height: 60px;
-  }
-}
-
-@media only screen and (max-width: 860px) {
-  .c-contact-section__spacer .pp-spacer-module {
-    height: 15px;
-  }
-}
-
-.c-contact-section__description {
-  /* Migrated styles from FL-node-9hf5wet31z02 */
-}
-
-.fl-builder-content .c-contact-section__description .fl-rich-text,
-.fl-builder-content .c-contact-section__description .fl-rich-text *:not(b, strong) {
-  text-align: center;
-}
-
-.c-contact-section__description > .fl-module-content {
-  margin-top: 15px;
-  margin-right: 250px;
-  margin-left: 250px;
-}
-
-@media (max-width: 1115px) {
-  .c-contact-section__description.fl-module > .fl-module-content {
-    margin-right: 0px;
-    margin-left: 0px;
-  }
-}
-
-@media (max-width: 860px) {
-  .c-contact-section__description.fl-module > .fl-module-content {
-    margin-top: 15px;
-    margin-right: 0px;
-    margin-left: 0px;
-  }
-}
-
-/* ================================================
-   UTILITY CLASSES FOR FUTURE USE
-   Currently inactive to prevent conflicts
-   ================================================ */
-
-/* Micro-change 1: Safe utility class addition */
-.u-text-center { text-align: center; }
-.u-margin-auto { margin-left: auto; margin-right: auto; }
-.u-form-center { text-align: center; }
-
-/* These can be activated once FL-builder classes are removed */
-/*
-.u-margin-top { margin-top: 2rem; }
-.u-padding { padding: 2rem; }
-*/
-
-/* ================================================
-   NOTES FOR SAFE MIGRATION
-   ================================================ */
-
-/*
- * Migration Strategy:
- * 1. Current: Dual-class approach (FL-builder + BEM classes)
- * 2. Testing: Verify no visual changes with semantic classes
- * 3. Future: Gradually move styles from FL-builder to BEM
- * 4. Final: Remove FL-builder classes once BEM is complete
- *
- * ROLLBACK PROCEDURES:
- * - Micro-change 1 (.u-text-center): git revert d6da6140
- * - Micro-change 2 (.u-margin-auto): git revert 61c5bb73
- * - Micro-change 3 (--color-primary): git revert b10b1a8d
- *
- * The semantic BEM classes are now in place for:
- * - .c-why-us (why us section) + internal elements
- * - .c-feature-card (info boxes) + grid structure
- * - .c-cta-section (CTA area) + internal elements [Batch 2]
- * - .c-contact-section (contact form area) + internal elements [Batch 2]
- *
- * Batch 2 completed 8/9 FL-node classes:
- * - CTA section: content column, heading, description, button
- * - Contact section: content column, intro text, heading, spacer
- * - Skipped: fl-node-9hf5wet31z02 (caused template parsing issues)
- */
\ No newline at end of file
diff --git a/themes/beaver/assets/css/bf72bba397177a0376baed325bffdc75-layout-bundle.css b/themes/beaver/assets/css/bf72bba397177a0376baed325bffdc75-layout-bundle.css
index f19bcdcd1..1a4469950 100644
--- a/themes/beaver/assets/css/bf72bba397177a0376baed325bffdc75-layout-bundle.css
+++ b/themes/beaver/assets/css/bf72bba397177a0376baed325bffdc75-layout-bundle.css
@@ -270,7 +270,7 @@ img.mfp-img {
   transition-timing-function: ease;
   transition-duration: .15s;
   transition-property: transform;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 
 .pp-advanced-menu-mobile-toggle .pp-hamburger .pp-hamburger-box .pp-hamburger-inner:before, .pp-advanced-menu-mobile-toggle .pp-hamburger .pp-hamburger-box .pp-hamburger-inner:after {
@@ -784,19 +784,19 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li.focus .pp-menu-toggle:before {
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li a:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li a:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li a:focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li a:focus .pp-menu-toggle:before {
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .menu > li > a:hover, .fl-node-menu .menu > li > a:focus, .fl-node-menu .menu > li:hover > .pp-has-submenu-container > a, .fl-node-menu .menu > li.focus > .pp-has-submenu-container > a, .fl-node-menu .menu > li.current-menu-item > a, .fl-node-menu .menu > li.current-menu-item > .pp-has-submenu-container > a {
-  color: #1A8CFF;
+  color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .pp-has-submenu-container:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .pp-has-submenu-container.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li.current-menu-item > .pp-has-submenu-container .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .pp-has-submenu-container:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .pp-has-submenu-container.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li.current-menu-item > .pp-has-submenu-container .pp-menu-toggle:before {
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .menu .pp-has-submenu .sub-menu {
@@ -835,7 +835,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 
 .fl-node-menu .sub-menu > li > a:hover, .fl-node-menu .sub-menu > li > a:focus, .fl-node-menu .sub-menu > li > .pp-has-submenu-container > a:hover, .fl-node-menu .sub-menu > li > .pp-has-submenu-container > a:focus, .fl-node-menu .sub-menu > li.current-menu-item > a, .fl-node-menu .sub-menu > li.current-menu-item > .pp-has-submenu-container > a {
   background-color: ;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .sub-menu .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .sub-menu .pp-menu-toggle:before {
@@ -843,7 +843,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .sub-menu li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .sub-menu li:hover .pp-menu-toggle:before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-menu-toggle:before {
@@ -1454,7 +1454,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-ntfp1iza9jy8 a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-ntfp1iza9jy8 a:hover {
@@ -1497,7 +1497,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-5dcip6gnz2at a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-5dcip6gnz2at a:hover {
@@ -1530,7 +1530,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-7p1us6kjlz9d a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-7p1us6kjlz9d a:hover {
@@ -1563,7 +1563,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-fxtbmly0wvq4 a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-fxtbmly0wvq4 a:hover {
@@ -1698,7 +1698,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text * {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-rich-text, .fl-builder-content .fl-node-lsrnf83ijm06 .fl-rich-text *:not(b, strong) {
diff --git a/themes/beaver/assets/css/component-bundle.css b/themes/beaver/assets/css/component-bundle.css
index d1206d0fc..68569b674 100644
--- a/themes/beaver/assets/css/component-bundle.css
+++ b/themes/beaver/assets/css/component-bundle.css
@@ -299,7 +299,7 @@ img.mfp-img {
   transition-timing-function: ease;
   transition-duration: 0.15s;
   transition-property: transform;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 
 .pp-advanced-menu-mobile-toggle
@@ -972,7 +972,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
   .pp-toggle-none
   li.focus
   .pp-menu-toggle:before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu
@@ -999,7 +999,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
   li
   a:focus
   .pp-menu-toggle:before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .menu > li > a:hover,
@@ -1008,7 +1008,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 .fl-node-menu .menu > li.focus > .pp-has-submenu-container > a,
 .fl-node-menu .menu > li.current-menu-item > a,
 .fl-node-menu .menu > li.current-menu-item > .pp-has-submenu-container > a {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-menu
@@ -1043,7 +1043,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
   li.current-menu-item
   > .pp-has-submenu-container
   .pp-menu-toggle:before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .menu .pp-has-submenu .sub-menu {
@@ -1096,7 +1096,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 .fl-node-menu .sub-menu > li.current-menu-item > a,
 .fl-node-menu .sub-menu > li.current-menu-item > .pp-has-submenu-container > a {
 
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-menu
@@ -1124,7 +1124,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
   .sub-menu
   li:hover
   .pp-menu-toggle:before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-menu-toggle:before {
@@ -1936,7 +1936,7 @@ body:not(.single-fl-theme-layout)
 }
 
 .fl-builder-content .fl-node-ntfp1iza9jy8 a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-ntfp1iza9jy8 a:hover {
@@ -1990,7 +1990,7 @@ body:not(.single-fl-theme-layout)
 }
 
 .fl-builder-content .fl-node-5dcip6gnz2at a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-5dcip6gnz2at a:hover {
@@ -2023,7 +2023,7 @@ body:not(.single-fl-theme-layout)
 }
 
 .fl-builder-content .fl-node-7p1us6kjlz9d a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-7p1us6kjlz9d a:hover {
@@ -2056,7 +2056,7 @@ body:not(.single-fl-theme-layout)
 }
 
 .fl-builder-content .fl-node-fxtbmly0wvq4 a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-fxtbmly0wvq4 a:hover {
@@ -2194,7 +2194,7 @@ body:not(.single-fl-theme-layout)
 
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text,
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text * {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-rich-text,
@@ -2802,7 +2802,7 @@ body:not(.single-fl-theme-layout)
 
 .authority-list li:before {
   content: "★";
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 /* Additional styling for better visual hierarchy */
diff --git a/themes/beaver/assets/css/components.css b/themes/beaver/assets/css/components.css
index bc65e9959..33715c328 100644
--- a/themes/beaver/assets/css/components.css
+++ b/themes/beaver/assets/css/components.css
@@ -2,6 +2,14 @@
 
 COMMENTED TO MAKE TESTS PASS */
 
+/* Design tokens first — PurgeCSS (variables: true) keeps a def only in
+   bundles with an in-bundle consumer, so this bundle carries its own defs
+   for the tokens component files consume. NOTE: must stay an @import at
+   the top of THIS file; prepending it via the baseof.html resource slice
+   puts :root before these @imports and invalidates them (CSS requires
+   @import before all other statements). */
+@import 'foundations/css-variables.css';
+
 /* Sprint 3 - c-button Component (GREEN Phase - Shameless Green Implementation) */
 @import 'components/c-button';
 
diff --git a/themes/beaver/assets/css/components/blocks/c-card.css b/themes/beaver/assets/css/components/blocks/c-card.css
index 46c3f9e41..9d7d6c2ff 100644
--- a/themes/beaver/assets/css/components/blocks/c-card.css
+++ b/themes/beaver/assets/css/components/blocks/c-card.css
@@ -70,7 +70,7 @@
   align-items: center;
   font-size: 16px;
   font-weight: 600;
-  color: var(--jt-primary, #1a8cff);
+  color: var(--jt-primary, var(--color-primary));
   text-decoration: none;
   transition: all 0.2s ease;
 }
@@ -105,7 +105,7 @@
 .c-card__icon svg {
   width: 32px;
   height: 32px;
-  fill: var(--jt-primary, #1a8cff);
+  fill: var(--jt-primary, var(--color-primary));
 }
 
 /* Card meta information */
diff --git a/themes/beaver/assets/css/components/blocks/c-hero.css b/themes/beaver/assets/css/components/blocks/c-hero.css
index baa06649e..3dc4ac56a 100644
--- a/themes/beaver/assets/css/components/blocks/c-hero.css
+++ b/themes/beaver/assets/css/components/blocks/c-hero.css
@@ -74,9 +74,9 @@
   font-size: 16px;
   font-weight: 600;
   text-decoration: none;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
   transition: all 0.3s ease;
-  background-color: var(--jt-primary, #1a8cff);
+  background-color: var(--jt-primary, var(--color-primary));
   color: white;
   border: 2px solid transparent;
 }
diff --git a/themes/beaver/assets/css/components/blocks/c-nav.css b/themes/beaver/assets/css/components/blocks/c-nav.css
index 8fed751fd..0ad3d250c 100644
--- a/themes/beaver/assets/css/components/blocks/c-nav.css
+++ b/themes/beaver/assets/css/components/blocks/c-nav.css
@@ -47,7 +47,7 @@
   left: 0;
   background: white;
   border: 1px solid #e5e7eb;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
   box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
   list-style: none;
   margin: 0;
diff --git a/themes/beaver/assets/css/components/buttons-migration.css b/themes/beaver/assets/css/components/buttons-migration.css
deleted file mode 100644
index eb5daf47f..000000000
--- a/themes/beaver/assets/css/components/buttons-migration.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/* components/buttons-migration.css */
-/* Phase 0: Button Component Migration - Dual-class strategy */
-.fl-builder-content a.fl-button,
-.fl-builder-content a.fl-button:visited,
-.c-button {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  padding: 12px 30px;
-  display: inline-block;
-  box-sizing: border-box;
-  font-family: inherit;
-  font-size: 16px;
-  line-height: 1.5;
-  text-decoration: none;
-  font-weight: 600;
-  text-align: center;
-  border: 2px solid transparent;
-  background-color: var(--color-primary, #007cba);
-  cursor: pointer;
-  color: var(--color-white, #ffffff);
-  vertical-align: middle;
-  user-select: none;
-  transition: all 0.3s ease;
-  -webkit-transition: all 0.3s ease;
-  -moz-transition: all 0.3s ease;
-}
-
-/* Hover states for both FL-Builder and BEM classes */
-.fl-builder-content a.fl-button:hover,
-.c-button:hover {
-  background-color: var(--color-primary-dark, #005a87);
-  transform: translateY(-1px);
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
-}
-
-/* Focus states for accessibility */
-.fl-builder-content a.fl-button:focus,
-.c-button:focus {
-  outline: 2px solid var(--color-focus, #4a90e2);
-  outline-offset: 2px;
-  box-shadow: 0 0 0 3px rgba(74, 144, 226, 0.3);
-}
-
-/* Active states for button press feedback */
-.fl-builder-content a.fl-button:active,
-.c-button:active {
-  background-color: var(--color-primary-darker, #004066);
-  transform: translateY(0);
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-}
-
-/* Size variants - Large button modifier */
-.fl-builder-content a.fl-button.fl-button-large,
-.c-button--large {
-  padding: 16px 40px;
-  font-size: 18px;
-  font-weight: 700;
-}
-
-/* Color variants - Secondary button style */
-.fl-builder-content a.fl-button.fl-button-secondary,
-.c-button--secondary {
-  background-color: var(--color-secondary, #6c757d);
-  border-color: var(--color-secondary, #6c757d);
-  color: var(--color-white, #ffffff);
-}
-
-/* Migration complete: Dual-class button component ready for integration */
\ No newline at end of file
diff --git a/themes/beaver/assets/css/components/buttons.css b/themes/beaver/assets/css/components/buttons.css
index c3d021708..34b2f76d2 100644
--- a/themes/beaver/assets/css/components/buttons.css
+++ b/themes/beaver/assets/css/components/buttons.css
@@ -2,7 +2,7 @@
 .fl-builder-content a.fl-button,
 .fl-builder-content a.fl-button:visited {
   display: inline-block;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #fff;
   font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif;
   font-weight: 700;
diff --git a/themes/beaver/assets/css/components/c-button.css b/themes/beaver/assets/css/components/c-button.css
index 2ae2c69ae..d325c1bd1 100644
--- a/themes/beaver/assets/css/components/c-button.css
+++ b/themes/beaver/assets/css/components/c-button.css
@@ -15,9 +15,9 @@
 .c-button--secondary,
 .c-button--tertiary {
   /* Base button styling - Consolidated from all variants */
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
@@ -47,9 +47,9 @@
 
 /* Primary Button Variant - Only color differences remain */
 .c-button--primary {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #ffffff;
-  border: 2px solid #1a8cff;
+  border: 2px solid var(--color-primary);
 }
 
 .c-button--primary:hover {
@@ -61,19 +61,19 @@
 /* Secondary Button Variant - Only color differences remain */
 .c-button--secondary {
   background-color: #ffffff;
-  color: #121212;
-  border: 2px solid #121212;
+  color: var(--color-dark);
+  border: 2px solid var(--color-dark);
 }
 
 .c-button--secondary:hover {
-  background-color: #121212;
+  background-color: var(--color-dark);
   color: #ffffff;
 }
 
 /* Tertiary Button Variant - Only color differences remain */
 .c-button--tertiary {
   background-color: transparent;
-  color: #1a8cff;
+  color: var(--color-primary);
   border: 2px solid transparent;
 }
 
diff --git a/themes/beaver/assets/css/components/c-gravity-forms.css b/themes/beaver/assets/css/components/c-gravity-forms.css
deleted file mode 100644
index 01f40d8ee..000000000
--- a/themes/beaver/assets/css/components/c-gravity-forms.css
+++ /dev/null
@@ -1,453 +0,0 @@
-/* ==========================================================================
-   Gravity Forms Component System
-   BEM-compliant Gravity Forms components to replace FL-node-specific styles
-   Conservative implementation with dual-class support for backward compatibility
-
-   Extracted from: homepage-layout.css, fl-contact-layout.css, and 16 other files
-   Target: 87+ patterns consolidated into reusable BEM components
-   ========================================================================== */
-
-/**
- * Base Gravity Forms Wrapper Component
- * Replaces: .fl-node-*[gform-related] and .pp-gf-content selectors
- * Usage: Apply to Gravity Forms wrapper containers
- */
-.c-gravity-form {
-  /* Base wrapper styles */
-  max-width: 100%;
-  margin: 0;
-  padding: 0;
-}
-
-.c-gravity-form__wrapper {
-  /* Replaces .gform_wrapper base styles */
-  position: relative;
-  width: 100% !important;
-  max-width: 100%;
-}
-
-.c-gravity-form__body {
-  /* Replaces .gform_body styles */
-  width: 100% !important;
-}
-
-/* Dual-class compatibility for existing FL-node implementations */
-.pp-gf-content .gform_wrapper,
-.fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper {
-  max-width: 100%;
-}
-
-.pp-gf-content .gform_wrapper form,
-.fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper form {
-  position: relative;
-}
-
-.pp-gf-content .gform_wrapper .gform_body,
-.fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gform_body {
-  width: 100% !important;
-}
-
-/* Field List Component */
-.c-gravity-form__fields {
-  /* Replaces ul.gform_fields styles */
-  padding: 0;
-  margin: 0;
-  list-style: none;
-}
-
-.c-gravity-form__field {
-  /* Replaces li.gfield styles */
-  margin-bottom: 1.25rem;
-  padding-right: 0;
-  list-style-type: none !important;
-}
-
-/* Field half-width layout */
-.c-gravity-form__field--left-half {
-  /* Replaces .gf_left_half styles */
-  padding-right: 16px;
-}
-
-/* Dual-class compatibility for field lists */
-.pp-gf-content .gform_wrapper ul.gform_fields,
-.fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper ul.gform_fields {
-  padding: 0;
-}
-
-.pp-gf-content .gform_wrapper ul.gform_fields li.gfield,
-.fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper ul li.gfield {
-  padding-right: 0;
-  list-style-type: none !important;
-  margin-bottom: 20px;
-  margin-top: 0;
-}
-
-/* Input Field Component */
-.c-gravity-form__input {
-  /* Replaces input[type="text"], input[type="email"], etc. styles */
-  width: 100% !important;
-  height: 50px;
-  padding: 0.75rem 1rem;
-  font-size: 1rem;
-  line-height: 1.5;
-  color: var(--jt-text-primary, #121212);
-  background-color: var(--jt-white, #ffffff);
-  border: 1px solid var(--jt-gray-medium, #d1d1d1);
-  border-radius: 0.25rem;
-  border-style: solid;
-  border-width: 0;
-  font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
-}
-
-.c-gravity-form__input:focus {
-  /* Replaces input:focus styles */
-  border-color: var(--jt-primary, #1a8cff);
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(26, 140, 255, 0.25);
-}
-
-.c-gravity-form__input::placeholder {
-  /* Replaces input placeholder styles */
-  color: #969798;
-  opacity: 1;
-}
-
-/* Dual-class compatibility for input fields */
-.fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield input:not([type="radio"]):not([type="checkbox"]):not([type="submit"]):not([type="button"]):not([type="image"]):not([type="file"]),
-.fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield select,
-.fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield textarea {
-  color: #121212;
-  background-color: #ffffff;
-  height: 50px;
-  border-style: solid;
-  border-width: 0;
-  font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
-}
-
-.fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield input:not([type="radio"]):not([type="checkbox"]):not([type="submit"]):not([type="button"]):not([type="image"]):not([type="file"]):focus,
-.fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield select:focus,
-.fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gfield textarea:focus {
-  border-color: #121212;
-}
-
-/* ========================================================================== */
-/* EXTRACTED FROM BEAVER-GRID-LAYOUT.CSS (Batch 1)                          */
-/* ========================================================================== */
-
-/* Dual-class compatibility for legend element */
-.pp-gf-content legend,
-.c-gravity-form__legend {
-  border: 0;
-}
-
-/* Dual-class compatibility for validation error fields */
-.pp-gf-content .gform_wrapper.gform_validation_error .gform_body ul li.gfield.gfield_error:not(.gf_left_half):not(.gf_right_half),
-.c-gravity-form__field--validation-error {
-  max-width: 100% !important;
-}
-
-/* Dual-class compatibility for checkbox and radio focus states */
-.pp-gf-content .gform_wrapper .gfield input[type="checkbox"]:focus,
-.pp-gf-content .gform_wrapper .gfield input[type="radio"]:focus,
-.c-gravity-form__checkbox:focus,
-.c-gravity-form__radio:focus {
-  width: auto;
-  text-align: left !important;
-}
-
-/* Dual-class compatibility for half-width input fields */
-.gform_wrapper .top_label li.gfield.gf_left_half input.medium,
-.gform_wrapper .top_label li.gfield.gf_right_half input.medium,
-.gform_wrapper .top_label li.gfield.gf_left_half select.medium,
-.gform_wrapper .top_label li.gfield.gf_right_half select.medium,
-.c-gravity-form__field--left-half .c-gravity-form__input,
-.c-gravity-form__field--right-half .c-gravity-form__input,
-.c-gravity-form__field--left-half .c-gravity-form__select,
-.c-gravity-form__field--right-half .c-gravity-form__select {
-  width: 100% !important;
-}
-
-/* Complex input field handling */
-.gform_wrapper .ginput_complex input:not([type="radio"]):not([type="checkbox"]):not([type="submit"]):not([type="image"]):not([type="file"]),
-.c-gravity-form__complex-input {
-  width: 100% !important;
-}
-
-/* Browser-specific checkbox and radio adjustments */
-.gform_wrapper.gf_browser_chrome .gfield_checkbox li input,
-.gform_wrapper.gf_browser_chrome .gfield_checkbox li input[type="checkbox"],
-.gform_wrapper.gf_browser_chrome .gfield_radio li input[type="radio"],
-.c-gravity-form__checkbox--chrome,
-.c-gravity-form__radio--chrome {
-  margin-top: 0 !important;
-}
-
-/* Complex field label positioning */
-div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label,
-.c-gravity-form__complex-label {
-  margin-bottom: 0;
-}
-
-/* Field margin reset */
-.pp-gf-content .gform_wrapper ul li.gfield,
-.c-gravity-form__field {
-  margin-top: 0;
-}
-
-/* Radio field special input handling */
-.pp-gf-content .gform_wrapper ul.gfield_radio li input:not([type="radio"]):not([type="checkbox"]):not([type="submit"]):not([type="button"]):not([type="image"]):not([type="file"]),
-.c-gravity-form__radio-field .c-gravity-form__input {
-  width: auto !important;
-}
-
-/* Complex input display handling */
-.pp-gf-content .gform_wrapper .ginput_complex span.ginput_full,
-.c-gravity-form__complex-span {
-  display: block;
-}
-
-/* Field description styling */
-.pp-gf-content .gform_wrapper .gfield .gfield_description,
-.c-gravity-form__description {
-  padding-top: 5px;
-}
-
-/* Section title styling */
-.pp-gf-content .gform_wrapper h2.gsection_title,
-.c-gravity-form__section-title {
-  margin-bottom: 0;
-}
-
-/* Mobile responsive - half field padding reset */
-@media only screen and (max-width: 640px) {
-  .pp-gf-content .gform_wrapper ul.gform_fields li.gfield.gf_left_half,
-  .c-gravity-form__field--left-half {
-    padding-right: 0;
-  }
-}
-
-/* Node-specific wrapper styling */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper,
-.c-gravity-form__wrapper--special {
-  max-width: 100%;
-}
-
-/* Special content background styling */
-.fl-node-nkrzpgyfwo7s .pp-gf-content,
-.c-gravity-form__content--special {
-  background-color: #f5f6f8;
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-
-/* Field list styling for special node */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper ul li.gfield,
-.c-gravity-form__wrapper--special .c-gravity-form__field {
-  list-style-type: none !important;
-  margin-bottom: 20px;
-}
-
-/* Form title display control for FL-Builder */
-.fl-builder-content .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gform_title,
-.fl-builder-content .fl-node-nkrzpgyfwo7s .pp-gf-content .form-title,
-.c-gravity-form__title--fl-builder {
-  display: block;
-}
-
-/* Form title visibility override */
-.fl-builder-content .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gform_title,
-.c-gravity-form__title--hidden {
-  display: none;
-}
-
-/* ========================================================================== */
-/* EXTRACTED FROM BEAVER-GRID-LAYOUT.CSS (Batch 5 - Conservative)           */
-/* ========================================================================== */
-
-/* Form description display control for FL-Builder */
-.fl-builder-content .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper span.gform_description,
-.fl-builder-content .fl-node-nkrzpgyfwo7s .pp-gf-content .form-description,
-.c-gravity-form__description--hidden {
-  display: none;
-}
-
-/* Form description visibility override */
-.fl-builder-content .fl-node-nkrzpgyfwo7s .pp-gf-content .form-description,
-.c-gravity-form__description--visible {
-  display: block;
-}
-
-/* Field label styling for special node */
-.fl-builder-content .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield .gfield_label,
-.c-gravity-form__label--special {
-  color: #121212;
-  display: block;
-}
-
-/* Required field indicator styling */
-.fl-builder-content .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield_required,
-.c-gravity-form__required {
-  color: #ff0000;
-}
-
-/* ========================================================================== */
-/* EXTRACTED FROM BEAVER-GRID-LAYOUT.CSS (Batch 6)                          */
-/* ========================================================================== */
-
-/* Product price special color styling */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper span.ginput_product_price,
-.c-gravity-form__product-price--special {
-  color: #900900 !important;
-}
-
-/* Section styling with border */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gsection,
-.c-gravity-form__section {
-  border-bottom-width: 1px;
-  border-bottom-color: #cccccc;
-  margin-bottom: 20px;
-}
-
-/* Section title styling */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper h2.gsection_title,
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper h3.gsection_title,
-.c-gravity-form__section-title--special {
-  color: #333333;
-}
-
-/* Complex input margin spacing */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .ginput_complex span,
-.c-gravity-form__complex-span--spacing {
-  margin-bottom: 8px;
-}
-
-/* ========================================================================== */
-/* EXTRACTED FROM BEAVER-GRID-LAYOUT.CSS (Batch 7)                          */
-/* ========================================================================== */
-
-/* Medium input and select width */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .top_label input.medium,
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .top_label select.medium,
-.c-gravity-form__medium-input {
-  width: 100% !important;
-}
-
-/* Medium textarea width */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper textarea.medium,
-.c-gravity-form__medium-textarea {
-  width: 100% !important;
-}
-
-/* Complex input right alignment reset */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .ginput_complex .ginput_right,
-.c-gravity-form__complex-right {
-  margin-left: 0 !important;
-}
-
-/* Form footer alignment */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gform_footer,
-.c-gravity-form__footer {
-  text-align: right;
-  justify-content: flex-end;
-}
-
-/* ========================================================================== */
-/* EXTRACTED FROM BEAVER-GRID-LAYOUT.CSS (Batch 8 - Conservative)           */
-/* ========================================================================== */
-
-/* File input styling */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield input[type="file"],
-.c-gravity-form__file-input {
-  background-color: transparent;
-  border-style: none;
-}
-
-/* ========================================================================== */
-/* EXTRACTED FROM BEAVER-GRID-LAYOUT.CSS (Batch 9)                          */
-/* ========================================================================== */
-
-/* Validation error styling with color and border */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .validation_error,
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gform_validation_errors,
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gform_validation_errors > h2,
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper li.gfield.gfield_error,
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper li.gfield.gfield_error.gfield_contains_required.gfield_creditcard_warning,
-.c-gravity-form__validation-error {
-  color: #790000 !important;
-  border-color: #e63946 !important;
-}
-
-/* Validation error display control */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .validation_error,
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gform_validation_errors,
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gform_validation_errors > h2,
-.c-gravity-form__validation-error--hidden {
-  display: none !important;
-}
-
-/* Error field background and width */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield.gfield_error,
-.c-gravity-form__field--error {
-  background-color: transparent;
-  width: 100%;
-}
-
-/* ========================================================================== */
-/* EXTRACTED FROM BEAVER-GRID-LAYOUT.CSS (Batch 10)                         */
-/* ========================================================================== */
-
-/* Error field label styling */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield.gfield_error .gfield_label,
-.c-gravity-form__field--error .c-gravity-form__label {
-  color: #121212;
-  margin-left: 0;
-}
-
-/* Validation message display and color */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield_error .validation_message,
-.c-gravity-form__validation-message {
-  display: block;
-  color: #e63946;
-  border-color: #e63946;
-}
-
-/* Error input field border styling */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield_error input:not([type="radio"]):not([type="checkbox"]):not([type="submit"]):not([type="button"]):not([type="image"]):not([type="file"]),
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield_error .ginput_container select,
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield_error .ginput_container textarea,
-.c-gravity-form__field--error .c-gravity-form__input,
-.c-gravity-form__field--error .c-gravity-form__select,
-.c-gravity-form__field--error .c-gravity-form__textarea {
-  border-color: #e63946;
-  border-width: 1px !important;
-}
-
-/* ========================================================================== */
-/* EXTRACTED FROM BEAVER-GRID-LAYOUT.CSS (Batch 11)                         */
-/* ========================================================================== */
-
-/* Form confirmation message styling */
-.fl-node-nkrzpgyfwo7s .gform_confirmation_wrapper .gform_confirmation_message,
-.c-gravity-form__confirmation-message {
-  color: #121212;
-}
-
-/* Form content wrapper with border radius and padding */
-.fl-node-nkrzpgyfwo7s .pp-gf-content,
-.c-gravity-form__content {
-  border-top-left-radius: 16px;
-  border-top-right-radius: 16px;
-  border-bottom-left-radius: 16px;
-  border-bottom-right-radius: 16px;
-  padding-top: 40px;
-  padding-right: 40px;
-  padding-bottom: 80px;
-  padding-left: 40px;
-}
-
-/* Form title size styling */
-.fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gform_title,
-.fl-node-nkrzpgyfwo7s .form-title,
-.c-gravity-form__title {
-  font-size: 30px;
-}
\ No newline at end of file
diff --git a/themes/beaver/assets/css/components/c-hero-sections.css b/themes/beaver/assets/css/components/c-hero-sections.css
index b2036d69e..df7de672d 100644
--- a/themes/beaver/assets/css/components/c-hero-sections.css
+++ b/themes/beaver/assets/css/components/c-hero-sections.css
@@ -427,7 +427,7 @@
 /* Pattern 38: Hero Text Animation Type Writer */
 .c-hero-sections__text--typewriter {
   overflow: hidden;
-  border-right: 2px solid var(--jt-primary, #1a8cff);
+  border-right: 2px solid var(--jt-primary, var(--color-primary));
   white-space: nowrap;
   margin: 0 auto;
   letter-spacing: 0.1em;
@@ -441,7 +441,7 @@
 
 @keyframes heroCursor {
   from, to { border-color: transparent; }
-  50% { border-color: var(--jt-primary, #1a8cff); }
+  50% { border-color: var(--jt-primary, var(--color-primary)); }
 }
 
 /* Pattern 39: Hero Shape Layer Integration */
@@ -488,7 +488,7 @@
   display: inline-block;
   padding: 8px 16px;
   background: rgba(26, 140, 255, 0.1);
-  color: var(--jt-primary, #1a8cff);
+  color: var(--jt-primary, var(--color-primary));
   border-radius: 50px;
   font-size: 14px;
   font-weight: 600;
@@ -510,7 +510,7 @@
 .c-hero-sections__stat-number {
   font-size: 48px;
   font-weight: 800;
-  color: var(--jt-primary, #1a8cff);
+  color: var(--jt-primary, var(--color-primary));
   display: block;
   line-height: 1;
 }
@@ -580,7 +580,7 @@
 }
 
 .c-hero-sections__breadcrumb a:hover {
-  color: var(--jt-primary, #1a8cff);
+  color: var(--jt-primary, var(--color-primary));
 }
 
 .c-hero-sections__breadcrumb-separator {
@@ -1084,7 +1084,7 @@
   color: white;
   border: none;
   padding: 8px 16px;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
   cursor: pointer;
   font-size: 14px;
   transition: background 0.3s ease;
diff --git a/themes/beaver/assets/css/components/c-navigation.css b/themes/beaver/assets/css/components/c-navigation.css
deleted file mode 100644
index 1bf5d1075..000000000
--- a/themes/beaver/assets/css/components/c-navigation.css
+++ /dev/null
@@ -1,878 +0,0 @@
-/**
- * Navigation Component (c-navigation)
- *
- * SPRINT 1: Navigation CSS Extraction - 82 Patterns
- * Comprehensive BEM-based navigation system consolidating all nav patterns
- * Target: Complete extraction of navigation patterns from legacy CSS
- * Progress: Extracting patterns 1-82 using c-navigation prefix
- */
-
-/* CSS Variables - Navigation Color System (inherits from foundations/css-variables.css) */
-:root {
-  --nav-text-color: var(--color-dark, #121212);
-  --nav-link-hover-bg: var(--color-primary, #1a8cff);
-}
-
-.c-nav {
-  display: flex;
-  align-items: center;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.c-nav__item {
-  margin: 0;
-}
-
-.c-nav__link {
-  display: block;
-  padding: 0.5rem 1rem;
-  color: var(--nav-text-color);
-  text-decoration: none;
-  transition: all 0.2s ease;
-}
-
-.c-nav__link:hover {
-  background-color: var(--nav-link-hover-bg);
-  color: white;
-}
-
-.c-nav--horizontal {
-  flex-direction: row;
-}
-
-.c-nav--vertical {
-  flex-direction: column;
-}
-
-@media (max-width: 768px) {
-  .c-nav--mobile {
-    flex-direction: column;
-    width: 100%;
-  }
-}
-
-/* FL-Builder menu integration */
-.fl-menu,
-.c-menu {
-  /* Base navigation styles */
-  display: flex;
-  align-items: center;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  /* Horizontal navigation */
-  flex-direction: row;
-}
-
-.fl-menu-item,
-.c-menu-item {
-  /* Navigation item styles */
-  margin: 0;
-}
-
-.fl-menu-link {
-  /* Navigation link styles */
-  display: block;
-  padding: 0.5rem 1rem;
-  color: var(--nav-text-color);
-  text-decoration: none;
-  transition: all 0.2s ease;
-}
-
-.fl-menu-link:hover {
-  background-color: var(--nav-link-hover-bg);
-  color: white;
-}
-
-/* ===== BATCH 1: Main Navigation Patterns (Patterns 1-15) ===== */
-
-/* Pattern 1: Main navigation container */
-.c-navigation {
-  @media (max-width: 1024px) {
-    position: fixed;
-    background-color: #ffffff;
-    top: 0;
-    bottom: 0;
-    width: 320px;
-    right: -320px;
-    z-index: 10;
-    transition: .3s;
-  }
-}
-
-/* Pattern 2: Mobile menu opener */
-.c-navigation__menu-opener {
-  display: none;
-  width: 30px;
-  height: 19px;
-  border: solid var(--nav-text-color);
-  border-width: 3px 0;
-  position: relative;
-  cursor: pointer;
-
-  @media (max-width: 1024px) {
-    display: block;
-  }
-}
-
-/* Pattern 3: Menu opener hamburger line */
-.c-navigation__menu-opener:before {
-  content: '';
-  position: absolute;
-  width: 100%;
-  height: 3px;
-  background-color: var(--nav-text-color);
-  left: 0;
-  top: 50%;
-  margin-top: -1px;
-}
-
-/* Pattern 4: Menu close button */
-.c-navigation__menu-close {
-  display: none;
-  width: 30px;
-  height: 30px;
-  position: absolute;
-  top: 24px;
-  left: 16px;
-  cursor: pointer;
-}
-
-/* Pattern 5: Menu close X lines */
-.c-navigation__menu-close:before {
-  content: '';
-  position: absolute;
-  height: 2px;
-  background-color: var(--nav-text-color);
-  left: 4px;
-  right: 4px;
-  top: 50%;
-  margin-top: -1px;
-  transform: rotate(45deg);
-  backface-visibility: hidden;
-  will-change: transform;
-}
-
-/* Pattern 6: Menu close second X line */
-.c-navigation__menu-close:after {
-  content: '';
-  position: absolute;
-  height: 2px;
-  background-color: var(--nav-text-color);
-  left: 4px;
-  right: 4px;
-  top: 50%;
-  margin-top: -1px;
-  transform: rotate(-45deg);
-  backface-visibility: hidden;
-  will-change: transform;
-}
-
-/* Pattern 7: Navigation list container */
-.c-navigation__list {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-/* Pattern 8: Navigation item */
-.c-navigation__item {
-  padding: 15px 0;
-  margin-right: 9px;
-  position: relative;
-}
-
-/* Pattern 9: Last navigation item */
-.c-navigation__item:last-child {
-  margin-right: 0;
-}
-
-/* Pattern 10: Navigation item arrow */
-.c-navigation__item-arrow {
-  content: '';
-  position: absolute;
-  top: 50%;
-  right: 0;
-  margin-top: -6px;
-  width: 9px;
-  height: 9px;
-  border-color: var(--nav-text-color);
-  border-style: solid;
-  border-width: 0 2px 2px 0;
-  transform-origin: 70% 70%;
-  transform: rotate(45deg);
-  transition: .3s;
-  backface-visibility: hidden;
-  will-change: transform;
-}
-
-/* Pattern 11: Navigation link base */
-.c-navigation__link {
-  padding: 15px;
-  display: inline-block;
-  vertical-align: top;
-  font-size: 16px;
-  font-weight: 300;
-  line-height: 24px;
-  color: var(--nav-text-color);
-  text-decoration: none;
-  transition: .3s;
-}
-
-/* Pattern 12: Active navigation link */
-.c-navigation__item--active .c-navigation__link {
-  color: var(--nav-link-hover-bg);
-}
-
-/* Pattern 13: Active navigation arrow */
-.c-navigation__item--active .c-navigation__item-arrow {
-  border-color: var(--nav-link-hover-bg);
-}
-
-/* Pattern 14: Mobile navigation open state */
-.c-navigation--open {
-  @media (max-width: 1024px) {
-    right: 0;
-    overflow-y: auto;
-  }
-}
-
-/* Pattern 15: Menu close button visibility in open state */
-.c-navigation--open .c-navigation__menu-close {
-  @media (max-width: 1024px) {
-    display: block;
-  }
-}
-
-/* ===== BATCH 2: Submenu and Dropdown Patterns (Patterns 16-30) ===== */
-
-/* Pattern 16: Submenu container */
-.c-navigation__submenu {
-  display: none;
-  background-color: #ffffff;
-  box-shadow: 0 10px 40px rgba(0,0,0,.1);
-  border-radius: 20px;
-  padding: 30px 30px 0;
-  margin: 30px 0 0;
-  position: absolute;
-  top: 100%;
-  margin-top: 0;
-  left: 0;
-  z-index: 10;
-  text-align: left;
-  width: 888px;
-  transform: translateX(-40%);
-  font-size: 0;
-  backface-visibility: hidden;
-  will-change: transform;
-  line-height: 0;
-
-  @media (max-width: 1080px) {
-    width: 720px;
-  }
-}
-
-/* Pattern 17: Submenu arrow pointer */
-.c-navigation__submenu:before {
-  position: absolute;
-  content: '';
-  width: 0;
-  height: 0;
-  border-style: solid;
-  border-width: 15px 0 15px 15px;
-  border-color: transparent transparent transparent #ffffff;
-  right: unset!important;
-  top: -20px !important;
-  left: 45% !important;
-  transform: rotate(270deg) !important;
-}
-
-/* Pattern 18: Submenu item */
-.c-navigation__submenu-item {
-  display: inline-block;
-  vertical-align: middle;
-  width: 50%;
-  font-size: 14px;
-  line-height: 20px;
-  font-weight: 300;
-  margin-bottom: 30px;
-}
-
-/* Pattern 19: Submenu link */
-.c-navigation__submenu-link {
-  display: block;
-  text-decoration: none;
-}
-
-/* Pattern 20: Submenu item image */
-.c-navigation__submenu-image {
-  float: left;
-  background-repeat: no-repeat;
-  background-size: contain;
-  width: 27px;
-  height: auto;
-}
-
-/* Pattern 21: Submenu image SVG styling */
-.c-navigation__submenu-image .a {
-  stroke-width: 1.5;
-}
-
-/* Pattern 22: Submenu content holder */
-.c-navigation__submenu-holder {
-  overflow: hidden;
-  padding-left: 20px;
-  padding-right: 45px;
-  padding: 0 20px;
-}
-
-/* Pattern 23: Submenu item title */
-.c-navigation__submenu-name {
-  font-weight: 700;
-  font-size: 20px;
-  line-height: 26px;
-  color: var(--nav-text-color);
-  transition: .3s;
-}
-
-/* Pattern 24: Submenu item hover title */
-.c-navigation__submenu-item:hover .c-navigation__submenu-name {
-  color: var(--nav-link-hover-bg);
-}
-
-/* Pattern 25: Submenu item description */
-.c-navigation__submenu-text {
-  font-size: 14px;
-  line-height: 20px;
-  font-weight: 300;
-  margin-bottom: 0;
-  margin-top: 5px;
-  color: #666666;
-}
-
-/* Pattern 26: Desktop hover submenu display */
-@media (min-width: 1025px) {
-  .c-navigation__item:hover .c-navigation__submenu {
-    display: block;
-  }
-
-  .c-navigation__item:hover .c-navigation__link {
-    color: var(--nav-link-hover-bg);
-  }
-
-  .c-navigation__item:hover .c-navigation__item-arrow {
-    transform: rotate(225deg);
-    border-color: var(--nav-link-hover-bg);
-  }
-}
-
-/* Pattern 27: Menu opener hidden when nav open */
-.c-navigation--open + .c-navigation__menu-opener {
-  @media (max-width: 1024px) {
-    display: none;
-  }
-}
-
-/* Pattern 28: Navigation overlay background */
-.c-navigation:before {
-  @media (max-width: 1024px) {
-    position: fixed;
-    content: '';
-    left: 0;
-    right: 320px;
-    top: 0;
-    bottom: 0;
-    background-color: rgba(0,0,0,.8);
-    z-index: -1;
-    opacity: 0;
-    transition: .3s;
-    display: none;
-  }
-}
-
-/* Pattern 29: Overlay visible when navigation open */
-.c-navigation--open:before {
-  @media (max-width: 1024px) {
-    opacity: 1;
-    display: block;
-  }
-}
-
-/* Pattern 30: Mobile list layout when open */
-.c-navigation--open .c-navigation__list {
-  @media (max-width: 1024px) {
-    display: block;
-    padding: 70px 20px 20px;
-  }
-}
-
-/* ===== BATCH 3: Mobile Navigation Patterns (Patterns 31-45) ===== */
-
-/* Pattern 31: Body overflow hidden when navigation open */
-.c-body--navigation-open {
-  @media (max-width: 1024px) {
-    overflow: hidden;
-  }
-}
-
-/* Pattern 32: Mobile navigation button styling */
-.c-navigation__mobile-btn {
-  @media (max-width: 1024px) {
-    display: block;
-    text-align: center;
-    font-weight: 300;
-    line-height: 22px;
-    font-size: 16px;
-    background-color: var(--nav-text-color) !important;
-    color: #ffffff !important;
-    border-radius: 6px;
-    margin-top: 15px;
-  }
-}
-
-/* Pattern 33: Mobile navigation item */
-.c-navigation__mobile-item {
-  @media (max-width: 1024px) {
-    padding: 0;
-    margin: 0;
-  }
-}
-
-/* Pattern 34: Mobile navigation link */
-.c-navigation__mobile-link {
-  @media (max-width: 1024px) {
-    padding: 14px 0;
-    color: var(--nav-text-color);
-    font-size: 18px;
-    padding-right: 15px;
-  }
-}
-
-/* Pattern 35: Mobile submenu holder */
-.c-navigation__mobile-submenu-holder {
-  @media (max-width: 1024px) {
-    padding-right: 0;
-  }
-}
-
-/* Pattern 36: Mobile submenu styling */
-.c-navigation__mobile-submenu {
-  @media (max-width: 1024px) {
-    width: auto;
-    position: static;
-    padding: 0;
-    margin: 0 -15px;
-    transform: none;
-    box-shadow: none;
-    transition: .3s;
-    display: block;
-    max-height: 0;
-    overflow: hidden;
-    background-color: #ffffff;
-  }
-}
-
-/* Pattern 37: Mobile submenu open state */
-.c-navigation__item--open .c-navigation__mobile-submenu {
-  @media (max-width: 1024px) {
-    max-height: 350px;
-  }
-}
-
-/* Pattern 38: Mobile submenu pseudo-elements hidden */
-.c-navigation__mobile-submenu:before,
-.c-navigation__mobile-submenu:after {
-  @media (max-width: 1024px) {
-    display: none;
-  }
-}
-
-/* Pattern 39: Mobile submenu item */
-.c-navigation__mobile-submenu-item {
-  @media (max-width: 1024px) {
-    width: auto;
-    display: block;
-    margin-bottom: 15px;
-    padding: 0 15px;
-  }
-}
-
-/* Pattern 40: Mobile submenu link flex display */
-.c-navigation__mobile-submenu-link {
-  @media (max-width: 1024px) {
-    display: flex;
-    align-items: center;
-  }
-}
-
-/* Pattern 41: Mobile submenu image float reset */
-.c-navigation__mobile-submenu-image {
-  @media (max-width: 1024px) {
-    float: none;
-  }
-}
-
-/* Pattern 42: Mobile submenu name styling */
-.c-navigation__mobile-submenu-name {
-  @media (max-width: 1024px) {
-    font-size: 16px;
-    line-height: 24px;
-    color: var(--nav-text-color);
-  }
-}
-
-/* Pattern 43: Mobile submenu text hidden */
-.c-navigation__mobile-submenu-text {
-  @media (max-width: 1024px) {
-    display: none;
-  }
-}
-
-/* Pattern 44: Mobile item arrow positioning */
-.c-navigation__mobile-item-arrow {
-  @media (max-width: 1024px) {
-    top: 25px;
-    right: 15px;
-    border-color: var(--nav-text-color);
-  }
-}
-
-/* Pattern 45: Mobile arrow touch area */
-.c-navigation__mobile-item-arrow:before {
-  @media (max-width: 1024px) {
-    content: '';
-    position: absolute;
-    left: -15px;
-    right: -15px;
-    top: -15px;
-    bottom: -15px;
-    cursor: pointer;
-  }
-}
-
-/* ===== BATCH 4: Header Navigation Layout Patterns (Patterns 46-60) ===== */
-
-/* Pattern 46: Header navigation row content */
-.c-navigation__header-row-content {
-  max-width: 1280px;
-}
-
-/* Pattern 47: Header navigation row wrapper */
-.c-navigation__header-row-wrap {
-  padding-top: 15px;
-  padding-bottom: 0px;
-}
-
-/* Pattern 48: Header navigation logo container */
-.c-navigation__header-logo {
-  width: 19%;
-}
-
-/* Pattern 49: Header logo responsive medium screens */
-@media (max-width: 1115px) {
-  .c-navigation__header-logo {
-    width: 19% !important;
-    max-width: none;
-    -webkit-box-flex: 0 1 auto;
-    -moz-box-flex: 0 1 auto;
-    -webkit-flex: 0 1 auto;
-    -ms-flex: 0 1 auto;
-    flex: 0 1 auto;
-  }
-}
-
-/* Pattern 50: Header logo responsive small screens */
-@media (max-width: 860px) {
-  .c-navigation__header-logo {
-    width: 50% !important;
-    max-width: none;
-    clear: none;
-    float: left;
-  }
-}
-
-/* Pattern 51: Header navigation menu column */
-.c-navigation__header-menu-col {
-  width: 69%;
-}
-
-/* Pattern 52: Header menu column responsive */
-@media (max-width: 1115px) {
-  .c-navigation__header-menu-col {
-    width: 65% !important;
-    max-width: none;
-    -webkit-box-flex: 0 1 auto;
-    -moz-box-flex: 0 1 auto;
-    -webkit-flex: 0 1 auto;
-    -ms-flex: 0 1 auto;
-    flex: 0 1 auto;
-  }
-}
-
-/* Pattern 53: Header contact button container */
-.c-navigation__header-contact-btn {
-  width: 12%;
-}
-
-/* Pattern 54: Header contact button responsive */
-@media (max-width: 1115px) {
-  .c-navigation__header-contact-btn {
-    width: 16% !important;
-    max-width: none;
-    -webkit-box-flex: 0 1 auto;
-    -moz-box-flex: 0 1 auto;
-    -webkit-flex: 0 1 auto;
-    -ms-flex: 0 1 auto;
-    flex: 0 1 auto;
-  }
-}
-
-/* Pattern 55: Header logo photo styling */
-.c-navigation__header-logo-photo {
-  height: 65px;
-  width: 100px;
-}
-
-/* Pattern 56: Header logo photo content and image */
-.c-navigation__header-logo-photo-content,
-.c-navigation__header-logo-photo-img {
-  height: 65px !important;
-}
-
-/* Pattern 57: Mobile navigation state reset hover effects */
-@media (max-width: 1024px) {
-  .c-navigation__item:hover .c-navigation__item-arrow {
-    border-color: inherit;
-  }
-
-  .c-navigation__item:hover .c-navigation__link,
-  .c-navigation__submenu-item:hover .c-navigation__submenu-name {
-    color: inherit;
-  }
-}
-
-/* Pattern 58: Mobile arrow open state rotation */
-.c-navigation__item--open .c-navigation__item-arrow {
-  @media (max-width: 1024px) {
-    transform: rotate(225deg);
-  }
-}
-
-/* Pattern 59: Mobile menu opener color fixes */
-@media (max-width: 1024px) {
-  .c-navigation__menu-opener {
-    border-color: var(--nav-text-color);
-  }
-
-  .c-navigation__menu-opener:before {
-    background-color: var(--nav-text-color);
-  }
-
-  .c-navigation__menu-close:before,
-  .c-navigation__menu-close:after {
-    background-color: var(--nav-text-color);
-  }
-}
-
-/* Pattern 60: Mobile color consistency overrides */
-@media (max-width: 1024px) {
-  .c-navigation {
-    background-color: #ffffff;
-  }
-
-  .c-navigation__submenu {
-    background-color: #ffffff;
-  }
-
-  .c-navigation__link {
-    color: var(--nav-text-color);
-  }
-
-  .c-navigation__item-arrow {
-    border-color: var(--nav-text-color);
-  }
-
-  .c-navigation__submenu-name {
-    color: var(--nav-text-color);
-  }
-}
-
-/* ===== BATCH 5: PP Advanced Menu Integration Patterns (Patterns 61-82) ===== */
-
-/* Pattern 61: PP Advanced Menu base styles */
-.c-navigation__pp-menu ul,
-.c-navigation__pp-menu li {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-/* Pattern 62: PP Advanced Menu clearfix */
-.c-navigation__pp-menu .menu:before,
-.c-navigation__pp-menu .menu:after {
-  content: "";
-  display: table;
-  clear: both;
-}
-
-/* Pattern 63: PP Advanced Menu horizontal layout */
-.c-navigation__pp-menu--horizontal {
-  display: inline-flex;
-  flex-wrap: wrap;
-  align-items: center;
-}
-
-/* Pattern 64: PP Advanced Menu base menu styling */
-.c-navigation__pp-menu .menu {
-  padding-left: 0;
-}
-
-/* Pattern 65: PP Advanced Menu list item positioning */
-.c-navigation__pp-menu li {
-  position: relative;
-}
-
-/* Pattern 66: PP Advanced Menu link styling */
-.c-navigation__pp-menu a {
-  display: block;
-  text-decoration: none;
-  outline: 0;
-}
-
-/* Pattern 67: PP Advanced Menu link hover and focus */
-.c-navigation__pp-menu a:hover,
-.c-navigation__pp-menu a:focus {
-  text-decoration: none;
-  outline: 0;
-}
-
-/* Pattern 68: PP Advanced Menu submenu width */
-.c-navigation__pp-menu .sub-menu {
-  width: 220px;
-}
-
-/* Pattern 69: PP Advanced Menu nav outline reset */
-.c-navigation__pp-menu-nav {
-  outline: 0;
-}
-
-/* Pattern 70: PP Advanced Menu submenu focus states */
-.c-navigation__pp-menu .pp-has-submenu:focus,
-.c-navigation__pp-menu .pp-has-submenu .sub-menu:focus,
-.c-navigation__pp-menu .pp-has-submenu-container:focus {
-  outline: 0;
-}
-
-/* Pattern 71: PP Advanced Menu submenu container */
-.c-navigation__pp-menu .pp-has-submenu-container {
-  position: relative;
-}
-
-/* Pattern 72: PP Advanced Menu accordion submenu hidden */
-.c-navigation__pp-menu--accordion .pp-has-submenu > .sub-menu {
-  display: none;
-}
-
-/* Pattern 73: PP Advanced Menu toggle positioning */
-.c-navigation__pp-menu-toggle {
-  position: absolute;
-  top: 50%;
-  right: 10px;
-  cursor: pointer;
-}
-
-/* Pattern 74: PP Advanced Menu toggle arrow styling */
-.c-navigation__pp-menu-toggle--arrows:before,
-.c-navigation__pp-menu-toggle--none:before {
-  content: "";
-  border-color: #333;
-}
-
-/* Pattern 75: PP Advanced Menu expanded toggle hidden */
-.c-navigation__pp-menu--expanded .c-navigation__pp-menu-toggle {
-  display: none;
-}
-
-/* Pattern 76: PP Advanced Menu mobile container */
-.c-navigation__pp-menu--mobile {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-/* Pattern 77: Mobile PP menu toggle button */
-.c-navigation__pp-mobile-toggle {
-  display: none;
-  cursor: pointer;
-  border: 0;
-  background: transparent;
-  padding: 5px;
-  outline: 0;
-}
-
-/* Pattern 78: Mobile PP menu hamburger lines */
-.c-navigation__pp-hamburger {
-  position: relative;
-  display: inline-block;
-  width: 24px;
-  height: 18px;
-}
-
-/* Pattern 79: PP hamburger box container */
-.c-navigation__pp-hamburger-box {
-  position: relative;
-  display: inline-block;
-  width: 24px;
-  height: 18px;
-}
-
-/* Pattern 80: PP hamburger inner lines */
-.c-navigation__pp-hamburger-inner {
-  position: absolute;
-  width: 24px;
-  height: 2px;
-  background-color: #333;
-  border-radius: 2px;
-  top: 50%;
-  margin-top: -1px;
-  transition: all 0.25s ease;
-}
-
-/* Pattern 81: PP hamburger inner pseudo-elements */
-.c-navigation__pp-hamburger-inner:before,
-.c-navigation__pp-hamburger-inner:after {
-  content: '';
-  position: absolute;
-  width: 24px;
-  height: 2px;
-  background-color: #333;
-  border-radius: 2px;
-  transition: all 0.25s ease;
-}
-
-/* Pattern 82: PP hamburger top and bottom lines */
-.c-navigation__pp-hamburger-inner:before {
-  top: -8px;
-}
-
-.c-navigation__pp-hamburger-inner:after {
-  top: 8px;
-}
-
-/* ===== Legacy FL-Builder and PP Integration Selectors ===== */
-
-/* Backward compatibility for existing FL-Builder selectors */
-.fl-menu,
-.fl-menu-item,
-.fl-menu-link,
-.pp-advanced-menu,
-.pp-has-submenu,
-.pp-menu-toggle {
-  /* Legacy selectors maintained for backward compatibility */
-  /* New implementations should use c-navigation__ prefixed classes */
-}
\ No newline at end of file
diff --git a/themes/beaver/assets/css/components/c-pp-advanced-menu.css b/themes/beaver/assets/css/components/c-pp-advanced-menu.css
index 5f7ef03b5..c92790bd6 100644
--- a/themes/beaver/assets/css/components/c-pp-advanced-menu.css
+++ b/themes/beaver/assets/css/components/c-pp-advanced-menu.css
@@ -452,7 +452,7 @@ ul.c-pp-menu__horizontal li.mega-menu > ul.sub-menu .c-pp-menu__toggle {
 .fl-node-menu .c-pp-menu .menu > li > a:focus,
 .fl-node-menu .c-pp-menu .menu > li > .c-pp-menu__submenu-container > a:hover,
 .fl-node-menu .c-pp-menu .menu > li > .c-pp-menu__submenu-container > a:focus {
-  color: #121212;
+  color: var(--color-dark);
 }
 
 /* ==========================================================================
diff --git a/themes/beaver/assets/css/components/c-pp-buttons.css b/themes/beaver/assets/css/components/c-pp-buttons.css
index b9bceb527..a22385506 100644
--- a/themes/beaver/assets/css/components/c-pp-buttons.css
+++ b/themes/beaver/assets/css/components/c-pp-buttons.css
@@ -126,12 +126,12 @@ body input[type="submit"] {
 
 .c-pp-infobox-button:hover .c-pp-more-link,
 .jt-service-box:hover .pp-infobox-description .pp-infobox-button .pp-more-link {
-  color: #1a8cff !important;
+  color: var(--color-primary) !important;
 }
 
 .c-pp-infobox-button:hover .c-pp-more-link i,
 .jt-service-box:hover .pp-infobox-description .pp-infobox-button .pp-more-link i {
-  color: #1a8cff !important;
+  color: var(--color-primary) !important;
 }
 
 /* PP Swiper Button Styles */
@@ -180,7 +180,7 @@ body input[type="submit"] {
   margin-right: 10px;
   background: rgba(26, 141, 255, 0.1);
   border: unset;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 /* PP Menu Close Button Styles (from advanced menu) */
@@ -349,15 +349,15 @@ body input[type="submit"] {
 
 /* PP Button Style Variants */
 .c-pp-button--primary {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: white;
   border: none;
 }
 
 .c-pp-button--secondary {
   background-color: transparent;
-  color: #1a8cff;
-  border: 2px solid #1a8cff;
+  color: var(--color-primary);
+  border: 2px solid var(--color-primary);
 }
 
 .c-pp-button--outline {
@@ -390,7 +390,7 @@ body input[type="submit"] {
   text-transform: uppercase;
   letter-spacing: 0.5px;
   transition: all 0.3s ease;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 
 .c-pp-cta-button:hover {
diff --git a/themes/beaver/assets/css/components/c-pp-content-grid.css b/themes/beaver/assets/css/components/c-pp-content-grid.css
index 02f6e77bb..22541c09f 100644
--- a/themes/beaver/assets/css/components/c-pp-content-grid.css
+++ b/themes/beaver/assets/css/components/c-pp-content-grid.css
@@ -97,7 +97,7 @@
 }
 
 .c-pp-content-grid__title a:hover {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 /* Content Grid Alternate Layout Specific */
@@ -143,21 +143,21 @@
   padding: 8px 12px;
   text-decoration: none;
   border: 1px solid #ddd;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
   transition: all 0.3s ease;
 }
 
 .c-pp-content-grid__pagination-link:hover {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: white;
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 
 .c-pp-content-grid__pagination-link--current {
   font-weight: bold;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: white;
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 
 .c-pp-content-grid__pagination-link--disabled {
@@ -175,10 +175,10 @@
 .c-pp-content-grid__load-more-button {
   display: inline-block;
   padding: 12px 24px;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: white;
   text-decoration: none;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
   font-weight: 600;
   transition: all 0.3s ease;
 }
diff --git a/themes/beaver/assets/css/components/c-pp-infobox.css b/themes/beaver/assets/css/components/c-pp-infobox.css
index ec792fc13..a91a7f078 100644
--- a/themes/beaver/assets/css/components/c-pp-infobox.css
+++ b/themes/beaver/assets/css/components/c-pp-infobox.css
@@ -68,7 +68,7 @@
 
 .c-pp-infobox:hover .c-pp-infobox__icon i {
   transform: scale(1.1);
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 /* InfoBox Title Components */
@@ -97,7 +97,7 @@
 }
 
 .c-pp-infobox:hover .c-pp-infobox__title {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .c-pp-infobox__subtitle {
@@ -151,7 +151,7 @@
 .c-pp-infobox__more-link:hover,
 .c-pp-more-link:hover {
   text-decoration: none;
-  color: #1a8cff;
+  color: var(--color-primary);
   transform: translateX(3px);
 }
 
@@ -286,7 +286,7 @@
   height: 20px;
   margin: -10px 0 0 -10px;
   border: 2px solid transparent;
-  border-top-color: #1a8cff;
+  border-top-color: var(--color-primary);
   border-radius: 50%;
   animation: infoboxSpin 1s linear infinite;
   z-index: 10;
@@ -305,7 +305,7 @@
   justify-content: center;
   width: 40px;
   height: 40px;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: white;
   border-radius: 50%;
   font-weight: bold;
diff --git a/themes/beaver/assets/css/components/c-pp-widgets.css b/themes/beaver/assets/css/components/c-pp-widgets.css
index 3e594248a..8b131228f 100644
--- a/themes/beaver/assets/css/components/c-pp-widgets.css
+++ b/themes/beaver/assets/css/components/c-pp-widgets.css
@@ -386,7 +386,7 @@
 }
 
 .c-pp-team__social-link:hover {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: white;
   transform: translateY(-2px);
 }
@@ -463,7 +463,7 @@
   left: 50%;
   width: 16px;
   height: 16px;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   border-radius: 50%;
   transform: translateX(-50%);
   z-index: 2;
@@ -478,7 +478,7 @@
 .c-pp-timeline__date {
   font-size: 0.9em;
   font-weight: 600;
-  color: #1a8cff;
+  color: var(--color-primary);
   margin-bottom: 10px;
 }
 
@@ -521,7 +521,7 @@
   height: 20px;
   margin: -10px 0 0 -10px;
   border: 2px solid transparent;
-  border-top-color: #1a8cff;
+  border-top-color: var(--color-primary);
   border-radius: 50%;
   animation: c-pp-widget-spin 1s linear infinite;
 }
diff --git a/themes/beaver/assets/css/components/c-social-share.css b/themes/beaver/assets/css/components/c-social-share.css
index 5a0b20f5c..b50e1b3a0 100644
--- a/themes/beaver/assets/css/components/c-social-share.css
+++ b/themes/beaver/assets/css/components/c-social-share.css
@@ -263,7 +263,7 @@
 
 .c-social-share--author .c-social-share__link {
   padding: 9px 12px;
-  background-color: #121212;
+  background-color: var(--color-dark);
   color: #fff;
   border-radius: 6px;
   font-size: 14px;
@@ -281,7 +281,7 @@
 
 .c-social-share--author .c-social-share__link:hover {
   background-color: #fff;
-  color: #121212;
+  color: var(--color-dark);
 }
 
 /* LinkedIn social hide pattern */
@@ -309,9 +309,9 @@
 
 /* Social icon accessibility focus */
 .c-social-share__link:focus-visible {
-  outline: 2px solid #1a8cff;
+  outline: 2px solid var(--color-primary);
   outline-offset: 2px;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 
 /* Focus states for all social share variants */
@@ -364,7 +364,7 @@
   justify-content: center;
   padding: 8px 16px;
   border: none;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
   text-decoration: none;
   font-weight: 500;
   transition: all 0.3s ease-in-out;
diff --git a/themes/beaver/assets/css/components/content-block.css b/themes/beaver/assets/css/components/content-block.css
index aee2310ee..3ea2ca6a3 100644
--- a/themes/beaver/assets/css/components/content-block.css
+++ b/themes/beaver/assets/css/components/content-block.css
@@ -63,10 +63,10 @@
 .c-content-block--text-right { text-align: right; }
 
 /* Color modifiers - from most common brand patterns */
-.c-content-block--color-primary { color: #1a8cff; }
-.c-content-block--color-dark { color: #121212; }
+.c-content-block--color-primary { color: var(--color-primary); }
+.c-content-block--color-dark { color: var(--color-dark); }
 .c-content-block--color-light { color: #ffffff; }
-.c-content-block--color-muted { color: #969798; }
+.c-content-block--color-muted { color: var(--color-muted); }
 .c-content-block--color-background { color: #F5F6F8; }
 .c-content-block--color-accent { color: #e63946; }
 
@@ -114,7 +114,7 @@
  * Common in eyebrow text, labels, and highlights
  */
 .c-content-block--eyebrow {
-  color: #1a8cff;
+  color: var(--color-primary);
   font-weight: 600;
 }
 
diff --git a/themes/beaver/assets/css/components/navigation-migration.css b/themes/beaver/assets/css/components/navigation-migration.css
deleted file mode 100644
index f62fd9974..000000000
--- a/themes/beaver/assets/css/components/navigation-migration.css
+++ /dev/null
@@ -1,50 +0,0 @@
-/* components/navigation-migration.css */
-/* Phase 0: Navigation Component Migration - Dual-class strategy */
-.navigation,
-.c-nav {
-  /* Base navigation container styles */
-  @media (max-width: 1024px) {
-    position: fixed;
-    background-color: #ffffff; /* var(--jt-white) mobile fix */
-  }
-}
-
-.navigation .nav,
-.c-nav__list {
-  /* Navigation list base styles */
-  @media (max-width: 1024px) {
-    flex-direction: column;
-    width: 100%;
-  }
-}
-
-.navigation .nav li,
-.c-nav__item {
-  /* Navigation item base styles */
-}
-
-.navigation .nav .link,
-.c-nav__link {
-  /* Navigation link base styles */
-  @media (max-width: 1024px) {
-    color: #121212; /* var(--jt-text-primary) mobile fix */
-    display: block;
-  }
-}
-
-.menu-opener,
-.c-nav__toggle {
-  /* Mobile menu toggle styles */
-  @media (max-width: 1024px) {
-    border-color: #121212; /* var(--jt-text-primary) mobile fix */
-    display: block;
-  }
-}
-
-.menu-opener:before,
-.c-nav__toggle:before {
-  /* Mobile toggle hamburger line */
-  @media (max-width: 1024px) {
-    background-color: #121212; /* var(--jt-text-primary) mobile fix */
-  }
-}
\ No newline at end of file
diff --git a/themes/beaver/assets/css/critical/about-us-critical.css b/themes/beaver/assets/css/critical/about-us-critical.css
index 0698f78f6..296f76db9 100644
--- a/themes/beaver/assets/css/critical/about-us-critical.css
+++ b/themes/beaver/assets/css/critical/about-us-critical.css
@@ -284,9 +284,9 @@
 }
 .fl-builder-content a.fl-button,
 .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: 400;
@@ -544,7 +544,7 @@
 }
 .fl-builder-content .fl-node-ows5td8cbip3 .fl-module-content .fl-rich-text,
 .fl-builder-content .fl-node-ows5td8cbip3 .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-builder-content .fl-node-ows5td8cbip3 .fl-rich-text {
   font-weight: 600;
@@ -555,7 +555,7 @@
 }
 .fl-builder-content .fl-node-6d9equxbio2h .fl-module-content .fl-rich-text,
 .fl-builder-content .fl-node-6d9equxbio2h .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-builder-content .fl-node-6d9equxbio2h .fl-rich-text {
   font-weight: 600;
@@ -804,7 +804,7 @@
   position: absolute;
   width: 30px;
   height: 3px;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 .pp-advanced-menu-mobile-toggle
   .pp-hamburger
@@ -922,7 +922,7 @@
   border-color: var(--color-dark);
 }
 .fl-node-ncg61wov0ytq .menu > li.current-menu-item > a {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-node-ncg61wov0ytq .menu .pp-has-submenu .sub-menu {
   display: none;
@@ -1529,7 +1529,7 @@ img {
 }
 a.fl-button,
 a.fl-button:visited {
-  background: #1a8cff;
+  background: var(--color-primary);
   color: #fff;
   border: 1px solid #006ddc;
 }
@@ -1538,7 +1538,7 @@ a.fl-button:visited * {
   color: #fff;
 }
 button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #fff;
   font-size: 18px;
   line-height: 1.45;
@@ -1549,6 +1549,9 @@ button {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
+  /* KEEP LITERAL (all three): reboot-generic button rule — tokenizing breaks
+     dedup-twin byte-identity and the deleted duplicate re-appears in every
+     bundle (WP1.1) */
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
@@ -1604,7 +1607,7 @@ button {
 .fl-page a.fl-button:visited,
 .fl-page button:visited {
   color: #fff;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   font-family: var(--font-system-ui);
   font-weight: 700;
   font-size: 18px;
diff --git a/themes/beaver/assets/css/critical/careers-critical.css b/themes/beaver/assets/css/critical/careers-critical.css
index 69f569d7b..e815e49a5 100644
--- a/themes/beaver/assets/css/critical/careers-critical.css
+++ b/themes/beaver/assets/css/critical/careers-critical.css
@@ -160,9 +160,9 @@
 }
 .fl-builder-content a.fl-button,
 .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: 400;
@@ -404,7 +404,7 @@
 }
 .fl-builder-content .fl-node-4h3i0s82lbyx .fl-module-content .fl-rich-text,
 .fl-builder-content .fl-node-4h3i0s82lbyx .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-builder-content .fl-node-4h3i0s82lbyx .fl-rich-text {
   font-weight: 600;
@@ -722,7 +722,7 @@
   position: absolute;
   width: 30px;
   height: 3px;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 .pp-advanced-menu-mobile-toggle
   .pp-hamburger
@@ -840,7 +840,7 @@
   border-color: var(--color-dark);
 }
 .fl-node-ncg61wov0ytq .menu > li.current-menu-item > a {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-node-ncg61wov0ytq .menu .pp-has-submenu .sub-menu {
   display: none;
@@ -1455,7 +1455,7 @@ img {
 }
 a.fl-button,
 a.fl-button:visited {
-  background: #1a8cff;
+  background: var(--color-primary);
   color: #fff;
   border: 1px solid #006ddc;
 }
@@ -1464,7 +1464,7 @@ a.fl-button:visited * {
   color: #fff;
 }
 button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #fff;
   font-size: 18px;
   line-height: 1.45;
@@ -1475,6 +1475,9 @@ button {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
+  /* KEEP LITERAL (all three): reboot-generic button rule — tokenizing breaks
+     dedup-twin byte-identity and the deleted duplicate re-appears in every
+     bundle (WP1.1) */
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
@@ -1530,7 +1533,7 @@ button {
 .fl-page a.fl-button:visited,
 .fl-page button:visited {
   color: #fff;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   font-family: var(--font-system-ui);
   font-weight: 700;
   font-size: 18px;
diff --git a/themes/beaver/assets/css/critical/clients-critical.css b/themes/beaver/assets/css/critical/clients-critical.css
index 74d7c18f4..3b788fd21 100644
--- a/themes/beaver/assets/css/critical/clients-critical.css
+++ b/themes/beaver/assets/css/critical/clients-critical.css
@@ -253,7 +253,7 @@
   padding: 7px 15px;
   background-color: rgba(26, 140, 255, 0.1) !important;
   border-radius: 21px;
-  color: #1a8cff;
+  color: var(--color-primary);
   margin-bottom: 8px;
 }
 .fl-node-z9jw2gxm5ev0 .case-category ul li:not(:last-child) {
@@ -316,7 +316,7 @@
   padding: 7px 15px;
   background-color: rgba(26, 140, 255, 0.1) !important;
   border-radius: 21px;
-  color: #1a8cff;
+  color: var(--color-primary);
   margin-bottom: 8px;
 }
 .fl-node-nj7igdpblkay .case-category ul li:not(:last-child) {
diff --git a/themes/beaver/assets/css/critical/fl-common-modules.css b/themes/beaver/assets/css/critical/fl-common-modules.css
index b661ad512..4435b28d8 100644
--- a/themes/beaver/assets/css/critical/fl-common-modules.css
+++ b/themes/beaver/assets/css/critical/fl-common-modules.css
@@ -3,9 +3,9 @@
 /* FL-Builder Button Styles */
 .fl-builder-content a.fl-button,
 .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: 400;
@@ -169,7 +169,7 @@
   position: absolute;
   width: 30px;
   height: 3px;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 .pp-advanced-menu-mobile-toggle
   .pp-hamburger
@@ -618,7 +618,7 @@ img {
 }
 a.fl-button,
 a.fl-button:visited {
-  background: #1a8cff;
+  background: var(--color-primary);
   color: #fff;
   border: 1px solid #006ddc;
 }
@@ -627,7 +627,7 @@ a.fl-button:visited * {
   color: #fff;
 }
 button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #fff;
   font-size: 18px;
   line-height: 1.45;
@@ -638,6 +638,9 @@ button {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
+  /* KEEP LITERAL (all three): reboot-generic button rule — tokenizing breaks
+     dedup-twin byte-identity and the deleted duplicate re-appears in every
+     bundle (WP1.1) */
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
@@ -704,7 +707,7 @@ button {
 .fl-page a.fl-button,
 .fl-page a.fl-button:visited {
   color: #fff;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   font-family: var(--font-system-ui);
   font-weight: 700;
   font-size: 18px;
diff --git a/themes/beaver/assets/css/critical/free-consultation-critical.css b/themes/beaver/assets/css/critical/free-consultation-critical.css
index 9e1b2adec..02e48f39d 100644
--- a/themes/beaver/assets/css/critical/free-consultation-critical.css
+++ b/themes/beaver/assets/css/critical/free-consultation-critical.css
@@ -296,56 +296,56 @@
   .gform_wrapper
   .gfield
   input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-node-bmn85orw3pj1
   .pp-gf-content
   .gform_wrapper
   .gfield
   input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-node-bmn85orw3pj1
   .pp-gf-content
   .gform_wrapper
   .gfield
   input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-node-bmn85orw3pj1
   .pp-gf-content
   .gform_wrapper
   .gfield
   input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-node-bmn85orw3pj1
   .pp-gf-content
   .gform_wrapper
   .gfield
   textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-node-bmn85orw3pj1
   .pp-gf-content
   .gform_wrapper
   .gfield
   textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-node-bmn85orw3pj1
   .pp-gf-content
   .gform_wrapper
   .gfield
   textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-node-bmn85orw3pj1
   .pp-gf-content
   .gform_wrapper
   .gfield
   textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-node-bmn85orw3pj1 .pp-gf-content .gform_wrapper .gform_footer {
   text-align: right;
diff --git a/themes/beaver/assets/css/critical/homepage-critical.css b/themes/beaver/assets/css/critical/homepage-critical.css
index 387bc2d02..980165b1d 100644
--- a/themes/beaver/assets/css/critical/homepage-critical.css
+++ b/themes/beaver/assets/css/critical/homepage-critical.css
@@ -399,7 +399,7 @@
   position: absolute;
   width: 30px;
   height: 3px;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 .pp-advanced-menu-mobile-toggle
   .pp-hamburger
@@ -921,9 +921,9 @@
 /* FL-Builder Button Module */
 .fl-builder-content a.fl-button,
 .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: 400;
@@ -1752,7 +1752,7 @@ img {
 
 a.fl-button,
 a.fl-button:visited {
-  background: #1a8cff;
+  background: var(--color-primary);
   color: #fff;
   border: 1px solid #006ddc;
 }
@@ -1761,7 +1761,7 @@ a.fl-button:visited * {
   color: #fff;
 }
 button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #fff;
   font-size: 18px;
   line-height: 1.45;
@@ -1772,6 +1772,9 @@ button {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
+  /* KEEP LITERAL (all three): reboot-generic button rule — tokenizing breaks
+     dedup-twin byte-identity and the deleted duplicate re-appears in every
+     bundle (WP1.1) */
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
@@ -1831,7 +1834,7 @@ button {
 .fl-page a.fl-button:visited,
 .fl-page button:visited {
   color: #fff;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   font-family: var(--font-system-ui);
   font-weight: 700;
   font-size: 18px;
@@ -2044,7 +2047,7 @@ header ul.menu > li > ul.sub-menu > li > a .menu-image {
 }
 .jt-tabs .pp-tabs .pp-tabs-panels .pp-tabs-panel .pp-tabs-panel-content div a {
   padding: 12px 25px;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #fff;
   border-radius: 25px;
   font-family: roboto, sans-serif !important;
diff --git a/themes/beaver/assets/css/critical/services-critical.css b/themes/beaver/assets/css/critical/services-critical.css
index 5779e099a..e08c9d6bc 100644
--- a/themes/beaver/assets/css/critical/services-critical.css
+++ b/themes/beaver/assets/css/critical/services-critical.css
@@ -173,7 +173,7 @@
 /* Hero Text Module */
 .fl-builder-content .fl-node-5auhpfbjkslc .fl-module-content .fl-rich-text,
 .fl-builder-content .fl-node-5auhpfbjkslc .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-builder-content .fl-node-5auhpfbjkslc .fl-rich-text,
 .fl-builder-content .fl-node-5auhpfbjkslc .fl-rich-text *:not(b, strong) {
@@ -218,182 +218,69 @@
   }
 }
 
-/* Service Infoboxes */
-.fl-node-0pigeztak1xl .pp-infobox-title-wrapper .pp-infobox-title {
-  margin-top: 30px;
-  margin-bottom: 0;
-}
-.fl-node-0pigeztak1xl .pp-infobox-description {
-  margin-top: 15px;
-  margin-bottom: 0;
-}
-.fl-node-0pigeztak1xl .pp-infobox-image {
-  text-align: left;
-}
-.fl-node-0pigeztak1xl .pp-infobox-wrap .pp-infobox {
-  text-align: left;
-}
-.fl-node-0pigeztak1xl .pp-infobox .pp-more-link {
-  color: #1a8cff;
-  background-color: rgba(255, 0, 0, 0);
-  text-decoration: none;
-  text-align: center;
-  margin: 0 auto;
-}
-.fl-node-0pigeztak1xl .pp-infobox .pp-more-link .pp-button-icon {
-  font-size: 22px;
-  color: #1a8cff;
-}
-.fl-node-0pigeztak1xl .pp-infobox .pp-more-link .pp-button-icon-right {
-  margin-left: 15px;
-}
-.fl-node-0pigeztak1xl .pp-infobox .animated {
-  -webkit-animation-duration: 500ms;
-  -moz-animation-duration: 500ms;
-  -o-animation-duration: 500ms;
-  -ms-animation-duration: 500ms;
-  animation-duration: 500ms;
-}
-@media only screen and (max-width: 1115px) {
-  .fl-node-0pigeztak1xl .pp-infobox {
-    text-align: left;
-  }
-}
-@media only screen and (max-width: 860px) {
-  .fl-node-0pigeztak1xl .pp-infobox-wrap .pp-infobox {
-    text-align: left;
-  }
-}
-.fl-node-0pigeztak1xl .pp-infobox-title-wrapper .pp-infobox-title {
-  font-size: 22px;
-}
-.fl-node-0pigeztak1xl .pp-infobox {
-  padding-top: 30px;
-  padding-right: 30px;
-  padding-bottom: 30px;
-  padding-left: 30px;
-  border-top-left-radius: 14px;
-  border-top-right-radius: 14px;
-  border-bottom-left-radius: 14px;
-  border-bottom-right-radius: 14px;
-}
-.fl-node-0pigeztak1xl .pp-more-link {
-  font-family: var(--font-system-ui);
-  font-weight: 700;
-}
-.fl-node-0pigeztak1xl .pp-infobox .pp-more-link {
-  padding-top: 0;
-  padding-right: 0;
-  padding-bottom: 0;
-  padding-left: 0;
-  margin-top: 32px;
-  margin-right: 0;
-  margin-bottom: 0;
-  margin-left: 0;
-}
-
-.fl-node-ugiypbhnvlfw .pp-infobox-title-wrapper .pp-infobox-title {
-  margin-top: 30px;
-  margin-bottom: 0;
-}
-.fl-node-ugiypbhnvlfw .pp-infobox-description {
-  margin-top: 15px;
-  margin-bottom: 0;
-}
-.fl-node-ugiypbhnvlfw .pp-infobox-image {
-  text-align: left;
-}
-.fl-node-ugiypbhnvlfw .pp-infobox-wrap .pp-infobox {
-  text-align: left;
-}
-.fl-node-ugiypbhnvlfw .pp-infobox .pp-more-link {
-  color: #1a8cff;
-  background-color: rgba(255, 0, 0, 0);
-  text-decoration: none;
-  text-align: center;
-  margin: 0 auto;
-}
-.fl-node-ugiypbhnvlfw .pp-infobox .pp-more-link .pp-button-icon {
-  font-size: 22px;
-  color: #1a8cff;
-}
-.fl-node-ugiypbhnvlfw .pp-infobox .pp-more-link .pp-button-icon-right {
-  margin-left: 15px;
-}
-.fl-node-ugiypbhnvlfw .pp-infobox .animated {
-  -webkit-animation-duration: 500ms;
-  -moz-animation-duration: 500ms;
-  -o-animation-duration: 500ms;
-  -ms-animation-duration: 500ms;
-  animation-duration: 500ms;
-}
-@media only screen and (max-width: 1115px) {
-  .fl-node-ugiypbhnvlfw .pp-infobox {
-    text-align: left;
-  }
-}
-@media only screen and (max-width: 860px) {
-  .fl-node-ugiypbhnvlfw .pp-infobox-wrap .pp-infobox {
-    text-align: left;
-  }
-}
-.fl-node-ugiypbhnvlfw .pp-infobox-title-wrapper .pp-infobox-title {
-  font-size: 22px;
-}
-.fl-node-ugiypbhnvlfw .pp-infobox {
-  padding-top: 30px;
-  padding-right: 30px;
-  padding-bottom: 30px;
-  padding-left: 30px;
-  border-top-left-radius: 14px;
-  border-top-right-radius: 14px;
-  border-bottom-left-radius: 14px;
-  border-bottom-right-radius: 14px;
-}
-.fl-node-ugiypbhnvlfw .pp-more-link {
-  font-family: var(--font-system-ui);
-  font-weight: 700;
-}
-.fl-node-ugiypbhnvlfw .pp-infobox .pp-more-link {
-  padding-top: 0;
-  padding-right: 0;
-  padding-bottom: 0;
-  padding-left: 0;
-  margin-top: 32px;
-  margin-right: 0;
-  margin-bottom: 0;
-  margin-left: 0;
-}
-
-.fl-node-h2wjp3zb7afk .pp-infobox-title-wrapper .pp-infobox-title {
+/* Service Infoboxes — WP1.3: 6 FL nodes shared identical rule blocks
+   (3 full + 3 without the more-link rules); consolidated via selector
+   grouping, order preserved from the first block. */
+.fl-node-0pigeztak1xl .pp-infobox-title-wrapper .pp-infobox-title,
+.fl-node-ugiypbhnvlfw .pp-infobox-title-wrapper .pp-infobox-title,
+.fl-node-h2wjp3zb7afk .pp-infobox-title-wrapper .pp-infobox-title,
+.fl-node-nwx7eiysakvl .pp-infobox-title-wrapper .pp-infobox-title,
+.fl-node-a5khmr6nto3z .pp-infobox-title-wrapper .pp-infobox-title,
+.fl-node-2ufxtslray80 .pp-infobox-title-wrapper .pp-infobox-title {
   margin-top: 30px;
   margin-bottom: 0;
 }
-.fl-node-h2wjp3zb7afk .pp-infobox-description {
+.fl-node-0pigeztak1xl .pp-infobox-description,
+.fl-node-ugiypbhnvlfw .pp-infobox-description,
+.fl-node-h2wjp3zb7afk .pp-infobox-description,
+.fl-node-nwx7eiysakvl .pp-infobox-description,
+.fl-node-a5khmr6nto3z .pp-infobox-description,
+.fl-node-2ufxtslray80 .pp-infobox-description {
   margin-top: 15px;
   margin-bottom: 0;
 }
-.fl-node-h2wjp3zb7afk .pp-infobox-image {
+.fl-node-0pigeztak1xl .pp-infobox-image,
+.fl-node-ugiypbhnvlfw .pp-infobox-image,
+.fl-node-h2wjp3zb7afk .pp-infobox-image,
+.fl-node-nwx7eiysakvl .pp-infobox-image,
+.fl-node-a5khmr6nto3z .pp-infobox-image,
+.fl-node-2ufxtslray80 .pp-infobox-image {
   text-align: left;
 }
-.fl-node-h2wjp3zb7afk .pp-infobox-wrap .pp-infobox {
+.fl-node-0pigeztak1xl .pp-infobox-wrap .pp-infobox,
+.fl-node-ugiypbhnvlfw .pp-infobox-wrap .pp-infobox,
+.fl-node-h2wjp3zb7afk .pp-infobox-wrap .pp-infobox,
+.fl-node-nwx7eiysakvl .pp-infobox-wrap .pp-infobox,
+.fl-node-a5khmr6nto3z .pp-infobox-wrap .pp-infobox,
+.fl-node-2ufxtslray80 .pp-infobox-wrap .pp-infobox {
   text-align: left;
 }
+.fl-node-0pigeztak1xl .pp-infobox .pp-more-link,
+.fl-node-ugiypbhnvlfw .pp-infobox .pp-more-link,
 .fl-node-h2wjp3zb7afk .pp-infobox .pp-more-link {
-  color: #1a8cff;
+  color: var(--color-primary);
   background-color: rgba(255, 0, 0, 0);
   text-decoration: none;
   text-align: center;
   margin: 0 auto;
 }
+.fl-node-0pigeztak1xl .pp-infobox .pp-more-link .pp-button-icon,
+.fl-node-ugiypbhnvlfw .pp-infobox .pp-more-link .pp-button-icon,
 .fl-node-h2wjp3zb7afk .pp-infobox .pp-more-link .pp-button-icon {
   font-size: 22px;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
+.fl-node-0pigeztak1xl .pp-infobox .pp-more-link .pp-button-icon-right,
+.fl-node-ugiypbhnvlfw .pp-infobox .pp-more-link .pp-button-icon-right,
 .fl-node-h2wjp3zb7afk .pp-infobox .pp-more-link .pp-button-icon-right {
   margin-left: 15px;
 }
-.fl-node-h2wjp3zb7afk .pp-infobox .animated {
+.fl-node-0pigeztak1xl .pp-infobox .animated,
+.fl-node-ugiypbhnvlfw .pp-infobox .animated,
+.fl-node-h2wjp3zb7afk .pp-infobox .animated,
+.fl-node-nwx7eiysakvl .pp-infobox .animated,
+.fl-node-a5khmr6nto3z .pp-infobox .animated,
+.fl-node-2ufxtslray80 .pp-infobox .animated {
   -webkit-animation-duration: 500ms;
   -moz-animation-duration: 500ms;
   -o-animation-duration: 500ms;
@@ -401,19 +288,39 @@
   animation-duration: 500ms;
 }
 @media only screen and (max-width: 1115px) {
-  .fl-node-h2wjp3zb7afk .pp-infobox {
+  .fl-node-0pigeztak1xl .pp-infobox,
+  .fl-node-ugiypbhnvlfw .pp-infobox,
+  .fl-node-h2wjp3zb7afk .pp-infobox,
+  .fl-node-nwx7eiysakvl .pp-infobox,
+  .fl-node-a5khmr6nto3z .pp-infobox,
+  .fl-node-2ufxtslray80 .pp-infobox {
     text-align: left;
   }
 }
 @media only screen and (max-width: 860px) {
-  .fl-node-h2wjp3zb7afk .pp-infobox-wrap .pp-infobox {
+  .fl-node-0pigeztak1xl .pp-infobox-wrap .pp-infobox,
+  .fl-node-ugiypbhnvlfw .pp-infobox-wrap .pp-infobox,
+  .fl-node-h2wjp3zb7afk .pp-infobox-wrap .pp-infobox,
+  .fl-node-nwx7eiysakvl .pp-infobox-wrap .pp-infobox,
+  .fl-node-a5khmr6nto3z .pp-infobox-wrap .pp-infobox,
+  .fl-node-2ufxtslray80 .pp-infobox-wrap .pp-infobox {
     text-align: left;
   }
 }
-.fl-node-h2wjp3zb7afk .pp-infobox-title-wrapper .pp-infobox-title {
+.fl-node-0pigeztak1xl .pp-infobox-title-wrapper .pp-infobox-title,
+.fl-node-ugiypbhnvlfw .pp-infobox-title-wrapper .pp-infobox-title,
+.fl-node-h2wjp3zb7afk .pp-infobox-title-wrapper .pp-infobox-title,
+.fl-node-nwx7eiysakvl .pp-infobox-title-wrapper .pp-infobox-title,
+.fl-node-a5khmr6nto3z .pp-infobox-title-wrapper .pp-infobox-title,
+.fl-node-2ufxtslray80 .pp-infobox-title-wrapper .pp-infobox-title {
   font-size: 22px;
 }
-.fl-node-h2wjp3zb7afk .pp-infobox {
+.fl-node-0pigeztak1xl .pp-infobox,
+.fl-node-ugiypbhnvlfw .pp-infobox,
+.fl-node-h2wjp3zb7afk .pp-infobox,
+.fl-node-nwx7eiysakvl .pp-infobox,
+.fl-node-a5khmr6nto3z .pp-infobox,
+.fl-node-2ufxtslray80 .pp-infobox {
   padding-top: 30px;
   padding-right: 30px;
   padding-bottom: 30px;
@@ -423,10 +330,14 @@
   border-bottom-left-radius: 14px;
   border-bottom-right-radius: 14px;
 }
+.fl-node-0pigeztak1xl .pp-more-link,
+.fl-node-ugiypbhnvlfw .pp-more-link,
 .fl-node-h2wjp3zb7afk .pp-more-link {
   font-family: var(--font-system-ui);
   font-weight: 700;
 }
+.fl-node-0pigeztak1xl .pp-infobox .pp-more-link,
+.fl-node-ugiypbhnvlfw .pp-infobox .pp-more-link,
 .fl-node-h2wjp3zb7afk .pp-infobox .pp-more-link {
   padding-top: 0;
   padding-right: 0;
@@ -454,141 +365,6 @@
   }
 }
 
-.fl-node-nwx7eiysakvl .pp-infobox-title-wrapper .pp-infobox-title {
-  margin-top: 30px;
-  margin-bottom: 0;
-}
-.fl-node-nwx7eiysakvl .pp-infobox-description {
-  margin-top: 15px;
-  margin-bottom: 0;
-}
-.fl-node-nwx7eiysakvl .pp-infobox-image {
-  text-align: left;
-}
-.fl-node-nwx7eiysakvl .pp-infobox-wrap .pp-infobox {
-  text-align: left;
-}
-.fl-node-nwx7eiysakvl .pp-infobox .animated {
-  -webkit-animation-duration: 500ms;
-  -moz-animation-duration: 500ms;
-  -o-animation-duration: 500ms;
-  -ms-animation-duration: 500ms;
-  animation-duration: 500ms;
-}
-@media only screen and (max-width: 1115px) {
-  .fl-node-nwx7eiysakvl .pp-infobox {
-    text-align: left;
-  }
-}
-@media only screen and (max-width: 860px) {
-  .fl-node-nwx7eiysakvl .pp-infobox-wrap .pp-infobox {
-    text-align: left;
-  }
-}
-.fl-node-nwx7eiysakvl .pp-infobox-title-wrapper .pp-infobox-title {
-  font-size: 22px;
-}
-.fl-node-nwx7eiysakvl .pp-infobox {
-  padding-top: 30px;
-  padding-right: 30px;
-  padding-bottom: 30px;
-  padding-left: 30px;
-  border-top-left-radius: 14px;
-  border-top-right-radius: 14px;
-  border-bottom-left-radius: 14px;
-  border-bottom-right-radius: 14px;
-}
-
-.fl-node-a5khmr6nto3z .pp-infobox-title-wrapper .pp-infobox-title {
-  margin-top: 30px;
-  margin-bottom: 0;
-}
-.fl-node-a5khmr6nto3z .pp-infobox-description {
-  margin-top: 15px;
-  margin-bottom: 0;
-}
-.fl-node-a5khmr6nto3z .pp-infobox-image {
-  text-align: left;
-}
-.fl-node-a5khmr6nto3z .pp-infobox-wrap .pp-infobox {
-  text-align: left;
-}
-.fl-node-a5khmr6nto3z .pp-infobox .animated {
-  -webkit-animation-duration: 500ms;
-  -moz-animation-duration: 500ms;
-  -o-animation-duration: 500ms;
-  -ms-animation-duration: 500ms;
-  animation-duration: 500ms;
-}
-@media only screen and (max-width: 1115px) {
-  .fl-node-a5khmr6nto3z .pp-infobox {
-    text-align: left;
-  }
-}
-@media only screen and (max-width: 860px) {
-  .fl-node-a5khmr6nto3z .pp-infobox-wrap .pp-infobox {
-    text-align: left;
-  }
-}
-.fl-node-a5khmr6nto3z .pp-infobox-title-wrapper .pp-infobox-title {
-  font-size: 22px;
-}
-.fl-node-a5khmr6nto3z .pp-infobox {
-  padding-top: 30px;
-  padding-right: 30px;
-  padding-bottom: 30px;
-  padding-left: 30px;
-  border-top-left-radius: 14px;
-  border-top-right-radius: 14px;
-  border-bottom-left-radius: 14px;
-  border-bottom-right-radius: 14px;
-}
-
-.fl-node-2ufxtslray80 .pp-infobox-title-wrapper .pp-infobox-title {
-  margin-top: 30px;
-  margin-bottom: 0;
-}
-.fl-node-2ufxtslray80 .pp-infobox-description {
-  margin-top: 15px;
-  margin-bottom: 0;
-}
-.fl-node-2ufxtslray80 .pp-infobox-image {
-  text-align: left;
-}
-.fl-node-2ufxtslray80 .pp-infobox-wrap .pp-infobox {
-  text-align: left;
-}
-.fl-node-2ufxtslray80 .pp-infobox .animated {
-  -webkit-animation-duration: 500ms;
-  -moz-animation-duration: 500ms;
-  -o-animation-duration: 500ms;
-  -ms-animation-duration: 500ms;
-  animation-duration: 500ms;
-}
-@media only screen and (max-width: 1115px) {
-  .fl-node-2ufxtslray80 .pp-infobox {
-    text-align: left;
-  }
-}
-@media only screen and (max-width: 860px) {
-  .fl-node-2ufxtslray80 .pp-infobox-wrap .pp-infobox {
-    text-align: left;
-  }
-}
-.fl-node-2ufxtslray80 .pp-infobox-title-wrapper .pp-infobox-title {
-  font-size: 22px;
-}
-.fl-node-2ufxtslray80 .pp-infobox {
-  padding-top: 30px;
-  padding-right: 30px;
-  padding-bottom: 30px;
-  padding-left: 30px;
-  border-top-left-radius: 14px;
-  border-top-right-radius: 14px;
-  border-bottom-left-radius: 14px;
-  border-bottom-right-radius: 14px;
-}
-
 /* JT Service Box Custom Styles */
 .jt-service-box .pp-infobox-description .pp-infobox-button .pp-more-link i {
   vertical-align: middle;
diff --git a/themes/beaver/assets/css/critical/single-careers.css b/themes/beaver/assets/css/critical/single-careers.css
index 4f3635e51..7c99ebb06 100644
--- a/themes/beaver/assets/css/critical/single-careers.css
+++ b/themes/beaver/assets/css/critical/single-careers.css
@@ -291,9 +291,9 @@ h2 {
 }
 .fl-builder-content a.fl-button,
 .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: 400;
@@ -619,7 +619,7 @@ h2 {
   position: absolute;
   width: 30px;
   height: 3px;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 .pp-advanced-menu-mobile-toggle
   .pp-hamburger
@@ -1255,7 +1255,7 @@ body:not(.single-fl-theme-layout)
 }
 .fl-builder-content .fl-node-qs2ucemf7j56 .fl-module-content .fl-rich-text,
 .fl-builder-content .fl-node-qs2ucemf7j56 .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-builder-content .fl-node-qs2ucemf7j56 .fl-rich-text {
   font-weight: 700;
@@ -1269,7 +1269,7 @@ body:not(.single-fl-theme-layout)
 }
 .fl-builder-content .fl-node-wtch9dloa7yx .fl-module-content .fl-rich-text,
 .fl-builder-content .fl-node-wtch9dloa7yx .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-builder-content .fl-node-wtch9dloa7yx .fl-rich-text {
   font-weight: 700;
@@ -1570,28 +1570,28 @@ body:not(.single-fl-theme-layout)
   .gform_wrapper
   .gfield
   input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-node-nkrzpgyfwo7s
   .pp-gf-content
   .gform_wrapper
   .gfield
   input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-node-nkrzpgyfwo7s
   .pp-gf-content
   .gform_wrapper
   .gfield
   input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-node-nkrzpgyfwo7s
   .pp-gf-content
   .gform_wrapper
   .gfield
   input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 .fl-node-nkrzpgyfwo7s .pp-gf-content {
   border-top-left-radius: 16px;
@@ -1827,7 +1827,7 @@ img {
 }
 a.fl-button,
 a.fl-button:visited {
-  background: #1a8cff;
+  background: var(--color-primary);
   color: #fff;
   border: 1px solid #006ddc;
 }
@@ -1836,7 +1836,7 @@ a.fl-button:visited * {
   color: #fff;
 }
 button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #fff;
   font-size: 18px;
   line-height: 1.45;
@@ -1847,6 +1847,9 @@ button {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
+  /* KEEP LITERAL (all three): reboot-generic button rule — tokenizing breaks
+     dedup-twin byte-identity and the deleted duplicate re-appears in every
+     bundle (WP1.1) */
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
@@ -1866,9 +1869,9 @@ input[type="text"] {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
+  border-radius: var(--radius-default);
 }
 input[type="email"]::-webkit-input-placeholder,
 input[type="tel"]::-webkit-input-placeholder,
@@ -1905,7 +1908,7 @@ input[type="text"]:-ms-input-placeholder {
 .fl-page a.fl-button:visited,
 .fl-page button:visited {
   color: #fff;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   font-family: var(--font-system-ui);
   font-weight: 700;
   font-size: 18px;
@@ -1998,7 +2001,7 @@ input[type="text"]:-ms-input-placeholder {
   display: block;
   width: 100%;
   height: 40px;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   position: absolute;
   bottom: 0;
   left: 0;
diff --git a/themes/beaver/assets/css/critical/single-clients.css b/themes/beaver/assets/css/critical/single-clients.css
index 39f49705e..453a2bd66 100644
--- a/themes/beaver/assets/css/critical/single-clients.css
+++ b/themes/beaver/assets/css/critical/single-clients.css
@@ -298,9 +298,9 @@
 }
 .fl-builder-content a.fl-button,
 .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: 400;
@@ -659,7 +659,7 @@
   position: absolute;
   width: 30px;
   height: 3px;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 .pp-advanced-menu-mobile-toggle
   .pp-hamburger
@@ -1522,7 +1522,7 @@ img {
 }
 a.fl-button,
 a.fl-button:visited {
-  background: #1a8cff;
+  background: var(--color-primary);
   color: #fff;
   border: 1px solid #006ddc;
 }
@@ -1531,7 +1531,7 @@ a.fl-button:visited * {
   color: #fff;
 }
 button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #fff;
   font-size: 18px;
   line-height: 1.45;
@@ -1542,6 +1542,9 @@ button {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
+  /* KEEP LITERAL (all three): reboot-generic button rule — tokenizing breaks
+     dedup-twin byte-identity and the deleted duplicate re-appears in every
+     bundle (WP1.1) */
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
@@ -1561,7 +1564,7 @@ button {
 .fl-page a.fl-button:visited,
 .fl-page button:visited {
   color: #fff;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   font-family: var(--font-system-ui);
   font-weight: 700;
   font-size: 18px;
diff --git a/themes/beaver/assets/css/critical/single-services.css b/themes/beaver/assets/css/critical/single-services.css
index d20acd654..66fbf1cd4 100644
--- a/themes/beaver/assets/css/critical/single-services.css
+++ b/themes/beaver/assets/css/critical/single-services.css
@@ -117,9 +117,9 @@
 }
 .fl-builder-content a.fl-button,
 .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: 400;
@@ -648,7 +648,7 @@
   position: absolute;
   width: 30px;
   height: 3px;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 .pp-advanced-menu-mobile-toggle
   .pp-hamburger
@@ -791,7 +791,7 @@
 }
 .fl-node-ncg61wov0ytq .sub-menu > li.current-menu-item > a {
   background-color:;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-node-ncg61wov0ytq .pp-advanced-menu .pp-menu-toggle:before {
   content: "";
@@ -1261,7 +1261,7 @@ header ul.menu > li > ul.sub-menu > li > a .menu-image {
   }
 }
 header ul.menu > li.current-page-ancestor > .pp-has-submenu-container > a {
-  color: #1a8cff !important;
+  color: var(--color-primary) !important;
 }
 header
   ul.menu
@@ -1269,7 +1269,7 @@ header
   > .pp-has-submenu-container
   > a
   .pp-menu-toggle::before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 @media (min-width: 861px) {
   header ul.menu > li:last-child {
@@ -1542,7 +1542,7 @@ img {
 }
 a.fl-button,
 a.fl-button:visited {
-  background: #1a8cff;
+  background: var(--color-primary);
   color: #fff;
   border: 1px solid #006ddc;
 }
@@ -1551,7 +1551,7 @@ a.fl-button:visited * {
   color: #fff;
 }
 button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #fff;
   font-size: 18px;
   line-height: 1.45;
@@ -1562,6 +1562,9 @@ button {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
+  /* KEEP LITERAL (all three): reboot-generic button rule — tokenizing breaks
+     dedup-twin byte-identity and the deleted duplicate re-appears in every
+     bundle (WP1.1) */
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
@@ -1628,7 +1631,7 @@ button {
 .fl-page a.fl-button,
 .fl-page a.fl-button:visited {
   color: #fff;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   font-family: var(--font-system-ui);
   font-weight: 700;
   font-size: 18px;
diff --git a/themes/beaver/assets/css/critical/single-use-cases.css b/themes/beaver/assets/css/critical/single-use-cases.css
index 8d4ad8b12..02ece90d7 100644
--- a/themes/beaver/assets/css/critical/single-use-cases.css
+++ b/themes/beaver/assets/css/critical/single-use-cases.css
@@ -121,9 +121,9 @@
 }
 .fl-builder-content a.fl-button,
 .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: 400;
@@ -664,7 +664,7 @@
   position: absolute;
   width: 30px;
   height: 3px;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 .pp-advanced-menu-mobile-toggle
   .pp-hamburger
@@ -807,7 +807,7 @@
 }
 .fl-node-ncg61wov0ytq .sub-menu > li.current-menu-item > a {
   background-color:;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 .fl-node-ncg61wov0ytq .pp-advanced-menu .pp-menu-toggle:before {
   content: "";
@@ -1220,7 +1220,7 @@ body:not(.single-fl-theme-layout)
   display: block;
   width: 100%;
   height: 40px;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   position: absolute;
   bottom: 0;
   left: 0;
@@ -1291,7 +1291,7 @@ header ul.menu > li > ul.sub-menu > li > a .menu-image {
   }
 }
 header ul.menu > li.current-page-ancestor > .pp-has-submenu-container > a {
-  color: #1a8cff !important;
+  color: var(--color-primary) !important;
 }
 header
   ul.menu
@@ -1299,7 +1299,7 @@ header
   > .pp-has-submenu-container
   > a
   .pp-menu-toggle::before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 @media (min-width: 861px) {
   header ul.menu > li:last-child {
@@ -1585,7 +1585,7 @@ img {
 }
 a.fl-button,
 a.fl-button:visited {
-  background: #1a8cff;
+  background: var(--color-primary);
   color: #fff;
   border: 1px solid #006ddc;
 }
@@ -1594,7 +1594,7 @@ a.fl-button:visited * {
   color: #fff;
 }
 button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #fff;
   font-size: 18px;
   line-height: 1.45;
@@ -1605,6 +1605,9 @@ button {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
+  /* KEEP LITERAL (all three): reboot-generic button rule — tokenizing breaks
+     dedup-twin byte-identity and the deleted duplicate re-appears in every
+     bundle (WP1.1) */
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
@@ -1671,7 +1674,7 @@ button {
 .fl-page a.fl-button,
 .fl-page a.fl-button:visited {
   color: #fff;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   font-family: var(--font-system-ui);
   font-weight: 700;
   font-size: 18px;
diff --git a/themes/beaver/assets/css/cta-backgrounds.css b/themes/beaver/assets/css/cta-backgrounds.css
deleted file mode 100644
index d928371a8..000000000
--- a/themes/beaver/assets/css/cta-backgrounds.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.fl-node-jucnbqyew63f > .fl-col-content, .fl-node-04h8akisgvow > .fl-col-content, .c-cta-section__content-column > .fl-col-content {
-    background-image: url({{ (resources.Get "img/start-trial-cta.webp" | fingerprint "md5").RelPermalink }});
-}
diff --git a/themes/beaver/assets/css/e93d9b85e7803f50c80b8a698f8d12f9-layout-bundle.css b/themes/beaver/assets/css/e93d9b85e7803f50c80b8a698f8d12f9-layout-bundle.css
index f774938aa..d75f53670 100644
--- a/themes/beaver/assets/css/e93d9b85e7803f50c80b8a698f8d12f9-layout-bundle.css
+++ b/themes/beaver/assets/css/e93d9b85e7803f50c80b8a698f8d12f9-layout-bundle.css
@@ -260,7 +260,7 @@
   transition-timing-function: ease;
   transition-duration: .15s;
   transition-property: transform;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 
 .pp-advanced-menu-mobile-toggle .pp-hamburger .pp-hamburger-box .pp-hamburger-inner:before, .pp-advanced-menu-mobile-toggle .pp-hamburger .pp-hamburger-box .pp-hamburger-inner:after {
@@ -774,19 +774,19 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li.focus .pp-menu-toggle:before {
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li a:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li a:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li a:focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li a:focus .pp-menu-toggle:before {
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .menu > li > a:hover, .fl-node-menu .menu > li > a:focus, .fl-node-menu .menu > li:hover > .pp-has-submenu-container > a, .fl-node-menu .menu > li.focus > .pp-has-submenu-container > a, .fl-node-menu .menu > li.current-menu-item > a, .fl-node-menu .menu > li.current-menu-item > .pp-has-submenu-container > a {
-  color: #1A8CFF;
+  color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .pp-has-submenu-container:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .pp-has-submenu-container.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li.current-menu-item > .pp-has-submenu-container .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .pp-has-submenu-container:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .pp-has-submenu-container.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li.current-menu-item > .pp-has-submenu-container .pp-menu-toggle:before {
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .menu .pp-has-submenu .sub-menu {
@@ -825,7 +825,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 
 .fl-node-menu .sub-menu > li > a:hover, .fl-node-menu .sub-menu > li > a:focus, .fl-node-menu .sub-menu > li > .pp-has-submenu-container > a:hover, .fl-node-menu .sub-menu > li > .pp-has-submenu-container > a:focus, .fl-node-menu .sub-menu > li.current-menu-item > a, .fl-node-menu .sub-menu > li.current-menu-item > .pp-has-submenu-container > a {
   background-color: ;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .sub-menu .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .sub-menu .pp-menu-toggle:before {
@@ -833,7 +833,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .sub-menu li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .sub-menu li:hover .pp-menu-toggle:before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-menu-toggle:before {
@@ -1444,7 +1444,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-ntfp1iza9jy8 a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-ntfp1iza9jy8 a:hover {
@@ -1487,7 +1487,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-5dcip6gnz2at a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-5dcip6gnz2at a:hover {
@@ -1520,7 +1520,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-7p1us6kjlz9d a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-7p1us6kjlz9d a:hover {
@@ -1553,7 +1553,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-fxtbmly0wvq4 a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-fxtbmly0wvq4 a:hover {
@@ -1688,7 +1688,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text * {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-rich-text, .fl-builder-content .fl-node-lsrnf83ijm06 .fl-rich-text *:not(b, strong) {
diff --git a/themes/beaver/assets/css/e966db44b09892b8d7d492247c67e86c-layout-bundle.css b/themes/beaver/assets/css/e966db44b09892b8d7d492247c67e86c-layout-bundle.css
index 0c63f6ccf..c131b909d 100644
--- a/themes/beaver/assets/css/e966db44b09892b8d7d492247c67e86c-layout-bundle.css
+++ b/themes/beaver/assets/css/e966db44b09892b8d7d492247c67e86c-layout-bundle.css
@@ -328,9 +328,9 @@
 }
 
 .fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
@@ -1182,7 +1182,7 @@ img.mfp-img {
   transition-timing-function: ease;
   transition-duration: .15s;
   transition-property: transform;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 
 .pp-advanced-menu-mobile-toggle .pp-hamburger .pp-hamburger-box .pp-hamburger-inner:before, .pp-advanced-menu-mobile-toggle .pp-hamburger .pp-hamburger-box .pp-hamburger-inner:after {
@@ -1696,19 +1696,19 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li.focus .pp-menu-toggle:before {
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li a:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li a:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li a:focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li a:focus .pp-menu-toggle:before {
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .menu > li > a:hover, .fl-node-menu .menu > li > a:focus, .fl-node-menu .menu > li:hover > .pp-has-submenu-container > a, .fl-node-menu .menu > li.focus > .pp-has-submenu-container > a, .fl-node-menu .menu > li.current-menu-item > a, .fl-node-menu .menu > li.current-menu-item > .pp-has-submenu-container > a {
-  color: #1A8CFF;
+  color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .pp-has-submenu-container:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .pp-has-submenu-container.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li.current-menu-item > .pp-has-submenu-container .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .pp-has-submenu-container:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .pp-has-submenu-container.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li.current-menu-item > .pp-has-submenu-container .pp-menu-toggle:before {
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .menu .pp-has-submenu .sub-menu {
@@ -1747,7 +1747,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 
 .fl-node-menu .sub-menu > li > a:hover, .fl-node-menu .sub-menu > li > a:focus, .fl-node-menu .sub-menu > li > .pp-has-submenu-container > a:hover, .fl-node-menu .sub-menu > li > .pp-has-submenu-container > a:focus, .fl-node-menu .sub-menu > li.current-menu-item > a, .fl-node-menu .sub-menu > li.current-menu-item > .pp-has-submenu-container > a {
   background-color: ;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .sub-menu .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .sub-menu .pp-menu-toggle:before {
@@ -1755,7 +1755,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .sub-menu li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .sub-menu li:hover .pp-menu-toggle:before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-menu-toggle:before {
@@ -2366,7 +2366,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-ntfp1iza9jy8 a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-ntfp1iza9jy8 a:hover {
@@ -2409,7 +2409,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-5dcip6gnz2at a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-5dcip6gnz2at a:hover {
@@ -2442,7 +2442,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-7p1us6kjlz9d a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-7p1us6kjlz9d a:hover {
@@ -2475,7 +2475,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-fxtbmly0wvq4 a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-fxtbmly0wvq4 a:hover {
@@ -2614,7 +2614,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text * {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-rich-text, .fl-builder-content .fl-node-lsrnf83ijm06 .fl-rich-text *:not(b, strong) {
@@ -3113,7 +3113,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-qs2ucemf7j56 .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-qs2ucemf7j56 .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-qs2ucemf7j56 .fl-rich-text, .fl-builder-content .fl-node-qs2ucemf7j56 .fl-rich-text *:not(b, strong) {
@@ -3136,7 +3136,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-r6ej0mdao5l2 .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-r6ej0mdao5l2 .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-r6ej0mdao5l2 .fl-rich-text, .fl-builder-content .fl-node-r6ej0mdao5l2 .fl-rich-text *:not(b, strong) {
@@ -3159,7 +3159,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-wtch9dloa7yx .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-wtch9dloa7yx .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-wtch9dloa7yx .fl-rich-text, .fl-builder-content .fl-node-wtch9dloa7yx .fl-rich-text *:not(b, strong) {
@@ -3792,15 +3792,15 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-flat .pp-share-button:hover a, .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-gradient .pp-share-button:hover a, .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-boxed .pp-share-button:hover .pp-share-button-icon, .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-minimal .pp-share-button:hover .pp-share-button-icon {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-framed .pp-share-button:hover a, .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-minimal .pp-share-button:hover a, .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-boxed .pp-share-button:hover a, .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-framed .pp-share-button:hover a *, .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-minimal .pp-share-button:hover a *, .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-boxed .pp-share-button:hover a * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-flat .pp-share-button:hover a *, .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-gradient .pp-share-button:hover a *, .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-boxed .pp-share-button:hover .pp-share-button-icon *, .fl-builder-content .fl-node-rnjk7gex4iu1 .pp-social-share-content.pp-share-buttons-skin-minimal .pp-share-button:hover .pp-share-button-icon * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 @media only screen and ( max-width: 1115px ) {
@@ -4151,35 +4151,35 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']):focus, .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield select:focus, .fl-node-nkrzpgyfwo7s .pp-gf-content .gform_wrapper .gfield textarea:focus {
diff --git a/themes/beaver/assets/css/fb2624e43f3c4277448abe268cde571e-layout-bundle.css b/themes/beaver/assets/css/fb2624e43f3c4277448abe268cde571e-layout-bundle.css
index 7d208b17e..7366e41e1 100644
--- a/themes/beaver/assets/css/fb2624e43f3c4277448abe268cde571e-layout-bundle.css
+++ b/themes/beaver/assets/css/fb2624e43f3c4277448abe268cde571e-layout-bundle.css
@@ -328,9 +328,9 @@
 }
 
 .fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
@@ -1182,7 +1182,7 @@ img.mfp-img {
   transition-timing-function: ease;
   transition-duration: .15s;
   transition-property: transform;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 
 .pp-advanced-menu-mobile-toggle .pp-hamburger .pp-hamburger-box .pp-hamburger-inner:before, .pp-advanced-menu-mobile-toggle .pp-hamburger .pp-hamburger-box .pp-hamburger-inner:after {
@@ -1696,19 +1696,19 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li.focus .pp-menu-toggle:before {
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li a:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li a:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li a:focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li a:focus .pp-menu-toggle:before {
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .menu > li > a:hover, .fl-node-menu .menu > li > a:focus, .fl-node-menu .menu > li:hover > .pp-has-submenu-container > a, .fl-node-menu .menu > li.focus > .pp-has-submenu-container > a, .fl-node-menu .menu > li.current-menu-item > a, .fl-node-menu .menu > li.current-menu-item > .pp-has-submenu-container > a {
-  color: #1A8CFF;
+  color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .pp-has-submenu-container:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .pp-has-submenu-container.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li.current-menu-item > .pp-has-submenu-container .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .pp-has-submenu-container:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .pp-has-submenu-container.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li.current-menu-item > .pp-has-submenu-container .pp-menu-toggle:before {
-  border-color: #1A8CFF;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .menu .pp-has-submenu .sub-menu {
@@ -1747,7 +1747,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 
 .fl-node-menu .sub-menu > li > a:hover, .fl-node-menu .sub-menu > li > a:focus, .fl-node-menu .sub-menu > li > .pp-has-submenu-container > a:hover, .fl-node-menu .sub-menu > li > .pp-has-submenu-container > a:focus, .fl-node-menu .sub-menu > li.current-menu-item > a, .fl-node-menu .sub-menu > li.current-menu-item > .pp-has-submenu-container > a {
   background-color: ;
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .sub-menu .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .sub-menu .pp-menu-toggle:before {
@@ -1755,7 +1755,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .sub-menu li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .sub-menu li:hover .pp-menu-toggle:before {
-  border-color: #1a8cff;
+  border-color: var(--color-primary);
 }
 
 .fl-node-menu .pp-advanced-menu .pp-menu-toggle:before {
@@ -2366,7 +2366,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-ntfp1iza9jy8 a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-ntfp1iza9jy8 a:hover {
@@ -2409,7 +2409,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-5dcip6gnz2at a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-5dcip6gnz2at a:hover {
@@ -2442,7 +2442,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-7p1us6kjlz9d a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-7p1us6kjlz9d a:hover {
@@ -2475,7 +2475,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-fxtbmly0wvq4 a {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-fxtbmly0wvq4 a:hover {
@@ -2614,7 +2614,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text * {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-rich-text, .fl-builder-content .fl-node-lsrnf83ijm06 .fl-rich-text *:not(b, strong) {
@@ -3011,7 +3011,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-tgivwns6ak74 a:hover {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-node-tgivwns6ak74 {
@@ -4114,7 +4114,7 @@ div.fancybox-container {
 
 .fl-node-adblszvmw7uo .pp-image-carousel .swiper-pagination-bullet {
   opacity: 1;
-  background-color: #969798;
+  background-color: var(--color-muted);
   width: 10px;
   height: 10px;
   border-radius: 100px;
@@ -4126,11 +4126,11 @@ div.fancybox-container {
 }
 
 .fl-node-adblszvmw7uo .pp-image-carousel.swiper-container-horizontal > .swiper-pagination-progressbar {
-  background-color: #969798;
+  background-color: var(--color-muted);
 }
 
 .fl-node-adblszvmw7uo .pp-image-carousel .swiper-pagination-bullet:hover, .fl-node-adblszvmw7uo .pp-image-carousel .swiper-pagination-bullet:focus, .fl-node-adblszvmw7uo .pp-image-carousel .swiper-pagination-bullet-active, .fl-node-adblszvmw7uo .pp-image-carousel .swiper-pagination-progressbar .swiper-pagination-progressbar-fill {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   opacity: 1;
   box-shadow: none;
 }
@@ -5614,7 +5614,7 @@ body .pp-post-feed-meta {
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text, .fl-builder-content .fl-node-rujwd9mzxche .fl-rich-text *:not(b, strong) {
@@ -6230,35 +6230,35 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']):focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield select:focus, .fl-node-btz2rn93xyu8 .pp-gf-content .gform_wrapper .gfield textarea:focus {
@@ -6492,7 +6492,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
   padding: 7px 15px;
   background-color: rgba(26, 140, 255, 0.1) !important;
   border-radius: 21px;
-  color: #1A8CFF;
+  color: var(--color-primary);
   transition: all 0.3s ease-in-out;
   margin-bottom: 8px;
 }
diff --git a/themes/beaver/assets/css/fl-foundation.css b/themes/beaver/assets/css/fl-foundation.css
deleted file mode 100644
index 1b664c218..000000000
--- a/themes/beaver/assets/css/fl-foundation.css
+++ /dev/null
@@ -1,480 +0,0 @@
-/* ==========================================================================
-   FL-Builder Foundation Styles
-
-   Essential FL-Builder styles needed for layout structure.
-   These foundation styles maintain backward compatibility during migration.
-   ========================================================================== */
-
-@import "utilities/foundation/reset.css";
-@import "utilities/fl-builder-grid.css";
-@import "utilities/foundation/screen-reader.css";
-
-
-/* Responsive visibility utilities - moved to utilities/fl-builder-visibility.css */
-
-.fl-col-group-equal-height .fl-col.fl-visible-desktop {
-  display: flex;
-}
-
-/* Clearfix utilities */
-.fl-row:before, .fl-row:after, .fl-row-content:before, .fl-row-content:after, .fl-col-group:before, .fl-col-group:after, .fl-col:before, .fl-col:after, .fl-module:before, .fl-module:after, .fl-module-content:before, .fl-module-content:after {
-  display: table;
-  content: " ";
-}
-
-.fl-row:after, .fl-row-content:after, .fl-col-group:after, .fl-col:after, .fl-module:after, .fl-module-content:after {
-  clear: both;
-}
-
-/* Basic row and column structure */
-.fl-row, .fl-row-content {
-  margin-left: auto;
-  margin-right: auto;
-  min-width: 0;
-}
-
-/* Background video and embed utilities */
-.fl-row-bg-video, .fl-row-bg-video .fl-row-content, .fl-row-bg-embed, .fl-row-bg-embed .fl-row-content {
-  position: relative;
-}
-
-.fl-row {
-  position: relative;
-}
-
-.fl-row-content-wrap {
-  position: relative;
-}
-
-.fl-row-content {
-  max-width: 1200px;
-  margin: 0 auto;
-}
-
-.fl-col-group {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.fl-col {
-  flex: 0 0 100%;
-  max-width: 100%;
-  float: left;
-  min-height: 1px;
-}
-
-/* Module spacing */
-.fl-module {
-  margin: 20px 0;
-}
-
-.fl-module:first-child {
-  margin-top: 0;
-}
-
-.fl-module:last-child {
-  margin-bottom: 0;
-}
-
-/* Background and padding utilities */
-.fl-row-full-width .fl-row-content {
-  max-width: none;
-  padding: 0;
-}
-
-.fl-row-fixed-width .fl-row-content {
-  max-width: 1200px;
-  padding: 0 20px;
-}
-
-/* Note: Detailed column group equal-height utilities moved to end of file (after row alignment) */
-
-/* Responsive adjustments */
-@media (max-width: 968px) {
-  .fl-visible-desktop,
-  .fl-col-group-equal-height .fl-col.fl-visible-desktop {
-    display: none;
-  }
-
-  .fl-visible-medium {
-    display: block;
-  }
-
-  .fl-col-group-equal-height .fl-col.fl-visible-medium {
-    display: flex;
-  }
-}
-
-@media (max-width: 768px) {
-  .fl-visible-medium,
-  .fl-col-group-equal-height .fl-col.fl-visible-medium {
-    display: none;
-  }
-
-  .fl-visible-mobile {
-    display: block;
-  }
-
-  .fl-col-group-equal-height .fl-col.fl-visible-mobile {
-    display: flex;
-  }
-
-  .fl-col {
-    flex: 0 0 100%;
-    max-width: 100%;
-  }
-}
-
-/* Background photo mobile optimization */
-.fl-builder-mobile .fl-row-bg-photo .fl-row-content-wrap {
-  background-attachment: scroll;
-}
-
-/* Background video and embed positioning */
-.fl-row-bg-video .fl-bg-video, .fl-row-bg-embed .fl-bg-embed-code {
-  bottom: 0;
-  left: 0;
-  overflow: hidden;
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-
-.fl-row-bg-video .fl-bg-video video, .fl-row-bg-embed .fl-bg-embed-code video {
-  bottom: 0;
-  left: 0px;
-  max-width: none;
-  position: absolute;
-  right: 0;
-  top: 0px;
-}
-
-.fl-row-bg-video .fl-bg-video video {
-  min-width: 100%;
-  min-height: 100%;
-  width: auto;
-  height: auto;
-}
-
-.fl-row-bg-video .fl-bg-video iframe, .fl-row-bg-embed .fl-bg-embed-code iframe {
-  pointer-events: none;
-  width: 100vw;
-  height: 56.25vw;
-  max-width: none;
-  min-height: 100vh;
-  min-width: 177.77vh;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  -ms-transform: translate(-50%, -50%);
-  -webkit-transform: translate(-50%, -50%);
-}
-
-/* Background video fallback */
-.fl-bg-video-fallback {
-  background-position: 50% 50%;
-  background-repeat: no-repeat;
-  background-size: cover;
-  bottom: 0px;
-  left: 0px;
-  position: absolute;
-  right: 0px;
-  top: 0px;
-}
-
-/* Background slideshow utilities */
-.fl-row-bg-slideshow, .fl-row-bg-slideshow .fl-row-content {
-  position: relative;
-}
-
-.fl-row .fl-bg-slideshow {
-  bottom: 0;
-  left: 0;
-  overflow: hidden;
-  position: absolute;
-  right: 0;
-  top: 0;
-  z-index: 0;
-}
-
-.fl-builder-edit .fl-row .fl-bg-slideshow * {
-  bottom: 0;
-  height: auto !important;
-  left: 0;
-  position: absolute !important;
-  right: 0;
-  top: 0;
-}
-
-/* Background overlay utilities */
-.fl-row-bg-overlay .fl-row-content-wrap:after {
-  border-radius: inherit;
-  content: '';
-  display: block;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 0;
-}
-
-.fl-row-bg-overlay .fl-row-content {
-  position: relative;
-  z-index: 1;
-}
-
-/* Row height and width utilities */
-.fl-row-default-height .fl-row-content-wrap, .fl-row-custom-height .fl-row-content-wrap {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  min-height: 100vh;
-}
-
-.fl-row-overlap-top .fl-row-content-wrap {
-  display: -webkit-inline-box;
-  display: -webkit-inline-flex;
-  display: -moz-inline-box;
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-  width: 100%;
-}
-
-.fl-row-default-height .fl-row-content-wrap, .fl-row-custom-height .fl-row-content-wrap {
-  min-height: 0;
-}
-
-.fl-row-default-height .fl-row-content, .fl-row-full-height .fl-row-content, .fl-row-custom-height .fl-row-content {
-  -webkit-box-flex: 1 1 auto;
-  -moz-box-flex: 1 1 auto;
-  -webkit-flex: 1 1 auto;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-}
-
-.fl-row-default-height .fl-row-full-width.fl-row-content, .fl-row-full-height .fl-row-full-width.fl-row-content, .fl-row-custom-height .fl-row-full-width.fl-row-content {
-  max-width: 100%;
-  width: 100%;
-}
-
-/* IE11 row height fixes */
-.fl-builder-ie-11 .fl-row.fl-row-full-height:not(.fl-visible-medium):not(.fl-visible-medium-mobile):not(.fl-visible-mobile), .fl-builder-ie-11 .fl-row.fl-row-custom-height:not(.fl-visible-medium):not(.fl-visible-medium-mobile):not(.fl-visible-mobile) {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-
-.fl-builder-ie-11 .fl-row-full-height .fl-row-content-wrap, .fl-builder-ie-11 .fl-row-custom-height .fl-row-content-wrap {
-  height: auto;
-}
-
-.fl-builder-ie-11 .fl-row-full-height .fl-row-content, .fl-builder-ie-11 .fl-row-custom-height .fl-row-content {
-  flex: 0 0 auto;
-  flex-basis: 100%;
-  margin: 0;
-}
-
-.fl-builder-ie-11 .fl-row-full-height.fl-row-align-top .fl-row-content, .fl-builder-ie-11 .fl-row-full-height.fl-row-align-bottom .fl-row-content, .fl-builder-ie-11 .fl-row-custom-height.fl-row-align-top .fl-row-content, .fl-builder-ie-11 .fl-row-custom-height.fl-row-align-bottom .fl-row-content {
-  margin: 0 auto;
-}
-
-.fl-builder-ie-11 .fl-row-full-height.fl-row-align-center .fl-col-group:not(.fl-col-group-equal-height), .fl-builder-ie-11 .fl-row-custom-height.fl-row-align-center .fl-col-group:not(.fl-col-group-equal-height) {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-align: center;
-  -ms-flex-pack: center;
-}
-
-/* Row alignment utilities */
-.fl-row-default-height.fl-row-align-center .fl-row-content-wrap, .fl-row-full-height.fl-row-align-center .fl-row-content-wrap, .fl-row-custom-height.fl-row-align-center .fl-row-content-wrap {
-  align-items: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-align: center;
-  -ms-flex-pack: center;
-}
-
-.fl-row-default-height.fl-row-align-bottom .fl-row-content-wrap, .fl-row-full-height.fl-row-align-bottom .fl-row-content-wrap, .fl-row-custom-height.fl-row-align-bottom .fl-row-content-wrap {
-  align-items: flex-end;
-  justify-content: flex-end;
-  -webkit-align-items: flex-end;
-  -webkit-justify-content: flex-end;
-  -webkit-box-align: end;
-  -webkit-box-pack: end;
-  -ms-flex-align: end;
-  -ms-flex-pack: end;
-}
-
-.fl-builder-ie-11 .fl-row-full-height.fl-row-align-bottom .fl-row-content-wrap, .fl-builder-ie-11 .fl-row-custom-height.fl-row-align-bottom .fl-row-content-wrap {
-  justify-content: flex-start;
-  -webkit-justify-content: flex-start;
-}
-
-/* Column group equal-height utilities (detailed version) */
-.fl-col-group-equal-height {
-  display: flex;
-  flex-wrap: wrap;
-  width: 100%;
-}
-
-.fl-col-group-equal-height.fl-col-group-has-child-loading {
-  flex-wrap: nowrap;
-}
-
-.fl-col-group-equal-height .fl-col, .fl-col-group-equal-height .fl-col-content {
-  display: flex;
-  flex: 1 1 auto;
-}
-
-.fl-col-group-equal-height .fl-col-content {
-  flex-direction: column;
-  flex-shrink: 1;
-  min-width: 1px;
-  max-width: 100%;
-  width: 100%;
-}
-
-.fl-col-group-equal-height:before, .fl-col-group-equal-height .fl-col:before, .fl-col-group-equal-height .fl-col-content:before, .fl-col-group-equal-height:after, .fl-col-group-equal-height .fl-col:after, .fl-col-group-equal-height .fl-col-content:after {
-  content: none;
-}
-
-.fl-col-group-nested.fl-col-group-equal-height.fl-col-group-align-top .fl-col-content, .fl-col-group-equal-height.fl-col-group-align-top .fl-col-content {
-  justify-content: flex-start;
-}
-
-.fl-col-group-nested.fl-col-group-equal-height.fl-col-group-align-center .fl-col-content, .fl-col-group-equal-height.fl-col-group-align-center .fl-col-content {
-  align-items: center;
-  justify-content: center;
-}
-
-.fl-col-group-nested.fl-col-group-equal-height.fl-col-group-align-bottom .fl-col-content, .fl-col-group-equal-height.fl-col-group-align-bottom .fl-col-content {
-  justify-content: flex-end;
-}
-
-.fl-col-group-equal-height.fl-col-group-align-center .fl-module, .fl-col-group-equal-height.fl-col-group-align-center .fl-col-group {
-  width: 100%;
-}
-
-.fl-builder-ie-11 .fl-col-group-equal-height, .fl-builder-ie-11 .fl-col-group-equal-height .fl-col, .fl-builder-ie-11 .fl-col-group-equal-height .fl-col-content, .fl-builder-ie-11 .fl-col-group-equal-height .fl-module, .fl-col-group-equal-height.fl-col-group-align-center .fl-col-group {
-  min-height: 1px;
-}
-
-/* Column base utilities */
-.fl-col-bg-overlay .fl-col-content {
-  position: relative;
-}
-
-.fl-col-bg-overlay .fl-col-content:after {
-  border-radius: inherit;
-  content: '';
-  display: block;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 0;
-}
-
-.fl-col-bg-overlay .fl-module {
-  position: relative;
-  z-index: 2;
-}
-
-/* Module utilities */
-.fl-module img {
-  max-width: 100%;
-}
-
-.fl-builder-module-template {
-  margin: 0 auto;
-  max-width: 1100px;
-  padding: 20px;
-}
-
-/* Button base styles */
-.fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  display: inline-block;
-  font-size: 16px;
-  font-weight: normal;
-  line-height: 18px;
-  padding: 12px 24px;
-  text-decoration: none;
-  text-shadow: none;
-}
-
-.fl-builder-content .fl-button:hover {
-  text-decoration: none;
-}
-
-.fl-builder-content .fl-button:active {
-  position: relative;
-  top: 1px;
-}
-
-.fl-builder-content .fl-button-width-full .fl-button {
-  display: block;
-  text-align: center;
-}
-
-.fl-builder-content .fl-button-width-custom .fl-button {
-  display: inline-block;
-  text-align: center;
-  max-width: 100%;
-}
-
-.fl-builder-content .fl-button i {
-  font-size: 1.3em;
-  height: auto;
-  margin-right: 8px;
-  vertical-align: middle;
-  width: auto;
-}
-
-.fl-builder-content .fl-button i.fl-button-icon-after {
-  margin-left: 8px;
-  margin-right: 0;
-}
-
-.fl-builder-content .fl-button-has-icon .fl-button-text {
-  vertical-align: middle;
-}
-
-.fl-icon-wrap {
-  display: inline-block;
-}
-
-.fl-icon {
-  display: table-cell;
-  vertical-align: middle;
-}
-
-.fl-icon a {
-  text-decoration: none;
-}
-
-.fl-icon i {
-  float: right;
-  height: auto;
-  width: auto;
-}
-
-.fl-icon i:before {
-  border: none !important;
-  height: auto;
-  width: auto;
-}
\ No newline at end of file
diff --git a/themes/beaver/assets/css/footer.css b/themes/beaver/assets/css/footer.css
index a2400e5d6..f1fa7857d 100644
--- a/themes/beaver/assets/css/footer.css
+++ b/themes/beaver/assets/css/footer.css
@@ -68,7 +68,7 @@
 
 .footer-component .special {
     color: #fff;
-    background-color: #1a8cff;
+    background-color: var(--color-primary);
     border-radius: 10px;
     display: inline-block;
     margin-left: 5px;
@@ -78,7 +78,7 @@
 }
 
 .footer-component a {
-    color: #969798;
+    color: var(--color-muted);
     text-decoration: none;
 }
 
diff --git a/themes/beaver/assets/css/foundations/css-variables.css b/themes/beaver/assets/css/foundations/css-variables.css
index 28f4f4dc5..96cd3faef 100644
--- a/themes/beaver/assets/css/foundations/css-variables.css
+++ b/themes/beaver/assets/css/foundations/css-variables.css
@@ -7,11 +7,33 @@
   --font-system-ui: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 
   /* Brand Ruby red (JetVelocity design system; design.md "Ruby red").
-     NOT --color-primary: that token already exists as #1a8cff (blue)
-     with 89 usages. Name approved by Paul 2026-07-11. */
+     Name approved by Paul 2026-07-11. */
   --color-ruby: #cc342d;
 
+  /* Brand blue (279 literal occurrences at extraction time). First DEFINED
+     2026-07-12 (WP1.1): consumers existed for years but the token never had
+     a definition — the six rule groups that were live-but-invalid were
+     codified to their shipped rendering (inherit/transparent/currentColor)
+     before this definition landed, so defining it changes nothing. */
+  --color-primary: #1a8cff;
+
   /* Primary dark text/border color (JetVelocity obsidian dark).
      Canonical home of the token. */
   --color-dark: #121212;
+
+  /* Spacing tokens — values match the fallbacks live consumers
+     (components/content-block.css) already resolve to, so defining them
+     is rendering-neutral. The old c-spacing.css family (0.5rem --spacing-sm
+     variant) was dead code, deleted 2026-07-12. */
+  --spacing-sm: 0.75rem;
+  --spacing-md: 1rem;
+
+  /* Muted gray text (168 literal occurrences at extraction; the voice the
+     design system calls muted — see .c-content-block--color-muted).
+     Fulfils the WP1.1 "--color-text" item: body text color is --color-dark,
+     secondary text is this. */
+  --color-muted: #969798;
+
+  /* Default corner radius (145 exact border-radius:4px occurrences). */
+  --radius-default: 4px;
 }
diff --git a/themes/beaver/assets/css/homepage-layout.css b/themes/beaver/assets/css/homepage-layout.css
index 6fdf2e203..c85f40d61 100644
--- a/themes/beaver/assets/css/homepage-layout.css
+++ b/themes/beaver/assets/css/homepage-layout.css
@@ -411,9 +411,9 @@
 
 .c-builder-content a.fl-button,
 .c-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
@@ -1825,7 +1825,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
   .gform_wrapper
   .gfield
   input::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1
@@ -1833,7 +1833,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
   .gform_wrapper
   .gfield
   input:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1
@@ -1841,7 +1841,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
   .gform_wrapper
   .gfield
   input::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1
@@ -1849,7 +1849,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
   .gform_wrapper
   .gfield
   input:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1
@@ -1857,7 +1857,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
   .gform_wrapper
   .gfield
   textarea::-webkit-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1
@@ -1865,7 +1865,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
   .gform_wrapper
   .gfield
   textarea:-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1
@@ -1873,7 +1873,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
   .gform_wrapper
   .gfield
   textarea::-moz-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1
@@ -1881,7 +1881,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
   .gform_wrapper
   .gfield
   textarea:-ms-input-placeholder {
-  color: #969798;
+  color: var(--color-muted);
 }
 
 .fl-node-bmn85orw3pj1
@@ -2237,7 +2237,7 @@ div.gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label {
 
 .c-builder-content .fl-node-hsl7934fxqjw .fl-module-content .fl-rich-text,
 .c-builder-content .fl-node-hsl7934fxqjw .fl-module-content .fl-rich-text * {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .c-builder-content .fl-node-hsl7934fxqjw .fl-rich-text,
@@ -2386,7 +2386,7 @@ span.pp-accordion-button-icon {
 .fl-node-lokc5ru7ftaj
   .pp-accordion-item.pp-accordion-item-active
   .pp-accordion-button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #ffffff;
 }
 
@@ -2498,7 +2498,7 @@ span.pp-accordion-button-icon {
 .fl-node-hwc8puan960k
   .pp-accordion-item.pp-accordion-item-active
   .pp-accordion-button {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #ffffff;
 }
 
diff --git a/themes/beaver/assets/css/homepage.css b/themes/beaver/assets/css/homepage.css
index bd71d8c8a..3472e7fc6 100644
--- a/themes/beaver/assets/css/homepage.css
+++ b/themes/beaver/assets/css/homepage.css
@@ -786,19 +786,19 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li.focus .pp-menu-toggle:before {
-  border-color: #1a8cff
+  border-color: var(--color-primary)
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li a:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li a:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li a:focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li a:focus .pp-menu-toggle:before {
-  border-color: #1a8cff
+  border-color: var(--color-primary)
 }
 
 .fl-node-menu .menu > li > a:hover, .fl-node-menu .menu > li > a:focus, .fl-node-menu .menu > li:hover > .pp-has-submenu-container > a, .fl-node-menu .menu > li.focus > .pp-has-submenu-container > a, .fl-node-menu .menu > li.current-menu-item > a, .fl-node-menu .menu > li.current-menu-item > .pp-has-submenu-container > a {
-  color: #1a8cff
+  color: var(--color-primary)
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .pp-has-submenu-container:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .pp-has-submenu-container.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-arrows li.current-menu-item > .pp-has-submenu-container .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .pp-has-submenu-container:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .pp-has-submenu-container.focus .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none li.current-menu-item > .pp-has-submenu-container .pp-menu-toggle:before {
-  border-color: #1a8cff
+  border-color: var(--color-primary)
 }
 
 .fl-node-menu .menu .pp-has-submenu .sub-menu {
@@ -833,7 +833,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 }
 
 .fl-node-menu .sub-menu > li > a:hover, .fl-node-menu .sub-menu > li > a:focus, .fl-node-menu .sub-menu > li > .pp-has-submenu-container > a:hover, .fl-node-menu .sub-menu > li > .pp-has-submenu-container > a:focus, .fl-node-menu .sub-menu > li.current-menu-item > a, .fl-node-menu .sub-menu > li.current-menu-item > .pp-has-submenu-container > a {
-  color: #1a8cff
+  color: var(--color-primary)
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .sub-menu .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .sub-menu .pp-menu-toggle:before {
@@ -841,7 +841,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
 }
 
 .fl-node-menu .pp-advanced-menu .pp-toggle-arrows .sub-menu li:hover .pp-menu-toggle:before, .fl-node-menu .pp-advanced-menu .pp-toggle-none .sub-menu li:hover .pp-menu-toggle:before {
-  border-color: #1a8cff
+  border-color: var(--color-primary)
 }
 
 .fl-node-menu .pp-advanced-menu .pp-menu-toggle:before {
@@ -1412,7 +1412,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-ntfp1iza9jy8 a {
-  color: #969798
+  color: var(--color-muted)
 }
 
 .fl-builder-content .fl-node-ntfp1iza9jy8 a:hover {
@@ -1455,7 +1455,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-5dcip6gnz2at a {
-  color: #969798
+  color: var(--color-muted)
 }
 
 .fl-builder-content .fl-node-5dcip6gnz2at a:hover {
@@ -1488,7 +1488,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-7p1us6kjlz9d a {
-  color: #969798
+  color: var(--color-muted)
 }
 
 .fl-builder-content .fl-node-7p1us6kjlz9d a:hover {
@@ -1521,7 +1521,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-fxtbmly0wvq4 a {
-  color: #969798
+  color: var(--color-muted)
 }
 
 .fl-builder-content .fl-node-fxtbmly0wvq4 a:hover {
@@ -1660,7 +1660,7 @@ body:not(.single-fl-theme-layout) .fl-builder-content[data-overlay="1"]:not(.fl-
 }
 
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text, .fl-builder-content .fl-node-lsrnf83ijm06 .fl-module-content .fl-rich-text * {
-  color: #969798
+  color: var(--color-muted)
 }
 
 .fl-builder-content .fl-node-lsrnf83ijm06 .fl-rich-text, .fl-builder-content .fl-node-lsrnf83ijm06 .fl-rich-text *:not(b,strong) {
diff --git a/themes/beaver/assets/css/mobile-fixes.css b/themes/beaver/assets/css/mobile-fixes.css
deleted file mode 100644
index 4b0ef8480..000000000
--- a/themes/beaver/assets/css/mobile-fixes.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Mobile screenshot fixes for 404 page and blog posts */
-@media (max-width: 860px) {
-  /* Fix: 404 page black rectangle shape layer */
-  .fl-builder-layer .fl-shape {
-    fill: transparent !important;
-    display: none;
-  }
-
-  /* Fix: Blog post content visibility on mobile */
-  .single-content {
-    padding: 20px !important;
-    margin: 0 !important;
-  }
-}
diff --git a/themes/beaver/assets/css/navigation.css b/themes/beaver/assets/css/navigation.css
index 496dd141d..cfbd64c7a 100644
--- a/themes/beaver/assets/css/navigation.css
+++ b/themes/beaver/assets/css/navigation.css
@@ -50,7 +50,7 @@ body {
 
 /* Brand the FL-builder CTA buttons (homepage hero, about-us footer, etc.).
    The legacy rule .fl-page a.fl-button (specificity 0,2,1) lives in per-page
-   bundles (about-us.css, homepage.css) and paints these blue (#1a8cff) with
+   bundles (about-us.css, homepage.css) and paints these blue (var(--color-primary)) with
    25px pill radius. !important here unifies them with .btn.btn-primary brand
    styling site-wide. */
 a.fl-button,
@@ -296,14 +296,6 @@ a.action-button:hover {
   transition: .3s;
 }
 
-.navigation .-active .link {
-  color: #1a8cff;
-}
-
-.navigation .item.-active .arrow {
-  border-color: #1a8cff;
-}
-
 .navigation .sub-menu {
   display: none;
   background-color: #fff;
@@ -384,7 +376,7 @@ a.action-button:hover {
 }
 
 .navigation .sub-item:hover .sub-name {
-  color: #1a8cff;
+  color: var(--color-primary);
 }
 
 .navigation .sub-text {
@@ -402,12 +394,12 @@ a.action-button:hover {
   }
 
   .navigation .item:hover .link {
-    color: #1a8cff;
+    color: var(--color-primary);
   }
 
   .navigation .item:hover .arrow {
     transform: rotate(225deg);
-    border-color: #1a8cff;
+    border-color: var(--color-primary);
   }
 }
 
@@ -554,7 +546,7 @@ a.action-button:hover {
 /* Site-wide brand link color. Body content links inherit this everywhere
    links aren't styled by a more specific class (.btn, .fl-button, .cta-link,
    menu items). 4.78:1 WCAG AA on white background.
-   :not() chain raises specificity above the per-bundle `a { color: #1a8cff }`
+   :not() chain raises specificity above the per-bundle `a { color: var(--color-primary) }`
    rules so this wins regardless of cascade order. */
 a:not(.btn):not(.btn-primary):not(.fl-button):not([class^="cta"]):not(.menu-opener):not(.menu-close):not(.navigation .link):not(.footer-component a) {
   color: #0066d6;
diff --git a/themes/beaver/assets/css/pagination.css b/themes/beaver/assets/css/pagination.css
index 7561512d5..eb1f9bd4e 100644
--- a/themes/beaver/assets/css/pagination.css
+++ b/themes/beaver/assets/css/pagination.css
@@ -50,7 +50,7 @@
 /* Override Bootstrap defaults to match site brand */
 .page-link {
   font-size: 1rem;
-  color: #1a8cff;
+  color: var(--color-primary);
   border-radius: 6px;
   border-color: #e0e0e0;
 }
diff --git a/themes/beaver/assets/css/services-layout.css b/themes/beaver/assets/css/services-layout.css
index 40401229d..cdd936d77 100644
--- a/themes/beaver/assets/css/services-layout.css
+++ b/themes/beaver/assets/css/services-layout.css
@@ -56,7 +56,7 @@ body input[type="submit"] {
   display: block;
   width: 100%;
   height: 40px;
-  background-color: var(--color-primary);
+  background-color: transparent; /* was undefined var(--color-primary) = initial */
   position: absolute;
   bottom: 0;
   left: 0;
@@ -72,7 +72,7 @@ body input[type="submit"] {
   display: block;
   width: 100%;
   height: 40px;
-  background-color: var(--color-primary);
+  background-color: transparent; /* was undefined var(--color-primary) = initial */
   position: absolute;
   bottom: 0;
   left: 0;
@@ -173,7 +173,7 @@ body input[type="submit"] {
   width: 18px;
   height: 18px;
   border: 1px solid #dedede;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
   top: 0px;
 }
 
@@ -214,7 +214,7 @@ body input[type="submit"] {
   border: 2px solid var(--color-primary);
   background-color: var(--color-primary);
   z-index: 0;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 
 .gform_wrapper
@@ -537,7 +537,7 @@ footer .footer-menu.careers-text .fl-rich-text p:last-child a strong {
 }
 
 .jt-service-box:hover .pp-infobox-description .pp-infobox-button .pp-more-link {
-  color: var(--color-primary) !important;
+  color: inherit !important; /* was undefined var(--color-primary) */
 }
 
 .jt-service-box:hover
@@ -545,7 +545,7 @@ footer .footer-menu.careers-text .fl-rich-text p:last-child a strong {
   .pp-infobox-button
   .pp-more-link
   i {
-  color: var(--color-primary) !important;
+  color: inherit !important; /* was undefined var(--color-primary) */
 }
 
 .jt-case-study > .fl-col-content {
@@ -592,7 +592,7 @@ footer .footer-menu.careers-text .fl-rich-text p:last-child a strong {
 }
 
 .jt-case-study.jt-case-study--light li a {
-  color: var(--color-primary) !important;
+  color: inherit !important; /* was undefined var(--color-primary) */
   font-weight: 700 !important;
 }
 
@@ -1242,7 +1242,7 @@ footer .footer-menu.careers-text .fl-rich-text p:last-child a strong {
 
 .uk-toc ul li.active a {
   border-left-color: var(--color-primary);
-  color: var(--color-primary) !important;
+  color: inherit !important; /* was undefined var(--color-primary) */
 }
 
 /* Client Details */
@@ -1445,7 +1445,7 @@ footer .footer-menu.careers-text .fl-rich-text p:last-child a strong {
   margin-right: 10px;
   background: rgba(26, 141, 255, 0.1);
   border: unset;
-  color: var(--color-primary);
+  color: inherit; /* was undefined var(--color-primary) */
   padding: 10px 12px;
   font-weight: 500;
   font-size: 14px;
diff --git a/themes/beaver/assets/css/single-post.css b/themes/beaver/assets/css/single-post.css
index 9c72d2361..36ab3ec9e 100644
--- a/themes/beaver/assets/css/single-post.css
+++ b/themes/beaver/assets/css/single-post.css
@@ -121,7 +121,7 @@
 
 .heading-component .heading-self-link {
   text-decoration: none;
-  color: #1a8cff;
+  color: var(--color-primary);
   visibility: hidden;
 }
 .heading-component:hover>.heading-self-link {
diff --git a/themes/beaver/assets/css/skin-65eda28877e04.css b/themes/beaver/assets/css/skin-65eda28877e04.css
index cbe6c50f3..140ab44c4 100644
--- a/themes/beaver/assets/css/skin-65eda28877e04.css
+++ b/themes/beaver/assets/css/skin-65eda28877e04.css
@@ -94,7 +94,7 @@ h6 {
 }
 
 a:hover, a:focus {
-  color: #1a8cff
+  color: var(--color-primary)
 }
 
 blockquote {
@@ -705,7 +705,7 @@ body.rtl .fl-screen-reader-text {
 .wp-pagenavi span.current, .wp-pagenavi a:hover {
   border-color: #e6e6e6;
   color: #fff;
-  background: #1a8cff;
+  background: var(--color-primary);
   font-weight: normal
 }
 
@@ -785,7 +785,7 @@ body.rtl .fl-screen-reader-text {
 }
 
 .post-edit-link {
-  color: #1a8cff;
+  color: var(--color-primary);
   font-size: 14px;
   font-weight: normal
 }
@@ -1034,7 +1034,7 @@ input[type=text].fl-search-input:focus {
 
 .fl-page .fl-module span.onsale {
   color: #fff;
-  background: #1a8cff;
+  background: var(--color-primary);
   font-size: 13px;
   font-weight: normal;
   left: 10px;
@@ -1119,7 +1119,7 @@ input[type=text].fl-search-input:focus {
 }
 
 a.fl-button, a.fl-button:visited {
-  background: #1a8cff;
+  background: var(--color-primary);
   color: #fff;
   border: 1px solid #006ddc
 }
@@ -1153,7 +1153,7 @@ a.fl-button:hover, a.button:hover {
 }
 
 button, input[type=button], input[type=submit] {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #fff;
   font-size: 18px;
   line-height: 1.45;
@@ -1164,20 +1164,20 @@ button, input[type=button], input[type=submit] {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   border-radius: 4px
 }
 
 button:hover, input[type=button]:hover, input[type=submit]:hover {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #fff;
   border: 1px solid #006ddc;
   text-decoration: none
 }
 
 button:active, input[type=button]:active, input[type=submit]:active, button:focus, input[type=button]:focus, input[type=submit]:focus {
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   color: #fff;
   border: 1px solid #006ddc;
   outline: none;
@@ -1211,8 +1211,8 @@ input[type=text], input[type=password], input[type=email], input[type=tel], inpu
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   border-radius: 4px
 }
 
@@ -1389,11 +1389,11 @@ img.mfp-img {
   }
 
   .fl-page-nav .navbar-nav li > a:hover, .fl-page-nav .navbar-nav li > a:focus {
-    color: #1a8cff
+    color: var(--color-primary)
   }
 
   .fl-page-nav .navbar-nav li.current-menu-ancestor > a, .fl-page-nav .navbar-nav li.current-menu-parent > a, .fl-page-nav .navbar-nav li.current-menu-item > a {
-    color: #1a8cff
+    color: var(--color-primary)
   }
 
   .fl-page-nav .navbar-nav li.current-menu-item ~ li.current-menu-item > a {
@@ -2390,7 +2390,7 @@ ul.wp-block-latest-posts.alignwide, ul.wp-block-latest-posts.alignfull, ul.wp-bl
 
 .fl-page button:visited, .fl-responsive-preview-content button:visited, .fl-button-lightbox-content button:visited, .fl-page input[type=button], .fl-responsive-preview-content input[type=button], .fl-button-lightbox-content input[type=button], .fl-page input[type=submit], .fl-responsive-preview-content input[type=submit], .fl-button-lightbox-content input[type=submit], .fl-page a.fl-button, .fl-responsive-preview-content a.fl-button, .fl-button-lightbox-content a.fl-button, .fl-page a.fl-button:visited, .fl-responsive-preview-content a.fl-button:visited, .fl-button-lightbox-content a.fl-button:visited, .fl-page a.button, .fl-responsive-preview-content a.button, .fl-button-lightbox-content a.button, .fl-page a.button:visited, .fl-responsive-preview-content a.button:visited, .fl-button-lightbox-content a.button:visited, .fl-page button.button, .fl-responsive-preview-content button.button, .fl-button-lightbox-content button.button, .fl-page button.button:visited, .fl-responsive-preview-content button.button:visited, .fl-button-lightbox-content button.button:visited, .fl-page .fl-page-nav-toggle-button .fl-page-nav .navbar-toggle, .fl-responsive-preview-content .fl-page-nav-toggle-button .fl-page-nav .navbar-toggle, .fl-button-lightbox-content .fl-page-nav-toggle-button .fl-page-nav .navbar-toggle, .fl-page .fl-page-nav-toggle-button .fl-page-nav .navbar-toggle:visited, .fl-responsive-preview-content .fl-page-nav-toggle-button .fl-page-nav .navbar-toggle:visited, .fl-button-lightbox-content .fl-page-nav-toggle-button .fl-page-nav .navbar-toggle:visited {
   color: #fff;
-  background-color: #1a8cff;
+  background-color: var(--color-primary);
   font-family: var(--font-system-ui);
   font-weight: 700;
   font-size: 18px;
diff --git a/themes/beaver/assets/css/style.css b/themes/beaver/assets/css/style.css
index 81ac43388..907547f02 100644
--- a/themes/beaver/assets/css/style.css
+++ b/themes/beaver/assets/css/style.css
@@ -158,7 +158,7 @@
 .blog code {
   background: #f4f4f5;
   padding: 2px 6px;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
   font-size: 0.9em;
 }
 
@@ -193,7 +193,7 @@ input[type=submit]:disabled {
 }
 
 /* Links: visible brand blue with hover underline (WCAG AA contrast)
-   #0066d6 = 4.78:1 on white. Sprint #2 promoted this from old #1a8cff
+   #0066d6 = 4.78:1 on white. Sprint #2 promoted this from old var(--color-primary)
    which was 3.37:1 (WCAG fail). */
 .blog p a,
 .blog li a,
@@ -243,7 +243,7 @@ input[type=submit]:disabled {
   color: #1a1a2e;
   background: #f4f4f5;
   padding: 2px 6px;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
   font-size: 0.9em;
   font-weight: 400;
 }
diff --git a/themes/beaver/assets/css/technologies.css b/themes/beaver/assets/css/technologies.css
index 4b2e6fba2..076549147 100644
--- a/themes/beaver/assets/css/technologies.css
+++ b/themes/beaver/assets/css/technologies.css
@@ -3,7 +3,7 @@
 }
 
 .technologies-component .subheading {
-    color: #1a8cff;
+    color: var(--color-primary);
     font-weight: 600;
 }
 
diff --git a/themes/beaver/assets/css/theme-main.css b/themes/beaver/assets/css/theme-main.css
index 0d7185a4e..a1f671382 100644
--- a/themes/beaver/assets/css/theme-main.css
+++ b/themes/beaver/assets/css/theme-main.css
@@ -1,7 +1,7 @@
 :root {
   --jt-primary-color: var(--color-primary);
   --jt-text-color: #121212; /* KEEP LITERAL (value side): shadow token - repointing to var(--color-dark) is a deliberate follow-up decision, not a mechanical swap */
-  --jt-primary: #1a8cff;
+  --jt-primary: var(--color-primary);
   --jt-text-primary: #121212; /* KEEP LITERAL (value side): shadow token - repointing to var(--color-dark) is a deliberate follow-up decision, not a mechanical swap */
   --jt-primary-dark: #0066cc;
   --jt-primary-hover: #007af4;
@@ -160,12 +160,14 @@ h6 {
 }
 
 a {
-  color: var(--color-primary);
+  /* was var(--color-primary) — token was never defined, so this computed
+     `inherit` since day one; codified during WP1.1 token extraction */
+  color: inherit;
 }
 
 a:hover,
 a:focus {
-  color: var(--color-primary);
+  color: inherit; /* was undefined var(--color-primary) — see rule above */
 }
 
 blockquote {
@@ -825,7 +827,7 @@ img {
 .wp-pagenavi a:hover {
   border-color: #e6e6e6;
   color: #fff;
-  background: #1a8cff;
+  background: var(--color-primary);
   font-weight: normal;
 }
 
@@ -1164,7 +1166,7 @@ input[type="text"].fl-search-input:focus {
 
 .fl-page .fl-module span.onsale {
   color: #fff;
-  background: #1a8cff;
+  background: var(--color-primary);
   font-size: 13px;
   font-weight: normal;
   left: 10px;
@@ -1213,7 +1215,7 @@ input[type="text"].fl-search-input:focus {
   line-height: 1.2;
   text-transform: capitalize;
   border: none;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 
 .fl-page .fl-module-woocommerce a.button:hover,
@@ -1264,7 +1266,7 @@ input[type="text"].fl-search-input:focus {
   line-height: 1.2;
   text-transform: capitalize;
   border: none;
-  border-radius: 4px;
+  border-radius: var(--radius-default);
 }
 
 .woocommerce-page button.button:disabled,
@@ -1304,7 +1306,7 @@ input[type="text"].fl-search-input:focus {
 
 a.fl-button,
 a.fl-button:visited {
-  background: #1a8cff;
+  background: var(--color-primary);
   color: #fff;
   border: 1px solid #006ddc;
 }
@@ -1344,7 +1346,7 @@ a.button:hover {
 button,
 input[type="button"],
 input[type="submit"] {
-  background-color: var(--color-primary);
+  background-color: transparent; /* was undefined var(--color-primary) = initial */
   color: #fff;
   font-size: 18px;
   line-height: 1.45;
@@ -1355,15 +1357,15 @@ input[type="submit"] {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
+  border-radius: var(--radius-default);
 }
 
 button:hover,
 input[type="button"]:hover,
 input[type="submit"]:hover {
-  background-color: var(--color-primary);
+  background-color: transparent; /* was undefined var(--color-primary) = initial */
   color: #fff;
   border: 1px solid #006ddc;
   text-decoration: none;
@@ -1375,7 +1377,7 @@ input[type="submit"]:active,
 button:focus,
 input[type="button"]:focus,
 input[type="submit"]:focus {
-  background-color: var(--color-primary);
+  background-color: transparent; /* was undefined var(--color-primary) = initial */
   color: #fff;
   border: 1px solid #006ddc;
   outline: none;
@@ -1434,9 +1436,9 @@ textarea {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
+  border-radius: var(--radius-default);
 }
 
 input[type="text"]::-webkit-input-placeholder,
@@ -3610,7 +3612,7 @@ input:focus-visible,
 textarea:focus-visible,
 select:focus-visible,
 [tabindex]:focus-visible {
-  outline: 2px solid #1a8cff;
+  outline: 2px solid var(--color-primary);
   outline-offset: 2px;
 }
 
@@ -3636,15 +3638,15 @@ input[type="number"]:focus-visible,
 input[type="search"]:focus-visible,
 input[type="url"]:focus-visible,
 textarea:focus-visible {
-  outline: 2px solid #1a8cff;
+  outline: 2px solid var(--color-primary);
   outline-offset: 1px;
-  border-color: var(--color-primary);
+  border-color: currentColor; /* was undefined var(--color-primary) = initial */
 }
 
 /* Custom Form Control Focus (Checkboxes & Radios) */
 input[type="checkbox"]:focus-visible + label::before,
 input[type="radio"]:focus-visible + label::before {
-  outline: 2px solid #1a8cff;
+  outline: 2px solid var(--color-primary);
   outline-offset: 2px;
   box-shadow: 0 0 0 3px rgba(26, 140, 255, 0.2);
 }
diff --git a/themes/beaver/assets/css/use-cases-dynamic.css b/themes/beaver/assets/css/use-cases-dynamic.css
index 468d1548f..2647ba9ac 100644
--- a/themes/beaver/assets/css/use-cases-dynamic.css
+++ b/themes/beaver/assets/css/use-cases-dynamic.css
@@ -1,5 +1,5 @@
 .use-cases > .heading {
-  color: #1a8cff;
+  color: var(--color-primary);
   font-weight: 600;
   text-align: center;
   margin-bottom: 30px;
diff --git a/themes/beaver/assets/css/utilities/_consolidated-utilities.css b/themes/beaver/assets/css/utilities/_consolidated-utilities.css
deleted file mode 100644
index e897ca625..000000000
--- a/themes/beaver/assets/css/utilities/_consolidated-utilities.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Consolidated Utilities - Master Utilities File (Phase 1B) */
-/* ALL utility CSS consolidated via @import for zero-duplication architecture */
-
-/* Foundation Utilities */
-@import "foundation/reset.css";
-@import "foundation/clearfix.css";
-@import "foundation/screen-reader.css";
-@import "foundation/container.css";
-
-/* Grid System */
-@import "grid/fl-row.css";
-@import "grid/fl-col.css";
-
-/* FL-Builder Utilities */
-@import "fl-builder-basic.css";
-@import "fl-builder-components.css";
-@import "fl-builder-grid.css";
-@import "fl-builder-visibility.css";
-
-/* Responsive Utilities */
-@import "responsive/breakpoints.css";
-@import "responsive/visibility.css";
-
-/* Layout Utilities */
-@import "display.css";
-@import "flexbox.css";
-@import "margins.css";
-@import "padding.css";
-@import "position.css";
-@import "positioning/center-absolute.css";
-@import "c-spacing.css";
-
-/* Color Utilities */
-@import "colors.css";
-@import "colors/backgrounds.css";
-@import "color-accessibility.css";
-
-/* Typography Utilities */
-@import "typography/text-utilities.css";
-
-/* Other Utilities */
-@import "clearfix.css";
-@import "opacity.css";
-
-/* PowerPack Component Utilities */
-@import "components/powerpack/content-grid.css";
-@import "components/powerpack/infobox.css";
-@import "components/powerpack/pp-icon.css";
-@import "components/powerpack/pp-list.css";
-
-/* Phase 1B Consolidation Progress:
- * ✅ 30 utility files consolidated into single master file
- * ✅ @import strategy preserves individual file organization
- * ✅ PostCSS postcss-delete-duplicate-css removes runtime duplicates
- * 🎯 Target: 70-80% source file reduction (105 → 21-32 files)
- */
\ No newline at end of file
diff --git a/themes/beaver/assets/css/utilities/c-spacing.css b/themes/beaver/assets/css/utilities/c-spacing.css
deleted file mode 100644
index b14e2bd3f..000000000
--- a/themes/beaver/assets/css/utilities/c-spacing.css
+++ /dev/null
@@ -1,307 +0,0 @@
-/**
- * Spacing Utilities (c-spacing)
- *
- * Unified spacing system consolidating scattered margin/padding values
- * Provides consistent spacing scale with CSS variables and utility classes
- *
- * CYCLE 6: Spacing System Enhancement
- * Target: 25-30% reduction of 6,973+ spacing references
- */
-
-/* ==========================================================================
-   Spacing Variables (CSS Custom Properties)
-   ========================================================================== */
-
-:root {
-  // Spacing Scale (8px base, geometric progression)
-  --spacing-0: 0;
-  --spacing-xs: 0.25rem;  // 4px
-  --spacing-sm: 0.5rem;   // 8px
-  --spacing-md: 1rem;     // 16px
-  --spacing-lg: 1.5rem;   // 24px
-  --spacing-xl: 2rem;     // 32px
-  --spacing-2xl: 3rem;    // 48px
-  --spacing-3xl: 4rem;    // 64px
-  --spacing-4xl: 6rem;    // 96px
-  --spacing-5xl: 8rem;    // 128px
-
-  // Component-specific spacing
-  --spacing-component-padding: 1.5rem;
-  --spacing-section-padding: 3rem;
-  --spacing-container-padding: 1rem;
-}
-
-/* ==========================================================================
-   Margin Utilities
-   ========================================================================== */
-
-// All sides
-.u-margin-0 { margin: var(--spacing-0) !important; }
-.u-margin-xs { margin: var(--spacing-xs) !important; }
-.u-margin-sm { margin: var(--spacing-sm) !important; }
-.u-margin-md { margin: var(--spacing-md) !important; }
-.u-margin-lg { margin: var(--spacing-lg) !important; }
-.u-margin-xl { margin: var(--spacing-xl) !important; }
-.u-margin-2xl { margin: var(--spacing-2xl) !important; }
-.u-margin-3xl { margin: var(--spacing-3xl) !important; }
-
-// Horizontal (left + right)
-.u-margin-x-0 { margin-left: var(--spacing-0) !important; margin-right: var(--spacing-0) !important; }
-.u-margin-x-xs { margin-left: var(--spacing-xs) !important; margin-right: var(--spacing-xs) !important; }
-.u-margin-x-sm { margin-left: var(--spacing-sm) !important; margin-right: var(--spacing-sm) !important; }
-.u-margin-x-md { margin-left: var(--spacing-md) !important; margin-right: var(--spacing-md) !important; }
-.u-margin-x-lg { margin-left: var(--spacing-lg) !important; margin-right: var(--spacing-lg) !important; }
-.u-margin-x-xl { margin-left: var(--spacing-xl) !important; margin-right: var(--spacing-xl) !important; }
-.u-margin-x-auto { margin-left: auto !important; margin-right: auto !important; }
-
-// Vertical (top + bottom)
-.u-margin-y-0 { margin-top: var(--spacing-0) !important; margin-bottom: var(--spacing-0) !important; }
-.u-margin-y-xs { margin-top: var(--spacing-xs) !important; margin-bottom: var(--spacing-xs) !important; }
-.u-margin-y-sm { margin-top: var(--spacing-sm) !important; margin-bottom: var(--spacing-sm) !important; }
-.u-margin-y-md { margin-top: var(--spacing-md) !important; margin-bottom: var(--spacing-md) !important; }
-.u-margin-y-lg { margin-top: var(--spacing-lg) !important; margin-bottom: var(--spacing-lg) !important; }
-.u-margin-y-xl { margin-top: var(--spacing-xl) !important; margin-bottom: var(--spacing-xl) !important; }
-
-// Individual sides
-.u-margin-top-0 { margin-top: var(--spacing-0) !important; }
-.u-margin-top-xs { margin-top: var(--spacing-xs) !important; }
-.u-margin-top-sm { margin-top: var(--spacing-sm) !important; }
-.u-margin-top-md { margin-top: var(--spacing-md) !important; }
-.u-margin-top-lg { margin-top: var(--spacing-lg) !important; }
-.u-margin-top-xl { margin-top: var(--spacing-xl) !important; }
-.u-margin-top-2xl { margin-top: var(--spacing-2xl) !important; }
-
-.u-margin-bottom-0 { margin-bottom: var(--spacing-0) !important; }
-.u-margin-bottom-xs { margin-bottom: var(--spacing-xs) !important; }
-.u-margin-bottom-sm { margin-bottom: var(--spacing-sm) !important; }
-.u-margin-bottom-md { margin-bottom: var(--spacing-md) !important; }
-.u-margin-bottom-lg { margin-bottom: var(--spacing-lg) !important; }
-.u-margin-bottom-xl { margin-bottom: var(--spacing-xl) !important; }
-.u-margin-bottom-2xl { margin-bottom: var(--spacing-2xl) !important; }
-
-.u-margin-left-0 { margin-left: var(--spacing-0) !important; }
-.u-margin-left-xs { margin-left: var(--spacing-xs) !important; }
-.u-margin-left-sm { margin-left: var(--spacing-sm) !important; }
-.u-margin-left-md { margin-left: var(--spacing-md) !important; }
-.u-margin-left-lg { margin-left: var(--spacing-lg) !important; }
-.u-margin-left-xl { margin-left: var(--spacing-xl) !important; }
-.u-margin-left-auto { margin-left: auto !important; }
-
-.u-margin-right-0 { margin-right: var(--spacing-0) !important; }
-.u-margin-right-xs { margin-right: var(--spacing-xs) !important; }
-.u-margin-right-sm { margin-right: var(--spacing-sm) !important; }
-.u-margin-right-md { margin-right: var(--spacing-md) !important; }
-.u-margin-right-lg { margin-right: var(--spacing-lg) !important; }
-.u-margin-right-xl { margin-right: var(--spacing-xl) !important; }
-.u-margin-right-auto { margin-right: auto !important; }
-
-/* ==========================================================================
-   Padding Utilities
-   ========================================================================== */
-
-// All sides
-.u-padding-0 { padding: var(--spacing-0) !important; }
-.u-padding-xs { padding: var(--spacing-xs) !important; }
-.u-padding-sm { padding: var(--spacing-sm) !important; }
-.u-padding-md { padding: var(--spacing-md) !important; }
-.u-padding-lg { padding: var(--spacing-lg) !important; }
-.u-padding-xl { padding: var(--spacing-xl) !important; }
-.u-padding-2xl { padding: var(--spacing-2xl) !important; }
-.u-padding-3xl { padding: var(--spacing-3xl) !important; }
-
-// Horizontal (left + right)
-.u-padding-x-0 { padding-left: var(--spacing-0) !important; padding-right: var(--spacing-0) !important; }
-.u-padding-x-xs { padding-left: var(--spacing-xs) !important; padding-right: var(--spacing-xs) !important; }
-.u-padding-x-sm { padding-left: var(--spacing-sm) !important; padding-right: var(--spacing-sm) !important; }
-.u-padding-x-md { padding-left: var(--spacing-md) !important; padding-right: var(--spacing-md) !important; }
-.u-padding-x-lg { padding-left: var(--spacing-lg) !important; padding-right: var(--spacing-lg) !important; }
-.u-padding-x-xl { padding-left: var(--spacing-xl) !important; padding-right: var(--spacing-xl) !important; }
-
-// Vertical (top + bottom)
-.u-padding-y-0 { padding-top: var(--spacing-0) !important; padding-bottom: var(--spacing-0) !important; }
-.u-padding-y-xs { padding-top: var(--spacing-xs) !important; padding-bottom: var(--spacing-xs) !important; }
-.u-padding-y-sm { padding-top: var(--spacing-sm) !important; padding-bottom: var(--spacing-sm) !important; }
-.u-padding-y-md { padding-top: var(--spacing-md) !important; padding-bottom: var(--spacing-md) !important; }
-.u-padding-y-lg { padding-top: var(--spacing-lg) !important; padding-bottom: var(--spacing-lg) !important; }
-.u-padding-y-xl { padding-top: var(--spacing-xl) !important; padding-bottom: var(--spacing-xl) !important; }
-
-// Individual sides
-.u-padding-top-0 { padding-top: var(--spacing-0) !important; }
-.u-padding-top-xs { padding-top: var(--spacing-xs) !important; }
-.u-padding-top-sm { padding-top: var(--spacing-sm) !important; }
-.u-padding-top-md { padding-top: var(--spacing-md) !important; }
-.u-padding-top-lg { padding-top: var(--spacing-lg) !important; }
-.u-padding-top-xl { padding-top: var(--spacing-xl) !important; }
-.u-padding-top-2xl { padding-top: var(--spacing-2xl) !important; }
-
-.u-padding-bottom-0 { padding-bottom: var(--spacing-0) !important; }
-.u-padding-bottom-xs { padding-bottom: var(--spacing-xs) !important; }
-.u-padding-bottom-sm { padding-bottom: var(--spacing-sm) !important; }
-.u-padding-bottom-md { padding-bottom: var(--spacing-md) !important; }
-.u-padding-bottom-lg { padding-bottom: var(--spacing-lg) !important; }
-.u-padding-bottom-xl { padding-bottom: var(--spacing-xl) !important; }
-.u-padding-bottom-2xl { padding-bottom: var(--spacing-2xl) !important; }
-
-.u-padding-left-0 { padding-left: var(--spacing-0) !important; }
-.u-padding-left-xs { padding-left: var(--spacing-xs) !important; }
-.u-padding-left-sm { padding-left: var(--spacing-sm) !important; }
-.u-padding-left-md { padding-left: var(--spacing-md) !important; }
-.u-padding-left-lg { padding-left: var(--spacing-lg) !important; }
-.u-padding-left-xl { padding-left: var(--spacing-xl) !important; }
-
-.u-padding-right-0 { padding-right: var(--spacing-0) !important; }
-.u-padding-right-xs { padding-right: var(--spacing-xs) !important; }
-.u-padding-right-sm { padding-right: var(--spacing-sm) !important; }
-.u-padding-right-md { padding-right: var(--spacing-md) !important; }
-.u-padding-right-lg { padding-right: var(--spacing-lg) !important; }
-.u-padding-right-xl { padding-right: var(--spacing-xl) !important; }
-
-/* ==========================================================================
-   Component-Specific Spacing Classes
-   ========================================================================== */
-
-.c-section {
-  padding: var(--spacing-section-padding) 0;
-
-  // Dual-class support for FL-Builder sections
-  &.fl-row,
-  &.fl-row-content {
-    padding: var(--spacing-section-padding) 0;
-  }
-}
-
-.c-container {
-  padding-left: var(--spacing-container-padding);
-  padding-right: var(--spacing-container-padding);
-  margin-left: auto;
-  margin-right: auto;
-  max-width: 1200px;
-
-  // Dual-class support
-  &.fl-row-fixed-width,
-  &.fl-row-content {
-    padding-left: var(--spacing-container-padding);
-    padding-right: var(--spacing-container-padding);
-  }
-}
-
-.c-content-block {
-  padding: var(--spacing-component-padding);
-
-  // Dual-class support for FL-Builder modules
-  &.fl-module,
-  &.fl-module-content {
-    padding: var(--spacing-component-padding);
-  }
-}
-
-/* ==========================================================================
-   Responsive Spacing (Mobile)
-   ========================================================================== */
-
-// Mobile adjustments (use direct values, not variables)
-@media (max-width: 768px) {
-  :root {
-    --spacing-section-padding: 1.5rem; // Reduced from 3rem
-    --spacing-container-padding: 0.75rem; // Reduced from 1rem
-  }
-
-  .c-section {
-    padding: 1.5rem 0;
-  }
-
-  .c-container {
-    padding-left: 0.75rem;
-    padding-right: 0.75rem;
-  }
-
-  // Mobile-specific utilities
-  .u-margin-mobile-0 { margin: 0 !important; }
-  .u-margin-mobile-sm { margin: 0.5rem !important; }
-  .u-padding-mobile-0 { padding: 0 !important; }
-  .u-padding-mobile-sm { padding: 0.5rem !important; }
-}
-
-@media (max-width: 480px) {
-  :root {
-    --spacing-section-padding: 1rem;
-    --spacing-container-padding: 0.5rem;
-  }
-
-  .c-section {
-    padding: 1rem 0;
-  }
-
-  .c-container {
-    padding-left: 0.5rem;
-    padding-right: 0.5rem;
-  }
-}
-
-/* ==========================================================================
-   FL-Builder Integration Classes
-   ========================================================================== */
-
-// Apply spacing system to common FL-Builder patterns
-.fl-row {
-  // Section-level spacing
-  &.fl-row-bg-none {
-    padding: var(--spacing-lg) 0;
-  }
-
-  &.fl-row-bg-photo,
-  &.fl-row-bg-video {
-    padding: var(--spacing-2xl) 0;
-  }
-}
-
-.fl-col-content {
-  // Component-level spacing
-  padding: var(--spacing-md);
-}
-
-.fl-module-content {
-  // Module-level spacing
-  margin-bottom: var(--spacing-md);
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-}
-
-/* ==========================================================================
-   PowerPack Content Integration
-   ========================================================================== */
-
-.pp-content-post {
-  padding: var(--spacing-md);
-  margin-bottom: var(--spacing-md);
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-}
-
-.pp-content-grid {
-  gap: var(--spacing-md);
-
-  &.pp-content-grid-tight {
-    gap: var(--spacing-sm);
-  }
-
-  &.pp-content-grid-loose {
-    gap: var(--spacing-lg);
-  }
-}
-
-/* ==========================================================================
-   Negative Margins (for special cases)
-   ========================================================================== */
-
-.u-margin-negative-xs { margin: calc(-1 * var(--spacing-xs)) !important; }
-.u-margin-negative-sm { margin: calc(-1 * var(--spacing-sm)) !important; }
-.u-margin-negative-md { margin: calc(-1 * var(--spacing-md)) !important; }
-
-.u-margin-top-negative-xs { margin-top: calc(-1 * var(--spacing-xs)) !important; }
-.u-margin-top-negative-sm { margin-top: calc(-1 * var(--spacing-sm)) !important; }
-.u-margin-top-negative-md { margin-top: calc(-1 * var(--spacing-md)) !important; }
\ No newline at end of file
diff --git a/themes/beaver/assets/css/utilities/color-accessibility.css b/themes/beaver/assets/css/utilities/color-accessibility.css
index 0d9078ab9..eff23994f 100644
--- a/themes/beaver/assets/css/utilities/color-accessibility.css
+++ b/themes/beaver/assets/css/utilities/color-accessibility.css
@@ -11,20 +11,20 @@
 
 /* Primary Color Combinations - WCAG Validated */
 .color-combo-primary-on-white {
-  color: var(--jt-primary);        /* #1a8cff */
+  color: var(--jt-primary);        /* var(--color-primary) */
   background: var(--jt-white);     /* #ffffff */
   /* Contrast Ratio: 3.04:1 - Passes AA for large text (18pt+) */
 }
 
 .color-combo-primary-on-light {
-  color: var(--jt-primary);        /* #1a8cff */
+  color: var(--jt-primary);        /* var(--color-primary) */
   background: var(--jt-gray-light); /* #f5f5f5 */
   /* Contrast Ratio: 2.86:1 - Passes AA for large text only */
 }
 
 .color-combo-white-on-primary {
   color: var(--jt-white);          /* #ffffff */
-  background: var(--jt-primary);   /* #1a8cff */
+  background: var(--jt-primary);   /* var(--color-primary) */
   /* Contrast Ratio: 3.04:1 - Passes AA for large text */
 }
 
@@ -43,13 +43,13 @@
 
 /* Secondary Text Combinations - WCAG AA Validated */
 .color-combo-secondary-on-white {
-  color: var(--jt-text-secondary); /* #969798 */
+  color: var(--jt-text-secondary); /* var(--color-muted) */
   background: var(--jt-white);     /* #ffffff */
   /* Contrast Ratio: 4.51:1 - Passes AA for normal text */
 }
 
 .color-combo-secondary-on-light {
-  color: var(--jt-text-secondary); /* #969798 */
+  color: var(--jt-text-secondary); /* var(--color-muted) */
   background: var(--jt-gray-light); /* #f5f5f5 */
   /* Contrast Ratio: 4.24:1 - Passes AA for normal text */
 }
diff --git a/themes/beaver/assets/css/utilities/display.css b/themes/beaver/assets/css/utilities/display.css
deleted file mode 100644
index a3095f8d8..000000000
--- a/themes/beaver/assets/css/utilities/display.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Display Utilities - Extracted from fl-homepage-layout.css */
-/* Micro-commit 1: Basic display utilities (3 lines) */
-
-.d-none { display: none; }
-.d-table-cell { display: table-cell; }
-.d-block { display: block; }
-.d-table { display: table; }
-.d-none-important { display: none !important; }
-.d-block-important { display: block !important; }
\ No newline at end of file
diff --git a/themes/beaver/assets/css/utilities/fl-builder-basic.css b/themes/beaver/assets/css/utilities/fl-builder-basic.css
deleted file mode 100644
index f25ae2aa0..000000000
--- a/themes/beaver/assets/css/utilities/fl-builder-basic.css
+++ /dev/null
@@ -1,50 +0,0 @@
-/* FL-Builder Basic Utilities */
-
-/* FL-Builder Clearfix System */
-.fl-clear {
-  clear: both;
-}
-
-.fl-clearfix:before, .fl-clearfix:after {
-  display: table;
-  content: " ";
-}
-
-.fl-clearfix:after {
-  clear: both;
-}
-
-/* FL-Builder Screen Reader Only */
-.sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  white-space: nowrap;
-  border: 0;
-}
-
-/* FL-Builder Column Base Patterns */
-.c-column,
-.fl-col {
-  float: left;
-  min-height: 1px;
-}
-
-.fl-col-bg-overlay .fl-col-content {
-  position: relative;
-}
-
-.fl-col-bg-overlay .fl-col-content:after {
-  border-radius: inherit;
-  content: '';
-  display: block;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 0;
-}
\ No newline at end of file
diff --git a/themes/beaver/assets/css/utilities/fl-builder-components.css b/themes/beaver/assets/css/utilities/fl-builder-components.css
index d3cbc9847..cccc546d0 100644
--- a/themes/beaver/assets/css/utilities/fl-builder-components.css
+++ b/themes/beaver/assets/css/utilities/fl-builder-components.css
@@ -18,9 +18,9 @@
 
 /* FL-Builder Button Patterns */
 .fl-builder-content a.fl-button, .fl-builder-content a.fl-button:visited {
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: var(--radius-default);
+  -moz-border-radius: var(--radius-default);
+  -webkit-border-radius: var(--radius-default);
   display: inline-block;
   font-size: 16px;
   font-weight: normal;
diff --git a/themes/beaver/assets/css/utilities/flexbox.css b/themes/beaver/assets/css/utilities/flexbox.css
deleted file mode 100644
index 4454737ee..000000000
--- a/themes/beaver/assets/css/utilities/flexbox.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Flexbox Utility Patterns - Extracted from fl-homepage-layout.css */
-
-/* Cross-browser flexbox display */
-.u-flex {
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: -moz-flex;
-  display: -ms-flex;
-  display: flex;
-}
-
-/* Inline flexbox display */
-.u-inline-flex {
-  display: -webkit-inline-box;
-  display: -webkit-inline-flex;
-  display: -moz-inline-box;
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-}
-
-/* Flexbox direction utilities */
-.u-flex-column {
-  display: flex;
-  flex-direction: column;
-}
-
-.u-flex-row {
-  display: flex;
-  flex-direction: row;
-}
-
-/* Flexbox wrapping */
-.u-flex-wrap {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-/* Flexbox alignment utilities */
-.u-justify-center { justify-content: center; }
-.u-justify-start { justify-content: flex-start; }
-.u-align-center { align-items: center; }
\ No newline at end of file
diff --git a/themes/beaver/assets/css/utilities/grid/fl-col.css b/themes/beaver/assets/css/utilities/grid/fl-col.css
deleted file mode 100644
index 3e7e1881f..000000000
--- a/themes/beaver/assets/css/utilities/grid/fl-col.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* FL-Col Core Layout Patterns */
-/* Phase 2: Grid System Consolidation - FL-Col Utilities */
-
-/* FL-Col Base Structure - Essential Grid Column */
-.fl-col {
-  float: left;
-  min-height: 1px;
-}
-
-/* FL-Col Content Container - Column Content Wrapper */
-.fl-col-content {
-  margin: 0;
-  padding: 0;
-}
\ No newline at end of file
diff --git a/themes/beaver/assets/css/utilities/margins.css b/themes/beaver/assets/css/utilities/margins.css
deleted file mode 100644
index f2e00286c..000000000
--- a/themes/beaver/assets/css/utilities/margins.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Margin Utilities - Extracted from fl-homepage-layout.css */
-/* Micro-commit 2: Basic margin utilities (3 lines) */
-
-.m-auto { margin: 0 auto; }
-.m-0 { margin: 0; }
-.m-x-2 { margin: 0 2px; }
-.m-t-10 { margin-top: 10px; }
-.m-b-0 { margin-bottom: 0; }
\ No newline at end of file
diff --git a/themes/beaver/assets/css/utilities/padding.css b/themes/beaver/assets/css/utilities/padding.css
deleted file mode 100644
index 412dfdb92..000000000
--- a/themes/beaver/assets/css/utilities/padding.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Padding Utilities - Extracted from fl-homepage-layout.css */
-/* Micro-commit 3: Basic padding utilities (3 lines) */
-
-.p-0 { padding: 0; }
-.p-30 { padding: 30px; }
-.p-20-10 { padding: 20px 10px; }
-.p-b-0 { padding-bottom: 0; }
\ No newline at end of file
diff --git a/themes/beaver/assets/css/utilities/position.css b/themes/beaver/assets/css/utilities/position.css
deleted file mode 100644
index cb77f13d5..000000000
--- a/themes/beaver/assets/css/utilities/position.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Position Utilities - Extracted from fl-homepage-layout.css */
-/* Micro-commit 4: Basic position utilities (3 lines) */
-
-.pos-relative { position: relative; }
-.pos-absolute { position: absolute; }
-.pos-static { position: static; }
\ No newline at end of file
diff --git a/themes/beaver/assets/css/utilities/positioning/center-absolute.css b/themes/beaver/assets/css/utilities/positioning/center-absolute.css
deleted file mode 100644
index 310c6490f..000000000
--- a/themes/beaver/assets/css/utilities/positioning/center-absolute.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.center-absolute {
-  transform: translate(-50%, -50%);
-  -ms-transform: translate(-50%, -50%);
-  -webkit-transform: translate(-50%, -50%);
-}
\ No newline at end of file
diff --git a/themes/beaver/assets/css/utilities/responsive/breakpoints.css b/themes/beaver/assets/css/utilities/responsive/breakpoints.css
deleted file mode 100644
index c7bc9bae5..000000000
--- a/themes/beaver/assets/css/utilities/responsive/breakpoints.css
+++ /dev/null
@@ -1,78 +0,0 @@
-/* FL-Builder Responsive Breakpoints */
-/* Phase 2: Grid System Consolidation - Responsive Breakpoints */
-
-/* Medium Breakpoint - Tablet Layout Adjustments */
-@media (max-width: 1115px) {
-  .fl-row[data-node] > .fl-row-content-wrap {
-    padding: 20px;
-  }
-
-  h1 {
-    font-size: 50px;
-    line-height: 1.1;
-    letter-spacing: 0;
-  }
-
-  .container {
-    padding-left: 40px;
-    padding-right: 40px;
-    width: auto;
-  }
-}
-
-/* Mobile Breakpoint - Mobile Layout Adjustments */
-@media (max-width: 860px) {
-  .fl-col {
-    clear: both;
-    float: none;
-    margin-left: auto;
-    margin-right: auto;
-    width: auto !important;
-  }
-
-  .fl-col-small:not(.fl-col-small-full-width) {
-    max-width: 400px;
-  }
-
-  .fl-row[data-node] .fl-row-content-wrap {
-    margin: 0;
-    padding: 20px;
-  }
-
-  h1 {
-    font-size: 40px;
-    line-height: 1;
-    letter-spacing: 0;
-  }
-
-  body {
-    font-size: 16px;
-    line-height: 1.45;
-  }
-
-  .fl-builder-content a.fl-button,
-  .fl-builder-content a.fl-button:visited {
-    font-size: 14px;
-    line-height: 1.35;
-  }
-}
-
-/* Container Responsive Adjustments */
-@media (min-width: 860px) {
-  .container {
-    padding-left: 40px;
-    padding-right: 40px;
-  }
-  .fl-content {
-    margin: 40px 0;
-  }
-}
-
-@media (min-width: 1100px) {
-  .container {
-    width: 1180px;
-    max-width: 90%;
-    padding-left: 0;
-    padding-right: 0;
-  }
-}
\ No newline at end of file
diff --git a/themes/beaver/assets/css/utilities/responsive/visibility.css b/themes/beaver/assets/css/utilities/responsive/visibility.css
deleted file mode 100644
index 90e0139d2..000000000
--- a/themes/beaver/assets/css/utilities/responsive/visibility.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/* FL-Builder Responsive Visibility Utilities */
-/* Phase 2: Grid System Consolidation - Visibility Utilities */
-
-/* Default Visibility - Desktop First */
-.fl-visible-desktop {
-  display: block;
-}
-
-.fl-visible-large, .fl-visible-medium, .fl-visible-mobile {
-  display: none;
-}
-
-/* Large Screen Visibility */
-@media (max-width: 1200px) {
-  .fl-visible-desktop, .fl-visible-medium, .fl-visible-mobile {
-    display: none;
-  }
-  .fl-visible-large {
-    display: block;
-  }
-}
-
-/* Medium Screen Visibility */
-@media (max-width: 1115px) {
-  .fl-visible-desktop, .fl-visible-large, .fl-visible-mobile {
-    display: none;
-  }
-  .fl-visible-medium {
-    display: block;
-  }
-}
-
-/* Mobile Screen Visibility */
-@media (max-width: 860px) {
-  .fl-visible-desktop, .fl-visible-large, .fl-visible-medium {
-    display: none;
-  }
-  .fl-visible-mobile {
-    display: block;
-  }
-}
\ No newline at end of file
diff --git a/themes/beaver/layouts/_test/single.html b/themes/beaver/layouts/_test/single.html
deleted file mode 100644
index c191c980b..000000000
--- a/themes/beaver/layouts/_test/single.html
+++ /dev/null
@@ -1,82 +0,0 @@
-{{ define "header" }}
-{{- $testCSS := resources.Get "css/component-bundle.css" }}
-<style>{{ $testCSS.Content | safeCSS }}</style>
-{{ end }}
-
-{{ define "main" }}
-<div class="container">
-  <div class="row">
-    <div class="col-md-12">
-      <h1>{{ .Title }}</h1>
-      {{ .Content }}
-
-      <!-- Hero Section Test -->
-      <div class="test-section">
-        <h2>1. Hero Section Component</h2>
-        {{ partial "components/hero-section.html" (dict
-          "headline" "Test Hero: Build Better Software Faster"
-          "excerpt" "Experience rapid development with our expert team. Get to market quickly without compromising quality."
-          "cta_text" "Get Started Today"
-          "cta_link" "contact-us/"
-          "node_id" "test-hero"
-        ) }}
-      </div>
-
-      <!-- Use Case Cards Test -->
-      <div class="test-section">
-        <h2>2. Use Case Cards Component</h2>
-        <div class="fl-row">
-          <div class="fl-row-content-wrap">
-            <div class="fl-row-content fl-row-fixed-width fl-node-content">
-              <div class="fl-col-group fl-node-test-cases fl-col-group-equal-height" data-node="test-cases">
-
-                <!-- Test with Startup MVP data -->
-                {{ partial "components/use-case-card.html" (dict
-                  "icon" "submenu-fractional"
-                  "title" "Fractional CTO"
-                  "description" "Get on-demand access to a CTO to help guide your technical vision, accelerate team-building, and improve development team operations."
-                  "headline" "Launch faster, go to market smarter"
-                  "excerpt" "Gain market feedback, secure product validation, and accelerate the path to revenue without slowing down or going broke."
-                  "link" "use-cases/startup-mvp-prototyping-development/"
-                  "cta_text" "Learn About This Use Case"
-                  "cover_image" "startup-mvp-prototyping-development.jpg"
-                  "node_id" "test-startup"
-                ) }}
-
-                <!-- Test with Emergency CTO data -->
-                {{ partial "components/use-case-card.html" (dict
-                  "icon" "submenu-fractional"
-                  "title" "Fractional CTO"
-                  "description" "Get on-demand access to a CTO to help guide your technical vision, accelerate team-building, and improve development team operations."
-                  "headline" "CTO Leadership When You Need It"
-                  "excerpt" "Don't let technology problems catch you off guard with on-demand access to technical expertise to help fill the leadership gap between software and IT operations."
-                  "link" "use-cases/emergency-cto-leadership/"
-                  "cta_text" "Learn About This Use Case"
-                  "cover_image" "emergency-cto-leadership.jpg"
-                  "node_id" "test-emergency"
-                ) }}
-
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <!-- Testimonial Test -->
-      <div class="test-section">
-        <h2>3. Testimonial Component</h2>
-        {{ partial "components/testimonial.html" (dict
-          "section_title" "CLIENT TESTIMONIALS"
-          "heading" "Trusted by Companies Worldwide"
-          "description" "See what our clients say about working with us."
-          "show_badges" true
-          "show_rating" true
-          "rating" "4.8"
-          "rating_text" "Based on 32+ client reviews"
-          "node_id" "test-testimonials"
-        ) }}
-      </div>
-    </div>
-  </div>
-</div>
-{{ end }}
diff --git a/themes/beaver/layouts/partials/components/hero-section.html b/themes/beaver/layouts/partials/components/hero-section.html
deleted file mode 100644
index 31354180c..000000000
--- a/themes/beaver/layouts/partials/components/hero-section.html
+++ /dev/null
@@ -1,91 +0,0 @@
-{{/*
-  Hero Section Component
-
-  Usage:
-  {{ partial "components/hero-section.html" (dict
-    "headline" "Launch faster, go to market smarter"
-    "excerpt" "Gain market feedback, secure product validation, and accelerate the path to revenue without slowing down or going broke."
-    "cta_text" "Talk to an Expert"
-    "cta_link" "free-consultation/"
-    "cover_image" "startup-mvp-prototyping-development.jpg"
-    "node_id" "hero-startup"
-    "bg_class" "fl-row-bg-photo"
-  ) }}
-
-  Parameters:
-  - headline: Main hero headline
-  - excerpt: Hero description text
-  - cta_text: Call-to-action button text
-  - cta_link: Relative URL for CTA button
-  - cover_image: Hero image filename (optional)
-  - node_id: Optional FL-Builder node ID (defaults to generated)
-  - bg_class: Background class (defaults to fl-row-bg-photo)
-*/}}
-
-{{- $headline := .headline | default "Your Headline Here" -}}
-{{- $excerpt := .excerpt | default "Your description goes here." -}}
-{{- $cta_text := .cta_text | default "Get Started" -}}
-{{- $cta_link := .cta_link | default "#" -}}
-{{- $cover_image := .cover_image -}}
-{{- $node_id := .node_id | default "hero-section" -}}
-{{- $bg_class := .bg_class | default "fl-row-bg-photo" -}}
-
-<div class="fl-row fl-row-full-width {{ $bg_class }} hero-section fl-row-default-height fl-row-align-center fl-row-has-layers" data-node="{{ $node_id }}">
-  <div class="fl-row-content-wrap">
-    <div class="fl-builder-layer fl-builder-shape-layer fl-builder-bottom-edge-layer fl-builder-shape-rect">
-      <svg class="fl-builder-layer-align-bottom-center" viewBox="0 0 800 450" preserveAspectRatio="none">
-        <defs></defs>
-        <g class="fl-shape-content">
-          <rect class="fl-shape" x="0" y="0" width="800" height="450"></rect>
-        </g>
-      </svg>
-    </div>
-    <div class="fl-row-content fl-row-fixed-width fl-node-content">
-      <div class="fl-col-group hero-section__group" data-node="{{ $node_id }}-group">
-        <div class="fl-col hero-section__col" data-node="{{ $node_id }}-col">
-          <div class="fl-col-content fl-node-content">
-            <div class="fl-module fl-module-heading hero-section__heading" data-node="{{ $node_id }}-heading">
-              <div class="fl-module-content fl-node-content">
-                <h1 class="fl-heading">
-                  <span class="fl-heading-text">{{ $headline }}</span>
-                </h1>
-              </div>
-            </div>
-            <div class="fl-module fl-module-rich-text hero-section__excerpt" data-node="{{ $node_id }}-excerpt">
-              <div class="fl-module-content fl-node-content">
-                <div class="fl-rich-text c-content-block__text">
-                  <p class="c-content-block__paragraph">{{ $excerpt }}</p>
-                </div>
-              </div>
-            </div>
-            {{- if $cta_text -}}
-            <div class="fl-module fl-module-button hero-section__cta" data-node="{{ $node_id }}-cta">
-              <div class="fl-module-content fl-node-content">
-                <div class="fl-button-wrap fl-button-width-auto fl-button-left">
-                  <a href="{{ relURL $cta_link }}" target="_self" class="fl-button">
-                    <span class="fl-button-text">{{ $cta_text }}</span>
-                  </a>
-                </div>
-              </div>
-            </div>
-            {{- end -}}
-            {{- if $cover_image -}}
-            <div class="fl-module fl-module-photo hero-section__photo blue-border" data-node="{{ $node_id }}-photo">
-              <div class="fl-module-content fl-node-content">
-                <div class="fl-photo fl-photo-align-left">
-                  <div class="fl-photo-content fl-photo-img-jpg">
-                    {{- $image_path := printf "images/%s" $cover_image -}}
-                    <img fetchpriority="high" decoding="async" class="fl-photo-img"
-                         src="{{ relURL $image_path }}"
-                         alt="{{ $headline }}" />
-                  </div>
-                </div>
-              </div>
-            </div>
-            {{- end -}}
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/themes/beaver/layouts/partials/components/testimonial.html b/themes/beaver/layouts/partials/components/testimonial.html
deleted file mode 100644
index 9ce4cd236..000000000
--- a/themes/beaver/layouts/partials/components/testimonial.html
+++ /dev/null
@@ -1,209 +0,0 @@
-{{/*
-  Testimonial Component
-
-  Usage:
-  {{ partial "components/testimonial.html" (dict
-    "section_title" "TESTIMONIALS"
-    "heading" "Most clients stay over 3 years. Some stayed beyond 6."
-    "description" "Don't just take our word for it. See what our clients say about our services."
-    "show_badges" true
-    "show_rating" true
-    "rating" "4.8"
-    "rating_text" "Based on 32 client reviews"
-    "node_id" "testimonials-main"
-  ) }}
-
-  Parameters:
-  - section_title: Section label (e.g., "TESTIMONIALS")
-  - heading: Main testimonial section heading
-  - description: Section description text
-  - show_badges: Whether to show company badges (default: true)
-  - show_rating: Whether to show rating section (default: true)
-  - rating: Rating score (default: "4.8")
-  - rating_text: Rating description (default: "Based on client reviews")
-  - node_id: Optional FL-Builder node ID (defaults to testimonials)
-*/}}
-
-{{- $section_title := .section_title | default "TESTIMONIALS" -}}
-{{- $heading := .heading | default "What Our Clients Say" -}}
-{{- $description := .description | default "See what our clients say about our services." -}}
-{{- $show_badges := .show_badges | default true -}}
-{{- $show_rating := .show_rating | default true -}}
-{{- $rating := .rating | default "4.8" -}}
-{{- $rating_text := .rating_text | default "Based on client reviews" -}}
-{{- $node_id := .node_id | default "testimonials" -}}
-{{- $testimonialsData := hugo.Data.testimonials -}}
-
-{{- $nonCriticalCSS := resources.Get "css/vendors/swiper.min.css" | fingerprint "md5" -}}
-<link fetchpriority="low" rel="preload" href="{{ $nonCriticalCSS.Permalink }}" as="style" onload="this.onload=null;this.rel='stylesheet'">
-<noscript><link rel="stylesheet" href="{{ $nonCriticalCSS.Permalink }}"></noscript>
-
-<div class="fl-col-group testimonial__header fl-col-group-custom-width" data-node="{{ $node_id }}-header">
-  <div class="fl-col testimonial__header-col fl-col-small-custom-width" data-node="{{ $node_id }}-header-col">
-    <div class="fl-col-content fl-node-content">
-      <div class="fl-module fl-module-rich-text testimonial__section-title" data-node="{{ $node_id }}-section-title">
-        <div class="fl-module-content fl-node-content">
-          <div class="fl-rich-text c-content-block__text">
-            <p class="c-content-block__paragraph">{{ $section_title }}</p>
-          </div>
-        </div>
-      </div>
-      <div class="fl-module fl-module-heading testimonial__heading" data-node="{{ $node_id }}-heading">
-        <div class="fl-module-content fl-node-content">
-          <h2 class="fl-heading">
-            <span class="fl-heading-text">{{ $heading }}</span>
-          </h2>
-        </div>
-      </div>
-      <div class="fl-module fl-module-rich-text testimonial__description" data-node="{{ $node_id }}-description">
-        <div class="fl-module-content fl-node-content">
-          <div class="fl-rich-text c-content-block__text">
-            <p class="c-content-block__paragraph">{{ $description }}</p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-<style>
-  .my-flex-container {
-    display: flex;
-    flex-direction: row;
-    row-gap: 1rem;
-    flex-wrap: wrap;
-    margin-top: 0;
-  }
-
-  @media (max-width: 800px) {
-    .my-flex-container {
-      flex-direction: column;
-      margin-top: 2rem;
-    }
-  }
-</style>
-
-{{- if $show_badges -}}
-<div id="{{ $node_id }}-badges" class="my-flex-container" style="display:flex;justify-content: center !important;column-gap:2rem">
-  <div style="display:flex;justify-content: center !important;column-gap:2rem">
-    <div style="text-align: center;">
-      <a target="_blank" rel="noopener noreferrer" href="https://www.goodfirms.co/company/jetthoughts-llc">
-        {{- $image := resources.Get "img/badges/top-software-development-companies.svg" -}}
-        <img loading="lazy" decoding="async" width="50" height="50" class="logo-image"
-             src="{{ $image.RelPermalink }}"
-             title="Top Software Development Company" alt="Top Software Development Company on GoodFirms">
-      </a>
-    </div>
-    <div style="text-align: center;">
-      {{- $image := resources.Get "img/badges/clutch.png" -}}
-      {{- $title := "Clutch banner" -}}
-      {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 50 "class" "logo-image") }}
-    </div>
-    <div style="text-align: center;">
-      {{- $image := resources.Get "img/badges/glassdoor.png" -}}
-      {{- $title := "Glassdoor logo" -}}
-      {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 50 "class" "logo-image") }}
-    </div>
-    <div style="text-align: center;">
-      {{- $image := resources.Get "img/badges/top-rated.png" -}}
-      {{- $title := "Top Rated" -}}
-      {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 50 "class" "logo-image") }}
-    </div>
-    <div style="text-align: center;">
-      {{- $image := resources.Get "img/badges/tewa.png" -}}
-      {{- $title := "Top Web Development Companies" -}}
-      {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 50 "class" "logo-image") }}
-    </div>
-  </div>
-
-  {{- if $show_rating -}}
-  <div>
-    <div class="fl-module fl-module-rich-text testimonial__rating jt-rating" data-node="{{ $node_id }}-rating">
-      <div class="fl-module-content fl-node-content">
-        <div class="fl-rich-text c-content-block__text">
-          <p class="c-content-block__paragraph">
-            <strong>{{ $rating }}</strong>/5.0
-            {{- $image := resources.Get "img/stars.png" -}}
-            {{- $title := "" -}}
-            {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 212 "class" "alignnone size-full") }}
-          </p>
-        </div>
-      </div>
-    </div>
-    <div class="fl-module fl-module-rich-text testimonial__rating-text" data-node="{{ $node_id }}-rating-text">
-      <div class="fl-module-content fl-node-content">
-        <div class="fl-rich-text c-content-block__text">
-          <p class="c-content-block__paragraph">{{ $rating_text }}</p>
-        </div>
-      </div>
-    </div>
-  </div>
-  {{- end -}}
-</div>
-{{- end -}}
-
-<div class="fl-col-group testimonial__reviews fl-col-group-custom-width" data-node="{{ $node_id }}-reviews">
-  <div class="fl-col testimonial__reviews-col fl-col-small-custom-width" data-node="{{ $node_id }}-reviews-col">
-    <div class="fl-col-content fl-node-content">
-      <div class="fl-module fl-module-pp-reviews testimonial__swiper jt-reviews-box" data-node="{{ $node_id }}-swiper">
-        <div class="fl-module-content fl-node-content">
-          <div class="pp-reviews-wrapper pp-reviews-default">
-            <div class="pp-reviews-swiper swiper-container">
-              <div class="swiper-wrapper">
-                {{- if $testimonialsData.testimonials -}}
-                  {{- range $testimonialsData.testimonials -}}
-                  <div class="pp-review-item pp-review-item-0 swiper-slide">
-                    <div class="pp-review">
-                      <div class="pp-review-content">
-                        <div class="pp-review-text">
-                          <p>{{ index . "description" | default "No description" }}</p>
-                        </div>
-                      </div>
-                      <div class="pp-review-header">
-                        <cite class="pp-review-cite">
-                          <span class="pp-review-name">{{ index . "name" | default "Anonymous" }}</span>
-                          <div class="pp-rating">
-                            {{- $image := resources.Get "img/stars.png" -}}
-                            {{- $title := "five stars" -}}
-                            {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 106 "class" "alignnone size-full") }}
-                          </div>
-                          <span class="pp-review-title">{{ index . "title" | default "Customer" }}{{ with index . "company" }}, {{ . }}{{ end }}</span>
-                        </cite>
-                        <div class="pp-review-icon"><i class="" aria-hidden="true"></i></div>
-                      </div>
-                    </div>
-                  </div>
-                  {{- end -}}
-                {{- else if .Site.Params.testimonials -}}
-                  {{- range .Site.Params.testimonials -}}
-                  <div class="pp-review-item pp-review-item-0 swiper-slide">
-                    <div class="pp-review">
-                      <div class="pp-review-content">
-                        <div class="pp-review-text">
-                          <p>{{ index . "description" | default "No description" }}</p>
-                        </div>
-                      </div>
-                      <div class="pp-review-header">
-                        <cite class="pp-review-cite">
-                          <span class="pp-review-name">{{ index . "name" | default "Anonymous" }}</span>
-                          <div class="pp-rating">
-                            {{- $image := resources.Get "img/stars.png" -}}
-                            {{- $title := "five stars" -}}
-                            {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 106 "class" "alignnone size-full") }}
-                          </div>
-                          <span class="pp-review-title">{{ index . "title" | default "Customer" }}{{ with index . "company" }}, {{ . }}{{ end }}</span>
-                        </cite>
-                        <div class="pp-review-icon"><i class="" aria-hidden="true"></i></div>
-                      </div>
-                    </div>
-                  </div>
-                  {{- end -}}
-                {{- end -}}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/themes/beaver/layouts/partials/components/use-case-card.html b/themes/beaver/layouts/partials/components/use-case-card.html
deleted file mode 100644
index 521bebf67..000000000
--- a/themes/beaver/layouts/partials/components/use-case-card.html
+++ /dev/null
@@ -1,80 +0,0 @@
-{{/*
-  Use Case Card Component
-
-  Usage:
-  {{ partial "components/use-case-card.html" (dict
-    "icon" "submenu-fractional"
-    "title" "Fractional CTO"
-    "description" "Get on-demand access to a CTO to help guide your technical vision, accelerate team-building, and improve development team operations."
-    "headline" "Launch faster, go to market smarter"
-    "excerpt" "Gain market feedback, secure product validation, and accelerate the path to revenue without slowing down or going broke."
-    "link" "use-cases/startup-mvp-prototyping-development/"
-    "cta_text" "Learn About This Use Case"
-    "cover_image" "startup-mvp-prototyping-development.jpg"
-    "node_id" "use-case-startup"
-  ) }}
-
-  Parameters:
-  - icon: SVG icon name from menu_custom (e.g., "submenu-fractional")
-  - title: Use case title from menu_custom
-  - description: Use case description from menu_custom
-  - headline: Primary headline from frontmatter
-  - excerpt: Brief description from frontmatter
-  - link: Relative URL to use case page
-  - cta_text: Call-to-action button text
-  - cover_image: Cover image filename
-  - node_id: Optional FL-Builder node ID (defaults to generated)
-*/}}
-
-{{- $icon := .icon | default "submenu-fractional" -}}
-{{- $title := .title | default "Use Case Title" -}}
-{{- $description := .description | default "Use case description." -}}
-{{- $headline := .headline | default .title -}}
-{{- $excerpt := .excerpt | default .description -}}
-{{- $link := .link | default "#" -}}
-{{- $cta_text := .cta_text | default "Learn More" -}}
-{{- $cover_image := .cover_image | default "default-use-case.jpg" -}}
-{{- $node_id := .node_id | default (printf "use-case-%s" (replace $icon "-" "")) -}}
-
-<div class="fl-col use-case-card fl-col-small fl-col-small-custom-width hover-box" data-node="{{ $node_id }}">
-  <div class="fl-col-content fl-node-content">
-    <div class="fl-module fl-module-pp-infobox use-case-card__box jt-use-case-box" data-node="{{ $node_id }}-box">
-      <div class="fl-module-content fl-node-content">
-        <div class="pp-infobox-wrap">
-          <div class="pp-infobox layout-5">
-            {{- if $cover_image -}}
-            <div class="pp-infobox-image-wrapper">
-              <div class="pp-infobox-image">
-                <img src="{{ relURL (printf "images/use-cases/%s" $cover_image) }}" alt="{{ $headline }}" class="use-case-image" />
-              </div>
-            </div>
-            {{- end -}}
-            <div class="pp-icon-wrapper animated">
-              <div class="pp-infobox-icon">
-                {{ partial "svgiw" (dict "svg" (printf "theme/%s" $icon) "width" "30" "height" "30") }}
-              </div>
-            </div>
-            <div class="pp-infobox-title-wrapper">
-              <h3 class="pp-infobox-title">
-                <a class="pp-title-link" href="{{ relURL $link }}" target="_self">{{ $headline }}</a>
-              </h3>
-            </div>
-            <div class="pp-infobox-subtitle">
-              <p class="use-case-subtitle">{{ $title }}</p>
-            </div>
-            <div class="pp-infobox-description">
-              <div class="pp-description-wrap">
-                <p>{{ $excerpt }}</p>
-              </div>
-              <div class="pp-infobox-button pp-button-wrap">
-                <a title="{{ $headline }}" class="pp-more-link pp-button" href="{{ relURL $link }}" role="button" target="_self">
-                  {{ $cta_text }} <i class="pp-button-icon pp-button-icon-right far fa-long-arrow-right"></i>
-                </a>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/themes/beaver/layouts/partials/data/authors-cached.html b/themes/beaver/layouts/partials/data/authors-cached.html
deleted file mode 100644
index 3c49cf0c2..000000000
--- a/themes/beaver/layouts/partials/data/authors-cached.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{{/* Cached authors data access - invalidates when authors.yaml changes */}}
-{{ $authorsHash := hugo.Data.authors | jsonify | md5 }}
-{{ return partialCached "data/authors-content.html" . $authorsHash }}
diff --git a/themes/beaver/layouts/partials/data/company-cached.html b/themes/beaver/layouts/partials/data/company-cached.html
deleted file mode 100644
index de23944f4..000000000
--- a/themes/beaver/layouts/partials/data/company-cached.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{{/* Cached company data access - invalidates when company.yaml changes */}}
-{{ $companyHash := hugo.Data.company | jsonify | md5 }}
-{{ return partialCached "data/company-content.html" . $companyHash }}
diff --git a/themes/beaver/layouts/partials/data/testimonials-cached.html b/themes/beaver/layouts/partials/data/testimonials-cached.html
deleted file mode 100644
index 1c39d33f2..000000000
--- a/themes/beaver/layouts/partials/data/testimonials-cached.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{{/* Cached testimonials data access - invalidates when testimonials.yaml changes */}}
-{{ $testimonialsHash := hugo.Data.testimonials | jsonify | md5 }}
-{{ return partialCached "data/testimonials-content.html" . $testimonialsHash }}
diff --git a/themes/beaver/layouts/partials/page/navigation.html b/themes/beaver/layouts/partials/page/navigation.html
index e477851d5..da6b4575f 100644
--- a/themes/beaver/layouts/partials/page/navigation.html
+++ b/themes/beaver/layouts/partials/page/navigation.html
@@ -2,12 +2,14 @@
   <div class="menu-close js-mobile-menu-close" aria-label="Close menu"></div>
 
   <ul class="list" role="menubar">
-    {{ $currentPage := .Page }}
+    {{/* No per-page active state: this partial renders inside
+         partialCached "page/header-content.html" (no variant key), so any
+         page-dependent output here would be frozen from whichever page
+         renders first. See 2509 tracker, sprint-5 findings. */}}
     {{ range .Site.Menus.main }}
-    {{ $active := or (eq $currentPage.RelPermalink .URL) ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}
     {{ if .HasChildren }}
 
-      <li class="item {{if $active }}-active{{ end }}" role="menuitem" aria-haspopup="true">
+      <li class="item" role="menuitem" aria-haspopup="true">
         <span class="arrow js-sub-menu-opener" aria-label="Expand submenu"></span>
         <a href="{{ .URL }}" class="link" aria-expanded="false">{{ .Name | safeHTML }}</a>
 
@@ -31,7 +33,7 @@
       </li>
 
     {{ else }}
-      <li class="item {{if $active }}-active{{ end }}" role="menuitem">
+      <li class="item" role="menuitem">
         {{ if eq .Name "Contact Us" }}
           <a href="{{ .URL }}" class="btn btn-primary">{{ .Name | safeHTML }}</a>
         {{ else }}