diff --git a/.github/workflows/docs_deploy.yaml b/.github/workflows/docs_deploy.yaml
index f0a670270..e55950ac1 100644
--- a/.github/workflows/docs_deploy.yaml
+++ b/.github/workflows/docs_deploy.yaml
@@ -67,11 +67,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2.18.0
         with:
-          flutter-version: 3.24.x
+          flutter-version: 3.27.x
           cache: true
 
       - run: flutter pub get
-      - run: flutter pub run build_runner build --delete-conflicting-outputs
+      - run: dart run build_runner build --delete-conflicting-outputs
       - run: flutter build web
 
       - name: Publish to Cloudflare Pages
diff --git a/.github/workflows/docs_preview_deploy.yaml b/.github/workflows/docs_preview_deploy.yaml
index 0bab5d76e..b3e899f14 100644
--- a/.github/workflows/docs_preview_deploy.yaml
+++ b/.github/workflows/docs_preview_deploy.yaml
@@ -27,12 +27,12 @@ jobs:
       # Publish samples
       - uses: subosito/flutter-action@v2.18.0
         with:
-          flutter-version: 3.24.x
+          flutter-version: 3.27.x
           cache: true
       - working-directory: ./samples
         run: |
           flutter pub get
-          flutter pub run build_runner build --delete-conflicting-outputs
+          dart run build_runner build --delete-conflicting-outputs
           flutter build web
       - uses: cloudflare/wrangler-action@v3
         id: publish-samples
diff --git a/.github/workflows/forui_build.yaml b/.github/workflows/forui_build.yaml
index 04fbe217d..83a18e5e7 100644
--- a/.github/workflows/forui_build.yaml
+++ b/.github/workflows/forui_build.yaml
@@ -27,7 +27,7 @@ jobs:
           flutter-version: ${{ matrix.flutter-version }}
           cache: true
       - run: flutter pub get
-      - run: flutter pub run build_runner build --delete-conflicting-outputs
+      - run: dart run build_runner build --delete-conflicting-outputs
       - run: |
           output=$(dart doc --validate-links .)
           if echo "$output" | grep -q "Found 0 warnings and 0 errors"; then
@@ -57,7 +57,7 @@ jobs:
           cache: true
 
       - run: flutter pub get
-      - run: flutter pub run build_runner build --delete-conflicting-outputs
+      - run: dart run build_runner build --delete-conflicting-outputs
       - run: flutter build appbundle --debug --no-pub --no-tree-shake-icons
 
   build-ios:
@@ -77,7 +77,7 @@ jobs:
           cache: true
 
       - run: flutter pub get
-      - run: flutter pub run build_runner build --delete-conflicting-outputs
+      - run: dart run build_runner build --delete-conflicting-outputs
       - run: pod repo update
         working-directory: forui/example/ios
       - run: flutter build ios --debug --no-codesign --no-pub
diff --git a/.github/workflows/forui_hooks_presubmit.yaml b/.github/workflows/forui_hooks_presubmit.yaml
index 2bc0cdc50..83abf74fc 100644
--- a/.github/workflows/forui_hooks_presubmit.yaml
+++ b/.github/workflows/forui_hooks_presubmit.yaml
@@ -42,8 +42,7 @@ jobs:
           cache: true
 
       - run: flutter pub get
-      - run: flutter pub global activate import_sorter
-      - run: flutter pub global run import_sorter:main
+      - run: dart run ../tool/sort.dart forui_samples
       - run: dart format --line-length 120 .
       - run: dart fix --apply
         # We format the code again since the required trailing comma lint fixes causes code to be formatted differently
diff --git a/.github/workflows/forui_presubmit.yaml b/.github/workflows/forui_presubmit.yaml
index 1bf72231f..61aaf80aa 100644
--- a/.github/workflows/forui_presubmit.yaml
+++ b/.github/workflows/forui_presubmit.yaml
@@ -42,9 +42,8 @@ jobs:
           cache: true
 
       - run: flutter pub get
-      - run: flutter pub global activate import_sorter
-      - run: flutter pub global run import_sorter:main
-      - run: flutter pub run build_runner build --delete-conflicting-outputs
+      - run: dart run ../tool/sort.dart forui_samples
+      - run: dart run build_runner build --delete-conflicting-outputs
       - run: dart format --line-length 120 .
       - run: dart fix --apply
         # We format the code again since the required trailing comma lint fixes causes code to be formatted differently
diff --git a/.github/workflows/samples_build.yaml b/.github/workflows/samples_build.yaml
index 1a9439f09..0caf9d52f 100644
--- a/.github/workflows/samples_build.yaml
+++ b/.github/workflows/samples_build.yaml
@@ -29,5 +29,5 @@ jobs:
           flutter-version: ${{ matrix.flutter-version }}
           cache: true
       - run: flutter pub get
-      - run: flutter pub run build_runner build --delete-conflicting-outputs
+      - run: dart run build_runner build --delete-conflicting-outputs
       - run: flutter analyze
diff --git a/.github/workflows/samples_presubmit.yaml b/.github/workflows/samples_presubmit.yaml
index 5c45b26b8..0cc180b85 100644
--- a/.github/workflows/samples_presubmit.yaml
+++ b/.github/workflows/samples_presubmit.yaml
@@ -42,9 +42,8 @@ jobs:
           cache: true
 
       - run: flutter pub get
-      - run: flutter pub global activate import_sorter
-      - run: flutter pub global run import_sorter:main
-      - run: flutter pub run build_runner build --delete-conflicting-outputs
+      - run: dart run ../tool/sort.dart forui_samples
+      - run: dart run build_runner build --delete-conflicting-outputs
       - run: dart format --line-length 120 .
       - run: dart fix --apply
         # We format the code again since the required trailing comma lint fixes causes code to be formatted differently
diff --git a/.gitignore b/.gitignore
index 588db64c8..6cd5c4a33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,5 @@ build/
 **/linux/flutter/generated_plugin_registrant.cc
 **/linux/flutter/generated_plugin_registrant.h
 **/linux/flutter/generated_plugins.cmake
+.flutter-plugins
+.flutter-plugins-dependencies
diff --git a/forui/CHANGELOG.md b/forui/CHANGELOG.md
index 3a4e92140..5af55bed3 100644
--- a/forui/CHANGELOG.md
+++ b/forui/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## 0.8.0 (Next)
 
+Bump minimum Flutter version to 3.27.0.
+
 ### Additions
 
 * Add `showFSheet(...)`.
diff --git a/forui/example/android/app/build.gradle b/forui/example/android/app/build.gradle
index eae2929e5..346fa31e2 100644
--- a/forui/example/android/app/build.gradle
+++ b/forui/example/android/app/build.gradle
@@ -40,7 +40,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.foruslabs.forui.example"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
diff --git a/forui/example/pubspec.lock b/forui/example/pubspec.lock
index b35981699..79b604f5f 100644
--- a/forui/example/pubspec.lock
+++ b/forui/example/pubspec.lock
@@ -5,23 +5,23 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
+      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
       url: "https://pub.dev"
     source: hosted
-    version: "72.0.0"
+    version: "76.0.0"
   _macros:
     dependency: transitive
     description: dart
     source: sdk
-    version: "0.3.2"
+    version: "0.3.3"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.0"
+    version: "6.11.0"
   args:
     dependency: transitive
     description:
@@ -146,10 +146,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   convert:
     dependency: transitive
     description:
@@ -317,10 +317,10 @@ packages:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.1"
   intl:
     dependency: "direct main"
     description:
@@ -333,10 +333,10 @@ packages:
     dependency: transitive
     description:
       name: io
-      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   js:
     dependency: transitive
     description:
@@ -357,18 +357,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.7"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.8"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -389,10 +389,10 @@ packages:
     dependency: transitive
     description:
       name: macros
-      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.2-main.4"
+    version: "0.1.3-main.0"
   matcher:
     dependency: transitive
     description:
@@ -453,10 +453,10 @@ packages:
     dependency: transitive
     description:
       name: package_config
-      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   package_info_plus:
     dependency: transitive
     description:
@@ -501,10 +501,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "8c4967f8b7cb46dc914e178daa29813d83ae502e0529d7b0478330616a691ef7"
+      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.14"
+    version: "2.2.15"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -573,10 +573,10 @@ packages:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   pubspec_parse:
     dependency: transitive
     description:
@@ -589,10 +589,10 @@ packages:
     dependency: transitive
     description:
       name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.2"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -605,7 +605,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_gen:
     dependency: transitive
     description:
@@ -626,10 +626,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   stream_channel:
     dependency: transitive
     description:
@@ -650,10 +650,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   sugar:
     dependency: "direct main"
     description:
@@ -674,10 +674,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
   timing:
     dependency: transitive
     description:
@@ -730,10 +730,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.3.0"
   wakelock_plus:
     dependency: "direct main"
     description:
@@ -815,5 +815,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
-  flutter: ">=3.24.0"
+  dart: ">=3.6.0 <4.0.0"
+  flutter: ">=3.27.0"
diff --git a/forui/example/pubspec.yaml b/forui/example/pubspec.yaml
index 26ab44107..3a441e567 100644
--- a/forui/example/pubspec.yaml
+++ b/forui/example/pubspec.yaml
@@ -19,8 +19,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
-  flutter: ">=3.24.0"
+  sdk: '>=3.6.0 <4.0.0'
+  flutter: ">=3.27.0"
 
 dependencies:
   flutter:
diff --git a/forui/lib/src/foundation/util.dart b/forui/lib/src/foundation/util.dart
deleted file mode 100644
index 03416e5fe..000000000
--- a/forui/lib/src/foundation/util.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-import 'package:flutter/widgets.dart';
-
-// TODO: Remove this function once DefaultTextStyle.merge(...) exposes TextHeightBehavior? textHeightBehavior.
-
-/// Creates a default text style that overrides the text styles in scope at
-/// this point in the widget tree.
-///
-/// The given [style] is merged with the [style] from the default text style
-/// for the [BuildContext] where the widget is inserted, and any of the other
-/// arguments that are not null replace the corresponding properties on that
-/// same default text style.
-///
-/// This constructor cannot be used to override the [maxLines] property of the
-/// ancestor with the value null, since null here is used to mean "defer to
-/// ancestor". To replace a non-null [maxLines] from an ancestor with the null
-/// value (to remove the restriction on number of lines), manually obtain the
-/// ambient [DefaultTextStyle] using [DefaultTextStyle.of], then create a new
-/// [DefaultTextStyle] using the [DefaultTextStyle.new] constructor directly.
-/// See the source below for an example of how to do this (since that's
-/// essentially what this constructor does).
-Widget merge({
-  required Widget child,
-  Key? key,
-  TextStyle? style,
-  TextAlign? textAlign,
-  bool? softWrap,
-  TextOverflow? overflow,
-  int? maxLines,
-  TextWidthBasis? textWidthBasis,
-  TextHeightBehavior? textHeightBehavior,
-}) =>
-    Builder(
-      builder: (context) {
-        final DefaultTextStyle parent = DefaultTextStyle.of(context);
-        return DefaultTextStyle(
-          key: key,
-          style: parent.style.merge(style),
-          textAlign: textAlign ?? parent.textAlign,
-          softWrap: softWrap ?? parent.softWrap,
-          overflow: overflow ?? parent.overflow,
-          maxLines: maxLines ?? parent.maxLines,
-          textWidthBasis: textWidthBasis ?? parent.textWidthBasis,
-          textHeightBehavior: textHeightBehavior ?? parent.textHeightBehavior,
-          child: child,
-        );
-      },
-    );
diff --git a/forui/lib/src/localizations/localizations_de.dart b/forui/lib/src/localizations/localizations_de.dart
index bbb792063..ea369d24b 100644
--- a/forui/lib/src/localizations/localizations_de.dart
+++ b/forui/lib/src/localizations/localizations_de.dart
@@ -65,7 +65,7 @@ class FLocalizationsDe extends FLocalizations {
 
 /// The translations for German, as used in Switzerland (`de_CH`).
 class FLocalizationsDeCh extends FLocalizationsDe {
-  FLocalizationsDeCh() : super('de_CH');
+  FLocalizationsDeCh(): super('de_CH');
 
   @override
   String get dialogLabel => 'Dialogfeld';
diff --git a/forui/lib/src/localizations/localizations_en.dart b/forui/lib/src/localizations/localizations_en.dart
index 3651b7c09..564ab36ca 100644
--- a/forui/lib/src/localizations/localizations_en.dart
+++ b/forui/lib/src/localizations/localizations_en.dart
@@ -65,7 +65,7 @@ class FLocalizationsEn extends FLocalizations {
 
 /// The translations for English, as used in Australia (`en_AU`).
 class FLocalizationsEnAu extends FLocalizationsEn {
-  FLocalizationsEnAu() : super('en_AU');
+  FLocalizationsEnAu(): super('en_AU');
 
   @override
   String get dialogLabel => 'Dialogue';
@@ -84,7 +84,7 @@ class FLocalizationsEnAu extends FLocalizationsEn {
 
 /// The translations for English, as used in Canada (`en_CA`).
 class FLocalizationsEnCa extends FLocalizationsEn {
-  FLocalizationsEnCa() : super('en_CA');
+  FLocalizationsEnCa(): super('en_CA');
 
   @override
   String get dialogLabel => 'Dialog';
@@ -103,7 +103,7 @@ class FLocalizationsEnCa extends FLocalizationsEn {
 
 /// The translations for English, as used in the United Kingdom (`en_GB`).
 class FLocalizationsEnGb extends FLocalizationsEn {
-  FLocalizationsEnGb() : super('en_GB');
+  FLocalizationsEnGb(): super('en_GB');
 
   @override
   String get dialogLabel => 'Dialogue';
@@ -122,7 +122,7 @@ class FLocalizationsEnGb extends FLocalizationsEn {
 
 /// The translations for English, as used in Ireland (`en_IE`).
 class FLocalizationsEnIe extends FLocalizationsEn {
-  FLocalizationsEnIe() : super('en_IE');
+  FLocalizationsEnIe(): super('en_IE');
 
   @override
   String get dialogLabel => 'Dialogue';
@@ -141,7 +141,7 @@ class FLocalizationsEnIe extends FLocalizationsEn {
 
 /// The translations for English, as used in India (`en_IN`).
 class FLocalizationsEnIn extends FLocalizationsEn {
-  FLocalizationsEnIn() : super('en_IN');
+  FLocalizationsEnIn(): super('en_IN');
 
   @override
   String get dialogLabel => 'Dialogue';
@@ -160,7 +160,7 @@ class FLocalizationsEnIn extends FLocalizationsEn {
 
 /// The translations for English, as used in New Zealand (`en_NZ`).
 class FLocalizationsEnNz extends FLocalizationsEn {
-  FLocalizationsEnNz() : super('en_NZ');
+  FLocalizationsEnNz(): super('en_NZ');
 
   @override
   String get dialogLabel => 'Dialogue';
@@ -179,7 +179,7 @@ class FLocalizationsEnNz extends FLocalizationsEn {
 
 /// The translations for English, as used in Singapore (`en_SG`).
 class FLocalizationsEnSg extends FLocalizationsEn {
-  FLocalizationsEnSg() : super('en_SG');
+  FLocalizationsEnSg(): super('en_SG');
 
   @override
   String get dialogLabel => 'Dialogue';
@@ -198,7 +198,7 @@ class FLocalizationsEnSg extends FLocalizationsEn {
 
 /// The translations for English, as used in South Africa (`en_ZA`).
 class FLocalizationsEnZa extends FLocalizationsEn {
-  FLocalizationsEnZa() : super('en_ZA');
+  FLocalizationsEnZa(): super('en_ZA');
 
   @override
   String get dialogLabel => 'Dialogue';
diff --git a/forui/lib/src/localizations/localizations_es.dart b/forui/lib/src/localizations/localizations_es.dart
index 40a8fa347..6853862c9 100644
--- a/forui/lib/src/localizations/localizations_es.dart
+++ b/forui/lib/src/localizations/localizations_es.dart
@@ -65,7 +65,7 @@ class FLocalizationsEs extends FLocalizations {
 
 /// The translations for Spanish Castilian, as used in Latin America and the Caribbean (`es_419`).
 class FLocalizationsEs419 extends FLocalizationsEs {
-  FLocalizationsEs419() : super('es_419');
+  FLocalizationsEs419(): super('es_419');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -84,7 +84,7 @@ class FLocalizationsEs419 extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Argentina (`es_AR`).
 class FLocalizationsEsAr extends FLocalizationsEs {
-  FLocalizationsEsAr() : super('es_AR');
+  FLocalizationsEsAr(): super('es_AR');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -103,7 +103,7 @@ class FLocalizationsEsAr extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Bolivia (`es_BO`).
 class FLocalizationsEsBo extends FLocalizationsEs {
-  FLocalizationsEsBo() : super('es_BO');
+  FLocalizationsEsBo(): super('es_BO');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -122,7 +122,7 @@ class FLocalizationsEsBo extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Chile (`es_CL`).
 class FLocalizationsEsCl extends FLocalizationsEs {
-  FLocalizationsEsCl() : super('es_CL');
+  FLocalizationsEsCl(): super('es_CL');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -141,7 +141,7 @@ class FLocalizationsEsCl extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Colombia (`es_CO`).
 class FLocalizationsEsCo extends FLocalizationsEs {
-  FLocalizationsEsCo() : super('es_CO');
+  FLocalizationsEsCo(): super('es_CO');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -160,7 +160,7 @@ class FLocalizationsEsCo extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Costa Rica (`es_CR`).
 class FLocalizationsEsCr extends FLocalizationsEs {
-  FLocalizationsEsCr() : super('es_CR');
+  FLocalizationsEsCr(): super('es_CR');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -179,7 +179,7 @@ class FLocalizationsEsCr extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in the Dominican Republic (`es_DO`).
 class FLocalizationsEsDo extends FLocalizationsEs {
-  FLocalizationsEsDo() : super('es_DO');
+  FLocalizationsEsDo(): super('es_DO');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -198,7 +198,7 @@ class FLocalizationsEsDo extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Ecuador (`es_EC`).
 class FLocalizationsEsEc extends FLocalizationsEs {
-  FLocalizationsEsEc() : super('es_EC');
+  FLocalizationsEsEc(): super('es_EC');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -217,7 +217,7 @@ class FLocalizationsEsEc extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Guatemala (`es_GT`).
 class FLocalizationsEsGt extends FLocalizationsEs {
-  FLocalizationsEsGt() : super('es_GT');
+  FLocalizationsEsGt(): super('es_GT');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -236,7 +236,7 @@ class FLocalizationsEsGt extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Honduras (`es_HN`).
 class FLocalizationsEsHn extends FLocalizationsEs {
-  FLocalizationsEsHn() : super('es_HN');
+  FLocalizationsEsHn(): super('es_HN');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -255,7 +255,7 @@ class FLocalizationsEsHn extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Mexico (`es_MX`).
 class FLocalizationsEsMx extends FLocalizationsEs {
-  FLocalizationsEsMx() : super('es_MX');
+  FLocalizationsEsMx(): super('es_MX');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -274,7 +274,7 @@ class FLocalizationsEsMx extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Nicaragua (`es_NI`).
 class FLocalizationsEsNi extends FLocalizationsEs {
-  FLocalizationsEsNi() : super('es_NI');
+  FLocalizationsEsNi(): super('es_NI');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -293,7 +293,7 @@ class FLocalizationsEsNi extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Panama (`es_PA`).
 class FLocalizationsEsPa extends FLocalizationsEs {
-  FLocalizationsEsPa() : super('es_PA');
+  FLocalizationsEsPa(): super('es_PA');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -312,7 +312,7 @@ class FLocalizationsEsPa extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Peru (`es_PE`).
 class FLocalizationsEsPe extends FLocalizationsEs {
-  FLocalizationsEsPe() : super('es_PE');
+  FLocalizationsEsPe(): super('es_PE');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -331,7 +331,7 @@ class FLocalizationsEsPe extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Puerto Rico (`es_PR`).
 class FLocalizationsEsPr extends FLocalizationsEs {
-  FLocalizationsEsPr() : super('es_PR');
+  FLocalizationsEsPr(): super('es_PR');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -350,7 +350,7 @@ class FLocalizationsEsPr extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Paraguay (`es_PY`).
 class FLocalizationsEsPy extends FLocalizationsEs {
-  FLocalizationsEsPy() : super('es_PY');
+  FLocalizationsEsPy(): super('es_PY');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -369,7 +369,7 @@ class FLocalizationsEsPy extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in El Salvador (`es_SV`).
 class FLocalizationsEsSv extends FLocalizationsEs {
-  FLocalizationsEsSv() : super('es_SV');
+  FLocalizationsEsSv(): super('es_SV');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -388,7 +388,7 @@ class FLocalizationsEsSv extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in the United States (`es_US`).
 class FLocalizationsEsUs extends FLocalizationsEs {
-  FLocalizationsEsUs() : super('es_US');
+  FLocalizationsEsUs(): super('es_US');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -407,7 +407,7 @@ class FLocalizationsEsUs extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Uruguay (`es_UY`).
 class FLocalizationsEsUy extends FLocalizationsEs {
-  FLocalizationsEsUy() : super('es_UY');
+  FLocalizationsEsUy(): super('es_UY');
 
   @override
   String get dialogLabel => 'Diálogo';
@@ -426,7 +426,7 @@ class FLocalizationsEsUy extends FLocalizationsEs {
 
 /// The translations for Spanish Castilian, as used in Venezuela (`es_VE`).
 class FLocalizationsEsVe extends FLocalizationsEs {
-  FLocalizationsEsVe() : super('es_VE');
+  FLocalizationsEsVe(): super('es_VE');
 
   @override
   String get dialogLabel => 'Diálogo';
diff --git a/forui/lib/src/localizations/localizations_fr.dart b/forui/lib/src/localizations/localizations_fr.dart
index e602f0f20..f17460216 100644
--- a/forui/lib/src/localizations/localizations_fr.dart
+++ b/forui/lib/src/localizations/localizations_fr.dart
@@ -65,7 +65,7 @@ class FLocalizationsFr extends FLocalizations {
 
 /// The translations for French, as used in Canada (`fr_CA`).
 class FLocalizationsFrCa extends FLocalizationsFr {
-  FLocalizationsFrCa() : super('fr_CA');
+  FLocalizationsFrCa(): super('fr_CA');
 
   @override
   String get dialogLabel => 'Boîte de dialogue';
diff --git a/forui/lib/src/localizations/localizations_pt.dart b/forui/lib/src/localizations/localizations_pt.dart
index 9ac42bd55..94fc7dcda 100644
--- a/forui/lib/src/localizations/localizations_pt.dart
+++ b/forui/lib/src/localizations/localizations_pt.dart
@@ -65,7 +65,7 @@ class FLocalizationsPt extends FLocalizations {
 
 /// The translations for Portuguese, as used in Portugal (`pt_PT`).
 class FLocalizationsPtPt extends FLocalizationsPt {
-  FLocalizationsPtPt() : super('pt_PT');
+  FLocalizationsPtPt(): super('pt_PT');
 
   @override
   String get dialogLabel => 'Caixa de diálogo';
diff --git a/forui/lib/src/localizations/localizations_sr.dart b/forui/lib/src/localizations/localizations_sr.dart
index 65d80df43..8a1fec626 100644
--- a/forui/lib/src/localizations/localizations_sr.dart
+++ b/forui/lib/src/localizations/localizations_sr.dart
@@ -65,7 +65,7 @@ class FLocalizationsSr extends FLocalizations {
 
 /// The translations for Serbian, using the Latin script (`sr_Latn`).
 class FLocalizationsSrLatn extends FLocalizationsSr {
-  FLocalizationsSrLatn() : super('sr_Latn');
+  FLocalizationsSrLatn(): super('sr_Latn');
 
   @override
   String get dialogLabel => 'Dijalog';
diff --git a/forui/lib/src/localizations/localizations_zh.dart b/forui/lib/src/localizations/localizations_zh.dart
index 3052b2c75..54636ff42 100644
--- a/forui/lib/src/localizations/localizations_zh.dart
+++ b/forui/lib/src/localizations/localizations_zh.dart
@@ -65,7 +65,7 @@ class FLocalizationsZh extends FLocalizations {
 
 /// The translations for Chinese, as used in Hong Kong (`zh_HK`).
 class FLocalizationsZhHk extends FLocalizationsZh {
-  FLocalizationsZhHk() : super('zh_HK');
+  FLocalizationsZhHk(): super('zh_HK');
 
   @override
   String get dialogLabel => '對話方塊';
@@ -84,7 +84,7 @@ class FLocalizationsZhHk extends FLocalizationsZh {
 
 /// The translations for Chinese, as used in Taiwan (`zh_TW`).
 class FLocalizationsZhTw extends FLocalizationsZh {
-  FLocalizationsZhTw() : super('zh_TW');
+  FLocalizationsZhTw(): super('zh_TW');
 
   @override
   String get dialogLabel => '對話方塊';
diff --git a/forui/lib/src/theme/color_scheme.dart b/forui/lib/src/theme/color_scheme.dart
index c66112239..4427b4352 100644
--- a/forui/lib/src/theme/color_scheme.dart
+++ b/forui/lib/src/theme/color_scheme.dart
@@ -142,7 +142,7 @@ final class FColorScheme with Diagnosticable {
   ///
   /// [FColorScheme.background] is used if [background] is not given.
   Color hover(Color foreground, [Color? background]) => Color.alphaBlend(
-        foreground.withOpacity(enabledHoveredOpacity),
+        foreground.withValues(alpha: enabledHoveredOpacity),
         background ?? this.background,
       );
 
@@ -150,7 +150,7 @@ final class FColorScheme with Diagnosticable {
   ///
   /// [FColorScheme.background] is used if [background] is not given.
   Color disable(Color foreground, [Color? background]) => Color.alphaBlend(
-        foreground.withOpacity(disabledOpacity),
+        foreground.withValues(alpha: disabledOpacity),
         background ?? this.background,
       );
 
diff --git a/forui/lib/src/widgets/accordion/accordion_item.dart b/forui/lib/src/widgets/accordion/accordion_item.dart
index 7cdf5a9b9..cc3c399ce 100644
--- a/forui/lib/src/widgets/accordion/accordion_item.dart
+++ b/forui/lib/src/widgets/accordion/accordion_item.dart
@@ -5,7 +5,6 @@ import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 
 import 'package:forui/forui.dart';
-import 'package:forui/src/foundation/util.dart';
 import 'package:forui/src/widgets/accordion/accordion.dart';
 
 /// An interactive heading that reveals a section of content.
@@ -124,8 +123,7 @@ class _FAccordionItemState extends State<FAccordionItem> with TickerProviderStat
               child: Row(
                 children: [
                   Expanded(
-                    child: merge(
-                      // TODO: replace with DefaultTextStyle.merge when textHeightBehavior has been added.
+                    child: DefaultTextStyle.merge(
                       textHeightBehavior: const TextHeightBehavior(
                         applyHeightToFirstAscent: false,
                         applyHeightToLastDescent: false,
diff --git a/forui/lib/src/widgets/card/card_content.dart b/forui/lib/src/widgets/card/card_content.dart
index aa34196b1..32626e747 100644
--- a/forui/lib/src/widgets/card/card_content.dart
+++ b/forui/lib/src/widgets/card/card_content.dart
@@ -4,7 +4,6 @@ import 'package:flutter/widgets.dart';
 import 'package:meta/meta.dart';
 
 import 'package:forui/forui.dart';
-import 'package:forui/src/foundation/util.dart';
 
 @internal
 class Content extends StatelessWidget {
@@ -39,8 +38,7 @@ class Content extends StatelessWidget {
             ),
           if ((title != null || subtitle != null || child != null) && image != null) const SizedBox(height: 10),
           if (title != null)
-            // TODO: replace with DefaultTextStyle.merge when textHeightBehavior has been added.
-            merge(
+            DefaultTextStyle.merge(
               textHeightBehavior: const TextHeightBehavior(
                 applyHeightToFirstAscent: false,
                 applyHeightToLastDescent: false,
@@ -49,8 +47,7 @@ class Content extends StatelessWidget {
               child: title!,
             ),
           if (subtitle != null)
-            // TODO: replace with DefaultTextStyle.merge when textHeightBehavior has been added.
-            merge(
+            DefaultTextStyle.merge(
               textHeightBehavior: const TextHeightBehavior(
                 applyHeightToFirstAscent: false,
                 applyHeightToLastDescent: false,
diff --git a/forui/lib/src/widgets/header/nested_header.dart b/forui/lib/src/widgets/header/nested_header.dart
index 223c74c58..c9873a808 100644
--- a/forui/lib/src/widgets/header/nested_header.dart
+++ b/forui/lib/src/widgets/header/nested_header.dart
@@ -9,7 +9,7 @@ part of 'header.dart';
 /// * https://forui.dev/docs/navigation/header for working examples.
 /// * [FNestedHeaderStyle] for customizing a header's appearance.
 final class _FNestedHeader extends FHeader {
-  /// The style. Defaults to [FThemeData.headerStyle.nestedStyle].
+  /// The style.
   final FNestedHeaderStyle? style;
 
   /// The title, aligned to the center.
diff --git a/forui/lib/src/widgets/header/root_header.dart b/forui/lib/src/widgets/header/root_header.dart
index e15c4cf22..91fd16adb 100644
--- a/forui/lib/src/widgets/header/root_header.dart
+++ b/forui/lib/src/widgets/header/root_header.dart
@@ -9,7 +9,7 @@ part of 'header.dart';
 /// * https://forui.dev/docs/navigation/header for working examples.
 /// * [FRootHeaderStyle] for customizing a header's appearance.
 final class _FRootHeader extends FHeader {
-  /// The header's style. Defaults to [FThemeData.headerStyle.rootStyle].
+  /// The header's style.
   final FRootHeaderStyle? style;
 
   /// The title, aligned to the left in LTR locales.
diff --git a/forui/lib/src/widgets/line_calendar/line_calendar_item.dart b/forui/lib/src/widgets/line_calendar/line_calendar_item.dart
index ae5eb007f..7d65ed6c7 100644
--- a/forui/lib/src/widgets/line_calendar/line_calendar_item.dart
+++ b/forui/lib/src/widgets/line_calendar/line_calendar_item.dart
@@ -5,7 +5,6 @@ import 'package:flutter/widgets.dart';
 import 'package:meta/meta.dart';
 
 import 'package:forui/forui.dart';
-import 'package:forui/src/foundation/util.dart';
 
 /// The state of a line calendar item used to build a line calendar item.
 typedef FLineCalendarItemData = ({
@@ -134,8 +133,7 @@ class ItemContent extends StatelessWidget {
           mainAxisAlignment: MainAxisAlignment.center,
           mainAxisSize: MainAxisSize.min,
           children: [
-            // TODO: replace with DefaultTextStyle.merge when textHeightBehavior has been added.
-            merge(
+            DefaultTextStyle.merge(
               textHeightBehavior: const TextHeightBehavior(
                 applyHeightToFirstAscent: false,
                 applyHeightToLastDescent: false,
@@ -144,8 +142,7 @@ class ItemContent extends StatelessWidget {
               child: Text(localizations.day(date)),
             ),
             SizedBox(height: style.itemContentSpacing),
-            // TODO: replace with DefaultTextStyle.merge when textHeightBehavior has been added.
-            merge(
+            DefaultTextStyle.merge(
               textHeightBehavior: const TextHeightBehavior(
                 applyHeightToFirstAscent: false,
                 applyHeightToLastDescent: false,
diff --git a/forui/lib/src/widgets/sheet/modal_sheet.dart b/forui/lib/src/widgets/sheet/modal_sheet.dart
index 48891d05b..65e13ddd0 100644
--- a/forui/lib/src/widgets/sheet/modal_sheet.dart
+++ b/forui/lib/src/widgets/sheet/modal_sheet.dart
@@ -241,11 +241,11 @@ class FModalSheetRoute<T> extends PopupRoute<T> {
 
   @override
   Widget buildModalBarrier() {
-    if (barrierColor.alpha != 0 && !offstage) {
+    if (barrierColor.a != 0 && !offstage) {
       // changedInternalState is called if barrierColor or offstage updates
       final color = animation!.drive(
         ColorTween(
-          begin: barrierColor.withOpacity(0.0),
+          begin: barrierColor.withValues(alpha: 0.0),
           end: barrierColor, // changedInternalState is called if barrierColor updates
         ).chain(CurveTween(curve: barrierCurve)), // changedInternalState is called if barrierCurve updates
       );
diff --git a/forui/lib/src/widgets/switch.dart b/forui/lib/src/widgets/switch.dart
index 233b5f067..634750618 100644
--- a/forui/lib/src/widgets/switch.dart
+++ b/forui/lib/src/widgets/switch.dart
@@ -140,8 +140,8 @@ class FSwitch extends StatelessWidget {
                 onChange?.call(value);
               },
               applyTheme: false,
-              activeColor: switchStyle.checkedColor,
-              trackColor: switchStyle.uncheckedColor,
+              activeTrackColor: switchStyle.checkedColor,
+              inactiveTrackColor: switchStyle.uncheckedColor,
               thumbColor: switchStyle.thumbColor,
               focusColor: style.focusColor,
               autofocus: autofocus,
diff --git a/forui/lib/src/widgets/text_field/text_field.dart b/forui/lib/src/widgets/text_field/text_field.dart
index 1b591f1ed..84f6328fd 100644
--- a/forui/lib/src/widgets/text_field/text_field.dart
+++ b/forui/lib/src/widgets/text_field/text_field.dart
@@ -767,7 +767,7 @@ final class FTextField extends StatelessWidget {
           data: Theme.of(context).copyWith(
             textSelectionTheme: TextSelectionThemeData(
               cursorColor: style.cursorColor,
-              selectionColor: style.cursorColor.withOpacity(0.4),
+              selectionColor: style.cursorColor.withValues(alpha: 0.4),
               selectionHandleColor: style.cursorColor,
             ),
             cupertinoOverrideTheme: CupertinoThemeData(
diff --git a/forui/lib/src/widgets/tile/tile_content.dart b/forui/lib/src/widgets/tile/tile_content.dart
index 4f0e90720..6e0605263 100644
--- a/forui/lib/src/widgets/tile/tile_content.dart
+++ b/forui/lib/src/widgets/tile/tile_content.dart
@@ -5,7 +5,6 @@ import 'package:flutter/widgets.dart';
 import 'package:meta/meta.dart';
 
 import 'package:forui/forui.dart';
-import 'package:forui/src/foundation/util.dart';
 import 'package:forui/src/widgets/tile/tile_group.dart';
 import 'package:forui/src/widgets/tile/tile_render_object.dart';
 
@@ -74,7 +73,7 @@ class FTileContent extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              merge(
+              DefaultTextStyle.merge(
                 style: style.titleTextStyle,
                 textHeightBehavior: const TextHeightBehavior(
                   applyHeightToFirstAscent: false,
@@ -86,7 +85,7 @@ class FTileContent extends StatelessWidget {
               if (subtitle case final subtitle?)
                 Padding(
                   padding: EdgeInsets.only(top: contentStyle.titleSpacing),
-                  child: merge(
+                  child: DefaultTextStyle.merge(
                     style: style.subtitleTextStyle,
                     textHeightBehavior: const TextHeightBehavior(
                       applyHeightToFirstAscent: false,
@@ -100,7 +99,7 @@ class FTileContent extends StatelessWidget {
           ),
         ),
         if (details case final details?)
-          merge(
+          DefaultTextStyle.merge(
             style: style.detailsTextStyle,
             textHeightBehavior: const TextHeightBehavior(
               applyHeightToFirstAscent: false,
diff --git a/forui/pubspec.yaml b/forui/pubspec.yaml
index 140eba6eb..a1d2155ff 100644
--- a/forui/pubspec.yaml
+++ b/forui/pubspec.yaml
@@ -10,8 +10,9 @@ topics:
   - widget
 
 environment:
-  sdk: ">=3.5.0 <4.0.0"
-  flutter: ">=3.24.0"
+  sdk: ">=3.6.0 <4.0.0"
+  flutter: ">=3.27.0"
+resolution: workspace
 
 dependencies:
   collection: ^1.18.0
@@ -28,10 +29,8 @@ dependencies:
   nitrogen_types: ^0.3.0+1
   sugar: ^3.1.0
 
-
 dev_dependencies:
   build_runner: ^2.4.0
-  flint: ^2.8.1
   flutter_test:
     sdk: flutter
   http: ^1.2.2
@@ -42,7 +41,7 @@ dev_dependencies:
 
 # The following section is specific to Flutter packages.
 flutter:
-  generate: true
+  generate: false
   # To add assets to your package, add an assets section, like this:
   # assets:
   #   - images/a_dot_burr.jpeg
@@ -77,6 +76,3 @@ flutter:
 
   # For details regarding fonts in packages, see
   # https://flutter.dev/custom-fonts/#from-packages
-
-import_sorter:
-  comments: false
diff --git a/forui/test/golden/accordion/zinc-dark/focused.png b/forui/test/golden/accordion/zinc-dark/focused.png
index 9a46e6484..8b856f4a6 100644
Binary files a/forui/test/golden/accordion/zinc-dark/focused.png and b/forui/test/golden/accordion/zinc-dark/focused.png differ
diff --git a/forui/test/golden/accordion/zinc-light/focused.png b/forui/test/golden/accordion/zinc-light/focused.png
index dae6619f2..b31402d19 100644
Binary files a/forui/test/golden/accordion/zinc-light/focused.png and b/forui/test/golden/accordion/zinc-light/focused.png differ
diff --git a/forui/test/golden/alert/zinc-dark/Variant.destructive-default-icon.png b/forui/test/golden/alert/zinc-dark/Variant.destructive-default-icon.png
index c730d4ab8..cd6bde36c 100644
Binary files a/forui/test/golden/alert/zinc-dark/Variant.destructive-default-icon.png and b/forui/test/golden/alert/zinc-dark/Variant.destructive-default-icon.png differ
diff --git a/forui/test/golden/alert/zinc-dark/Variant.destructive-user-icon.png b/forui/test/golden/alert/zinc-dark/Variant.destructive-user-icon.png
index 19e804c2c..5395524de 100644
Binary files a/forui/test/golden/alert/zinc-dark/Variant.destructive-user-icon.png and b/forui/test/golden/alert/zinc-dark/Variant.destructive-user-icon.png differ
diff --git a/forui/test/golden/alert/zinc-dark/Variant.primary-default-icon.png b/forui/test/golden/alert/zinc-dark/Variant.primary-default-icon.png
index 0d492d353..7050ef46c 100644
Binary files a/forui/test/golden/alert/zinc-dark/Variant.primary-default-icon.png and b/forui/test/golden/alert/zinc-dark/Variant.primary-default-icon.png differ
diff --git a/forui/test/golden/alert/zinc-dark/Variant.primary-user-icon.png b/forui/test/golden/alert/zinc-dark/Variant.primary-user-icon.png
index 314ec8578..58022996e 100644
Binary files a/forui/test/golden/alert/zinc-dark/Variant.primary-user-icon.png and b/forui/test/golden/alert/zinc-dark/Variant.primary-user-icon.png differ
diff --git a/forui/test/golden/alert/zinc-light/Variant.destructive-default-icon.png b/forui/test/golden/alert/zinc-light/Variant.destructive-default-icon.png
index c864b08ba..8a691c463 100644
Binary files a/forui/test/golden/alert/zinc-light/Variant.destructive-default-icon.png and b/forui/test/golden/alert/zinc-light/Variant.destructive-default-icon.png differ
diff --git a/forui/test/golden/alert/zinc-light/Variant.destructive-user-icon.png b/forui/test/golden/alert/zinc-light/Variant.destructive-user-icon.png
index c02de8274..f74f4be4d 100644
Binary files a/forui/test/golden/alert/zinc-light/Variant.destructive-user-icon.png and b/forui/test/golden/alert/zinc-light/Variant.destructive-user-icon.png differ
diff --git a/forui/test/golden/alert/zinc-light/Variant.primary-default-icon.png b/forui/test/golden/alert/zinc-light/Variant.primary-default-icon.png
index 4ed0340d6..66a957d3f 100644
Binary files a/forui/test/golden/alert/zinc-light/Variant.primary-default-icon.png and b/forui/test/golden/alert/zinc-light/Variant.primary-default-icon.png differ
diff --git a/forui/test/golden/alert/zinc-light/Variant.primary-user-icon.png b/forui/test/golden/alert/zinc-light/Variant.primary-user-icon.png
index a502ec335..91dfb43de 100644
Binary files a/forui/test/golden/alert/zinc-light/Variant.primary-user-icon.png and b/forui/test/golden/alert/zinc-light/Variant.primary-user-icon.png differ
diff --git a/forui/test/golden/avatar/zinc-dark/raw.png b/forui/test/golden/avatar/zinc-dark/raw.png
index 910a642af..08cadb141 100644
Binary files a/forui/test/golden/avatar/zinc-dark/raw.png and b/forui/test/golden/avatar/zinc-dark/raw.png differ
diff --git a/forui/test/golden/avatar/zinc-light/raw.png b/forui/test/golden/avatar/zinc-light/raw.png
index 650756d9a..2d66ab0cb 100644
Binary files a/forui/test/golden/avatar/zinc-light/raw.png and b/forui/test/golden/avatar/zinc-light/raw.png differ
diff --git a/forui/test/golden/badge/zinc-dark/Variant.destructive-content.png b/forui/test/golden/badge/zinc-dark/Variant.destructive-content.png
index 88b88f9ba..01193d86f 100644
Binary files a/forui/test/golden/badge/zinc-dark/Variant.destructive-content.png and b/forui/test/golden/badge/zinc-dark/Variant.destructive-content.png differ
diff --git a/forui/test/golden/badge/zinc-dark/Variant.destructive-raw.png b/forui/test/golden/badge/zinc-dark/Variant.destructive-raw.png
index 6d0299192..d9c083ced 100644
Binary files a/forui/test/golden/badge/zinc-dark/Variant.destructive-raw.png and b/forui/test/golden/badge/zinc-dark/Variant.destructive-raw.png differ
diff --git a/forui/test/golden/badge/zinc-dark/Variant.outline-content.png b/forui/test/golden/badge/zinc-dark/Variant.outline-content.png
index 0af12217f..2f7313ef0 100644
Binary files a/forui/test/golden/badge/zinc-dark/Variant.outline-content.png and b/forui/test/golden/badge/zinc-dark/Variant.outline-content.png differ
diff --git a/forui/test/golden/badge/zinc-dark/Variant.outline-raw.png b/forui/test/golden/badge/zinc-dark/Variant.outline-raw.png
index 8735aa73e..1dfbff2a5 100644
Binary files a/forui/test/golden/badge/zinc-dark/Variant.outline-raw.png and b/forui/test/golden/badge/zinc-dark/Variant.outline-raw.png differ
diff --git a/forui/test/golden/badge/zinc-dark/Variant.primary-content.png b/forui/test/golden/badge/zinc-dark/Variant.primary-content.png
index 4ee1b8175..ff5b1ab0c 100644
Binary files a/forui/test/golden/badge/zinc-dark/Variant.primary-content.png and b/forui/test/golden/badge/zinc-dark/Variant.primary-content.png differ
diff --git a/forui/test/golden/badge/zinc-dark/Variant.primary-raw.png b/forui/test/golden/badge/zinc-dark/Variant.primary-raw.png
index 4ee4240aa..76fcb3fdb 100644
Binary files a/forui/test/golden/badge/zinc-dark/Variant.primary-raw.png and b/forui/test/golden/badge/zinc-dark/Variant.primary-raw.png differ
diff --git a/forui/test/golden/badge/zinc-dark/Variant.secondary-content.png b/forui/test/golden/badge/zinc-dark/Variant.secondary-content.png
index 0b81db4c8..aaf7c41d0 100644
Binary files a/forui/test/golden/badge/zinc-dark/Variant.secondary-content.png and b/forui/test/golden/badge/zinc-dark/Variant.secondary-content.png differ
diff --git a/forui/test/golden/badge/zinc-dark/Variant.secondary-raw.png b/forui/test/golden/badge/zinc-dark/Variant.secondary-raw.png
index be0249bf0..fee61a20c 100644
Binary files a/forui/test/golden/badge/zinc-dark/Variant.secondary-raw.png and b/forui/test/golden/badge/zinc-dark/Variant.secondary-raw.png differ
diff --git a/forui/test/golden/badge/zinc-light/Variant.destructive-content.png b/forui/test/golden/badge/zinc-light/Variant.destructive-content.png
index 67157df9e..c8b15ed7d 100644
Binary files a/forui/test/golden/badge/zinc-light/Variant.destructive-content.png and b/forui/test/golden/badge/zinc-light/Variant.destructive-content.png differ
diff --git a/forui/test/golden/badge/zinc-light/Variant.destructive-raw.png b/forui/test/golden/badge/zinc-light/Variant.destructive-raw.png
index f7a4e92cf..e8bd42695 100644
Binary files a/forui/test/golden/badge/zinc-light/Variant.destructive-raw.png and b/forui/test/golden/badge/zinc-light/Variant.destructive-raw.png differ
diff --git a/forui/test/golden/badge/zinc-light/Variant.outline-content.png b/forui/test/golden/badge/zinc-light/Variant.outline-content.png
index 933296d0c..c5057be8a 100644
Binary files a/forui/test/golden/badge/zinc-light/Variant.outline-content.png and b/forui/test/golden/badge/zinc-light/Variant.outline-content.png differ
diff --git a/forui/test/golden/badge/zinc-light/Variant.outline-raw.png b/forui/test/golden/badge/zinc-light/Variant.outline-raw.png
index 204573639..53bd71ed0 100644
Binary files a/forui/test/golden/badge/zinc-light/Variant.outline-raw.png and b/forui/test/golden/badge/zinc-light/Variant.outline-raw.png differ
diff --git a/forui/test/golden/badge/zinc-light/Variant.primary-content.png b/forui/test/golden/badge/zinc-light/Variant.primary-content.png
index 516d7bc01..bdb58cfc6 100644
Binary files a/forui/test/golden/badge/zinc-light/Variant.primary-content.png and b/forui/test/golden/badge/zinc-light/Variant.primary-content.png differ
diff --git a/forui/test/golden/badge/zinc-light/Variant.primary-raw.png b/forui/test/golden/badge/zinc-light/Variant.primary-raw.png
index 6515616bc..f183c4c23 100644
Binary files a/forui/test/golden/badge/zinc-light/Variant.primary-raw.png and b/forui/test/golden/badge/zinc-light/Variant.primary-raw.png differ
diff --git a/forui/test/golden/badge/zinc-light/Variant.secondary-content.png b/forui/test/golden/badge/zinc-light/Variant.secondary-content.png
index 84fa10dbb..2294cb0b9 100644
Binary files a/forui/test/golden/badge/zinc-light/Variant.secondary-content.png and b/forui/test/golden/badge/zinc-light/Variant.secondary-content.png differ
diff --git a/forui/test/golden/badge/zinc-light/Variant.secondary-raw.png b/forui/test/golden/badge/zinc-light/Variant.secondary-raw.png
index 71437a57d..7b238b7c7 100644
Binary files a/forui/test/golden/badge/zinc-light/Variant.secondary-raw.png and b/forui/test/golden/badge/zinc-light/Variant.secondary-raw.png differ
diff --git a/forui/test/golden/bottom-navigation-bar/zinc-dark-focused.png b/forui/test/golden/bottom-navigation-bar/zinc-dark-focused.png
index d07eb4ca1..d6584f5bb 100644
Binary files a/forui/test/golden/bottom-navigation-bar/zinc-dark-focused.png and b/forui/test/golden/bottom-navigation-bar/zinc-dark-focused.png differ
diff --git a/forui/test/golden/bottom-navigation-bar/zinc-dark-forui-icon.png b/forui/test/golden/bottom-navigation-bar/zinc-dark-forui-icon.png
index 6a5d8c8a8..624bc9dd5 100644
Binary files a/forui/test/golden/bottom-navigation-bar/zinc-dark-forui-icon.png and b/forui/test/golden/bottom-navigation-bar/zinc-dark-forui-icon.png differ
diff --git a/forui/test/golden/bottom-navigation-bar/zinc-light-focused.png b/forui/test/golden/bottom-navigation-bar/zinc-light-focused.png
index 6dd638554..61f248313 100644
Binary files a/forui/test/golden/bottom-navigation-bar/zinc-light-focused.png and b/forui/test/golden/bottom-navigation-bar/zinc-light-focused.png differ
diff --git a/forui/test/golden/bottom-navigation-bar/zinc-light-forui-icon.png b/forui/test/golden/bottom-navigation-bar/zinc-light-forui-icon.png
index ca90f0a5f..443a9f3a6 100644
Binary files a/forui/test/golden/bottom-navigation-bar/zinc-light-forui-icon.png and b/forui/test/golden/bottom-navigation-bar/zinc-light-forui-icon.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.destructive/button-spinner-disabled-button.png b/forui/test/golden/button/zinc-dark/Variant.destructive/button-spinner-disabled-button.png
index 385273628..314598989 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.destructive/button-spinner-disabled-button.png and b/forui/test/golden/button/zinc-dark/Variant.destructive/button-spinner-disabled-button.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.destructive/disabled-content.png b/forui/test/golden/button/zinc-dark/Variant.destructive/disabled-content.png
index fa45e0db7..967ddb016 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.destructive/disabled-content.png and b/forui/test/golden/button/zinc-dark/Variant.destructive/disabled-content.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.destructive/focused.png b/forui/test/golden/button/zinc-dark/Variant.destructive/focused.png
index ce0db73e0..b52748951 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.destructive/focused.png and b/forui/test/golden/button/zinc-dark/Variant.destructive/focused.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.destructive/icon-disabled.png b/forui/test/golden/button/zinc-dark/Variant.destructive/icon-disabled.png
index 284d4adab..addeb7d10 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.destructive/icon-disabled.png and b/forui/test/golden/button/zinc-dark/Variant.destructive/icon-disabled.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.ghost/button-spinner-disabled-button.png b/forui/test/golden/button/zinc-dark/Variant.ghost/button-spinner-disabled-button.png
index 21c60d225..fa0bfea28 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.ghost/button-spinner-disabled-button.png and b/forui/test/golden/button/zinc-dark/Variant.ghost/button-spinner-disabled-button.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.ghost/disabled-content.png b/forui/test/golden/button/zinc-dark/Variant.ghost/disabled-content.png
index 6d15d56ef..49becf1c2 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.ghost/disabled-content.png and b/forui/test/golden/button/zinc-dark/Variant.ghost/disabled-content.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.ghost/focused.png b/forui/test/golden/button/zinc-dark/Variant.ghost/focused.png
index 3f0345313..df9bf4474 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.ghost/focused.png and b/forui/test/golden/button/zinc-dark/Variant.ghost/focused.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.ghost/icon-disabled.png b/forui/test/golden/button/zinc-dark/Variant.ghost/icon-disabled.png
index 33204960c..d8228227d 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.ghost/icon-disabled.png and b/forui/test/golden/button/zinc-dark/Variant.ghost/icon-disabled.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.outline/button-spinner-disabled-button.png b/forui/test/golden/button/zinc-dark/Variant.outline/button-spinner-disabled-button.png
index ebcccb961..d36eb059f 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.outline/button-spinner-disabled-button.png and b/forui/test/golden/button/zinc-dark/Variant.outline/button-spinner-disabled-button.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.outline/disabled-content.png b/forui/test/golden/button/zinc-dark/Variant.outline/disabled-content.png
index a83d64980..9e942b3d2 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.outline/disabled-content.png and b/forui/test/golden/button/zinc-dark/Variant.outline/disabled-content.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.outline/disabled-raw.png b/forui/test/golden/button/zinc-dark/Variant.outline/disabled-raw.png
index 86d4c1671..80856cabb 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.outline/disabled-raw.png and b/forui/test/golden/button/zinc-dark/Variant.outline/disabled-raw.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.outline/enabled-hovered.png b/forui/test/golden/button/zinc-dark/Variant.outline/enabled-hovered.png
index 83b0f7012..d7c25656c 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.outline/enabled-hovered.png and b/forui/test/golden/button/zinc-dark/Variant.outline/enabled-hovered.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.outline/enabled-long-pressed.png b/forui/test/golden/button/zinc-dark/Variant.outline/enabled-long-pressed.png
index 83b0f7012..d7c25656c 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.outline/enabled-long-pressed.png and b/forui/test/golden/button/zinc-dark/Variant.outline/enabled-long-pressed.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.outline/focused.png b/forui/test/golden/button/zinc-dark/Variant.outline/focused.png
index a636e6700..b45ed633b 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.outline/focused.png and b/forui/test/golden/button/zinc-dark/Variant.outline/focused.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.outline/icon-disabled.png b/forui/test/golden/button/zinc-dark/Variant.outline/icon-disabled.png
index 8ef345c6c..0aa95c77a 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.outline/icon-disabled.png and b/forui/test/golden/button/zinc-dark/Variant.outline/icon-disabled.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.primary/button-spinner-disabled-button.png b/forui/test/golden/button/zinc-dark/Variant.primary/button-spinner-disabled-button.png
index eb60c8e0c..a40f385dc 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.primary/button-spinner-disabled-button.png and b/forui/test/golden/button/zinc-dark/Variant.primary/button-spinner-disabled-button.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.primary/disabled-content.png b/forui/test/golden/button/zinc-dark/Variant.primary/disabled-content.png
index 73ec46c41..d7916bfa9 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.primary/disabled-content.png and b/forui/test/golden/button/zinc-dark/Variant.primary/disabled-content.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.primary/disabled-raw.png b/forui/test/golden/button/zinc-dark/Variant.primary/disabled-raw.png
index 4ec54c97d..1a277f3a9 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.primary/disabled-raw.png and b/forui/test/golden/button/zinc-dark/Variant.primary/disabled-raw.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.primary/focused.png b/forui/test/golden/button/zinc-dark/Variant.primary/focused.png
index bd7446449..c912b67a5 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.primary/focused.png and b/forui/test/golden/button/zinc-dark/Variant.primary/focused.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.primary/icon-disabled.png b/forui/test/golden/button/zinc-dark/Variant.primary/icon-disabled.png
index d32ebb9ae..021f1c541 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.primary/icon-disabled.png and b/forui/test/golden/button/zinc-dark/Variant.primary/icon-disabled.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.secondary/button-spinner-disabled-button.png b/forui/test/golden/button/zinc-dark/Variant.secondary/button-spinner-disabled-button.png
index 7fa9817e3..542dda4e2 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.secondary/button-spinner-disabled-button.png and b/forui/test/golden/button/zinc-dark/Variant.secondary/button-spinner-disabled-button.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.secondary/disabled-content.png b/forui/test/golden/button/zinc-dark/Variant.secondary/disabled-content.png
index d18a55a53..009b1d2b0 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.secondary/disabled-content.png and b/forui/test/golden/button/zinc-dark/Variant.secondary/disabled-content.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.secondary/disabled-raw.png b/forui/test/golden/button/zinc-dark/Variant.secondary/disabled-raw.png
index 84de905fc..c6b916e83 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.secondary/disabled-raw.png and b/forui/test/golden/button/zinc-dark/Variant.secondary/disabled-raw.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.secondary/enabled-hovered.png b/forui/test/golden/button/zinc-dark/Variant.secondary/enabled-hovered.png
index 50f90db24..dc12fa714 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.secondary/enabled-hovered.png and b/forui/test/golden/button/zinc-dark/Variant.secondary/enabled-hovered.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.secondary/enabled-long-pressed.png b/forui/test/golden/button/zinc-dark/Variant.secondary/enabled-long-pressed.png
index 50f90db24..dc12fa714 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.secondary/enabled-long-pressed.png and b/forui/test/golden/button/zinc-dark/Variant.secondary/enabled-long-pressed.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.secondary/focused.png b/forui/test/golden/button/zinc-dark/Variant.secondary/focused.png
index 5403e9fbb..01861852f 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.secondary/focused.png and b/forui/test/golden/button/zinc-dark/Variant.secondary/focused.png differ
diff --git a/forui/test/golden/button/zinc-dark/Variant.secondary/icon-disabled.png b/forui/test/golden/button/zinc-dark/Variant.secondary/icon-disabled.png
index f11b09fdb..ab0c73b65 100644
Binary files a/forui/test/golden/button/zinc-dark/Variant.secondary/icon-disabled.png and b/forui/test/golden/button/zinc-dark/Variant.secondary/icon-disabled.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.destructive/button-spinner-disabled-button.png b/forui/test/golden/button/zinc-light/Variant.destructive/button-spinner-disabled-button.png
index 2578f5bd8..f72605680 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.destructive/button-spinner-disabled-button.png and b/forui/test/golden/button/zinc-light/Variant.destructive/button-spinner-disabled-button.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.destructive/disabled-content.png b/forui/test/golden/button/zinc-light/Variant.destructive/disabled-content.png
index 4195d39ad..78cf68c3d 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.destructive/disabled-content.png and b/forui/test/golden/button/zinc-light/Variant.destructive/disabled-content.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.destructive/disabled-raw.png b/forui/test/golden/button/zinc-light/Variant.destructive/disabled-raw.png
index e30f89c77..5d1e2116d 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.destructive/disabled-raw.png and b/forui/test/golden/button/zinc-light/Variant.destructive/disabled-raw.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.destructive/enabled-hovered.png b/forui/test/golden/button/zinc-light/Variant.destructive/enabled-hovered.png
index 32ff8f15d..8e8a6fd4e 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.destructive/enabled-hovered.png and b/forui/test/golden/button/zinc-light/Variant.destructive/enabled-hovered.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.destructive/enabled-long-pressed.png b/forui/test/golden/button/zinc-light/Variant.destructive/enabled-long-pressed.png
index 32ff8f15d..8e8a6fd4e 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.destructive/enabled-long-pressed.png and b/forui/test/golden/button/zinc-light/Variant.destructive/enabled-long-pressed.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.destructive/focused.png b/forui/test/golden/button/zinc-light/Variant.destructive/focused.png
index 61b36b23c..e3da53f3e 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.destructive/focused.png and b/forui/test/golden/button/zinc-light/Variant.destructive/focused.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.destructive/icon-disabled.png b/forui/test/golden/button/zinc-light/Variant.destructive/icon-disabled.png
index 7563929df..1505b6da1 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.destructive/icon-disabled.png and b/forui/test/golden/button/zinc-light/Variant.destructive/icon-disabled.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.ghost/button-spinner-disabled-button.png b/forui/test/golden/button/zinc-light/Variant.ghost/button-spinner-disabled-button.png
index 3474209e8..e70c09afd 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.ghost/button-spinner-disabled-button.png and b/forui/test/golden/button/zinc-light/Variant.ghost/button-spinner-disabled-button.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.ghost/disabled-content.png b/forui/test/golden/button/zinc-light/Variant.ghost/disabled-content.png
index be2224ec8..a0953f02c 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.ghost/disabled-content.png and b/forui/test/golden/button/zinc-light/Variant.ghost/disabled-content.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.ghost/focused.png b/forui/test/golden/button/zinc-light/Variant.ghost/focused.png
index 5826152af..f5e2e48d4 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.ghost/focused.png and b/forui/test/golden/button/zinc-light/Variant.ghost/focused.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.ghost/icon-disabled.png b/forui/test/golden/button/zinc-light/Variant.ghost/icon-disabled.png
index 7b0b7681c..9fb81e6b8 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.ghost/icon-disabled.png and b/forui/test/golden/button/zinc-light/Variant.ghost/icon-disabled.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.outline/button-spinner-disabled-button.png b/forui/test/golden/button/zinc-light/Variant.outline/button-spinner-disabled-button.png
index 35eac6c7a..c4551c1e8 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.outline/button-spinner-disabled-button.png and b/forui/test/golden/button/zinc-light/Variant.outline/button-spinner-disabled-button.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.outline/disabled-content.png b/forui/test/golden/button/zinc-light/Variant.outline/disabled-content.png
index 3dae66e84..2fa38f254 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.outline/disabled-content.png and b/forui/test/golden/button/zinc-light/Variant.outline/disabled-content.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.outline/disabled-raw.png b/forui/test/golden/button/zinc-light/Variant.outline/disabled-raw.png
index 7e92d82b0..abb42e63e 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.outline/disabled-raw.png and b/forui/test/golden/button/zinc-light/Variant.outline/disabled-raw.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.outline/enabled-hovered.png b/forui/test/golden/button/zinc-light/Variant.outline/enabled-hovered.png
index 3a5a13b72..50b82f0e8 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.outline/enabled-hovered.png and b/forui/test/golden/button/zinc-light/Variant.outline/enabled-hovered.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.outline/enabled-long-pressed.png b/forui/test/golden/button/zinc-light/Variant.outline/enabled-long-pressed.png
index 3a5a13b72..50b82f0e8 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.outline/enabled-long-pressed.png and b/forui/test/golden/button/zinc-light/Variant.outline/enabled-long-pressed.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.outline/focused.png b/forui/test/golden/button/zinc-light/Variant.outline/focused.png
index ba1432d92..d3c6fb3a2 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.outline/focused.png and b/forui/test/golden/button/zinc-light/Variant.outline/focused.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.outline/icon-disabled.png b/forui/test/golden/button/zinc-light/Variant.outline/icon-disabled.png
index 215037db2..59e4ae3b1 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.outline/icon-disabled.png and b/forui/test/golden/button/zinc-light/Variant.outline/icon-disabled.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.primary/button-spinner-disabled-button.png b/forui/test/golden/button/zinc-light/Variant.primary/button-spinner-disabled-button.png
index 404d8e2ca..b05d2d5ea 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.primary/button-spinner-disabled-button.png and b/forui/test/golden/button/zinc-light/Variant.primary/button-spinner-disabled-button.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.primary/disabled-content.png b/forui/test/golden/button/zinc-light/Variant.primary/disabled-content.png
index 323d8fcaf..770c74596 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.primary/disabled-content.png and b/forui/test/golden/button/zinc-light/Variant.primary/disabled-content.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.primary/disabled-raw.png b/forui/test/golden/button/zinc-light/Variant.primary/disabled-raw.png
index b839a2ac8..73e2acddf 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.primary/disabled-raw.png and b/forui/test/golden/button/zinc-light/Variant.primary/disabled-raw.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.primary/enabled-hovered.png b/forui/test/golden/button/zinc-light/Variant.primary/enabled-hovered.png
index e6d92c687..9304c1eae 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.primary/enabled-hovered.png and b/forui/test/golden/button/zinc-light/Variant.primary/enabled-hovered.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.primary/enabled-long-pressed.png b/forui/test/golden/button/zinc-light/Variant.primary/enabled-long-pressed.png
index e6d92c687..9304c1eae 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.primary/enabled-long-pressed.png and b/forui/test/golden/button/zinc-light/Variant.primary/enabled-long-pressed.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.primary/focused.png b/forui/test/golden/button/zinc-light/Variant.primary/focused.png
index a820b72be..ea4db5d78 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.primary/focused.png and b/forui/test/golden/button/zinc-light/Variant.primary/focused.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.primary/icon-disabled.png b/forui/test/golden/button/zinc-light/Variant.primary/icon-disabled.png
index 3b2a8a8d5..f9f8b8829 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.primary/icon-disabled.png and b/forui/test/golden/button/zinc-light/Variant.primary/icon-disabled.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.secondary/button-spinner-disabled-button.png b/forui/test/golden/button/zinc-light/Variant.secondary/button-spinner-disabled-button.png
index 54dcd8c5d..f28978cb6 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.secondary/button-spinner-disabled-button.png and b/forui/test/golden/button/zinc-light/Variant.secondary/button-spinner-disabled-button.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.secondary/disabled-content.png b/forui/test/golden/button/zinc-light/Variant.secondary/disabled-content.png
index 1b2cd775e..24bc99472 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.secondary/disabled-content.png and b/forui/test/golden/button/zinc-light/Variant.secondary/disabled-content.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.secondary/disabled-raw.png b/forui/test/golden/button/zinc-light/Variant.secondary/disabled-raw.png
index 46657b376..22dac6bd6 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.secondary/disabled-raw.png and b/forui/test/golden/button/zinc-light/Variant.secondary/disabled-raw.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.secondary/enabled-hovered.png b/forui/test/golden/button/zinc-light/Variant.secondary/enabled-hovered.png
index b9a2a1833..1d9f00451 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.secondary/enabled-hovered.png and b/forui/test/golden/button/zinc-light/Variant.secondary/enabled-hovered.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.secondary/enabled-long-pressed.png b/forui/test/golden/button/zinc-light/Variant.secondary/enabled-long-pressed.png
index b9a2a1833..1d9f00451 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.secondary/enabled-long-pressed.png and b/forui/test/golden/button/zinc-light/Variant.secondary/enabled-long-pressed.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.secondary/focused.png b/forui/test/golden/button/zinc-light/Variant.secondary/focused.png
index 034ab4e3f..275448b92 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.secondary/focused.png and b/forui/test/golden/button/zinc-light/Variant.secondary/focused.png differ
diff --git a/forui/test/golden/button/zinc-light/Variant.secondary/icon-disabled.png b/forui/test/golden/button/zinc-light/Variant.secondary/icon-disabled.png
index 6c98ff2e6..03d9b944c 100644
Binary files a/forui/test/golden/button/zinc-light/Variant.secondary/icon-disabled.png and b/forui/test/golden/button/zinc-light/Variant.secondary/icon-disabled.png differ
diff --git a/forui/test/golden/calendar/zinc-dark/day-picker/default.png b/forui/test/golden/calendar/zinc-dark/day-picker/default.png
index bbad03b3b..d507e4f34 100644
Binary files a/forui/test/golden/calendar/zinc-dark/day-picker/default.png and b/forui/test/golden/calendar/zinc-dark/day-picker/default.png differ
diff --git a/forui/test/golden/calendar/zinc-dark/day-picker/disabled-previous.png b/forui/test/golden/calendar/zinc-dark/day-picker/disabled-previous.png
index 0605ca9e1..a7439c027 100644
Binary files a/forui/test/golden/calendar/zinc-dark/day-picker/disabled-previous.png and b/forui/test/golden/calendar/zinc-dark/day-picker/disabled-previous.png differ
diff --git a/forui/test/golden/calendar/zinc-dark/day-picker/hovered-selected.png b/forui/test/golden/calendar/zinc-dark/day-picker/hovered-selected.png
index 5d1ec2b25..40f3ab463 100644
Binary files a/forui/test/golden/calendar/zinc-dark/day-picker/hovered-selected.png and b/forui/test/golden/calendar/zinc-dark/day-picker/hovered-selected.png differ
diff --git a/forui/test/golden/calendar/zinc-dark/day-picker/max-rows.png b/forui/test/golden/calendar/zinc-dark/day-picker/max-rows.png
index 519cf212b..a6bbebde4 100644
Binary files a/forui/test/golden/calendar/zinc-dark/day-picker/max-rows.png and b/forui/test/golden/calendar/zinc-dark/day-picker/max-rows.png differ
diff --git a/forui/test/golden/calendar/zinc-dark/day-picker/rtl.png b/forui/test/golden/calendar/zinc-dark/day-picker/rtl.png
index d196dbb6e..fff90b286 100644
Binary files a/forui/test/golden/calendar/zinc-dark/day-picker/rtl.png and b/forui/test/golden/calendar/zinc-dark/day-picker/rtl.png differ
diff --git a/forui/test/golden/calendar/zinc-dark/month-picker/default.png b/forui/test/golden/calendar/zinc-dark/month-picker/default.png
index 3d9b45d3a..672dec337 100644
Binary files a/forui/test/golden/calendar/zinc-dark/month-picker/default.png and b/forui/test/golden/calendar/zinc-dark/month-picker/default.png differ
diff --git a/forui/test/golden/calendar/zinc-dark/year-picker/default.png b/forui/test/golden/calendar/zinc-dark/year-picker/default.png
index 1715c91b3..75edf5ff8 100644
Binary files a/forui/test/golden/calendar/zinc-dark/year-picker/default.png and b/forui/test/golden/calendar/zinc-dark/year-picker/default.png differ
diff --git a/forui/test/golden/calendar/zinc-dark/year-picker/initial-date.png b/forui/test/golden/calendar/zinc-dark/year-picker/initial-date.png
index 01a4f9cac..1d4580e51 100644
Binary files a/forui/test/golden/calendar/zinc-dark/year-picker/initial-date.png and b/forui/test/golden/calendar/zinc-dark/year-picker/initial-date.png differ
diff --git a/forui/test/golden/calendar/zinc-light/day-picker/default.png b/forui/test/golden/calendar/zinc-light/day-picker/default.png
index bbad03b3b..d507e4f34 100644
Binary files a/forui/test/golden/calendar/zinc-light/day-picker/default.png and b/forui/test/golden/calendar/zinc-light/day-picker/default.png differ
diff --git a/forui/test/golden/calendar/zinc-light/day-picker/disabled-previous.png b/forui/test/golden/calendar/zinc-light/day-picker/disabled-previous.png
index 83d2e7273..7bba42e4d 100644
Binary files a/forui/test/golden/calendar/zinc-light/day-picker/disabled-previous.png and b/forui/test/golden/calendar/zinc-light/day-picker/disabled-previous.png differ
diff --git a/forui/test/golden/calendar/zinc-light/day-picker/hovered-selected.png b/forui/test/golden/calendar/zinc-light/day-picker/hovered-selected.png
index dbe645595..7a7013955 100644
Binary files a/forui/test/golden/calendar/zinc-light/day-picker/hovered-selected.png and b/forui/test/golden/calendar/zinc-light/day-picker/hovered-selected.png differ
diff --git a/forui/test/golden/calendar/zinc-light/day-picker/max-rows.png b/forui/test/golden/calendar/zinc-light/day-picker/max-rows.png
index 726543c27..b8708a59b 100644
Binary files a/forui/test/golden/calendar/zinc-light/day-picker/max-rows.png and b/forui/test/golden/calendar/zinc-light/day-picker/max-rows.png differ
diff --git a/forui/test/golden/calendar/zinc-light/day-picker/rtl.png b/forui/test/golden/calendar/zinc-light/day-picker/rtl.png
index d196dbb6e..fff90b286 100644
Binary files a/forui/test/golden/calendar/zinc-light/day-picker/rtl.png and b/forui/test/golden/calendar/zinc-light/day-picker/rtl.png differ
diff --git a/forui/test/golden/calendar/zinc-light/month-picker/default.png b/forui/test/golden/calendar/zinc-light/month-picker/default.png
index 341266102..07eadb898 100644
Binary files a/forui/test/golden/calendar/zinc-light/month-picker/default.png and b/forui/test/golden/calendar/zinc-light/month-picker/default.png differ
diff --git a/forui/test/golden/calendar/zinc-light/year-picker/default.png b/forui/test/golden/calendar/zinc-light/year-picker/default.png
index fcf3c3aba..5bb952178 100644
Binary files a/forui/test/golden/calendar/zinc-light/year-picker/default.png and b/forui/test/golden/calendar/zinc-light/year-picker/default.png differ
diff --git a/forui/test/golden/calendar/zinc-light/year-picker/initial-date.png b/forui/test/golden/calendar/zinc-light/year-picker/initial-date.png
index 5d6201e46..7cd4bc999 100644
Binary files a/forui/test/golden/calendar/zinc-light/year-picker/initial-date.png and b/forui/test/golden/calendar/zinc-light/year-picker/initial-date.png differ
diff --git a/forui/test/golden/card/zinc-dark/content-image.png b/forui/test/golden/card/zinc-dark/content-image.png
index 346a9de69..7e63d84ca 100644
Binary files a/forui/test/golden/card/zinc-dark/content-image.png and b/forui/test/golden/card/zinc-dark/content-image.png differ
diff --git a/forui/test/golden/card/zinc-dark/content.png b/forui/test/golden/card/zinc-dark/content.png
index 48ea50bdd..a6e57b13c 100644
Binary files a/forui/test/golden/card/zinc-dark/content.png and b/forui/test/golden/card/zinc-dark/content.png differ
diff --git a/forui/test/golden/card/zinc-dark/raw.png b/forui/test/golden/card/zinc-dark/raw.png
index 840d13ec2..16b7a9cef 100644
Binary files a/forui/test/golden/card/zinc-dark/raw.png and b/forui/test/golden/card/zinc-dark/raw.png differ
diff --git a/forui/test/golden/card/zinc-light/content-image.png b/forui/test/golden/card/zinc-light/content-image.png
index 1e662fa9f..c18eaee1e 100644
Binary files a/forui/test/golden/card/zinc-light/content-image.png and b/forui/test/golden/card/zinc-light/content-image.png differ
diff --git a/forui/test/golden/card/zinc-light/content.png b/forui/test/golden/card/zinc-light/content.png
index b1b85f689..a15026990 100644
Binary files a/forui/test/golden/card/zinc-light/content.png and b/forui/test/golden/card/zinc-light/content.png differ
diff --git a/forui/test/golden/card/zinc-light/raw.png b/forui/test/golden/card/zinc-light/raw.png
index 413f51bf7..dd3d136d5 100644
Binary files a/forui/test/golden/card/zinc-light/raw.png and b/forui/test/golden/card/zinc-light/raw.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/disabled-checked-error.png b/forui/test/golden/check-box/zinc-dark/disabled-checked-error.png
index 9933ff1b3..b73bb56e4 100644
Binary files a/forui/test/golden/check-box/zinc-dark/disabled-checked-error.png and b/forui/test/golden/check-box/zinc-dark/disabled-checked-error.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/disabled-checked.png b/forui/test/golden/check-box/zinc-dark/disabled-checked.png
index 9fff7c9b4..3a35c0880 100644
Binary files a/forui/test/golden/check-box/zinc-dark/disabled-checked.png and b/forui/test/golden/check-box/zinc-dark/disabled-checked.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/disabled-error.png b/forui/test/golden/check-box/zinc-dark/disabled-error.png
index 56cbcc407..1ff942d5b 100644
Binary files a/forui/test/golden/check-box/zinc-dark/disabled-error.png and b/forui/test/golden/check-box/zinc-dark/disabled-error.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/disabled.png b/forui/test/golden/check-box/zinc-dark/disabled.png
index b78c1793f..aba6c4fcd 100644
Binary files a/forui/test/golden/check-box/zinc-dark/disabled.png and b/forui/test/golden/check-box/zinc-dark/disabled.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/enabled-checked-error.png b/forui/test/golden/check-box/zinc-dark/enabled-checked-error.png
index 9933ff1b3..b73bb56e4 100644
Binary files a/forui/test/golden/check-box/zinc-dark/enabled-checked-error.png and b/forui/test/golden/check-box/zinc-dark/enabled-checked-error.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/enabled-checked.png b/forui/test/golden/check-box/zinc-dark/enabled-checked.png
index 82eb8d4f2..5f44d0f35 100644
Binary files a/forui/test/golden/check-box/zinc-dark/enabled-checked.png and b/forui/test/golden/check-box/zinc-dark/enabled-checked.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/enabled-error.png b/forui/test/golden/check-box/zinc-dark/enabled-error.png
index 56cbcc407..1ff942d5b 100644
Binary files a/forui/test/golden/check-box/zinc-dark/enabled-error.png and b/forui/test/golden/check-box/zinc-dark/enabled-error.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/enabled.png b/forui/test/golden/check-box/zinc-dark/enabled.png
index 6d91fde6a..4afec7018 100644
Binary files a/forui/test/golden/check-box/zinc-dark/enabled.png and b/forui/test/golden/check-box/zinc-dark/enabled.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/focused.png b/forui/test/golden/check-box/zinc-dark/focused.png
index e2ccb26d0..29257d9b0 100644
Binary files a/forui/test/golden/check-box/zinc-dark/focused.png and b/forui/test/golden/check-box/zinc-dark/focused.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/label-disabled-checked-error.png b/forui/test/golden/check-box/zinc-dark/label-disabled-checked-error.png
index e9467b202..a864c8dce 100644
Binary files a/forui/test/golden/check-box/zinc-dark/label-disabled-checked-error.png and b/forui/test/golden/check-box/zinc-dark/label-disabled-checked-error.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/label-disabled-checked.png b/forui/test/golden/check-box/zinc-dark/label-disabled-checked.png
index def03765a..95c0e1301 100644
Binary files a/forui/test/golden/check-box/zinc-dark/label-disabled-checked.png and b/forui/test/golden/check-box/zinc-dark/label-disabled-checked.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/label-disabled-error.png b/forui/test/golden/check-box/zinc-dark/label-disabled-error.png
index 75e738238..71f2cbc8a 100644
Binary files a/forui/test/golden/check-box/zinc-dark/label-disabled-error.png and b/forui/test/golden/check-box/zinc-dark/label-disabled-error.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/label-disabled.png b/forui/test/golden/check-box/zinc-dark/label-disabled.png
index 3015ce4cd..6d420c688 100644
Binary files a/forui/test/golden/check-box/zinc-dark/label-disabled.png and b/forui/test/golden/check-box/zinc-dark/label-disabled.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/label-enabled-checked-error.png b/forui/test/golden/check-box/zinc-dark/label-enabled-checked-error.png
index e9467b202..a864c8dce 100644
Binary files a/forui/test/golden/check-box/zinc-dark/label-enabled-checked-error.png and b/forui/test/golden/check-box/zinc-dark/label-enabled-checked-error.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/label-enabled-checked.png b/forui/test/golden/check-box/zinc-dark/label-enabled-checked.png
index b35c464c6..d11e3ac04 100644
Binary files a/forui/test/golden/check-box/zinc-dark/label-enabled-checked.png and b/forui/test/golden/check-box/zinc-dark/label-enabled-checked.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/label-enabled-error.png b/forui/test/golden/check-box/zinc-dark/label-enabled-error.png
index 75e738238..71f2cbc8a 100644
Binary files a/forui/test/golden/check-box/zinc-dark/label-enabled-error.png and b/forui/test/golden/check-box/zinc-dark/label-enabled-error.png differ
diff --git a/forui/test/golden/check-box/zinc-dark/label-enabled.png b/forui/test/golden/check-box/zinc-dark/label-enabled.png
index 692b6b4de..2ca79906d 100644
Binary files a/forui/test/golden/check-box/zinc-dark/label-enabled.png and b/forui/test/golden/check-box/zinc-dark/label-enabled.png differ
diff --git a/forui/test/golden/check-box/zinc-light/disabled-checked-error.png b/forui/test/golden/check-box/zinc-light/disabled-checked-error.png
index 9ea951844..1d67c7052 100644
Binary files a/forui/test/golden/check-box/zinc-light/disabled-checked-error.png and b/forui/test/golden/check-box/zinc-light/disabled-checked-error.png differ
diff --git a/forui/test/golden/check-box/zinc-light/disabled-checked.png b/forui/test/golden/check-box/zinc-light/disabled-checked.png
index 87c867ae1..8fc4dda8a 100644
Binary files a/forui/test/golden/check-box/zinc-light/disabled-checked.png and b/forui/test/golden/check-box/zinc-light/disabled-checked.png differ
diff --git a/forui/test/golden/check-box/zinc-light/disabled-error.png b/forui/test/golden/check-box/zinc-light/disabled-error.png
index 63a9a2da2..aacd0bb59 100644
Binary files a/forui/test/golden/check-box/zinc-light/disabled-error.png and b/forui/test/golden/check-box/zinc-light/disabled-error.png differ
diff --git a/forui/test/golden/check-box/zinc-light/disabled.png b/forui/test/golden/check-box/zinc-light/disabled.png
index 4bd312313..77c648fc0 100644
Binary files a/forui/test/golden/check-box/zinc-light/disabled.png and b/forui/test/golden/check-box/zinc-light/disabled.png differ
diff --git a/forui/test/golden/check-box/zinc-light/enabled-checked-error.png b/forui/test/golden/check-box/zinc-light/enabled-checked-error.png
index 9ea951844..1d67c7052 100644
Binary files a/forui/test/golden/check-box/zinc-light/enabled-checked-error.png and b/forui/test/golden/check-box/zinc-light/enabled-checked-error.png differ
diff --git a/forui/test/golden/check-box/zinc-light/enabled-checked.png b/forui/test/golden/check-box/zinc-light/enabled-checked.png
index cd1377c2a..37fb11631 100644
Binary files a/forui/test/golden/check-box/zinc-light/enabled-checked.png and b/forui/test/golden/check-box/zinc-light/enabled-checked.png differ
diff --git a/forui/test/golden/check-box/zinc-light/enabled-error.png b/forui/test/golden/check-box/zinc-light/enabled-error.png
index 63a9a2da2..aacd0bb59 100644
Binary files a/forui/test/golden/check-box/zinc-light/enabled-error.png and b/forui/test/golden/check-box/zinc-light/enabled-error.png differ
diff --git a/forui/test/golden/check-box/zinc-light/enabled.png b/forui/test/golden/check-box/zinc-light/enabled.png
index 8b08158d5..b6a02d3b3 100644
Binary files a/forui/test/golden/check-box/zinc-light/enabled.png and b/forui/test/golden/check-box/zinc-light/enabled.png differ
diff --git a/forui/test/golden/check-box/zinc-light/focused.png b/forui/test/golden/check-box/zinc-light/focused.png
index 21be23333..788ed7c69 100644
Binary files a/forui/test/golden/check-box/zinc-light/focused.png and b/forui/test/golden/check-box/zinc-light/focused.png differ
diff --git a/forui/test/golden/check-box/zinc-light/label-disabled-checked-error.png b/forui/test/golden/check-box/zinc-light/label-disabled-checked-error.png
index 2c3b9b86b..0a13a3e58 100644
Binary files a/forui/test/golden/check-box/zinc-light/label-disabled-checked-error.png and b/forui/test/golden/check-box/zinc-light/label-disabled-checked-error.png differ
diff --git a/forui/test/golden/check-box/zinc-light/label-disabled-checked.png b/forui/test/golden/check-box/zinc-light/label-disabled-checked.png
index 88bbfdb34..00b969e34 100644
Binary files a/forui/test/golden/check-box/zinc-light/label-disabled-checked.png and b/forui/test/golden/check-box/zinc-light/label-disabled-checked.png differ
diff --git a/forui/test/golden/check-box/zinc-light/label-disabled-error.png b/forui/test/golden/check-box/zinc-light/label-disabled-error.png
index 6732cd4db..7e6255451 100644
Binary files a/forui/test/golden/check-box/zinc-light/label-disabled-error.png and b/forui/test/golden/check-box/zinc-light/label-disabled-error.png differ
diff --git a/forui/test/golden/check-box/zinc-light/label-disabled.png b/forui/test/golden/check-box/zinc-light/label-disabled.png
index c193a03c2..61a0f38fb 100644
Binary files a/forui/test/golden/check-box/zinc-light/label-disabled.png and b/forui/test/golden/check-box/zinc-light/label-disabled.png differ
diff --git a/forui/test/golden/check-box/zinc-light/label-enabled-checked-error.png b/forui/test/golden/check-box/zinc-light/label-enabled-checked-error.png
index 2c3b9b86b..0a13a3e58 100644
Binary files a/forui/test/golden/check-box/zinc-light/label-enabled-checked-error.png and b/forui/test/golden/check-box/zinc-light/label-enabled-checked-error.png differ
diff --git a/forui/test/golden/check-box/zinc-light/label-enabled-checked.png b/forui/test/golden/check-box/zinc-light/label-enabled-checked.png
index 31164903e..0b9228402 100644
Binary files a/forui/test/golden/check-box/zinc-light/label-enabled-checked.png and b/forui/test/golden/check-box/zinc-light/label-enabled-checked.png differ
diff --git a/forui/test/golden/check-box/zinc-light/label-enabled-error.png b/forui/test/golden/check-box/zinc-light/label-enabled-error.png
index 6732cd4db..7e6255451 100644
Binary files a/forui/test/golden/check-box/zinc-light/label-enabled-error.png and b/forui/test/golden/check-box/zinc-light/label-enabled-error.png differ
diff --git a/forui/test/golden/check-box/zinc-light/label-enabled.png b/forui/test/golden/check-box/zinc-light/label-enabled.png
index c2c59e6e6..d6f5eb7ce 100644
Binary files a/forui/test/golden/check-box/zinc-light/label-enabled.png and b/forui/test/golden/check-box/zinc-light/label-enabled.png differ
diff --git a/forui/test/golden/focused-outline/zinc-dark/focused.png b/forui/test/golden/focused-outline/zinc-dark/focused.png
index 603717157..9fdf3fd4c 100644
Binary files a/forui/test/golden/focused-outline/zinc-dark/focused.png and b/forui/test/golden/focused-outline/zinc-dark/focused.png differ
diff --git a/forui/test/golden/focused-outline/zinc-light/focused.png b/forui/test/golden/focused-outline/zinc-light/focused.png
index 401aa3486..b304e8b78 100644
Binary files a/forui/test/golden/focused-outline/zinc-light/focused.png and b/forui/test/golden/focused-outline/zinc-light/focused.png differ
diff --git a/forui/test/golden/header/nested/zinc-dark-focused.png b/forui/test/golden/header/nested/zinc-dark-focused.png
index 4f8fbc375..5ad17e960 100644
Binary files a/forui/test/golden/header/nested/zinc-dark-focused.png and b/forui/test/golden/header/nested/zinc-dark-focused.png differ
diff --git a/forui/test/golden/header/nested/zinc-dark-rtl.png b/forui/test/golden/header/nested/zinc-dark-rtl.png
index eec42ae52..f6336b27e 100644
Binary files a/forui/test/golden/header/nested/zinc-dark-rtl.png and b/forui/test/golden/header/nested/zinc-dark-rtl.png differ
diff --git a/forui/test/golden/header/nested/zinc-dark.png b/forui/test/golden/header/nested/zinc-dark.png
index be332091f..8286eb8e5 100644
Binary files a/forui/test/golden/header/nested/zinc-dark.png and b/forui/test/golden/header/nested/zinc-dark.png differ
diff --git a/forui/test/golden/header/nested/zinc-light-focused.png b/forui/test/golden/header/nested/zinc-light-focused.png
index d29c5691e..80e11a1e4 100644
Binary files a/forui/test/golden/header/nested/zinc-light-focused.png and b/forui/test/golden/header/nested/zinc-light-focused.png differ
diff --git a/forui/test/golden/header/nested/zinc-light-rtl.png b/forui/test/golden/header/nested/zinc-light-rtl.png
index 2332367a1..5dc0c0b75 100644
Binary files a/forui/test/golden/header/nested/zinc-light-rtl.png and b/forui/test/golden/header/nested/zinc-light-rtl.png differ
diff --git a/forui/test/golden/header/nested/zinc-light.png b/forui/test/golden/header/nested/zinc-light.png
index e1d4f3493..591ff70dd 100644
Binary files a/forui/test/golden/header/nested/zinc-light.png and b/forui/test/golden/header/nested/zinc-light.png differ
diff --git a/forui/test/golden/header/root/zinc-dark-focused.png b/forui/test/golden/header/root/zinc-dark-focused.png
index 9d16011d3..c4fc8a741 100644
Binary files a/forui/test/golden/header/root/zinc-dark-focused.png and b/forui/test/golden/header/root/zinc-dark-focused.png differ
diff --git a/forui/test/golden/header/root/zinc-dark-rtl.png b/forui/test/golden/header/root/zinc-dark-rtl.png
index 3785b73d9..950488a9c 100644
Binary files a/forui/test/golden/header/root/zinc-dark-rtl.png and b/forui/test/golden/header/root/zinc-dark-rtl.png differ
diff --git a/forui/test/golden/header/root/zinc-dark.png b/forui/test/golden/header/root/zinc-dark.png
index 1c0be203d..41b3fc0cf 100644
Binary files a/forui/test/golden/header/root/zinc-dark.png and b/forui/test/golden/header/root/zinc-dark.png differ
diff --git a/forui/test/golden/header/root/zinc-light-focused.png b/forui/test/golden/header/root/zinc-light-focused.png
index 5c4dcff46..bd218cc38 100644
Binary files a/forui/test/golden/header/root/zinc-light-focused.png and b/forui/test/golden/header/root/zinc-light-focused.png differ
diff --git a/forui/test/golden/header/root/zinc-light-rtl.png b/forui/test/golden/header/root/zinc-light-rtl.png
index 82bef72e4..41f240964 100644
Binary files a/forui/test/golden/header/root/zinc-light-rtl.png and b/forui/test/golden/header/root/zinc-light-rtl.png differ
diff --git a/forui/test/golden/header/root/zinc-light.png b/forui/test/golden/header/root/zinc-light.png
index 12c00c9b6..64b845a59 100644
Binary files a/forui/test/golden/header/root/zinc-light.png and b/forui/test/golden/header/root/zinc-light.png differ
diff --git a/forui/test/golden/icon/icon-style.png b/forui/test/golden/icon/icon-style.png
index cb7bbc8ba..580bd5738 100644
Binary files a/forui/test/golden/icon/icon-style.png and b/forui/test/golden/icon/icon-style.png differ
diff --git a/forui/test/golden/icon/zinc-dark/svg-asset.png b/forui/test/golden/icon/zinc-dark/svg-asset.png
index d22b7877b..6f6638ea0 100644
Binary files a/forui/test/golden/icon/zinc-dark/svg-asset.png and b/forui/test/golden/icon/zinc-dark/svg-asset.png differ
diff --git a/forui/test/golden/icon/zinc-light/svg-asset.png b/forui/test/golden/icon/zinc-light/svg-asset.png
index 84ad13cdc..f42bcb15d 100644
Binary files a/forui/test/golden/icon/zinc-light/svg-asset.png and b/forui/test/golden/icon/zinc-light/svg-asset.png differ
diff --git a/forui/test/golden/label/zinc-dark/horizontal-FLabelState.disabled.png b/forui/test/golden/label/zinc-dark/horizontal-FLabelState.disabled.png
index d20a81f94..7c29351c6 100644
Binary files a/forui/test/golden/label/zinc-dark/horizontal-FLabelState.disabled.png and b/forui/test/golden/label/zinc-dark/horizontal-FLabelState.disabled.png differ
diff --git a/forui/test/golden/label/zinc-dark/vertical-FLabelState.disabled.png b/forui/test/golden/label/zinc-dark/vertical-FLabelState.disabled.png
index 70295f9b8..7ae15a095 100644
Binary files a/forui/test/golden/label/zinc-dark/vertical-FLabelState.disabled.png and b/forui/test/golden/label/zinc-dark/vertical-FLabelState.disabled.png differ
diff --git a/forui/test/golden/label/zinc-light/horizontal-FLabelState.disabled.png b/forui/test/golden/label/zinc-light/horizontal-FLabelState.disabled.png
index 4397cd57a..e464b4af4 100644
Binary files a/forui/test/golden/label/zinc-light/horizontal-FLabelState.disabled.png and b/forui/test/golden/label/zinc-light/horizontal-FLabelState.disabled.png differ
diff --git a/forui/test/golden/label/zinc-light/vertical-FLabelState.disabled.png b/forui/test/golden/label/zinc-light/vertical-FLabelState.disabled.png
index 414a9ae9d..a32d6f4db 100644
Binary files a/forui/test/golden/label/zinc-light/vertical-FLabelState.disabled.png and b/forui/test/golden/label/zinc-light/vertical-FLabelState.disabled.png differ
diff --git a/forui/test/golden/line-calendar/zinc-dark/default.png b/forui/test/golden/line-calendar/zinc-dark/default.png
index 12c7eb70a..8cdb2e3eb 100644
Binary files a/forui/test/golden/line-calendar/zinc-dark/default.png and b/forui/test/golden/line-calendar/zinc-dark/default.png differ
diff --git a/forui/test/golden/line-calendar/zinc-dark/selected-focused.png b/forui/test/golden/line-calendar/zinc-dark/selected-focused.png
index 4ce8d5946..96409a5c4 100644
Binary files a/forui/test/golden/line-calendar/zinc-dark/selected-focused.png and b/forui/test/golden/line-calendar/zinc-dark/selected-focused.png differ
diff --git a/forui/test/golden/line-calendar/zinc-dark/selected-hovered.png b/forui/test/golden/line-calendar/zinc-dark/selected-hovered.png
index 4d86076da..06e51137f 100644
Binary files a/forui/test/golden/line-calendar/zinc-dark/selected-hovered.png and b/forui/test/golden/line-calendar/zinc-dark/selected-hovered.png differ
diff --git a/forui/test/golden/line-calendar/zinc-dark/selected-other-date.png b/forui/test/golden/line-calendar/zinc-dark/selected-other-date.png
index 57a3493a5..5850c5dab 100644
Binary files a/forui/test/golden/line-calendar/zinc-dark/selected-other-date.png and b/forui/test/golden/line-calendar/zinc-dark/selected-other-date.png differ
diff --git a/forui/test/golden/line-calendar/zinc-dark/selected-today.png b/forui/test/golden/line-calendar/zinc-dark/selected-today.png
index 774afb1c7..a210b39d4 100644
Binary files a/forui/test/golden/line-calendar/zinc-dark/selected-today.png and b/forui/test/golden/line-calendar/zinc-dark/selected-today.png differ
diff --git a/forui/test/golden/line-calendar/zinc-dark/unselected-hovered.png b/forui/test/golden/line-calendar/zinc-dark/unselected-hovered.png
index 7b7cb5aa9..d5763815b 100644
Binary files a/forui/test/golden/line-calendar/zinc-dark/unselected-hovered.png and b/forui/test/golden/line-calendar/zinc-dark/unselected-hovered.png differ
diff --git a/forui/test/golden/line-calendar/zinc-light/default.png b/forui/test/golden/line-calendar/zinc-light/default.png
index 2e6f8bbc7..6b220a36e 100644
Binary files a/forui/test/golden/line-calendar/zinc-light/default.png and b/forui/test/golden/line-calendar/zinc-light/default.png differ
diff --git a/forui/test/golden/line-calendar/zinc-light/selected-focused.png b/forui/test/golden/line-calendar/zinc-light/selected-focused.png
index e85e286f1..06ed5cdd8 100644
Binary files a/forui/test/golden/line-calendar/zinc-light/selected-focused.png and b/forui/test/golden/line-calendar/zinc-light/selected-focused.png differ
diff --git a/forui/test/golden/line-calendar/zinc-light/selected-hovered.png b/forui/test/golden/line-calendar/zinc-light/selected-hovered.png
index ac0c75589..8e1a00ee1 100644
Binary files a/forui/test/golden/line-calendar/zinc-light/selected-hovered.png and b/forui/test/golden/line-calendar/zinc-light/selected-hovered.png differ
diff --git a/forui/test/golden/line-calendar/zinc-light/selected-other-date.png b/forui/test/golden/line-calendar/zinc-light/selected-other-date.png
index 446d869af..d9137af2e 100644
Binary files a/forui/test/golden/line-calendar/zinc-light/selected-other-date.png and b/forui/test/golden/line-calendar/zinc-light/selected-other-date.png differ
diff --git a/forui/test/golden/line-calendar/zinc-light/selected-today.png b/forui/test/golden/line-calendar/zinc-light/selected-today.png
index a7ff51e5a..46c49776b 100644
Binary files a/forui/test/golden/line-calendar/zinc-light/selected-today.png and b/forui/test/golden/line-calendar/zinc-light/selected-today.png differ
diff --git a/forui/test/golden/line-calendar/zinc-light/unselected-hovered.png b/forui/test/golden/line-calendar/zinc-light/unselected-hovered.png
index 004e4070a..cf69263a0 100644
Binary files a/forui/test/golden/line-calendar/zinc-light/unselected-hovered.png and b/forui/test/golden/line-calendar/zinc-light/unselected-hovered.png differ
diff --git a/forui/test/golden/popover-menu/directional-padding-zinc-dark.png b/forui/test/golden/popover-menu/directional-padding-zinc-dark.png
index c56a3f03e..ddc2424f0 100644
Binary files a/forui/test/golden/popover-menu/directional-padding-zinc-dark.png and b/forui/test/golden/popover-menu/directional-padding-zinc-dark.png differ
diff --git a/forui/test/golden/popover-menu/directional-padding-zinc-light.png b/forui/test/golden/popover-menu/directional-padding-zinc-light.png
index 408c5f131..d763469b9 100644
Binary files a/forui/test/golden/popover-menu/directional-padding-zinc-light.png and b/forui/test/golden/popover-menu/directional-padding-zinc-light.png differ
diff --git a/forui/test/golden/popover-menu/no-directional-padding-zinc-dark.png b/forui/test/golden/popover-menu/no-directional-padding-zinc-dark.png
index 1774bcffa..858500011 100644
Binary files a/forui/test/golden/popover-menu/no-directional-padding-zinc-dark.png and b/forui/test/golden/popover-menu/no-directional-padding-zinc-dark.png differ
diff --git a/forui/test/golden/popover-menu/no-directional-padding-zinc-light.png b/forui/test/golden/popover-menu/no-directional-padding-zinc-light.png
index b0645b5ed..abb5cb6d7 100644
Binary files a/forui/test/golden/popover-menu/no-directional-padding-zinc-light.png and b/forui/test/golden/popover-menu/no-directional-padding-zinc-light.png differ
diff --git a/forui/test/golden/popover-menu/scrollable-zinc-dark.png b/forui/test/golden/popover-menu/scrollable-zinc-dark.png
index 1bc6955ce..9cf500f84 100644
Binary files a/forui/test/golden/popover-menu/scrollable-zinc-dark.png and b/forui/test/golden/popover-menu/scrollable-zinc-dark.png differ
diff --git a/forui/test/golden/popover-menu/scrollable-zinc-light.png b/forui/test/golden/popover-menu/scrollable-zinc-light.png
index 1e4422a95..45e00f76f 100644
Binary files a/forui/test/golden/popover-menu/scrollable-zinc-light.png and b/forui/test/golden/popover-menu/scrollable-zinc-light.png differ
diff --git a/forui/test/golden/popover-menu/shown-zinc-dark.png b/forui/test/golden/popover-menu/shown-zinc-dark.png
index b1d0d1c3f..d1b70d9e0 100644
Binary files a/forui/test/golden/popover-menu/shown-zinc-dark.png and b/forui/test/golden/popover-menu/shown-zinc-dark.png differ
diff --git a/forui/test/golden/popover-menu/shown-zinc-light.png b/forui/test/golden/popover-menu/shown-zinc-light.png
index db5550216..b1bcf1451 100644
Binary files a/forui/test/golden/popover-menu/shown-zinc-light.png and b/forui/test/golden/popover-menu/shown-zinc-light.png differ
diff --git a/forui/test/golden/popover/directional-padding-zinc-dark.png b/forui/test/golden/popover/directional-padding-zinc-dark.png
index b2579b1a0..fec4244bf 100644
Binary files a/forui/test/golden/popover/directional-padding-zinc-dark.png and b/forui/test/golden/popover/directional-padding-zinc-dark.png differ
diff --git a/forui/test/golden/popover/directional-padding-zinc-light.png b/forui/test/golden/popover/directional-padding-zinc-light.png
index cc0260590..75c4f07ee 100644
Binary files a/forui/test/golden/popover/directional-padding-zinc-light.png and b/forui/test/golden/popover/directional-padding-zinc-light.png differ
diff --git a/forui/test/golden/popover/no-directional-padding-zinc-dark.png b/forui/test/golden/popover/no-directional-padding-zinc-dark.png
index 30af78f0d..6f391b819 100644
Binary files a/forui/test/golden/popover/no-directional-padding-zinc-dark.png and b/forui/test/golden/popover/no-directional-padding-zinc-dark.png differ
diff --git a/forui/test/golden/popover/no-directional-padding-zinc-light.png b/forui/test/golden/popover/no-directional-padding-zinc-light.png
index a4926760b..be2001902 100644
Binary files a/forui/test/golden/popover/no-directional-padding-zinc-light.png and b/forui/test/golden/popover/no-directional-padding-zinc-light.png differ
diff --git a/forui/test/golden/popover/shown-non-touch-device-zinc-dark.png b/forui/test/golden/popover/shown-non-touch-device-zinc-dark.png
index c9b26ede1..6628127c1 100644
Binary files a/forui/test/golden/popover/shown-non-touch-device-zinc-dark.png and b/forui/test/golden/popover/shown-non-touch-device-zinc-dark.png differ
diff --git a/forui/test/golden/popover/shown-non-touch-device-zinc-light.png b/forui/test/golden/popover/shown-non-touch-device-zinc-light.png
index 0f2fdf951..62e23020d 100644
Binary files a/forui/test/golden/popover/shown-non-touch-device-zinc-light.png and b/forui/test/golden/popover/shown-non-touch-device-zinc-light.png differ
diff --git a/forui/test/golden/popover/shown-touch-device-zinc-dark.png b/forui/test/golden/popover/shown-touch-device-zinc-dark.png
index d2df3eb1c..60e69aa9e 100644
Binary files a/forui/test/golden/popover/shown-touch-device-zinc-dark.png and b/forui/test/golden/popover/shown-touch-device-zinc-dark.png differ
diff --git a/forui/test/golden/popover/shown-touch-device-zinc-light.png b/forui/test/golden/popover/shown-touch-device-zinc-light.png
index 585226c0a..bf9610f64 100644
Binary files a/forui/test/golden/popover/shown-touch-device-zinc-light.png and b/forui/test/golden/popover/shown-touch-device-zinc-light.png differ
diff --git a/forui/test/golden/radio/zinc-dark/disabled-checked-error.png b/forui/test/golden/radio/zinc-dark/disabled-checked-error.png
index e8e3e4fac..158910809 100644
Binary files a/forui/test/golden/radio/zinc-dark/disabled-checked-error.png and b/forui/test/golden/radio/zinc-dark/disabled-checked-error.png differ
diff --git a/forui/test/golden/radio/zinc-dark/disabled-checked.png b/forui/test/golden/radio/zinc-dark/disabled-checked.png
index 093460061..241faaaf9 100644
Binary files a/forui/test/golden/radio/zinc-dark/disabled-checked.png and b/forui/test/golden/radio/zinc-dark/disabled-checked.png differ
diff --git a/forui/test/golden/radio/zinc-dark/disabled-error.png b/forui/test/golden/radio/zinc-dark/disabled-error.png
index 67a6a7b26..bae65503f 100644
Binary files a/forui/test/golden/radio/zinc-dark/disabled-error.png and b/forui/test/golden/radio/zinc-dark/disabled-error.png differ
diff --git a/forui/test/golden/radio/zinc-dark/disabled.png b/forui/test/golden/radio/zinc-dark/disabled.png
index 1a9031e73..e71e6a1c9 100644
Binary files a/forui/test/golden/radio/zinc-dark/disabled.png and b/forui/test/golden/radio/zinc-dark/disabled.png differ
diff --git a/forui/test/golden/radio/zinc-dark/enabled-checked-error.png b/forui/test/golden/radio/zinc-dark/enabled-checked-error.png
index e8e3e4fac..158910809 100644
Binary files a/forui/test/golden/radio/zinc-dark/enabled-checked-error.png and b/forui/test/golden/radio/zinc-dark/enabled-checked-error.png differ
diff --git a/forui/test/golden/radio/zinc-dark/enabled-checked.png b/forui/test/golden/radio/zinc-dark/enabled-checked.png
index f3ea10689..1b8f12028 100644
Binary files a/forui/test/golden/radio/zinc-dark/enabled-checked.png and b/forui/test/golden/radio/zinc-dark/enabled-checked.png differ
diff --git a/forui/test/golden/radio/zinc-dark/enabled-error.png b/forui/test/golden/radio/zinc-dark/enabled-error.png
index 67a6a7b26..bae65503f 100644
Binary files a/forui/test/golden/radio/zinc-dark/enabled-error.png and b/forui/test/golden/radio/zinc-dark/enabled-error.png differ
diff --git a/forui/test/golden/radio/zinc-dark/enabled.png b/forui/test/golden/radio/zinc-dark/enabled.png
index 5040cf87a..632678fb1 100644
Binary files a/forui/test/golden/radio/zinc-dark/enabled.png and b/forui/test/golden/radio/zinc-dark/enabled.png differ
diff --git a/forui/test/golden/radio/zinc-dark/focused.png b/forui/test/golden/radio/zinc-dark/focused.png
index 63e1a4af6..5f056183a 100644
Binary files a/forui/test/golden/radio/zinc-dark/focused.png and b/forui/test/golden/radio/zinc-dark/focused.png differ
diff --git a/forui/test/golden/radio/zinc-dark/label-disabled-checked-error.png b/forui/test/golden/radio/zinc-dark/label-disabled-checked-error.png
index 74067b813..464db135a 100644
Binary files a/forui/test/golden/radio/zinc-dark/label-disabled-checked-error.png and b/forui/test/golden/radio/zinc-dark/label-disabled-checked-error.png differ
diff --git a/forui/test/golden/radio/zinc-dark/label-disabled-checked.png b/forui/test/golden/radio/zinc-dark/label-disabled-checked.png
index 1d012b371..018343ee8 100644
Binary files a/forui/test/golden/radio/zinc-dark/label-disabled-checked.png and b/forui/test/golden/radio/zinc-dark/label-disabled-checked.png differ
diff --git a/forui/test/golden/radio/zinc-dark/label-disabled-error.png b/forui/test/golden/radio/zinc-dark/label-disabled-error.png
index 048a7a4e6..d936538dc 100644
Binary files a/forui/test/golden/radio/zinc-dark/label-disabled-error.png and b/forui/test/golden/radio/zinc-dark/label-disabled-error.png differ
diff --git a/forui/test/golden/radio/zinc-dark/label-disabled.png b/forui/test/golden/radio/zinc-dark/label-disabled.png
index 1f9a8e0d0..c6bdda984 100644
Binary files a/forui/test/golden/radio/zinc-dark/label-disabled.png and b/forui/test/golden/radio/zinc-dark/label-disabled.png differ
diff --git a/forui/test/golden/radio/zinc-dark/label-enabled-checked-error.png b/forui/test/golden/radio/zinc-dark/label-enabled-checked-error.png
index 74067b813..464db135a 100644
Binary files a/forui/test/golden/radio/zinc-dark/label-enabled-checked-error.png and b/forui/test/golden/radio/zinc-dark/label-enabled-checked-error.png differ
diff --git a/forui/test/golden/radio/zinc-dark/label-enabled-checked.png b/forui/test/golden/radio/zinc-dark/label-enabled-checked.png
index f6c6fa584..286281262 100644
Binary files a/forui/test/golden/radio/zinc-dark/label-enabled-checked.png and b/forui/test/golden/radio/zinc-dark/label-enabled-checked.png differ
diff --git a/forui/test/golden/radio/zinc-dark/label-enabled-error.png b/forui/test/golden/radio/zinc-dark/label-enabled-error.png
index 048a7a4e6..d936538dc 100644
Binary files a/forui/test/golden/radio/zinc-dark/label-enabled-error.png and b/forui/test/golden/radio/zinc-dark/label-enabled-error.png differ
diff --git a/forui/test/golden/radio/zinc-dark/label-enabled.png b/forui/test/golden/radio/zinc-dark/label-enabled.png
index eeda5a26e..385653d43 100644
Binary files a/forui/test/golden/radio/zinc-dark/label-enabled.png and b/forui/test/golden/radio/zinc-dark/label-enabled.png differ
diff --git a/forui/test/golden/radio/zinc-light/disabled-checked-error.png b/forui/test/golden/radio/zinc-light/disabled-checked-error.png
index ae0773479..cf8e2cafc 100644
Binary files a/forui/test/golden/radio/zinc-light/disabled-checked-error.png and b/forui/test/golden/radio/zinc-light/disabled-checked-error.png differ
diff --git a/forui/test/golden/radio/zinc-light/disabled-checked.png b/forui/test/golden/radio/zinc-light/disabled-checked.png
index 3ecc2d4dd..72ae332d7 100644
Binary files a/forui/test/golden/radio/zinc-light/disabled-checked.png and b/forui/test/golden/radio/zinc-light/disabled-checked.png differ
diff --git a/forui/test/golden/radio/zinc-light/disabled-error.png b/forui/test/golden/radio/zinc-light/disabled-error.png
index b957c29f2..492a3f8eb 100644
Binary files a/forui/test/golden/radio/zinc-light/disabled-error.png and b/forui/test/golden/radio/zinc-light/disabled-error.png differ
diff --git a/forui/test/golden/radio/zinc-light/disabled.png b/forui/test/golden/radio/zinc-light/disabled.png
index e795923b6..746705811 100644
Binary files a/forui/test/golden/radio/zinc-light/disabled.png and b/forui/test/golden/radio/zinc-light/disabled.png differ
diff --git a/forui/test/golden/radio/zinc-light/enabled-checked-error.png b/forui/test/golden/radio/zinc-light/enabled-checked-error.png
index ae0773479..cf8e2cafc 100644
Binary files a/forui/test/golden/radio/zinc-light/enabled-checked-error.png and b/forui/test/golden/radio/zinc-light/enabled-checked-error.png differ
diff --git a/forui/test/golden/radio/zinc-light/enabled-checked.png b/forui/test/golden/radio/zinc-light/enabled-checked.png
index 8540a0311..56267dc60 100644
Binary files a/forui/test/golden/radio/zinc-light/enabled-checked.png and b/forui/test/golden/radio/zinc-light/enabled-checked.png differ
diff --git a/forui/test/golden/radio/zinc-light/enabled-error.png b/forui/test/golden/radio/zinc-light/enabled-error.png
index b957c29f2..492a3f8eb 100644
Binary files a/forui/test/golden/radio/zinc-light/enabled-error.png and b/forui/test/golden/radio/zinc-light/enabled-error.png differ
diff --git a/forui/test/golden/radio/zinc-light/enabled.png b/forui/test/golden/radio/zinc-light/enabled.png
index 10d22afe5..eeb709988 100644
Binary files a/forui/test/golden/radio/zinc-light/enabled.png and b/forui/test/golden/radio/zinc-light/enabled.png differ
diff --git a/forui/test/golden/radio/zinc-light/focused.png b/forui/test/golden/radio/zinc-light/focused.png
index 42f6796df..2b5a2656b 100644
Binary files a/forui/test/golden/radio/zinc-light/focused.png and b/forui/test/golden/radio/zinc-light/focused.png differ
diff --git a/forui/test/golden/radio/zinc-light/label-disabled-checked-error.png b/forui/test/golden/radio/zinc-light/label-disabled-checked-error.png
index 79d903e69..8f03df337 100644
Binary files a/forui/test/golden/radio/zinc-light/label-disabled-checked-error.png and b/forui/test/golden/radio/zinc-light/label-disabled-checked-error.png differ
diff --git a/forui/test/golden/radio/zinc-light/label-disabled-checked.png b/forui/test/golden/radio/zinc-light/label-disabled-checked.png
index 8650e6f8e..e0472e447 100644
Binary files a/forui/test/golden/radio/zinc-light/label-disabled-checked.png and b/forui/test/golden/radio/zinc-light/label-disabled-checked.png differ
diff --git a/forui/test/golden/radio/zinc-light/label-disabled-error.png b/forui/test/golden/radio/zinc-light/label-disabled-error.png
index e21a7d3ee..ae1a9164b 100644
Binary files a/forui/test/golden/radio/zinc-light/label-disabled-error.png and b/forui/test/golden/radio/zinc-light/label-disabled-error.png differ
diff --git a/forui/test/golden/radio/zinc-light/label-disabled.png b/forui/test/golden/radio/zinc-light/label-disabled.png
index ba7ef7c6b..9ad2a4ade 100644
Binary files a/forui/test/golden/radio/zinc-light/label-disabled.png and b/forui/test/golden/radio/zinc-light/label-disabled.png differ
diff --git a/forui/test/golden/radio/zinc-light/label-enabled-checked-error.png b/forui/test/golden/radio/zinc-light/label-enabled-checked-error.png
index 79d903e69..8f03df337 100644
Binary files a/forui/test/golden/radio/zinc-light/label-enabled-checked-error.png and b/forui/test/golden/radio/zinc-light/label-enabled-checked-error.png differ
diff --git a/forui/test/golden/radio/zinc-light/label-enabled-checked.png b/forui/test/golden/radio/zinc-light/label-enabled-checked.png
index 77050fd23..4b1cf54cb 100644
Binary files a/forui/test/golden/radio/zinc-light/label-enabled-checked.png and b/forui/test/golden/radio/zinc-light/label-enabled-checked.png differ
diff --git a/forui/test/golden/radio/zinc-light/label-enabled-error.png b/forui/test/golden/radio/zinc-light/label-enabled-error.png
index e21a7d3ee..ae1a9164b 100644
Binary files a/forui/test/golden/radio/zinc-light/label-enabled-error.png and b/forui/test/golden/radio/zinc-light/label-enabled-error.png differ
diff --git a/forui/test/golden/radio/zinc-light/label-enabled.png b/forui/test/golden/radio/zinc-light/label-enabled.png
index 5dfa1cad1..c9fc771e5 100644
Binary files a/forui/test/golden/radio/zinc-light/label-enabled.png and b/forui/test/golden/radio/zinc-light/label-enabled.png differ
diff --git a/forui/test/golden/select-group/zinc-dark/checkbox-error.png b/forui/test/golden/select-group/zinc-dark/checkbox-error.png
index 3ef43bd34..30842eb32 100644
Binary files a/forui/test/golden/select-group/zinc-dark/checkbox-error.png and b/forui/test/golden/select-group/zinc-dark/checkbox-error.png differ
diff --git a/forui/test/golden/select-group/zinc-dark/checkbox.png b/forui/test/golden/select-group/zinc-dark/checkbox.png
index 893c927b6..089735091 100644
Binary files a/forui/test/golden/select-group/zinc-dark/checkbox.png and b/forui/test/golden/select-group/zinc-dark/checkbox.png differ
diff --git a/forui/test/golden/select-group/zinc-dark/radio-error.png b/forui/test/golden/select-group/zinc-dark/radio-error.png
index c6197b787..33cd61a24 100644
Binary files a/forui/test/golden/select-group/zinc-dark/radio-error.png and b/forui/test/golden/select-group/zinc-dark/radio-error.png differ
diff --git a/forui/test/golden/select-group/zinc-dark/radio.png b/forui/test/golden/select-group/zinc-dark/radio.png
index ee48b2a47..fc71f9525 100644
Binary files a/forui/test/golden/select-group/zinc-dark/radio.png and b/forui/test/golden/select-group/zinc-dark/radio.png differ
diff --git a/forui/test/golden/select-group/zinc-light/checkbox-error.png b/forui/test/golden/select-group/zinc-light/checkbox-error.png
index 6755f3e99..394fb8a40 100644
Binary files a/forui/test/golden/select-group/zinc-light/checkbox-error.png and b/forui/test/golden/select-group/zinc-light/checkbox-error.png differ
diff --git a/forui/test/golden/select-group/zinc-light/checkbox.png b/forui/test/golden/select-group/zinc-light/checkbox.png
index 02147e4a2..734db2c47 100644
Binary files a/forui/test/golden/select-group/zinc-light/checkbox.png and b/forui/test/golden/select-group/zinc-light/checkbox.png differ
diff --git a/forui/test/golden/select-group/zinc-light/radio-error.png b/forui/test/golden/select-group/zinc-light/radio-error.png
index 7d7abc4a9..8fdd46cbe 100644
Binary files a/forui/test/golden/select-group/zinc-light/radio-error.png and b/forui/test/golden/select-group/zinc-light/radio-error.png differ
diff --git a/forui/test/golden/select-group/zinc-light/radio.png b/forui/test/golden/select-group/zinc-light/radio.png
index ba07712da..ddbb26918 100644
Binary files a/forui/test/golden/select-group/zinc-light/radio.png and b/forui/test/golden/select-group/zinc-light/radio.png differ
diff --git a/forui/test/golden/select-menu-tile/builder/count-limited.png b/forui/test/golden/select-menu-tile/builder/count-limited.png
index 1f636c733..f732505eb 100644
Binary files a/forui/test/golden/select-menu-tile/builder/count-limited.png and b/forui/test/golden/select-menu-tile/builder/count-limited.png differ
diff --git a/forui/test/golden/select-menu-tile/builder/lazy.png b/forui/test/golden/select-menu-tile/builder/lazy.png
index 0fbbb6de6..b3879e2a0 100644
Binary files a/forui/test/golden/select-menu-tile/builder/lazy.png and b/forui/test/golden/select-menu-tile/builder/lazy.png differ
diff --git a/forui/test/golden/select-menu-tile/builder/null-limited.png b/forui/test/golden/select-menu-tile/builder/null-limited.png
index 1f636c733..f732505eb 100644
Binary files a/forui/test/golden/select-menu-tile/builder/null-limited.png and b/forui/test/golden/select-menu-tile/builder/null-limited.png differ
diff --git a/forui/test/golden/select-menu-tile/disabled-zinc-dark.png b/forui/test/golden/select-menu-tile/disabled-zinc-dark.png
index e79ea0255..49e53b5a2 100644
Binary files a/forui/test/golden/select-menu-tile/disabled-zinc-dark.png and b/forui/test/golden/select-menu-tile/disabled-zinc-dark.png differ
diff --git a/forui/test/golden/select-menu-tile/disabled-zinc-light.png b/forui/test/golden/select-menu-tile/disabled-zinc-light.png
index 564682be0..5902c6a4b 100644
Binary files a/forui/test/golden/select-menu-tile/disabled-zinc-light.png and b/forui/test/golden/select-menu-tile/disabled-zinc-light.png differ
diff --git a/forui/test/golden/select-menu-tile/enabled-hidden-zinc-dark.png b/forui/test/golden/select-menu-tile/enabled-hidden-zinc-dark.png
index 74f9e946f..15792bae2 100644
Binary files a/forui/test/golden/select-menu-tile/enabled-hidden-zinc-dark.png and b/forui/test/golden/select-menu-tile/enabled-hidden-zinc-dark.png differ
diff --git a/forui/test/golden/select-menu-tile/enabled-hidden-zinc-light.png b/forui/test/golden/select-menu-tile/enabled-hidden-zinc-light.png
index 0672c38f6..52bd0f70c 100644
Binary files a/forui/test/golden/select-menu-tile/enabled-hidden-zinc-light.png and b/forui/test/golden/select-menu-tile/enabled-hidden-zinc-light.png differ
diff --git a/forui/test/golden/select-menu-tile/enabled-shown-zinc-dark.png b/forui/test/golden/select-menu-tile/enabled-shown-zinc-dark.png
index 6634ae08c..5d85b1860 100644
Binary files a/forui/test/golden/select-menu-tile/enabled-shown-zinc-dark.png and b/forui/test/golden/select-menu-tile/enabled-shown-zinc-dark.png differ
diff --git a/forui/test/golden/select-menu-tile/enabled-shown-zinc-light.png b/forui/test/golden/select-menu-tile/enabled-shown-zinc-light.png
index 6d0a97ee1..8054da924 100644
Binary files a/forui/test/golden/select-menu-tile/enabled-shown-zinc-light.png and b/forui/test/golden/select-menu-tile/enabled-shown-zinc-light.png differ
diff --git a/forui/test/golden/select-menu-tile/error-zinc-dark.png b/forui/test/golden/select-menu-tile/error-zinc-dark.png
index 64c021b49..4df705f46 100644
Binary files a/forui/test/golden/select-menu-tile/error-zinc-dark.png and b/forui/test/golden/select-menu-tile/error-zinc-dark.png differ
diff --git a/forui/test/golden/select-menu-tile/error-zinc-light.png b/forui/test/golden/select-menu-tile/error-zinc-light.png
index 88db8f139..afb84a04d 100644
Binary files a/forui/test/golden/select-menu-tile/error-zinc-light.png and b/forui/test/golden/select-menu-tile/error-zinc-light.png differ
diff --git a/forui/test/golden/select-menu-tile/zinc-dark/scrollable.png b/forui/test/golden/select-menu-tile/zinc-dark/scrollable.png
index 519e49ecb..e225fda4a 100644
Binary files a/forui/test/golden/select-menu-tile/zinc-dark/scrollable.png and b/forui/test/golden/select-menu-tile/zinc-dark/scrollable.png differ
diff --git a/forui/test/golden/select-menu-tile/zinc-light/scrollable.png b/forui/test/golden/select-menu-tile/zinc-light/scrollable.png
index 498d61db2..8ff619377 100644
Binary files a/forui/test/golden/select-menu-tile/zinc-light/scrollable.png and b/forui/test/golden/select-menu-tile/zinc-light/scrollable.png differ
diff --git a/forui/test/golden/select-tile-group/group/builder/count-limited.png b/forui/test/golden/select-tile-group/group/builder/count-limited.png
index 351749e68..3398e763c 100644
Binary files a/forui/test/golden/select-tile-group/group/builder/count-limited.png and b/forui/test/golden/select-tile-group/group/builder/count-limited.png differ
diff --git a/forui/test/golden/select-tile-group/group/builder/lazy.png b/forui/test/golden/select-tile-group/group/builder/lazy.png
index 83afe5b14..da25ac7e3 100644
Binary files a/forui/test/golden/select-tile-group/group/builder/lazy.png and b/forui/test/golden/select-tile-group/group/builder/lazy.png differ
diff --git a/forui/test/golden/select-tile-group/group/builder/null-limited.png b/forui/test/golden/select-tile-group/group/builder/null-limited.png
index 351749e68..3398e763c 100644
Binary files a/forui/test/golden/select-tile-group/group/builder/null-limited.png and b/forui/test/golden/select-tile-group/group/builder/null-limited.png differ
diff --git a/forui/test/golden/select-tile-group/group/override-state.png b/forui/test/golden/select-tile-group/group/override-state.png
index 675e80a84..578531941 100644
Binary files a/forui/test/golden/select-tile-group/group/override-state.png and b/forui/test/golden/select-tile-group/group/override-state.png differ
diff --git a/forui/test/golden/select-tile-group/group/override-style.png b/forui/test/golden/select-tile-group/group/override-style.png
index 8a4428e59..7ac65cde4 100644
Binary files a/forui/test/golden/select-tile-group/group/override-style.png and b/forui/test/golden/select-tile-group/group/override-style.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.full-bottom.png b/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.full-bottom.png
index 8b6d00bdb..fb0e8a67f 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.full-bottom.png and b/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.full-bottom.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.full-top.png b/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.full-top.png
index 1b048b347..5373c3083 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.full-top.png and b/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.full-top.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.indented-bottom.png b/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.indented-bottom.png
index 98360c15c..8947e5f68 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.indented-bottom.png and b/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.indented-bottom.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.indented-top.png b/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.indented-top.png
index 4e0a73a25..58fdcec11 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.indented-top.png and b/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.indented-top.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.none-bottom.png b/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.none-bottom.png
index 42302af03..bcb1c12d7 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.none-bottom.png and b/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.none-bottom.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.none-top.png b/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.none-top.png
index 8561ba333..05b3a9f94 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.none-top.png and b/forui/test/golden/select-tile-group/group/zinc-dark/disabled/FTileDivider.none-top.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/enabled/FTileDivider.full.png b/forui/test/golden/select-tile-group/group/zinc-dark/enabled/FTileDivider.full.png
index 6faa3752f..40b0594b0 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/enabled/FTileDivider.full.png and b/forui/test/golden/select-tile-group/group/zinc-dark/enabled/FTileDivider.full.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/enabled/FTileDivider.indented.png b/forui/test/golden/select-tile-group/group/zinc-dark/enabled/FTileDivider.indented.png
index 11f22159b..8fab4a8aa 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/enabled/FTileDivider.indented.png and b/forui/test/golden/select-tile-group/group/zinc-dark/enabled/FTileDivider.indented.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/enabled/FTileDivider.none.png b/forui/test/golden/select-tile-group/group/zinc-dark/enabled/FTileDivider.none.png
index 3cf569d8d..05bfb130b 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/enabled/FTileDivider.none.png and b/forui/test/golden/select-tile-group/group/zinc-dark/enabled/FTileDivider.none.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/error.png b/forui/test/golden/select-tile-group/group/zinc-dark/error.png
index 23521e52b..18f2a7e22 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/error.png and b/forui/test/golden/select-tile-group/group/zinc-dark/error.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.full-bottom.png b/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.full-bottom.png
index a0eb14178..7a21defb8 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.full-bottom.png and b/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.full-bottom.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.full-top.png b/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.full-top.png
index 554ff0fd4..98ab97135 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.full-top.png and b/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.full-top.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.indented-bottom.png b/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.indented-bottom.png
index 4c7937f95..4c134d04f 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.indented-bottom.png and b/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.indented-bottom.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.indented-top.png b/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.indented-top.png
index 554ff0fd4..98ab97135 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.indented-top.png and b/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.indented-top.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.none-bottom.png b/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.none-bottom.png
index 2bc63059b..f477493b8 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.none-bottom.png and b/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.none-bottom.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.none-top.png b/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.none-top.png
index 554ff0fd4..98ab97135 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.none-top.png and b/forui/test/golden/select-tile-group/group/zinc-dark/hovered/FTileDivider.none-top.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/scrollable/FTileDivider.full.png b/forui/test/golden/select-tile-group/group/zinc-dark/scrollable/FTileDivider.full.png
index 18b6bdb4c..c3bdfe7da 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/scrollable/FTileDivider.full.png and b/forui/test/golden/select-tile-group/group/zinc-dark/scrollable/FTileDivider.full.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/scrollable/FTileDivider.indented.png b/forui/test/golden/select-tile-group/group/zinc-dark/scrollable/FTileDivider.indented.png
index 9627e0d33..178c5278d 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/scrollable/FTileDivider.indented.png and b/forui/test/golden/select-tile-group/group/zinc-dark/scrollable/FTileDivider.indented.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/scrollable/FTileDivider.none.png b/forui/test/golden/select-tile-group/group/zinc-dark/scrollable/FTileDivider.none.png
index 6fae862b6..6e0dac668 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/scrollable/FTileDivider.none.png and b/forui/test/golden/select-tile-group/group/zinc-dark/scrollable/FTileDivider.none.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-dark/single.png b/forui/test/golden/select-tile-group/group/zinc-dark/single.png
index 2032cdead..a00771443 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-dark/single.png and b/forui/test/golden/select-tile-group/group/zinc-dark/single.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.full-bottom.png b/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.full-bottom.png
index f6ea1df5a..3e4906ee1 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.full-bottom.png and b/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.full-bottom.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.full-top.png b/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.full-top.png
index fca1f702b..74a34ad86 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.full-top.png and b/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.full-top.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.indented-bottom.png b/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.indented-bottom.png
index f869f4402..6db35d054 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.indented-bottom.png and b/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.indented-bottom.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.indented-top.png b/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.indented-top.png
index b9140e649..10e22369e 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.indented-top.png and b/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.indented-top.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.none-bottom.png b/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.none-bottom.png
index 7200c0e8c..d11feb87f 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.none-bottom.png and b/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.none-bottom.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.none-top.png b/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.none-top.png
index 2a5713c4e..b4d919d7a 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.none-top.png and b/forui/test/golden/select-tile-group/group/zinc-light/disabled/FTileDivider.none-top.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/enabled/FTileDivider.full.png b/forui/test/golden/select-tile-group/group/zinc-light/enabled/FTileDivider.full.png
index f456c1ff1..b3b522e96 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/enabled/FTileDivider.full.png and b/forui/test/golden/select-tile-group/group/zinc-light/enabled/FTileDivider.full.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/enabled/FTileDivider.indented.png b/forui/test/golden/select-tile-group/group/zinc-light/enabled/FTileDivider.indented.png
index 426ab8f1e..0e337e11f 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/enabled/FTileDivider.indented.png and b/forui/test/golden/select-tile-group/group/zinc-light/enabled/FTileDivider.indented.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/enabled/FTileDivider.none.png b/forui/test/golden/select-tile-group/group/zinc-light/enabled/FTileDivider.none.png
index 887591118..17ea66768 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/enabled/FTileDivider.none.png and b/forui/test/golden/select-tile-group/group/zinc-light/enabled/FTileDivider.none.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/error.png b/forui/test/golden/select-tile-group/group/zinc-light/error.png
index d250ffbbe..5b5ac1267 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/error.png and b/forui/test/golden/select-tile-group/group/zinc-light/error.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.full-bottom.png b/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.full-bottom.png
index a7227f3c6..2087980cf 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.full-bottom.png and b/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.full-bottom.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.full-top.png b/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.full-top.png
index 0739c2496..f709a7b79 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.full-top.png and b/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.full-top.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.indented-bottom.png b/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.indented-bottom.png
index 7f77f05f1..da7e2dc8f 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.indented-bottom.png and b/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.indented-bottom.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.indented-top.png b/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.indented-top.png
index 0a4475f58..fce6cc4c0 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.indented-top.png and b/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.indented-top.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.none-bottom.png b/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.none-bottom.png
index e758f6469..f13707353 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.none-bottom.png and b/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.none-bottom.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.none-top.png b/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.none-top.png
index 35a289731..e884bc3ec 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.none-top.png and b/forui/test/golden/select-tile-group/group/zinc-light/hovered/FTileDivider.none-top.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/scrollable/FTileDivider.full.png b/forui/test/golden/select-tile-group/group/zinc-light/scrollable/FTileDivider.full.png
index 69079d5f3..78f8714d1 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/scrollable/FTileDivider.full.png and b/forui/test/golden/select-tile-group/group/zinc-light/scrollable/FTileDivider.full.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/scrollable/FTileDivider.indented.png b/forui/test/golden/select-tile-group/group/zinc-light/scrollable/FTileDivider.indented.png
index 371aa4e9d..5fcea72c1 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/scrollable/FTileDivider.indented.png and b/forui/test/golden/select-tile-group/group/zinc-light/scrollable/FTileDivider.indented.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/scrollable/FTileDivider.none.png b/forui/test/golden/select-tile-group/group/zinc-light/scrollable/FTileDivider.none.png
index cb9ebcd77..66b4e9117 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/scrollable/FTileDivider.none.png and b/forui/test/golden/select-tile-group/group/zinc-light/scrollable/FTileDivider.none.png differ
diff --git a/forui/test/golden/select-tile-group/group/zinc-light/single.png b/forui/test/golden/select-tile-group/group/zinc-light/single.png
index d8a242249..eaf7af486 100644
Binary files a/forui/test/golden/select-tile-group/group/zinc-light/single.png and b/forui/test/golden/select-tile-group/group/zinc-light/single.png differ
diff --git a/forui/test/golden/select-tile-group/tile/checked-zinc-dark.png b/forui/test/golden/select-tile-group/tile/checked-zinc-dark.png
index ebe4c15af..f1c55fe85 100644
Binary files a/forui/test/golden/select-tile-group/tile/checked-zinc-dark.png and b/forui/test/golden/select-tile-group/tile/checked-zinc-dark.png differ
diff --git a/forui/test/golden/select-tile-group/tile/checked-zinc-light.png b/forui/test/golden/select-tile-group/tile/checked-zinc-light.png
index 1441cb7f5..849f32be2 100644
Binary files a/forui/test/golden/select-tile-group/tile/checked-zinc-light.png and b/forui/test/golden/select-tile-group/tile/checked-zinc-light.png differ
diff --git a/forui/test/golden/select-tile-group/tile/disabled-zinc-dark.png b/forui/test/golden/select-tile-group/tile/disabled-zinc-dark.png
index 1b9a17ada..d5a9f19a2 100644
Binary files a/forui/test/golden/select-tile-group/tile/disabled-zinc-dark.png and b/forui/test/golden/select-tile-group/tile/disabled-zinc-dark.png differ
diff --git a/forui/test/golden/select-tile-group/tile/disabled-zinc-light.png b/forui/test/golden/select-tile-group/tile/disabled-zinc-light.png
index 77b986020..c235446a2 100644
Binary files a/forui/test/golden/select-tile-group/tile/disabled-zinc-light.png and b/forui/test/golden/select-tile-group/tile/disabled-zinc-light.png differ
diff --git a/forui/test/golden/select-tile-group/tile/enabled-zinc-dark.png b/forui/test/golden/select-tile-group/tile/enabled-zinc-dark.png
index 75b74803c..bb560331d 100644
Binary files a/forui/test/golden/select-tile-group/tile/enabled-zinc-dark.png and b/forui/test/golden/select-tile-group/tile/enabled-zinc-dark.png differ
diff --git a/forui/test/golden/select-tile-group/tile/enabled-zinc-light.png b/forui/test/golden/select-tile-group/tile/enabled-zinc-light.png
index 345f8497d..64c05f496 100644
Binary files a/forui/test/golden/select-tile-group/tile/enabled-zinc-light.png and b/forui/test/golden/select-tile-group/tile/enabled-zinc-light.png differ
diff --git a/forui/test/golden/select-tile-group/tile/hovered-zinc-dark.png b/forui/test/golden/select-tile-group/tile/hovered-zinc-dark.png
index 8b0064180..f9fd1a9af 100644
Binary files a/forui/test/golden/select-tile-group/tile/hovered-zinc-dark.png and b/forui/test/golden/select-tile-group/tile/hovered-zinc-dark.png differ
diff --git a/forui/test/golden/select-tile-group/tile/hovered-zinc-light.png b/forui/test/golden/select-tile-group/tile/hovered-zinc-light.png
index 836b0730a..4cef1547d 100644
Binary files a/forui/test/golden/select-tile-group/tile/hovered-zinc-light.png and b/forui/test/golden/select-tile-group/tile/hovered-zinc-light.png differ
diff --git a/forui/test/golden/select-tile-group/tile/suffix-checked-zinc-dark.png b/forui/test/golden/select-tile-group/tile/suffix-checked-zinc-dark.png
index 5ba97001c..b448e5650 100644
Binary files a/forui/test/golden/select-tile-group/tile/suffix-checked-zinc-dark.png and b/forui/test/golden/select-tile-group/tile/suffix-checked-zinc-dark.png differ
diff --git a/forui/test/golden/select-tile-group/tile/suffix-checked-zinc-light.png b/forui/test/golden/select-tile-group/tile/suffix-checked-zinc-light.png
index ceb914afb..85fa1057a 100644
Binary files a/forui/test/golden/select-tile-group/tile/suffix-checked-zinc-light.png and b/forui/test/golden/select-tile-group/tile/suffix-checked-zinc-light.png differ
diff --git a/forui/test/golden/select-tile-group/tile/suffix-unchecked-zinc-dark.png b/forui/test/golden/select-tile-group/tile/suffix-unchecked-zinc-dark.png
index 67a20ac2b..358d79dde 100644
Binary files a/forui/test/golden/select-tile-group/tile/suffix-unchecked-zinc-dark.png and b/forui/test/golden/select-tile-group/tile/suffix-unchecked-zinc-dark.png differ
diff --git a/forui/test/golden/select-tile-group/tile/suffix-unchecked-zinc-light.png b/forui/test/golden/select-tile-group/tile/suffix-unchecked-zinc-light.png
index b7c0fc0db..31e71ed1e 100644
Binary files a/forui/test/golden/select-tile-group/tile/suffix-unchecked-zinc-light.png and b/forui/test/golden/select-tile-group/tile/suffix-unchecked-zinc-light.png differ
diff --git a/forui/test/golden/slider/interweaving-marks.png b/forui/test/golden/slider/interweaving-marks.png
index 91e42d3e6..5e5ad78f8 100644
Binary files a/forui/test/golden/slider/interweaving-marks.png and b/forui/test/golden/slider/interweaving-marks.png differ
diff --git a/forui/test/golden/slider/label-offset/Layout.btt-asymmetric.png b/forui/test/golden/slider/label-offset/Layout.btt-asymmetric.png
index 9383efdd5..0264212fe 100644
Binary files a/forui/test/golden/slider/label-offset/Layout.btt-asymmetric.png and b/forui/test/golden/slider/label-offset/Layout.btt-asymmetric.png differ
diff --git a/forui/test/golden/slider/label-offset/Layout.btt-labelled.png b/forui/test/golden/slider/label-offset/Layout.btt-labelled.png
index f808808b2..6113c0765 100644
Binary files a/forui/test/golden/slider/label-offset/Layout.btt-labelled.png and b/forui/test/golden/slider/label-offset/Layout.btt-labelled.png differ
diff --git a/forui/test/golden/slider/label-offset/Layout.btt-symmetric.png b/forui/test/golden/slider/label-offset/Layout.btt-symmetric.png
index c4f448f41..fb0af29b7 100644
Binary files a/forui/test/golden/slider/label-offset/Layout.btt-symmetric.png and b/forui/test/golden/slider/label-offset/Layout.btt-symmetric.png differ
diff --git a/forui/test/golden/slider/label-offset/Layout.ltr-asymmetric.png b/forui/test/golden/slider/label-offset/Layout.ltr-asymmetric.png
index 7b07e80d2..c3e918b1c 100644
Binary files a/forui/test/golden/slider/label-offset/Layout.ltr-asymmetric.png and b/forui/test/golden/slider/label-offset/Layout.ltr-asymmetric.png differ
diff --git a/forui/test/golden/slider/label-offset/Layout.ltr-labelled.png b/forui/test/golden/slider/label-offset/Layout.ltr-labelled.png
index f3071ec80..14bca4f0c 100644
Binary files a/forui/test/golden/slider/label-offset/Layout.ltr-labelled.png and b/forui/test/golden/slider/label-offset/Layout.ltr-labelled.png differ
diff --git a/forui/test/golden/slider/label-offset/Layout.ltr-symmetric.png b/forui/test/golden/slider/label-offset/Layout.ltr-symmetric.png
index 0255dc73f..5916ee26d 100644
Binary files a/forui/test/golden/slider/label-offset/Layout.ltr-symmetric.png and b/forui/test/golden/slider/label-offset/Layout.ltr-symmetric.png differ
diff --git a/forui/test/golden/slider/label-offset/Layout.rtl-asymmetric.png b/forui/test/golden/slider/label-offset/Layout.rtl-asymmetric.png
index 3824ab026..3fd307d3d 100644
Binary files a/forui/test/golden/slider/label-offset/Layout.rtl-asymmetric.png and b/forui/test/golden/slider/label-offset/Layout.rtl-asymmetric.png differ
diff --git a/forui/test/golden/slider/label-offset/Layout.rtl-labelled.png b/forui/test/golden/slider/label-offset/Layout.rtl-labelled.png
index de0f953e2..bba64a2c5 100644
Binary files a/forui/test/golden/slider/label-offset/Layout.rtl-labelled.png and b/forui/test/golden/slider/label-offset/Layout.rtl-labelled.png differ
diff --git a/forui/test/golden/slider/label-offset/Layout.rtl-symmetric.png b/forui/test/golden/slider/label-offset/Layout.rtl-symmetric.png
index e41ef1684..fd64a0194 100644
Binary files a/forui/test/golden/slider/label-offset/Layout.rtl-symmetric.png and b/forui/test/golden/slider/label-offset/Layout.rtl-symmetric.png differ
diff --git a/forui/test/golden/slider/label-offset/Layout.ttb-asymmetric.png b/forui/test/golden/slider/label-offset/Layout.ttb-asymmetric.png
index 3aef69ad5..e04d1ada4 100644
Binary files a/forui/test/golden/slider/label-offset/Layout.ttb-asymmetric.png and b/forui/test/golden/slider/label-offset/Layout.ttb-asymmetric.png differ
diff --git a/forui/test/golden/slider/label-offset/Layout.ttb-labelled.png b/forui/test/golden/slider/label-offset/Layout.ttb-labelled.png
index fa53b24a8..a69f5b2d0 100644
Binary files a/forui/test/golden/slider/label-offset/Layout.ttb-labelled.png and b/forui/test/golden/slider/label-offset/Layout.ttb-labelled.png differ
diff --git a/forui/test/golden/slider/label-offset/Layout.ttb-symmetric.png b/forui/test/golden/slider/label-offset/Layout.ttb-symmetric.png
index 77cd8c524..d5a0a56a1 100644
Binary files a/forui/test/golden/slider/label-offset/Layout.ttb-symmetric.png and b/forui/test/golden/slider/label-offset/Layout.ttb-symmetric.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-disabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-disabled.png
index eee14b74b..d13bbd344 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-disabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-enabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-enabled.png
index 10f81f3eb..0ea4061a3 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-enabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-error.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-error.png
index a15abc49c..5ee2488c9 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-error.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-focused.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-focused.png
index d4c9b180b..9f2f34eb9 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-focused.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-desktop-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-disabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-disabled.png
index c28c2470c..79ba02c03 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-disabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-enabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-enabled.png
index 7a243bf44..40fe97c35 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-enabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-error.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-error.png
index b8a6c8309..333f304fc 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-error.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-focused.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-focused.png
index 0ada19374..7b75f79e4 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-focused.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.btt-touch-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-disabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-disabled.png
index c76722fef..e864438f6 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-disabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-enabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-enabled.png
index 5e163fac2..be52c0069 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-enabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-error.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-error.png
index e7cf6aa03..dbf73c255 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-error.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-focused.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-focused.png
index 49b4e1275..12003a22d 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-focused.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-desktop-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-disabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-disabled.png
index 6e79a2945..feeeb61be 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-disabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-enabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-enabled.png
index af23f6ec1..4d33184e6 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-enabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-error.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-error.png
index e63b3aa0f..8597c7622 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-error.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-focused.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-focused.png
index 034b63270..22ad044ad 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-focused.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ltr-touch-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-disabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-disabled.png
index f47e8e3d0..be87d8beb 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-disabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-enabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-enabled.png
index 54edcf67e..6dcc6d0db 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-enabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-error.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-error.png
index f93e51702..66b88cddd 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-error.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-focused.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-focused.png
index d53f30206..8ab558dc1 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-focused.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-desktop-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-disabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-disabled.png
index 40417fe2e..f2bf15736 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-disabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-enabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-enabled.png
index 92b5963b6..54a817cb4 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-enabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-error.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-error.png
index f47b7e739..7362e8967 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-error.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-focused.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-focused.png
index 462eafd9c..75b7e10fb 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-focused.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.rtl-touch-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-disabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-disabled.png
index d61487d9c..6851d3e61 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-disabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-enabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-enabled.png
index ba5a5333a..07e56c10b 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-enabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-error.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-error.png
index ebb0b6e5a..9d8d3824a 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-error.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-focused.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-focused.png
index 922323ee0..9a61a83b5 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-focused.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-desktop-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-disabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-disabled.png
index 8341b0cb8..950545ff9 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-disabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-enabled.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-enabled.png
index 88924610f..04c23ca88 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-enabled.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-error.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-error.png
index 1a4830ba4..c02d69c63 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-error.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-focused.png b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-focused.png
index 235b13102..b85fce7a5 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-focused.png and b/forui/test/golden/slider/range-slider/zinc-dark/Layout.ttb-touch-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-disabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-disabled.png
index 9c4c105d9..9b9068724 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-disabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-enabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-enabled.png
index 3163a97b4..8d2dc020a 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-enabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-error.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-error.png
index 28be3f1fb..c742da940 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-error.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-focused.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-focused.png
index c4daae1dc..7492d60d2 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-focused.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-desktop-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-disabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-disabled.png
index 562499b8d..ff68d66cf 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-disabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-enabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-enabled.png
index a956b5324..bcce34275 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-enabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-error.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-error.png
index 7fa1be9a8..dc65400b9 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-error.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-focused.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-focused.png
index e20f478cd..947358e80 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-focused.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.btt-touch-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-disabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-disabled.png
index ebc550d03..b1ae11739 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-disabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-enabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-enabled.png
index 65260a7b8..8539d05e9 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-enabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-error.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-error.png
index 4517bec15..015611635 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-error.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-focused.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-focused.png
index 18ed4b9e0..aa73db818 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-focused.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-desktop-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-disabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-disabled.png
index 0abeb7bbc..b1f12961c 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-disabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-enabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-enabled.png
index 5decb4c91..9f92c8986 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-enabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-error.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-error.png
index d0dfe559d..3944e9251 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-error.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-focused.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-focused.png
index 525c246cc..da597f76b 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-focused.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ltr-touch-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-disabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-disabled.png
index 8e523fcb2..be95e1845 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-disabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-enabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-enabled.png
index a76519ccc..6faec6582 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-enabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-error.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-error.png
index 61c0eb4de..b9ff63ef8 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-error.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-focused.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-focused.png
index 470f715ab..8fe420785 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-focused.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-desktop-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-disabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-disabled.png
index bd991c17e..9e5375203 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-disabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-enabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-enabled.png
index c8b292f2a..32bdccaca 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-enabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-error.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-error.png
index a4331a775..90f379940 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-error.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-focused.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-focused.png
index 00157681e..2908f84d9 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-focused.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.rtl-touch-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-disabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-disabled.png
index ac5a7a273..ea490d347 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-disabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-enabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-enabled.png
index 33c94cc49..a1f60648b 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-enabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-error.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-error.png
index 46e1e3896..8410e4629 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-error.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-focused.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-focused.png
index 301b435fe..36d038c3b 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-focused.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-desktop-focused.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-disabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-disabled.png
index ccb2517c7..342a5d0b8 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-disabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-disabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-enabled.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-enabled.png
index 59e5b1c6c..cdfc31345 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-enabled.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-enabled.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-error.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-error.png
index 471326c72..8ab8db63c 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-error.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-error.png differ
diff --git a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-focused.png b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-focused.png
index a2e6edbd9..15dd9b623 100644
Binary files a/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-focused.png and b/forui/test/golden/slider/range-slider/zinc-light/Layout.ttb-touch-focused.png differ
diff --git a/forui/test/golden/slider/value-slider/Layout.btt-max.png b/forui/test/golden/slider/value-slider/Layout.btt-max.png
index dce2a4c0f..0028b2f6a 100644
Binary files a/forui/test/golden/slider/value-slider/Layout.btt-max.png and b/forui/test/golden/slider/value-slider/Layout.btt-max.png differ
diff --git a/forui/test/golden/slider/value-slider/Layout.btt-min.png b/forui/test/golden/slider/value-slider/Layout.btt-min.png
index 255d263b6..77c76219a 100644
Binary files a/forui/test/golden/slider/value-slider/Layout.btt-min.png and b/forui/test/golden/slider/value-slider/Layout.btt-min.png differ
diff --git a/forui/test/golden/slider/value-slider/Layout.ltr-max.png b/forui/test/golden/slider/value-slider/Layout.ltr-max.png
index 54a85bbfc..b0c800c45 100644
Binary files a/forui/test/golden/slider/value-slider/Layout.ltr-max.png and b/forui/test/golden/slider/value-slider/Layout.ltr-max.png differ
diff --git a/forui/test/golden/slider/value-slider/Layout.ltr-min.png b/forui/test/golden/slider/value-slider/Layout.ltr-min.png
index 6ced70a5a..7f28a5d79 100644
Binary files a/forui/test/golden/slider/value-slider/Layout.ltr-min.png and b/forui/test/golden/slider/value-slider/Layout.ltr-min.png differ
diff --git a/forui/test/golden/slider/value-slider/Layout.rtl-max.png b/forui/test/golden/slider/value-slider/Layout.rtl-max.png
index 584cafab6..43eacd967 100644
Binary files a/forui/test/golden/slider/value-slider/Layout.rtl-max.png and b/forui/test/golden/slider/value-slider/Layout.rtl-max.png differ
diff --git a/forui/test/golden/slider/value-slider/Layout.rtl-min.png b/forui/test/golden/slider/value-slider/Layout.rtl-min.png
index 89a6ab003..c0495de86 100644
Binary files a/forui/test/golden/slider/value-slider/Layout.rtl-min.png and b/forui/test/golden/slider/value-slider/Layout.rtl-min.png differ
diff --git a/forui/test/golden/slider/value-slider/Layout.ttb-max.png b/forui/test/golden/slider/value-slider/Layout.ttb-max.png
index 75213dd79..99d569634 100644
Binary files a/forui/test/golden/slider/value-slider/Layout.ttb-max.png and b/forui/test/golden/slider/value-slider/Layout.ttb-max.png differ
diff --git a/forui/test/golden/slider/value-slider/Layout.ttb-min.png b/forui/test/golden/slider/value-slider/Layout.ttb-min.png
index d6fda040d..abb37b30f 100644
Binary files a/forui/test/golden/slider/value-slider/Layout.ttb-min.png and b/forui/test/golden/slider/value-slider/Layout.ttb-min.png differ
diff --git a/forui/test/golden/switch/zinc-dark/checked-disabled.png b/forui/test/golden/switch/zinc-dark/checked-disabled.png
index 5036700be..c4b044712 100644
Binary files a/forui/test/golden/switch/zinc-dark/checked-disabled.png and b/forui/test/golden/switch/zinc-dark/checked-disabled.png differ
diff --git a/forui/test/golden/switch/zinc-dark/unchecked-disabled.png b/forui/test/golden/switch/zinc-dark/unchecked-disabled.png
index 3cb872f26..fe6e39e09 100644
Binary files a/forui/test/golden/switch/zinc-dark/unchecked-disabled.png and b/forui/test/golden/switch/zinc-dark/unchecked-disabled.png differ
diff --git a/forui/test/golden/switch/zinc-light/checked-disabled.png b/forui/test/golden/switch/zinc-light/checked-disabled.png
index 7f6de8876..e5cb765d5 100644
Binary files a/forui/test/golden/switch/zinc-light/checked-disabled.png and b/forui/test/golden/switch/zinc-light/checked-disabled.png differ
diff --git a/forui/test/golden/switch/zinc-light/unchecked-disabled.png b/forui/test/golden/switch/zinc-light/unchecked-disabled.png
index 46c22ed33..17e600ef0 100644
Binary files a/forui/test/golden/switch/zinc-light/unchecked-disabled.png and b/forui/test/golden/switch/zinc-light/unchecked-disabled.png differ
diff --git a/forui/test/golden/tabs/zinc-dark-focused.png b/forui/test/golden/tabs/zinc-dark-focused.png
index 7aa70444c..bc304dc22 100644
Binary files a/forui/test/golden/tabs/zinc-dark-focused.png and b/forui/test/golden/tabs/zinc-dark-focused.png differ
diff --git a/forui/test/golden/tabs/zinc-dark.png b/forui/test/golden/tabs/zinc-dark.png
index 265365375..240c263f8 100644
Binary files a/forui/test/golden/tabs/zinc-dark.png and b/forui/test/golden/tabs/zinc-dark.png differ
diff --git a/forui/test/golden/tabs/zinc-light-focused.png b/forui/test/golden/tabs/zinc-light-focused.png
index 87996614d..dbf4f0f1c 100644
Binary files a/forui/test/golden/tabs/zinc-light-focused.png and b/forui/test/golden/tabs/zinc-light-focused.png differ
diff --git a/forui/test/golden/tabs/zinc-light.png b/forui/test/golden/tabs/zinc-light.png
index ffe45eeec..d47a443dd 100644
Binary files a/forui/test/golden/tabs/zinc-light.png and b/forui/test/golden/tabs/zinc-light.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/default-focused-no-text.png b/forui/test/golden/text-field/zinc-dark/default-focused-no-text.png
index 8eb331fed..b48532c6a 100644
Binary files a/forui/test/golden/text-field/zinc-dark/default-focused-no-text.png and b/forui/test/golden/text-field/zinc-dark/default-focused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/default-focused.png b/forui/test/golden/text-field/zinc-dark/default-focused.png
index 04e1b1291..135a69fbd 100644
Binary files a/forui/test/golden/text-field/zinc-dark/default-focused.png and b/forui/test/golden/text-field/zinc-dark/default-focused.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/default-unfocused-no-text.png b/forui/test/golden/text-field/zinc-dark/default-unfocused-no-text.png
index 552abe5be..0cf11da83 100644
Binary files a/forui/test/golden/text-field/zinc-dark/default-unfocused-no-text.png and b/forui/test/golden/text-field/zinc-dark/default-unfocused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/default-unfocused.png b/forui/test/golden/text-field/zinc-dark/default-unfocused.png
index 40f08d33d..d90acc6ad 100644
Binary files a/forui/test/golden/text-field/zinc-dark/default-unfocused.png and b/forui/test/golden/text-field/zinc-dark/default-unfocused.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/email-focused-no-text.png b/forui/test/golden/text-field/zinc-dark/email-focused-no-text.png
index a2cb54310..1873898f2 100644
Binary files a/forui/test/golden/text-field/zinc-dark/email-focused-no-text.png and b/forui/test/golden/text-field/zinc-dark/email-focused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/email-focused.png b/forui/test/golden/text-field/zinc-dark/email-focused.png
index 10b51356b..9d5fa718b 100644
Binary files a/forui/test/golden/text-field/zinc-dark/email-focused.png and b/forui/test/golden/text-field/zinc-dark/email-focused.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/email-unfocused-no-text.png b/forui/test/golden/text-field/zinc-dark/email-unfocused-no-text.png
index d758a642a..acb20ced9 100644
Binary files a/forui/test/golden/text-field/zinc-dark/email-unfocused-no-text.png and b/forui/test/golden/text-field/zinc-dark/email-unfocused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/email-unfocused.png b/forui/test/golden/text-field/zinc-dark/email-unfocused.png
index 60c3c8d6d..33ab5afd2 100644
Binary files a/forui/test/golden/text-field/zinc-dark/email-unfocused.png and b/forui/test/golden/text-field/zinc-dark/email-unfocused.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/error-focused-no-text.png b/forui/test/golden/text-field/zinc-dark/error-focused-no-text.png
index 7c4c85cf1..8ce876592 100644
Binary files a/forui/test/golden/text-field/zinc-dark/error-focused-no-text.png and b/forui/test/golden/text-field/zinc-dark/error-focused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/error-focused.png b/forui/test/golden/text-field/zinc-dark/error-focused.png
index 9df8a43ea..603adcdbb 100644
Binary files a/forui/test/golden/text-field/zinc-dark/error-focused.png and b/forui/test/golden/text-field/zinc-dark/error-focused.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/error-unfocused-no-text.png b/forui/test/golden/text-field/zinc-dark/error-unfocused-no-text.png
index a6b3a300b..f843ab458 100644
Binary files a/forui/test/golden/text-field/zinc-dark/error-unfocused-no-text.png and b/forui/test/golden/text-field/zinc-dark/error-unfocused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/error-unfocused.png b/forui/test/golden/text-field/zinc-dark/error-unfocused.png
index 26b3470f9..37edf9470 100644
Binary files a/forui/test/golden/text-field/zinc-dark/error-unfocused.png and b/forui/test/golden/text-field/zinc-dark/error-unfocused.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/multiline-focused-no-text.png b/forui/test/golden/text-field/zinc-dark/multiline-focused-no-text.png
index ba7284336..ef5bea27a 100644
Binary files a/forui/test/golden/text-field/zinc-dark/multiline-focused-no-text.png and b/forui/test/golden/text-field/zinc-dark/multiline-focused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/multiline-focused.png b/forui/test/golden/text-field/zinc-dark/multiline-focused.png
index 91726e2dc..845622dc9 100644
Binary files a/forui/test/golden/text-field/zinc-dark/multiline-focused.png and b/forui/test/golden/text-field/zinc-dark/multiline-focused.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/multiline-unfocused-no-text.png b/forui/test/golden/text-field/zinc-dark/multiline-unfocused-no-text.png
index 9178c2b8d..3e4f49d64 100644
Binary files a/forui/test/golden/text-field/zinc-dark/multiline-unfocused-no-text.png and b/forui/test/golden/text-field/zinc-dark/multiline-unfocused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/multiline-unfocused.png b/forui/test/golden/text-field/zinc-dark/multiline-unfocused.png
index f9c2f840e..f1dd1d9f1 100644
Binary files a/forui/test/golden/text-field/zinc-dark/multiline-unfocused.png and b/forui/test/golden/text-field/zinc-dark/multiline-unfocused.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/password-focused-no-text.png b/forui/test/golden/text-field/zinc-dark/password-focused-no-text.png
index 726ed3c02..e17f7732a 100644
Binary files a/forui/test/golden/text-field/zinc-dark/password-focused-no-text.png and b/forui/test/golden/text-field/zinc-dark/password-focused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/password-focused.png b/forui/test/golden/text-field/zinc-dark/password-focused.png
index 36bb503c9..189f6ffd0 100644
Binary files a/forui/test/golden/text-field/zinc-dark/password-focused.png and b/forui/test/golden/text-field/zinc-dark/password-focused.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/password-unfocused-no-text.png b/forui/test/golden/text-field/zinc-dark/password-unfocused-no-text.png
index 20d20aff2..a1b383e9e 100644
Binary files a/forui/test/golden/text-field/zinc-dark/password-unfocused-no-text.png and b/forui/test/golden/text-field/zinc-dark/password-unfocused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-dark/password-unfocused.png b/forui/test/golden/text-field/zinc-dark/password-unfocused.png
index 543cbff72..62f663a27 100644
Binary files a/forui/test/golden/text-field/zinc-dark/password-unfocused.png and b/forui/test/golden/text-field/zinc-dark/password-unfocused.png differ
diff --git a/forui/test/golden/text-field/zinc-light/default-focused-no-text.png b/forui/test/golden/text-field/zinc-light/default-focused-no-text.png
index dad6ef97e..b7af96c84 100644
Binary files a/forui/test/golden/text-field/zinc-light/default-focused-no-text.png and b/forui/test/golden/text-field/zinc-light/default-focused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-light/default-focused.png b/forui/test/golden/text-field/zinc-light/default-focused.png
index a6d69092d..7c26f041f 100644
Binary files a/forui/test/golden/text-field/zinc-light/default-focused.png and b/forui/test/golden/text-field/zinc-light/default-focused.png differ
diff --git a/forui/test/golden/text-field/zinc-light/default-unfocused-no-text.png b/forui/test/golden/text-field/zinc-light/default-unfocused-no-text.png
index 1567f54b1..278344084 100644
Binary files a/forui/test/golden/text-field/zinc-light/default-unfocused-no-text.png and b/forui/test/golden/text-field/zinc-light/default-unfocused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-light/default-unfocused.png b/forui/test/golden/text-field/zinc-light/default-unfocused.png
index 3a8b78ca1..5683aad23 100644
Binary files a/forui/test/golden/text-field/zinc-light/default-unfocused.png and b/forui/test/golden/text-field/zinc-light/default-unfocused.png differ
diff --git a/forui/test/golden/text-field/zinc-light/email-focused-no-text.png b/forui/test/golden/text-field/zinc-light/email-focused-no-text.png
index fe2c7eb41..cc9d3a9c5 100644
Binary files a/forui/test/golden/text-field/zinc-light/email-focused-no-text.png and b/forui/test/golden/text-field/zinc-light/email-focused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-light/email-focused.png b/forui/test/golden/text-field/zinc-light/email-focused.png
index 20444260d..a24a16bc5 100644
Binary files a/forui/test/golden/text-field/zinc-light/email-focused.png and b/forui/test/golden/text-field/zinc-light/email-focused.png differ
diff --git a/forui/test/golden/text-field/zinc-light/email-unfocused-no-text.png b/forui/test/golden/text-field/zinc-light/email-unfocused-no-text.png
index f2daec2b0..df332c506 100644
Binary files a/forui/test/golden/text-field/zinc-light/email-unfocused-no-text.png and b/forui/test/golden/text-field/zinc-light/email-unfocused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-light/email-unfocused.png b/forui/test/golden/text-field/zinc-light/email-unfocused.png
index e96c9d5cf..70862f69c 100644
Binary files a/forui/test/golden/text-field/zinc-light/email-unfocused.png and b/forui/test/golden/text-field/zinc-light/email-unfocused.png differ
diff --git a/forui/test/golden/text-field/zinc-light/error-focused-no-text.png b/forui/test/golden/text-field/zinc-light/error-focused-no-text.png
index 2f70195c5..702297df7 100644
Binary files a/forui/test/golden/text-field/zinc-light/error-focused-no-text.png and b/forui/test/golden/text-field/zinc-light/error-focused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-light/error-focused.png b/forui/test/golden/text-field/zinc-light/error-focused.png
index 6e232f3f1..404db918c 100644
Binary files a/forui/test/golden/text-field/zinc-light/error-focused.png and b/forui/test/golden/text-field/zinc-light/error-focused.png differ
diff --git a/forui/test/golden/text-field/zinc-light/error-unfocused-no-text.png b/forui/test/golden/text-field/zinc-light/error-unfocused-no-text.png
index b29b99f7f..5bf703ba7 100644
Binary files a/forui/test/golden/text-field/zinc-light/error-unfocused-no-text.png and b/forui/test/golden/text-field/zinc-light/error-unfocused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-light/error-unfocused.png b/forui/test/golden/text-field/zinc-light/error-unfocused.png
index 06f493623..7221c329e 100644
Binary files a/forui/test/golden/text-field/zinc-light/error-unfocused.png and b/forui/test/golden/text-field/zinc-light/error-unfocused.png differ
diff --git a/forui/test/golden/text-field/zinc-light/multiline-focused-no-text.png b/forui/test/golden/text-field/zinc-light/multiline-focused-no-text.png
index fb8afdceb..7442697ff 100644
Binary files a/forui/test/golden/text-field/zinc-light/multiline-focused-no-text.png and b/forui/test/golden/text-field/zinc-light/multiline-focused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-light/multiline-focused.png b/forui/test/golden/text-field/zinc-light/multiline-focused.png
index 4d5860033..32a38c965 100644
Binary files a/forui/test/golden/text-field/zinc-light/multiline-focused.png and b/forui/test/golden/text-field/zinc-light/multiline-focused.png differ
diff --git a/forui/test/golden/text-field/zinc-light/multiline-unfocused-no-text.png b/forui/test/golden/text-field/zinc-light/multiline-unfocused-no-text.png
index 7e702ba98..5ee0a5386 100644
Binary files a/forui/test/golden/text-field/zinc-light/multiline-unfocused-no-text.png and b/forui/test/golden/text-field/zinc-light/multiline-unfocused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-light/multiline-unfocused.png b/forui/test/golden/text-field/zinc-light/multiline-unfocused.png
index d13409a65..1759ac985 100644
Binary files a/forui/test/golden/text-field/zinc-light/multiline-unfocused.png and b/forui/test/golden/text-field/zinc-light/multiline-unfocused.png differ
diff --git a/forui/test/golden/text-field/zinc-light/password-focused-no-text.png b/forui/test/golden/text-field/zinc-light/password-focused-no-text.png
index 9ea6377f1..b60b1463c 100644
Binary files a/forui/test/golden/text-field/zinc-light/password-focused-no-text.png and b/forui/test/golden/text-field/zinc-light/password-focused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-light/password-focused.png b/forui/test/golden/text-field/zinc-light/password-focused.png
index b5b606d93..6c04b7992 100644
Binary files a/forui/test/golden/text-field/zinc-light/password-focused.png and b/forui/test/golden/text-field/zinc-light/password-focused.png differ
diff --git a/forui/test/golden/text-field/zinc-light/password-unfocused-no-text.png b/forui/test/golden/text-field/zinc-light/password-unfocused-no-text.png
index 280ef04c9..40e6fe42e 100644
Binary files a/forui/test/golden/text-field/zinc-light/password-unfocused-no-text.png and b/forui/test/golden/text-field/zinc-light/password-unfocused-no-text.png differ
diff --git a/forui/test/golden/text-field/zinc-light/password-unfocused.png b/forui/test/golden/text-field/zinc-light/password-unfocused.png
index 177206969..f4ae45c71 100644
Binary files a/forui/test/golden/text-field/zinc-light/password-unfocused.png and b/forui/test/golden/text-field/zinc-light/password-unfocused.png differ
diff --git a/forui/test/golden/tile/group/builder/count-limited.png b/forui/test/golden/tile/group/builder/count-limited.png
index cf555349a..3049dc564 100644
Binary files a/forui/test/golden/tile/group/builder/count-limited.png and b/forui/test/golden/tile/group/builder/count-limited.png differ
diff --git a/forui/test/golden/tile/group/builder/lazy.png b/forui/test/golden/tile/group/builder/lazy.png
index 1c1171e14..448034a34 100644
Binary files a/forui/test/golden/tile/group/builder/lazy.png and b/forui/test/golden/tile/group/builder/lazy.png differ
diff --git a/forui/test/golden/tile/group/builder/null-limited.png b/forui/test/golden/tile/group/builder/null-limited.png
index cf555349a..3049dc564 100644
Binary files a/forui/test/golden/tile/group/builder/null-limited.png and b/forui/test/golden/tile/group/builder/null-limited.png differ
diff --git a/forui/test/golden/tile/group/merge/full-no-dividers.png b/forui/test/golden/tile/group/merge/full-no-dividers.png
index f6b539a29..8cda96ede 100644
Binary files a/forui/test/golden/tile/group/merge/full-no-dividers.png and b/forui/test/golden/tile/group/merge/full-no-dividers.png differ
diff --git a/forui/test/golden/tile/group/merge/ignore-group-label.png b/forui/test/golden/tile/group/merge/ignore-group-label.png
index 68aa4db6f..3eef5ea5a 100644
Binary files a/forui/test/golden/tile/group/merge/ignore-group-label.png and b/forui/test/golden/tile/group/merge/ignore-group-label.png differ
diff --git a/forui/test/golden/tile/group/merge/ignore-group-labels.png b/forui/test/golden/tile/group/merge/ignore-group-labels.png
index f533d0cb9..34e1dce7a 100644
Binary files a/forui/test/golden/tile/group/merge/ignore-group-labels.png and b/forui/test/golden/tile/group/merge/ignore-group-labels.png differ
diff --git a/forui/test/golden/tile/group/merge/override-state.png b/forui/test/golden/tile/group/merge/override-state.png
index 2f0accd26..30a89878e 100644
Binary files a/forui/test/golden/tile/group/merge/override-state.png and b/forui/test/golden/tile/group/merge/override-state.png differ
diff --git a/forui/test/golden/tile/group/merge/override-style.png b/forui/test/golden/tile/group/merge/override-style.png
index 0a1ae5323..d935d979a 100644
Binary files a/forui/test/golden/tile/group/merge/override-style.png and b/forui/test/golden/tile/group/merge/override-style.png differ
diff --git a/forui/test/golden/tile/group/merge/single.png b/forui/test/golden/tile/group/merge/single.png
index bf1c82c1e..2a7b499ec 100644
Binary files a/forui/test/golden/tile/group/merge/single.png and b/forui/test/golden/tile/group/merge/single.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/FTileDivider.full.png b/forui/test/golden/tile/group/merge/zinc-dark/FTileDivider.full.png
index 772166dac..1da5e7d87 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/FTileDivider.full.png and b/forui/test/golden/tile/group/merge/zinc-dark/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/FTileDivider.indented.png b/forui/test/golden/tile/group/merge/zinc-dark/FTileDivider.indented.png
index 6ac2890aa..26bb3576a 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/FTileDivider.indented.png and b/forui/test/golden/tile/group/merge/zinc-dark/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/FTileDivider.none.png b/forui/test/golden/tile/group/merge/zinc-dark/FTileDivider.none.png
index 33cb62508..bb0513fa6 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/FTileDivider.none.png and b/forui/test/golden/tile/group/merge/zinc-dark/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/clamped-physics/FTileDivider.full.png b/forui/test/golden/tile/group/merge/zinc-dark/clamped-physics/FTileDivider.full.png
index 43248d39e..69d0c4804 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/clamped-physics/FTileDivider.full.png and b/forui/test/golden/tile/group/merge/zinc-dark/clamped-physics/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/clamped-physics/FTileDivider.indented.png b/forui/test/golden/tile/group/merge/zinc-dark/clamped-physics/FTileDivider.indented.png
index 11c2591bc..3a6b4c72c 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/clamped-physics/FTileDivider.indented.png and b/forui/test/golden/tile/group/merge/zinc-dark/clamped-physics/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/clamped-physics/FTileDivider.none.png b/forui/test/golden/tile/group/merge/zinc-dark/clamped-physics/FTileDivider.none.png
index d31a8175e..20259ef8a 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/clamped-physics/FTileDivider.none.png and b/forui/test/golden/tile/group/merge/zinc-dark/clamped-physics/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/constrained-first/FTileDivider.full.png b/forui/test/golden/tile/group/merge/zinc-dark/constrained-first/FTileDivider.full.png
index 43248d39e..69d0c4804 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/constrained-first/FTileDivider.full.png and b/forui/test/golden/tile/group/merge/zinc-dark/constrained-first/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/constrained-first/FTileDivider.indented.png b/forui/test/golden/tile/group/merge/zinc-dark/constrained-first/FTileDivider.indented.png
index 11c2591bc..3a6b4c72c 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/constrained-first/FTileDivider.indented.png and b/forui/test/golden/tile/group/merge/zinc-dark/constrained-first/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/constrained-first/FTileDivider.none.png b/forui/test/golden/tile/group/merge/zinc-dark/constrained-first/FTileDivider.none.png
index d31a8175e..20259ef8a 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/constrained-first/FTileDivider.none.png and b/forui/test/golden/tile/group/merge/zinc-dark/constrained-first/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/constrained-last/FTileDivider.full.png b/forui/test/golden/tile/group/merge/zinc-dark/constrained-last/FTileDivider.full.png
index 43248d39e..69d0c4804 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/constrained-last/FTileDivider.full.png and b/forui/test/golden/tile/group/merge/zinc-dark/constrained-last/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/constrained-last/FTileDivider.indented.png b/forui/test/golden/tile/group/merge/zinc-dark/constrained-last/FTileDivider.indented.png
index 11c2591bc..3a6b4c72c 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/constrained-last/FTileDivider.indented.png and b/forui/test/golden/tile/group/merge/zinc-dark/constrained-last/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/constrained-last/FTileDivider.none.png b/forui/test/golden/tile/group/merge/zinc-dark/constrained-last/FTileDivider.none.png
index d31a8175e..20259ef8a 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/constrained-last/FTileDivider.none.png and b/forui/test/golden/tile/group/merge/zinc-dark/constrained-last/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/disabled.png b/forui/test/golden/tile/group/merge/zinc-dark/disabled.png
index 031eb9695..0c0bf3380 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/disabled.png and b/forui/test/golden/tile/group/merge/zinc-dark/disabled.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/error.png b/forui/test/golden/tile/group/merge/zinc-dark/error.png
index 0af4d1012..16b7b1bcd 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/error.png and b/forui/test/golden/tile/group/merge/zinc-dark/error.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/focused-bottom-viewport/FTileDivider.full.png b/forui/test/golden/tile/group/merge/zinc-dark/focused-bottom-viewport/FTileDivider.full.png
index 68bfd074d..77bbcc560 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/focused-bottom-viewport/FTileDivider.full.png and b/forui/test/golden/tile/group/merge/zinc-dark/focused-bottom-viewport/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/focused-bottom-viewport/FTileDivider.indented.png b/forui/test/golden/tile/group/merge/zinc-dark/focused-bottom-viewport/FTileDivider.indented.png
index b238e0c7e..92c1106f7 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/focused-bottom-viewport/FTileDivider.indented.png and b/forui/test/golden/tile/group/merge/zinc-dark/focused-bottom-viewport/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-dark/focused-bottom-viewport/FTileDivider.none.png b/forui/test/golden/tile/group/merge/zinc-dark/focused-bottom-viewport/FTileDivider.none.png
index 23c6ed3bc..e57d7c946 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-dark/focused-bottom-viewport/FTileDivider.none.png and b/forui/test/golden/tile/group/merge/zinc-dark/focused-bottom-viewport/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/FTileDivider.full.png b/forui/test/golden/tile/group/merge/zinc-light/FTileDivider.full.png
index 5bbd2f29b..483c797af 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/FTileDivider.full.png and b/forui/test/golden/tile/group/merge/zinc-light/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/FTileDivider.indented.png b/forui/test/golden/tile/group/merge/zinc-light/FTileDivider.indented.png
index c200ffef6..b3d34a98c 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/FTileDivider.indented.png and b/forui/test/golden/tile/group/merge/zinc-light/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/FTileDivider.none.png b/forui/test/golden/tile/group/merge/zinc-light/FTileDivider.none.png
index 27a016262..c23123821 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/FTileDivider.none.png and b/forui/test/golden/tile/group/merge/zinc-light/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/clamped-physics/FTileDivider.full.png b/forui/test/golden/tile/group/merge/zinc-light/clamped-physics/FTileDivider.full.png
index b9c2a1fcd..3901a0ee4 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/clamped-physics/FTileDivider.full.png and b/forui/test/golden/tile/group/merge/zinc-light/clamped-physics/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/clamped-physics/FTileDivider.indented.png b/forui/test/golden/tile/group/merge/zinc-light/clamped-physics/FTileDivider.indented.png
index 8e6d6d8e3..d35bc5f14 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/clamped-physics/FTileDivider.indented.png and b/forui/test/golden/tile/group/merge/zinc-light/clamped-physics/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/clamped-physics/FTileDivider.none.png b/forui/test/golden/tile/group/merge/zinc-light/clamped-physics/FTileDivider.none.png
index cea2b02be..e108c05b3 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/clamped-physics/FTileDivider.none.png and b/forui/test/golden/tile/group/merge/zinc-light/clamped-physics/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/constrained-first/FTileDivider.full.png b/forui/test/golden/tile/group/merge/zinc-light/constrained-first/FTileDivider.full.png
index b9c2a1fcd..3901a0ee4 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/constrained-first/FTileDivider.full.png and b/forui/test/golden/tile/group/merge/zinc-light/constrained-first/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/constrained-first/FTileDivider.indented.png b/forui/test/golden/tile/group/merge/zinc-light/constrained-first/FTileDivider.indented.png
index 8e6d6d8e3..d35bc5f14 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/constrained-first/FTileDivider.indented.png and b/forui/test/golden/tile/group/merge/zinc-light/constrained-first/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/constrained-first/FTileDivider.none.png b/forui/test/golden/tile/group/merge/zinc-light/constrained-first/FTileDivider.none.png
index cea2b02be..e108c05b3 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/constrained-first/FTileDivider.none.png and b/forui/test/golden/tile/group/merge/zinc-light/constrained-first/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/constrained-last/FTileDivider.full.png b/forui/test/golden/tile/group/merge/zinc-light/constrained-last/FTileDivider.full.png
index b9c2a1fcd..3901a0ee4 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/constrained-last/FTileDivider.full.png and b/forui/test/golden/tile/group/merge/zinc-light/constrained-last/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/constrained-last/FTileDivider.indented.png b/forui/test/golden/tile/group/merge/zinc-light/constrained-last/FTileDivider.indented.png
index 8e6d6d8e3..d35bc5f14 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/constrained-last/FTileDivider.indented.png and b/forui/test/golden/tile/group/merge/zinc-light/constrained-last/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/constrained-last/FTileDivider.none.png b/forui/test/golden/tile/group/merge/zinc-light/constrained-last/FTileDivider.none.png
index cea2b02be..e108c05b3 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/constrained-last/FTileDivider.none.png and b/forui/test/golden/tile/group/merge/zinc-light/constrained-last/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/disabled.png b/forui/test/golden/tile/group/merge/zinc-light/disabled.png
index e46c59df4..30f1359da 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/disabled.png and b/forui/test/golden/tile/group/merge/zinc-light/disabled.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/error.png b/forui/test/golden/tile/group/merge/zinc-light/error.png
index c453c57b2..20e023b07 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/error.png and b/forui/test/golden/tile/group/merge/zinc-light/error.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/focused-bottom-viewport/FTileDivider.full.png b/forui/test/golden/tile/group/merge/zinc-light/focused-bottom-viewport/FTileDivider.full.png
index 18c638af8..ceca685dc 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/focused-bottom-viewport/FTileDivider.full.png and b/forui/test/golden/tile/group/merge/zinc-light/focused-bottom-viewport/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/focused-bottom-viewport/FTileDivider.indented.png b/forui/test/golden/tile/group/merge/zinc-light/focused-bottom-viewport/FTileDivider.indented.png
index a33fea54f..5d53634d3 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/focused-bottom-viewport/FTileDivider.indented.png and b/forui/test/golden/tile/group/merge/zinc-light/focused-bottom-viewport/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/merge/zinc-light/focused-bottom-viewport/FTileDivider.none.png b/forui/test/golden/tile/group/merge/zinc-light/focused-bottom-viewport/FTileDivider.none.png
index 3f4fa389d..16ba9e605 100644
Binary files a/forui/test/golden/tile/group/merge/zinc-light/focused-bottom-viewport/FTileDivider.none.png and b/forui/test/golden/tile/group/merge/zinc-light/focused-bottom-viewport/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/override-state.png b/forui/test/golden/tile/group/override-state.png
index 9e0112307..ae875e609 100644
Binary files a/forui/test/golden/tile/group/override-state.png and b/forui/test/golden/tile/group/override-state.png differ
diff --git a/forui/test/golden/tile/group/override-style.png b/forui/test/golden/tile/group/override-style.png
index 304d53334..033457665 100644
Binary files a/forui/test/golden/tile/group/override-style.png and b/forui/test/golden/tile/group/override-style.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/clamped-physics/FTileDivider.full.png b/forui/test/golden/tile/group/zinc-dark/clamped-physics/FTileDivider.full.png
index 6ad9158b6..434a5ac5b 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/clamped-physics/FTileDivider.full.png and b/forui/test/golden/tile/group/zinc-dark/clamped-physics/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/clamped-physics/FTileDivider.indented.png b/forui/test/golden/tile/group/zinc-dark/clamped-physics/FTileDivider.indented.png
index f564c13cb..54df4f513 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/clamped-physics/FTileDivider.indented.png and b/forui/test/golden/tile/group/zinc-dark/clamped-physics/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/clamped-physics/FTileDivider.none.png b/forui/test/golden/tile/group/zinc-dark/clamped-physics/FTileDivider.none.png
index bb9cb29ba..436261483 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/clamped-physics/FTileDivider.none.png and b/forui/test/golden/tile/group/zinc-dark/clamped-physics/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/constrained-first/FTileDivider.full.png b/forui/test/golden/tile/group/zinc-dark/constrained-first/FTileDivider.full.png
index 6ad9158b6..434a5ac5b 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/constrained-first/FTileDivider.full.png and b/forui/test/golden/tile/group/zinc-dark/constrained-first/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/constrained-first/FTileDivider.indented.png b/forui/test/golden/tile/group/zinc-dark/constrained-first/FTileDivider.indented.png
index f564c13cb..54df4f513 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/constrained-first/FTileDivider.indented.png and b/forui/test/golden/tile/group/zinc-dark/constrained-first/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/constrained-first/FTileDivider.none.png b/forui/test/golden/tile/group/zinc-dark/constrained-first/FTileDivider.none.png
index bb9cb29ba..436261483 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/constrained-first/FTileDivider.none.png and b/forui/test/golden/tile/group/zinc-dark/constrained-first/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/constrained-last/FTileDivider.full.png b/forui/test/golden/tile/group/zinc-dark/constrained-last/FTileDivider.full.png
index c5ab4f9dd..cbc8c92f0 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/constrained-last/FTileDivider.full.png and b/forui/test/golden/tile/group/zinc-dark/constrained-last/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/constrained-last/FTileDivider.indented.png b/forui/test/golden/tile/group/zinc-dark/constrained-last/FTileDivider.indented.png
index 749790da2..405a62cc8 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/constrained-last/FTileDivider.indented.png and b/forui/test/golden/tile/group/zinc-dark/constrained-last/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/constrained-last/FTileDivider.none.png b/forui/test/golden/tile/group/zinc-dark/constrained-last/FTileDivider.none.png
index 9a73c0a2b..bb65d258e 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/constrained-last/FTileDivider.none.png and b/forui/test/golden/tile/group/zinc-dark/constrained-last/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.full-bottom.png b/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.full-bottom.png
index d795e2ed5..60f45966f 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.full-bottom.png and b/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.full-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.full-top.png b/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.full-top.png
index a0c78efba..3a7aad18c 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.full-top.png and b/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.full-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.indented-bottom.png b/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.indented-bottom.png
index 3084cc168..94e074377 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.indented-bottom.png and b/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.indented-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.indented-top.png b/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.indented-top.png
index 4d8ed2519..d0107c630 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.indented-top.png and b/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.indented-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.none-bottom.png b/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.none-bottom.png
index 3b2cf4b9d..79d858c07 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.none-bottom.png and b/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.none-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.none-top.png b/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.none-top.png
index e5b130060..ad9b2c4e9 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.none-top.png and b/forui/test/golden/tile/group/zinc-dark/disabled/FTileDivider.none-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/enabled/FTileDivider.full.png b/forui/test/golden/tile/group/zinc-dark/enabled/FTileDivider.full.png
index 00dc82a35..5174eec87 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/enabled/FTileDivider.full.png and b/forui/test/golden/tile/group/zinc-dark/enabled/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/enabled/FTileDivider.indented.png b/forui/test/golden/tile/group/zinc-dark/enabled/FTileDivider.indented.png
index f7ae9768e..43e84302d 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/enabled/FTileDivider.indented.png and b/forui/test/golden/tile/group/zinc-dark/enabled/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/enabled/FTileDivider.none.png b/forui/test/golden/tile/group/zinc-dark/enabled/FTileDivider.none.png
index d14a3e44e..34496cca2 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/enabled/FTileDivider.none.png and b/forui/test/golden/tile/group/zinc-dark/enabled/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/error.png b/forui/test/golden/tile/group/zinc-dark/error.png
index 4b41131b3..136bd2134 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/error.png and b/forui/test/golden/tile/group/zinc-dark/error.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/focused-bottom-viewport/FTileDivider.full.png b/forui/test/golden/tile/group/zinc-dark/focused-bottom-viewport/FTileDivider.full.png
index 86034e8e1..5c34327de 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/focused-bottom-viewport/FTileDivider.full.png and b/forui/test/golden/tile/group/zinc-dark/focused-bottom-viewport/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/focused-bottom-viewport/FTileDivider.indented.png b/forui/test/golden/tile/group/zinc-dark/focused-bottom-viewport/FTileDivider.indented.png
index d5da45919..637988ae5 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/focused-bottom-viewport/FTileDivider.indented.png and b/forui/test/golden/tile/group/zinc-dark/focused-bottom-viewport/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/focused-bottom-viewport/FTileDivider.none.png b/forui/test/golden/tile/group/zinc-dark/focused-bottom-viewport/FTileDivider.none.png
index ca935050f..4ced78447 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/focused-bottom-viewport/FTileDivider.none.png and b/forui/test/golden/tile/group/zinc-dark/focused-bottom-viewport/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.full-bottom.png b/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.full-bottom.png
index 288ae88a8..04d18fb13 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.full-bottom.png and b/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.full-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.full-top.png b/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.full-top.png
index a16b998e2..75f1da31a 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.full-top.png and b/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.full-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.indented-bottom.png b/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.indented-bottom.png
index b7a2f1d4e..8b3e7362a 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.indented-bottom.png and b/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.indented-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.indented-top.png b/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.indented-top.png
index a16b998e2..75f1da31a 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.indented-top.png and b/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.indented-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.none-bottom.png b/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.none-bottom.png
index 33bdbaecf..2e36d3932 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.none-bottom.png and b/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.none-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.none-top.png b/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.none-top.png
index a16b998e2..75f1da31a 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.none-top.png and b/forui/test/golden/tile/group/zinc-dark/focused/FTileDivider.none-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.full-bottom.png b/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.full-bottom.png
index 69ce736c5..e9873edd7 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.full-bottom.png and b/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.full-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.full-top.png b/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.full-top.png
index 7d715a0ea..0c4f743b9 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.full-top.png and b/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.full-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.indented-bottom.png b/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.indented-bottom.png
index 51b42a5fa..d1bc3b299 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.indented-bottom.png and b/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.indented-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.indented-top.png b/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.indented-top.png
index 7d715a0ea..0c4f743b9 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.indented-top.png and b/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.indented-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.none-bottom.png b/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.none-bottom.png
index 799f74ec5..16fd902b2 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.none-bottom.png and b/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.none-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.none-top.png b/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.none-top.png
index 7d715a0ea..0c4f743b9 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.none-top.png and b/forui/test/golden/tile/group/zinc-dark/hovered/FTileDivider.none-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/rtl/FTileDivider.full.png b/forui/test/golden/tile/group/zinc-dark/rtl/FTileDivider.full.png
index 9034283fa..9c65df4a9 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/rtl/FTileDivider.full.png and b/forui/test/golden/tile/group/zinc-dark/rtl/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/rtl/FTileDivider.indented.png b/forui/test/golden/tile/group/zinc-dark/rtl/FTileDivider.indented.png
index fb7d297b4..1917be17c 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/rtl/FTileDivider.indented.png and b/forui/test/golden/tile/group/zinc-dark/rtl/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/rtl/FTileDivider.none.png b/forui/test/golden/tile/group/zinc-dark/rtl/FTileDivider.none.png
index d38f3aeee..ae4773aff 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/rtl/FTileDivider.none.png and b/forui/test/golden/tile/group/zinc-dark/rtl/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/zinc-dark/single.png b/forui/test/golden/tile/group/zinc-dark/single.png
index 224b28e12..7a596860f 100644
Binary files a/forui/test/golden/tile/group/zinc-dark/single.png and b/forui/test/golden/tile/group/zinc-dark/single.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/clamped-physics/FTileDivider.full.png b/forui/test/golden/tile/group/zinc-light/clamped-physics/FTileDivider.full.png
index e2714d4f4..459787a96 100644
Binary files a/forui/test/golden/tile/group/zinc-light/clamped-physics/FTileDivider.full.png and b/forui/test/golden/tile/group/zinc-light/clamped-physics/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/clamped-physics/FTileDivider.indented.png b/forui/test/golden/tile/group/zinc-light/clamped-physics/FTileDivider.indented.png
index 72eac1542..d7807dc9a 100644
Binary files a/forui/test/golden/tile/group/zinc-light/clamped-physics/FTileDivider.indented.png and b/forui/test/golden/tile/group/zinc-light/clamped-physics/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/clamped-physics/FTileDivider.none.png b/forui/test/golden/tile/group/zinc-light/clamped-physics/FTileDivider.none.png
index 14cae9ded..3264d37f1 100644
Binary files a/forui/test/golden/tile/group/zinc-light/clamped-physics/FTileDivider.none.png and b/forui/test/golden/tile/group/zinc-light/clamped-physics/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/constrained-first/FTileDivider.full.png b/forui/test/golden/tile/group/zinc-light/constrained-first/FTileDivider.full.png
index e2714d4f4..459787a96 100644
Binary files a/forui/test/golden/tile/group/zinc-light/constrained-first/FTileDivider.full.png and b/forui/test/golden/tile/group/zinc-light/constrained-first/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/constrained-first/FTileDivider.indented.png b/forui/test/golden/tile/group/zinc-light/constrained-first/FTileDivider.indented.png
index 72eac1542..d7807dc9a 100644
Binary files a/forui/test/golden/tile/group/zinc-light/constrained-first/FTileDivider.indented.png and b/forui/test/golden/tile/group/zinc-light/constrained-first/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/constrained-first/FTileDivider.none.png b/forui/test/golden/tile/group/zinc-light/constrained-first/FTileDivider.none.png
index 14cae9ded..3264d37f1 100644
Binary files a/forui/test/golden/tile/group/zinc-light/constrained-first/FTileDivider.none.png and b/forui/test/golden/tile/group/zinc-light/constrained-first/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/constrained-last/FTileDivider.full.png b/forui/test/golden/tile/group/zinc-light/constrained-last/FTileDivider.full.png
index 0091c37d4..fbe871b6e 100644
Binary files a/forui/test/golden/tile/group/zinc-light/constrained-last/FTileDivider.full.png and b/forui/test/golden/tile/group/zinc-light/constrained-last/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/constrained-last/FTileDivider.indented.png b/forui/test/golden/tile/group/zinc-light/constrained-last/FTileDivider.indented.png
index 0aadf251a..731fd3f88 100644
Binary files a/forui/test/golden/tile/group/zinc-light/constrained-last/FTileDivider.indented.png and b/forui/test/golden/tile/group/zinc-light/constrained-last/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/constrained-last/FTileDivider.none.png b/forui/test/golden/tile/group/zinc-light/constrained-last/FTileDivider.none.png
index fae516834..89b40bde0 100644
Binary files a/forui/test/golden/tile/group/zinc-light/constrained-last/FTileDivider.none.png and b/forui/test/golden/tile/group/zinc-light/constrained-last/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.full-bottom.png b/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.full-bottom.png
index f8ad0887c..99b5269ff 100644
Binary files a/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.full-bottom.png and b/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.full-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.full-top.png b/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.full-top.png
index ac8e98303..801015869 100644
Binary files a/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.full-top.png and b/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.full-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.indented-bottom.png b/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.indented-bottom.png
index 9c969aaf5..a198da059 100644
Binary files a/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.indented-bottom.png and b/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.indented-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.indented-top.png b/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.indented-top.png
index 93fee3bf1..2e7c30093 100644
Binary files a/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.indented-top.png and b/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.indented-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.none-bottom.png b/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.none-bottom.png
index 12ed6ce70..9cc25f1ad 100644
Binary files a/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.none-bottom.png and b/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.none-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.none-top.png b/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.none-top.png
index e31ae6a8c..115c49c52 100644
Binary files a/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.none-top.png and b/forui/test/golden/tile/group/zinc-light/disabled/FTileDivider.none-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/enabled/FTileDivider.full.png b/forui/test/golden/tile/group/zinc-light/enabled/FTileDivider.full.png
index 1184ea55f..69b6ebc85 100644
Binary files a/forui/test/golden/tile/group/zinc-light/enabled/FTileDivider.full.png and b/forui/test/golden/tile/group/zinc-light/enabled/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/enabled/FTileDivider.indented.png b/forui/test/golden/tile/group/zinc-light/enabled/FTileDivider.indented.png
index 9068a4ae0..5a1cecee3 100644
Binary files a/forui/test/golden/tile/group/zinc-light/enabled/FTileDivider.indented.png and b/forui/test/golden/tile/group/zinc-light/enabled/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/enabled/FTileDivider.none.png b/forui/test/golden/tile/group/zinc-light/enabled/FTileDivider.none.png
index d9943131e..d47195a9d 100644
Binary files a/forui/test/golden/tile/group/zinc-light/enabled/FTileDivider.none.png and b/forui/test/golden/tile/group/zinc-light/enabled/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/error.png b/forui/test/golden/tile/group/zinc-light/error.png
index f376eded5..219afb2fc 100644
Binary files a/forui/test/golden/tile/group/zinc-light/error.png and b/forui/test/golden/tile/group/zinc-light/error.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/focused-bottom-viewport/FTileDivider.full.png b/forui/test/golden/tile/group/zinc-light/focused-bottom-viewport/FTileDivider.full.png
index 672b31dd4..ba2dac8ee 100644
Binary files a/forui/test/golden/tile/group/zinc-light/focused-bottom-viewport/FTileDivider.full.png and b/forui/test/golden/tile/group/zinc-light/focused-bottom-viewport/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/focused-bottom-viewport/FTileDivider.indented.png b/forui/test/golden/tile/group/zinc-light/focused-bottom-viewport/FTileDivider.indented.png
index 9ef0a1f50..0ab1dd95c 100644
Binary files a/forui/test/golden/tile/group/zinc-light/focused-bottom-viewport/FTileDivider.indented.png and b/forui/test/golden/tile/group/zinc-light/focused-bottom-viewport/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/focused-bottom-viewport/FTileDivider.none.png b/forui/test/golden/tile/group/zinc-light/focused-bottom-viewport/FTileDivider.none.png
index 490ecd22b..fae1558d7 100644
Binary files a/forui/test/golden/tile/group/zinc-light/focused-bottom-viewport/FTileDivider.none.png and b/forui/test/golden/tile/group/zinc-light/focused-bottom-viewport/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.full-bottom.png b/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.full-bottom.png
index 532d750e6..e65dddacc 100644
Binary files a/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.full-bottom.png and b/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.full-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.full-top.png b/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.full-top.png
index 47d4c610d..10f055eec 100644
Binary files a/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.full-top.png and b/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.full-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.indented-bottom.png b/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.indented-bottom.png
index b7cb6beed..64a29dcd1 100644
Binary files a/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.indented-bottom.png and b/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.indented-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.indented-top.png b/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.indented-top.png
index 47d4c610d..10f055eec 100644
Binary files a/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.indented-top.png and b/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.indented-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.none-bottom.png b/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.none-bottom.png
index e59976b9b..d163a5403 100644
Binary files a/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.none-bottom.png and b/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.none-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.none-top.png b/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.none-top.png
index 47d4c610d..10f055eec 100644
Binary files a/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.none-top.png and b/forui/test/golden/tile/group/zinc-light/focused/FTileDivider.none-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.full-bottom.png b/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.full-bottom.png
index f40f90618..407cf0d3d 100644
Binary files a/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.full-bottom.png and b/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.full-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.full-top.png b/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.full-top.png
index 38f8a2cd5..bd6ff2a21 100644
Binary files a/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.full-top.png and b/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.full-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.indented-bottom.png b/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.indented-bottom.png
index bf15d0380..f5a4c5d4d 100644
Binary files a/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.indented-bottom.png and b/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.indented-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.indented-top.png b/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.indented-top.png
index 3d715b0fb..13e6c7645 100644
Binary files a/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.indented-top.png and b/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.indented-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.none-bottom.png b/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.none-bottom.png
index c88188ca4..70222477a 100644
Binary files a/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.none-bottom.png and b/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.none-bottom.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.none-top.png b/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.none-top.png
index dc75b3d70..8305a2bf6 100644
Binary files a/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.none-top.png and b/forui/test/golden/tile/group/zinc-light/hovered/FTileDivider.none-top.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/rtl/FTileDivider.full.png b/forui/test/golden/tile/group/zinc-light/rtl/FTileDivider.full.png
index bb319cc08..a0a2fb545 100644
Binary files a/forui/test/golden/tile/group/zinc-light/rtl/FTileDivider.full.png and b/forui/test/golden/tile/group/zinc-light/rtl/FTileDivider.full.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/rtl/FTileDivider.indented.png b/forui/test/golden/tile/group/zinc-light/rtl/FTileDivider.indented.png
index c526711e1..c256e4dd0 100644
Binary files a/forui/test/golden/tile/group/zinc-light/rtl/FTileDivider.indented.png and b/forui/test/golden/tile/group/zinc-light/rtl/FTileDivider.indented.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/rtl/FTileDivider.none.png b/forui/test/golden/tile/group/zinc-light/rtl/FTileDivider.none.png
index 53c98fd72..918de15b9 100644
Binary files a/forui/test/golden/tile/group/zinc-light/rtl/FTileDivider.none.png and b/forui/test/golden/tile/group/zinc-light/rtl/FTileDivider.none.png differ
diff --git a/forui/test/golden/tile/group/zinc-light/single.png b/forui/test/golden/tile/group/zinc-light/single.png
index 4f26ec185..5dd6eeb34 100644
Binary files a/forui/test/golden/tile/group/zinc-light/single.png and b/forui/test/golden/tile/group/zinc-light/single.png differ
diff --git a/forui/test/golden/tile/tile/disabled-zinc-dark.png b/forui/test/golden/tile/tile/disabled-zinc-dark.png
index 063eecc90..a9d89cfa8 100644
Binary files a/forui/test/golden/tile/tile/disabled-zinc-dark.png and b/forui/test/golden/tile/tile/disabled-zinc-dark.png differ
diff --git a/forui/test/golden/tile/tile/disabled-zinc-light.png b/forui/test/golden/tile/tile/disabled-zinc-light.png
index e172f3383..7dcdaaa1c 100644
Binary files a/forui/test/golden/tile/tile/disabled-zinc-light.png and b/forui/test/golden/tile/tile/disabled-zinc-light.png differ
diff --git a/forui/test/golden/tile/tile/enabled-zinc-dark.png b/forui/test/golden/tile/tile/enabled-zinc-dark.png
index 0078be4d1..f8e1a9b25 100644
Binary files a/forui/test/golden/tile/tile/enabled-zinc-dark.png and b/forui/test/golden/tile/tile/enabled-zinc-dark.png differ
diff --git a/forui/test/golden/tile/tile/enabled-zinc-light.png b/forui/test/golden/tile/tile/enabled-zinc-light.png
index c6dcf3982..10af4da09 100644
Binary files a/forui/test/golden/tile/tile/enabled-zinc-light.png and b/forui/test/golden/tile/tile/enabled-zinc-light.png differ
diff --git a/forui/test/golden/tile/tile/focused-zinc-dark.png b/forui/test/golden/tile/tile/focused-zinc-dark.png
index 052121884..5a08d34a4 100644
Binary files a/forui/test/golden/tile/tile/focused-zinc-dark.png and b/forui/test/golden/tile/tile/focused-zinc-dark.png differ
diff --git a/forui/test/golden/tile/tile/focused-zinc-light.png b/forui/test/golden/tile/tile/focused-zinc-light.png
index 3ae47d3ee..8315309d7 100644
Binary files a/forui/test/golden/tile/tile/focused-zinc-light.png and b/forui/test/golden/tile/tile/focused-zinc-light.png differ
diff --git a/forui/test/golden/tile/tile/hovered-zinc-dark.png b/forui/test/golden/tile/tile/hovered-zinc-dark.png
index d54a485c4..7f7de9ac9 100644
Binary files a/forui/test/golden/tile/tile/hovered-zinc-dark.png and b/forui/test/golden/tile/tile/hovered-zinc-dark.png differ
diff --git a/forui/test/golden/tile/tile/hovered-zinc-light.png b/forui/test/golden/tile/tile/hovered-zinc-light.png
index e93cc69d7..4cb032401 100644
Binary files a/forui/test/golden/tile/tile/hovered-zinc-light.png and b/forui/test/golden/tile/tile/hovered-zinc-light.png differ
diff --git a/forui/test/golden/tile/tile/rtl-zinc-dark.png b/forui/test/golden/tile/tile/rtl-zinc-dark.png
index e0f790e5d..a761914db 100644
Binary files a/forui/test/golden/tile/tile/rtl-zinc-dark.png and b/forui/test/golden/tile/tile/rtl-zinc-dark.png differ
diff --git a/forui/test/golden/tile/tile/rtl-zinc-light.png b/forui/test/golden/tile/tile/rtl-zinc-light.png
index 693a366fe..44de8b98d 100644
Binary files a/forui/test/golden/tile/tile/rtl-zinc-light.png and b/forui/test/golden/tile/tile/rtl-zinc-light.png differ
diff --git a/forui/test/golden/tooltip/zinc-dark-shown.png b/forui/test/golden/tooltip/zinc-dark-shown.png
index 64cc5cc5a..f38bdf8f7 100644
Binary files a/forui/test/golden/tooltip/zinc-dark-shown.png and b/forui/test/golden/tooltip/zinc-dark-shown.png differ
diff --git a/forui/test/golden/tooltip/zinc-light-shown.png b/forui/test/golden/tooltip/zinc-light-shown.png
index 2f246cdb9..c1c77a292 100644
Binary files a/forui/test/golden/tooltip/zinc-light-shown.png and b/forui/test/golden/tooltip/zinc-light-shown.png differ
diff --git a/forui/test/src/flutter_test_config.dart b/forui/test/src/flutter_test_config.dart
index d68d6af57..e3382ecc5 100644
--- a/forui/test/src/flutter_test_config.dart
+++ b/forui/test/src/flutter_test_config.dart
@@ -18,7 +18,9 @@ Future<void> configureGoldenTests(double threshold) async {
   TestWidgetsFlutterBinding.ensureInitialized();
 
   final fontLoader = FontLoader('packages/forui/Inter');
-  final directory = Directory('./assets/fonts/inter/');
+
+  final prefix = Directory.current.path.contains('forui/forui') ? '.' : '${Directory.current.path}/forui';
+  final directory = Directory('$prefix/assets/fonts/inter/');
   for (final file in directory.listSync().whereType<File>().where((e) => e.path.endsWith('.ttf'))) {
     fontLoader.addFont(rootBundle.load(file.path));
   }
@@ -33,7 +35,7 @@ Future<void> configureGoldenTests(double threshold) async {
       // As such, we use the default `testUrl`, which is only the `baseDir` and
       // append a generically named `test.dart` so that the `baseDir` is
       // properly extracted.
-      Uri.parse('./test/golden/test.dart'),
+      Uri.parse('$prefix/test/golden/test.dart'),
       threshold,
     );
   }
diff --git a/forui/test/src/widgets/avatar_golden_test.dart b/forui/test/src/widgets/avatar_golden_test.dart
index c6fd6578e..87cce654b 100644
--- a/forui/test/src/widgets/avatar_golden_test.dart
+++ b/forui/test/src/widgets/avatar_golden_test.dart
@@ -17,7 +17,7 @@ void main() {
         final testWidget = TestScaffold.app(
           theme: theme.data,
           child: FAvatar(
-            image: FileImage(File('./test/resources/pante.jpg')),
+            image: FileImage(File('${Directory.current.path}/forui/test/resources/pante.jpg')),
             fallback: const Text('MN'),
           ),
         );
diff --git a/forui/test/src/widgets/icon_golden_test.dart b/forui/test/src/widgets/icon_golden_test.dart
index 3015fe5ac..912f5590d 100644
--- a/forui/test/src/widgets/icon_golden_test.dart
+++ b/forui/test/src/widgets/icon_golden_test.dart
@@ -54,7 +54,7 @@ void main() {
           await tester.pumpWidget(
             TestScaffold(
               theme: theme.data,
-              child: FIcon.image(FileImage(File('./test/resources/forus-labs.png'))),
+              child: FIcon.image(FileImage(File('${Directory.current.path}/forui/test/resources/forus-labs.png'))),
             ),
           );
           for (final element in find.byType(Image).evaluate()) {
@@ -73,7 +73,10 @@ void main() {
           await tester.pumpWidget(
             TestScaffold(
               theme: theme.data,
-              child: FIcon.image(FileImage(File('./test/resources/forus-labs.png')), color: Colors.transparent),
+              child: FIcon.image(
+                FileImage(File('${Directory.current.path}/forui/test/resources/forus-labs.png')),
+                color: Colors.transparent,
+              ),
             ),
           );
           for (final element in find.byType(Image).evaluate()) {
diff --git a/forui/tool/fetch_arb_files.dart b/forui/tool/fetch_arb_files.dart
index ac930eca3..b113dbb94 100644
--- a/forui/tool/fetch_arb_files.dart
+++ b/forui/tool/fetch_arb_files.dart
@@ -2,7 +2,6 @@
 
 import 'dart:convert';
 import 'dart:io';
-import 'package:collection/collection.dart';
 import 'package:http/http.dart' as http;
 
 final pattern = RegExp(r'(widgets|material)_([\w_]+)\.arb');
@@ -21,7 +20,7 @@ Future<void> main() async {
   (json.decode(response.body) as List<dynamic>)
       .map((file) => file['name'] as String)
       .map((file) => pattern.firstMatch(file)?.group(2))
-      .whereNotNull()
+      .nonNulls
       .map((locale) => File('lib/l10n/f_$locale.arb'))
       .where((arb) => !arb.existsSync())
       .forEach(
diff --git a/forui_assets/pubspec.yaml b/forui_assets/pubspec.yaml
index f6bcee396..96db954b2 100644
--- a/forui_assets/pubspec.yaml
+++ b/forui_assets/pubspec.yaml
@@ -11,8 +11,9 @@ topics:
   - widget
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
-  flutter: ">=3.24.0"
+  sdk: '>=3.6.0 <4.0.0'
+  flutter: ">=3.27.0"
+resolution: workspace
 
 dependencies:
   flutter:
@@ -21,7 +22,6 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.4.0
-  flint: ^2.8.1
   nitrogen: ^0.3.0+1
 
 # For information on the generic Dart part of this file, see the
diff --git a/forui_hooks/pubspec.yaml b/forui_hooks/pubspec.yaml
index ba445cedd..5d0b27a11 100644
--- a/forui_hooks/pubspec.yaml
+++ b/forui_hooks/pubspec.yaml
@@ -7,8 +7,9 @@ repository: https://github.com/forus-labs/forui/tree/main/forui_hooks
 issue_tracker: https://github.com/forus-labs/forui/issues
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
-  flutter: ">=3.24.0"
+  sdk: '>=3.6.0 <4.0.0'
+  flutter: ">=3.27.0"
+resolution: workspace
 
 dependencies:
   flutter:
@@ -17,15 +18,7 @@ dependencies:
   forui: ^0.7.0
 
 dev_dependencies:
-  flint: ^2.8.1
   flutter_test:
     sdk: flutter
 
-dependency_overrides:
-  forui:
-    path: ../forui
-
 flutter:
-
-import_sorter:
-  comments: false
diff --git a/forui_hooks/test/src/accordion_controller_hook_test.dart b/forui_hooks/test/src/accordion_controller_hook_test.dart
index 0509472cb..0f81de36b 100644
--- a/forui_hooks/test/src/accordion_controller_hook_test.dart
+++ b/forui_hooks/test/src/accordion_controller_hook_test.dart
@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:forui/forui.dart';
-
 import 'package:forui_hooks/forui_hooks.dart';
 
 void main() {
diff --git a/forui_hooks/test/src/calendar_controller_hook_test.dart b/forui_hooks/test/src/calendar_controller_hook_test.dart
index 2c766f89e..9fce56026 100644
--- a/forui_hooks/test/src/calendar_controller_hook_test.dart
+++ b/forui_hooks/test/src/calendar_controller_hook_test.dart
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:forui/forui.dart';
-
 import 'package:forui_hooks/forui_hooks.dart';
 
 void main() {
diff --git a/forui_hooks/test/src/popover_controller_hook_test.dart b/forui_hooks/test/src/popover_controller_hook_test.dart
index 06f446d12..94841c14b 100644
--- a/forui_hooks/test/src/popover_controller_hook_test.dart
+++ b/forui_hooks/test/src/popover_controller_hook_test.dart
@@ -5,7 +5,6 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:forui/forui.dart';
-
 import 'package:forui_hooks/forui_hooks.dart';
 
 void main() {
diff --git a/forui_hooks/test/src/resizable_controller_hook_test.dart b/forui_hooks/test/src/resizable_controller_hook_test.dart
index cbce5306e..24cd36708 100644
--- a/forui_hooks/test/src/resizable_controller_hook_test.dart
+++ b/forui_hooks/test/src/resizable_controller_hook_test.dart
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:forui/forui.dart';
-
 import 'package:forui_hooks/forui_hooks.dart';
 
 void main() {
diff --git a/forui_hooks/test/src/select_group_controller_hook_test.dart b/forui_hooks/test/src/select_group_controller_hook_test.dart
index 07952a665..e95c9cc2c 100644
--- a/forui_hooks/test/src/select_group_controller_hook_test.dart
+++ b/forui_hooks/test/src/select_group_controller_hook_test.dart
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:forui/forui.dart';
-
 import 'package:forui_hooks/forui_hooks.dart';
 
 void main() {
diff --git a/forui_hooks/test/src/slider_controller_hook_test.dart b/forui_hooks/test/src/slider_controller_hook_test.dart
index c77a8498f..65fdad66f 100644
--- a/forui_hooks/test/src/slider_controller_hook_test.dart
+++ b/forui_hooks/test/src/slider_controller_hook_test.dart
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:forui/forui.dart';
-
 import 'package:forui_hooks/forui_hooks.dart';
 
 void main() {
diff --git a/forui_hooks/test/src/tab_controller_hook_test.dart b/forui_hooks/test/src/tab_controller_hook_test.dart
index 5813740bf..fc2a654a5 100644
--- a/forui_hooks/test/src/tab_controller_hook_test.dart
+++ b/forui_hooks/test/src/tab_controller_hook_test.dart
@@ -3,7 +3,6 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:forui/forui.dart';
-
 import 'package:forui_hooks/forui_hooks.dart';
 
 void main() {
diff --git a/forui_hooks/test/src/tooltip_controller_hook_test.dart b/forui_hooks/test/src/tooltip_controller_hook_test.dart
index 637107a9b..99215744f 100644
--- a/forui_hooks/test/src/tooltip_controller_hook_test.dart
+++ b/forui_hooks/test/src/tooltip_controller_hook_test.dart
@@ -5,7 +5,6 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:forui/forui.dart';
-
 import 'package:forui_hooks/forui_hooks.dart';
 
 void main() {
diff --git a/pubspec.yaml b/pubspec.yaml
new file mode 100644
index 000000000..f0c808a45
--- /dev/null
+++ b/pubspec.yaml
@@ -0,0 +1,12 @@
+name: _
+environment:
+  sdk: ">=3.6.0 <4.0.0"
+  flutter: ">=3.27.0"
+workspace:
+  - forui
+  - forui_assets
+  - forui_hooks
+  - samples
+
+dev_dependencies:
+  flint: ^2.8.1
diff --git a/samples/pubspec.lock b/samples/pubspec.lock
deleted file mode 100644
index 806a9ace6..000000000
--- a/samples/pubspec.lock
+++ /dev/null
@@ -1,786 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  _fe_analyzer_shared:
-    dependency: transitive
-    description:
-      name: _fe_analyzer_shared
-      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
-      url: "https://pub.dev"
-    source: hosted
-    version: "72.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.2"
-  analyzer:
-    dependency: transitive
-    description:
-      name: analyzer
-      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.7.0"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.0"
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.11.0"
-  auto_route:
-    dependency: "direct main"
-    description:
-      name: auto_route
-      sha256: b83e8ce46da7228cdd019b5a11205454847f0a971bca59a7529b98df9876889b
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.2.2"
-  auto_route_generator:
-    dependency: "direct dev"
-    description:
-      name: auto_route_generator
-      sha256: c9086eb07271e51b44071ad5cff34e889f3156710b964a308c2ab590769e79e6
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.0.0"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  build:
-    dependency: transitive
-    description:
-      name: build
-      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  build_config:
-    dependency: transitive
-    description:
-      name: build_config
-      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  build_daemon:
-    dependency: transitive
-    description:
-      name: build_daemon
-      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
-  build_resolvers:
-    dependency: transitive
-    description:
-      name: build_resolvers
-      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.2"
-  build_runner:
-    dependency: "direct dev"
-    description:
-      name: build_runner
-      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.13"
-  build_runner_core:
-    dependency: transitive
-    description:
-      name: build_runner_core
-      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.3.2"
-  built_collection:
-    dependency: transitive
-    description:
-      name: built_collection
-      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.1.1"
-  built_value:
-    dependency: transitive
-    description:
-      name: built_value
-      sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.9.2"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  checked_yaml:
-    dependency: transitive
-    description:
-      name: checked_yaml
-      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.3"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  code_builder:
-    dependency: transitive
-    description:
-      name: code_builder
-      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.10.1"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  convert:
-    dependency: transitive
-    description:
-      name: convert
-      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.2"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.6"
-  cupertino_icons:
-    dependency: "direct main"
-    description:
-      name: cupertino_icons
-      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.8"
-  dart_style:
-    dependency: transitive
-    description:
-      name: dart_style
-      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.7"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.1"
-  ffi:
-    dependency: transitive
-    description:
-      name: ffi
-      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.1"
-  fixnum:
-    dependency: transitive
-    description:
-      name: fixnum
-      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  flint:
-    dependency: "direct dev"
-    description:
-      name: flint
-      sha256: "47d2c84e11bf93fd0d257883a4aa6483d094b70672ec26e33a56faf8e4c04671"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.10.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_localizations:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_svg:
-    dependency: transitive
-    description:
-      name: flutter_svg
-      sha256: "936d9c1c010d3e234d1672574636f3352b4941ca3decaddd3cafaeb9ad49c471"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.15"
-  flutter_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_web_plugins:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  forui:
-    dependency: "direct main"
-    description:
-      path: "../forui"
-      relative: true
-    source: path
-    version: "0.7.0"
-  forui_assets:
-    dependency: "direct overridden"
-    description:
-      path: "../forui_assets"
-      relative: true
-    source: path
-    version: "0.7.0"
-  frontend_server_client:
-    dependency: transitive
-    description:
-      name: frontend_server_client
-      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.0"
-  glob:
-    dependency: transitive
-    description:
-      name: glob
-      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  google_fonts:
-    dependency: transitive
-    description:
-      name: google_fonts
-      sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.2.1"
-  graphs:
-    dependency: transitive
-    description:
-      name: graphs
-      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.2"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
-  http_multi_server:
-    dependency: transitive
-    description:
-      name: http_multi_server
-      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.1"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
-  intl:
-    dependency: "direct main"
-    description:
-      name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.19.0"
-  io:
-    dependency: transitive
-    description:
-      name: io
-      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.4"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.7"
-  json_annotation:
-    dependency: transitive
-    description:
-      name: json_annotation
-      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.9.0"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.5"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.5"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
-  logging:
-    dependency: transitive
-    description:
-      name: logging
-      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.2-main.4"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.12.16+1"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  mime:
-    dependency: transitive
-    description:
-      name: mime
-      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  nitrogen_flutter_svg:
-    dependency: transitive
-    description:
-      name: nitrogen_flutter_svg
-      sha256: "2c473caaeeeddb11a437e72f9d112622619493ce22dcd6b41f7364cb999b8e2b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.0+1"
-  nitrogen_types:
-    dependency: transitive
-    description:
-      name: nitrogen_types
-      sha256: "04c3e921fe59a47710b81f6bfd3c4dfeb819ca16e25ad6824dcc5b44ca39ed46"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.0+1"
-  package_config:
-    dependency: transitive
-    description:
-      name: package_config
-      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.0"
-  path_parsing:
-    dependency: transitive
-    description:
-      name: path_parsing
-      sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  path_provider:
-    dependency: transitive
-    description:
-      name: path_provider
-      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.5"
-  path_provider_android:
-    dependency: transitive
-    description:
-      name: path_provider_android
-      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.12"
-  path_provider_foundation:
-    dependency: transitive
-    description:
-      name: path_provider_foundation
-      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.0"
-  path_provider_linux:
-    dependency: transitive
-    description:
-      name: path_provider_linux
-      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.1"
-  path_provider_platform_interface:
-    dependency: transitive
-    description:
-      name: path_provider_platform_interface
-      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  path_provider_windows:
-    dependency: transitive
-    description:
-      name: path_provider_windows
-      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.0"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.2"
-  platform:
-    dependency: transitive
-    description:
-      name: platform
-      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.6"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  pool:
-    dependency: transitive
-    description:
-      name: pool
-      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.5.1"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  pubspec_parse:
-    dependency: transitive
-    description:
-      name: pubspec_parse
-      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  shelf:
-    dependency: transitive
-    description:
-      name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.1"
-  shelf_web_socket:
-    dependency: transitive
-    description:
-      name: shelf_web_socket
-      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_gen:
-    dependency: transitive
-    description:
-      name: source_gen
-      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.5.0"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.0"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.11.1"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  stream_transform:
-    dependency: transitive
-    description:
-      name: stream_transform
-      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  sugar:
-    dependency: "direct main"
-    description:
-      name: sugar
-      sha256: "9bfbba7793b5e3650003fca22a857a1d8485e99bf17558cad406a74ba5c4aa3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.2"
-  timing:
-    dependency: transitive
-    description:
-      name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  vector_graphics:
-    dependency: transitive
-    description:
-      name: vector_graphics
-      sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.15"
-  vector_graphics_codec:
-    dependency: transitive
-    description:
-      name: vector_graphics_codec
-      sha256: "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.12"
-  vector_graphics_compiler:
-    dependency: transitive
-    description:
-      name: vector_graphics_compiler
-      sha256: ab9ff38fc771e9ee1139320adbe3d18a60327370c218c60752068ebee4b49ab1
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.15"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.2.5"
-  watcher:
-    dependency: transitive
-    description:
-      name: watcher
-      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  web_socket:
-    dependency: transitive
-    description:
-      name: web_socket
-      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.6"
-  web_socket_channel:
-    dependency: transitive
-    description:
-      name: web_socket_channel
-      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
-  xdg_directories:
-    dependency: transitive
-    description:
-      name: xdg_directories
-      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.5.0"
-  yaml:
-    dependency: transitive
-    description:
-      name: yaml
-      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.2"
-sdks:
-  dart: ">=3.5.0 <4.0.0"
-  flutter: ">=3.24.0"
diff --git a/samples/pubspec.yaml b/samples/pubspec.yaml
index f1aae672c..5c12ec041 100644
--- a/samples/pubspec.yaml
+++ b/samples/pubspec.yaml
@@ -21,6 +21,7 @@ version: 1.0.0+1
 environment:
   flutter: ">=3.24.0"
   sdk: '>=3.5.0 <4.0.0'
+resolution: workspace
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -36,32 +37,20 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   forui:
-    path: ../forui
   intl: any
   sugar: ^3.1.0
 
 dev_dependencies:
   auto_route_generator: ^9.0.0
   build_runner: any
-  flint: ^2.8.1
   flutter_test:
     sdk: flutter
 
-dependency_overrides:
-  forui_assets:
-    path: ../forui_assets
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
 # The following section is specific to Flutter packages.
 flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
-  uses-material-design: true
-
   # To add assets to your application, add an assets section, like this:
   # assets:
   #   - images/a_dot_burr.jpeg
@@ -96,7 +85,3 @@ flutter:
   #
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/custom-fonts/#from-packages
-
-
-import_sorter:
-  comments: false
diff --git a/tool/sort.dart b/tool/sort.dart
new file mode 100644
index 000000000..81b74464c
--- /dev/null
+++ b/tool/sort.dart
@@ -0,0 +1,162 @@
+import 'dart:io';
+
+void main(List<String> args) {
+  final currentPath = Directory.current.path;
+  final [packageName, ...] = args;
+
+  // Getting all the dart files for the project
+  final files = dartFiles(currentPath)..remove('$currentPath/lib/generated_plugin_registrant.dart');
+
+  // Sorting and writing to files
+  for (final file in files.values) {
+    final sortedFile = sortImports(file.readAsLinesSync(), packageName);
+    file.writeAsStringSync(sortedFile);
+  }
+
+  stdout.write('Sorted files\n');
+}
+
+/// Get all the dart files for the project and the contents.
+Map<String, File> dartFiles(String currentPath) {
+  final dartFiles = <String, File>{};
+  final allContents = [
+    ..._readDir(currentPath, 'lib'),
+    ..._readDir(currentPath, 'bin'),
+    ..._readDir(currentPath, 'test'),
+    ..._readDir(currentPath, 'tests'),
+    ..._readDir(currentPath, 'test_driver'),
+    ..._readDir(currentPath, 'integration_test'),
+  ];
+
+  for (final file in allContents.whereType<File>().where((file) => file.path.endsWith('.dart'))) {
+    dartFiles[file.path] = file;
+  }
+
+  return dartFiles;
+}
+
+List<FileSystemEntity> _readDir(String currentPath, String name) {
+  if (Directory('$currentPath/$name') case final directory when directory.existsSync()) {
+    return directory.listSync(recursive: true);
+  }
+  return [];
+}
+
+/// Sort the imports.
+String sortImports(List<String> lines, String packageName, {String? filePath}) {
+  final beforeImportLines = <String>[];
+  final afterImportLines = <String>[];
+
+  final dartImports = <String>[];
+  final flutterImports = <String>[];
+  final packageImports = <String>[];
+  final projectRelativeImports = <String>[];
+  final projectImports = <String>[];
+
+  bool noImports() =>
+      dartImports.isEmpty &&
+          flutterImports.isEmpty &&
+          packageImports.isEmpty &&
+          projectImports.isEmpty &&
+          projectRelativeImports.isEmpty;
+
+  var isMultiLineString = false;
+
+  for (final line in lines) {
+    // Check if line is in multiline string
+    if (_timesContained(line, "'''") == 1 || _timesContained(line, '"""') == 1) {
+      isMultiLineString = !isMultiLineString;
+    }
+
+    // If line is an import line
+    if (line.startsWith('import ') && line.endsWith(';') && !isMultiLineString) {
+      if (line.contains('dart:')) {
+        dartImports.add(line);
+      } else if (line.contains('package:flutter/')) {
+        flutterImports.add(line);
+      } else if (line.contains('package:$packageName/')) {
+        projectImports.add(line);
+      } else if (line.contains('package:')) {
+        packageImports.add(line);
+      } else {
+        projectRelativeImports.add(line);
+      }
+    } else if (noImports()) {
+      beforeImportLines.add(line);
+    } else {
+      afterImportLines.add(line);
+    }
+  }
+
+  // If no imports return original string of lines
+  if (noImports()) {
+    var joinedLines = lines.join('\n');
+    if (joinedLines.endsWith('\n') && !joinedLines.endsWith('\n\n')) {
+      joinedLines += '\n';
+    } else if (!joinedLines.endsWith('\n')) {
+      joinedLines += '\n';
+    }
+    return joinedLines;
+  }
+
+  // Remove spaces
+  if (beforeImportLines.isNotEmpty) {
+    if (beforeImportLines.last.trim() == '') {
+      beforeImportLines.removeLast();
+    }
+  }
+
+  final sortedLines = [...beforeImportLines];
+
+  // Adding content conditionally
+  if (beforeImportLines.isNotEmpty) {
+    sortedLines.add('');
+  }
+  if (dartImports.isNotEmpty) {
+    dartImports.sort();
+    sortedLines.addAll(dartImports);
+  }
+  if (flutterImports.isNotEmpty) {
+    if (dartImports.isNotEmpty) sortedLines.add('');
+    flutterImports.sort();
+    sortedLines.addAll(flutterImports);
+  }
+  if (packageImports.isNotEmpty) {
+    if (dartImports.isNotEmpty || flutterImports.isNotEmpty) {
+      sortedLines.add('');
+    }
+    packageImports.sort();
+    sortedLines.addAll(packageImports);
+  }
+  if (projectImports.isNotEmpty || projectRelativeImports.isNotEmpty) {
+    if (dartImports.isNotEmpty || flutterImports.isNotEmpty || packageImports.isNotEmpty) {
+      sortedLines.add('');
+    }
+    projectImports.sort();
+    projectRelativeImports.sort();
+    sortedLines.addAll(projectImports);
+    sortedLines.addAll(projectRelativeImports);
+  }
+
+  sortedLines.add('');
+
+  var addedCode = false;
+  for (final line in afterImportLines) {
+    if (line != '') {
+      sortedLines.add(line);
+      addedCode = true;
+    }
+    if (addedCode && line == '') {
+      sortedLines.add(line);
+    }
+  }
+  sortedLines.add('');
+
+  final sortedFile = sortedLines.join('\n');
+
+  return sortedFile;
+}
+
+/// Get the number of times a string contains another
+/// string
+int _timesContained(String string, String looking) => string.split(looking).length - 1;