diff --git a/lib/screens/common_widgets/button_navbar.dart b/lib/screens/common_widgets/button_navbar.dart
index 39b7938a..cd3dfe07 100644
--- a/lib/screens/common_widgets/button_navbar.dart
+++ b/lib/screens/common_widgets/button_navbar.dart
@@ -74,10 +74,7 @@ class NavbarButton extends ConsumerWidget {
                               ? Theme.of(context)
                                   .colorScheme
                                   .onSecondaryContainer
-                              : Theme.of(context)
-                                  .colorScheme
-                                  .onSurface
-                                  .withOpacity(0.65),
+                              : Theme.of(context).colorScheme.onSurfaceVariant,
                         ),
                   )
                 : const SizedBox.shrink(),
diff --git a/lib/screens/common_widgets/editor_title.dart b/lib/screens/common_widgets/editor_title.dart
index 453e2a4f..8cd51a7e 100644
--- a/lib/screens/common_widgets/editor_title.dart
+++ b/lib/screens/common_widgets/editor_title.dart
@@ -29,10 +29,7 @@ class EditorTitle extends StatelessWidget {
             tooltip: title,
             onSelected: onSelected,
             child: Ink(
-              color: Theme.of(context)
-                  .colorScheme
-                  .secondaryContainer
-                  .withOpacity(0.3),
+              color: Theme.of(context).colorScheme.surface,
               padding:
                   const EdgeInsets.symmetric(horizontal: 12.0, vertical: 6),
               child: Row(
diff --git a/lib/screens/common_widgets/envfield_cell.dart b/lib/screens/common_widgets/envfield_cell.dart
index 6eedad02..7aceae1b 100644
--- a/lib/screens/common_widgets/envfield_cell.dart
+++ b/lib/screens/common_widgets/envfield_cell.dart
@@ -29,17 +29,13 @@ class EnvCellField extends StatelessWidget {
       ),
       decoration: InputDecoration(
         hintStyle: kCodeStyle.copyWith(
-          color: clrScheme.outline.withOpacity(
-            kHintOpacity,
-          ),
+          color: clrScheme.outlineVariant,
         ),
         hintText: hintText,
         contentPadding: const EdgeInsets.only(bottom: 12),
         focusedBorder: UnderlineInputBorder(
           borderSide: BorderSide(
-            color: clrScheme.primary.withOpacity(
-              kHintOpacity,
-            ),
+            color: clrScheme.outlineVariant,
           ),
         ),
         enabledBorder: UnderlineInputBorder(
diff --git a/lib/screens/common_widgets/envfield_url.dart b/lib/screens/common_widgets/envfield_url.dart
index 2e7e7de5..6e6b3706 100644
--- a/lib/screens/common_widgets/envfield_url.dart
+++ b/lib/screens/common_widgets/envfield_url.dart
@@ -26,9 +26,7 @@ class EnvURLField extends StatelessWidget {
       decoration: InputDecoration(
         hintText: kHintTextUrlCard,
         hintStyle: kCodeStyle.copyWith(
-          color: Theme.of(context).colorScheme.outline.withOpacity(
-                kHintOpacity,
-              ),
+          color: Theme.of(context).colorScheme.outlineVariant,
         ),
         border: InputBorder.none,
       ),
diff --git a/lib/screens/dashboard.dart b/lib/screens/dashboard.dart
index d71b3008..3e33cbb6 100644
--- a/lib/screens/dashboard.dart
+++ b/lib/screens/dashboard.dart
@@ -107,7 +107,7 @@ class Dashboard extends ConsumerWidget {
             VerticalDivider(
               thickness: 1,
               width: 1,
-              color: Theme.of(context).colorScheme.surfaceContainerHighest,
+              color: Theme.of(context).colorScheme.surfaceContainerHigh,
             ),
             Expanded(
               child: IndexedStack(
diff --git a/lib/screens/history/history_sidebar.dart b/lib/screens/history/history_sidebar.dart
index 77e4b36e..a6ec2721 100644
--- a/lib/screens/history/history_sidebar.dart
+++ b/lib/screens/history/history_sidebar.dart
@@ -112,14 +112,14 @@ class _HistoryExpansionTileState extends ConsumerState<HistoryExpansionTile>
               child: Icon(
                 Icons.chevron_right_rounded,
                 size: 20,
-                color: colorScheme.onSurface.withOpacity(0.6),
+                color: colorScheme.outline,
               )),
           kHSpacer5,
           Text(
             humanizeDate(widget.date),
             style: Theme.of(context).textTheme.titleSmall?.copyWith(
                   fontWeight: FontWeight.bold,
-                  color: colorScheme.onSurface.withOpacity(0.6),
+                  color: colorScheme.outline,
                 ),
           ),
         ],
diff --git a/lib/screens/mobile/navbar.dart b/lib/screens/mobile/navbar.dart
index b1495b6a..71fe8c5c 100644
--- a/lib/screens/mobile/navbar.dart
+++ b/lib/screens/mobile/navbar.dart
@@ -23,7 +23,7 @@ class BottomNavBar extends ConsumerWidget {
                 color: Theme.of(context).colorScheme.onInverseSurface,
               ),
             ),
-            color: Theme.of(context).colorScheme.surface,
+            color: Theme.of(context).colorScheme.surfaceContainerLowest,
           ),
           child: Material(
             type: MaterialType.transparency,
diff --git a/lib/screens/mobile/widgets/page_base.dart b/lib/screens/mobile/widgets/page_base.dart
index ebd3ff4c..d9726b19 100644
--- a/lib/screens/mobile/widgets/page_base.dart
+++ b/lib/screens/mobile/widgets/page_base.dart
@@ -21,9 +21,9 @@ class PageBase extends ConsumerWidget {
     final isDarkMode =
         ref.watch(settingsProvider.select((value) => value.isDark));
     final scaffold = Scaffold(
-      backgroundColor: Theme.of(context).colorScheme.surface,
+      backgroundColor: Theme.of(context).colorScheme.surfaceContainerLowest,
       appBar: AppBar(
-        backgroundColor: Theme.of(context).colorScheme.surface,
+        backgroundColor: Theme.of(context).colorScheme.surfaceContainerLowest,
         primary: true,
         title: Text(title),
         centerTitle: true,
@@ -43,7 +43,7 @@ class PageBase extends ConsumerWidget {
                   ? kPb70
                   : EdgeInsets.zero) +
               (kIsWindows || kIsMacOS ? kPt28 : EdgeInsets.zero),
-          color: Theme.of(context).colorScheme.surface,
+          color: Theme.of(context).colorScheme.surfaceContainerLowest,
           child: scaffold,
         ),
         if (kIsWindows)