diff --git a/lib/settings/data/settings_schema.dart b/lib/settings/data/settings_schema.dart
index 1370371f..5202bce1 100644
--- a/lib/settings/data/settings_schema.dart
+++ b/lib/settings/data/settings_schema.dart
@@ -135,6 +135,8 @@ SettingGroup appSettings = SettingGroup(
           [
             CustomSetting(
               "Color Scheme",
+              description:
+                  "Select from predefined color schemes or create your own",
               defaultColorScheme,
               (context, setting) => ThemesScreen(
                 saveTag: 'color_schemes',
@@ -152,23 +154,19 @@ SettingGroup appSettings = SettingGroup(
               },
               searchTags: ["theme", "style", "visual", "dark mode"],
             ),
-            SwitchSetting(
-              "Override Accent Color",
-              false,
-              onChange: (context, value) {
-                App.setColorScheme(context);
-              },
-            ),
-            ColorSetting(
-              "Accent Color",
-              Colors.cyan,
-              onChange: (context, color) {
-                App.setColorScheme(context);
-              },
-              enableConditions: [
-                SettingEnableConditionParameter("Override Accent Color", true)
-              ],
-            ),
+            SwitchSetting("Override Accent Color", false,
+                onChange: (context, value) {
+              App.setColorScheme(context);
+            }, searchTags: ["primary", "color"]),
+            ColorSetting("Accent Color", Colors.cyan,
+                onChange: (context, color) {
+              App.setColorScheme(context);
+            }, enableConditions: [
+              SettingEnableConditionParameter("Override Accent Color", true)
+            ], searchTags: [
+              "primary",
+              "color"
+            ]),
           ],
         ),
         SettingGroup(
@@ -176,6 +174,7 @@ SettingGroup appSettings = SettingGroup(
           [
             CustomSetting<StyleTheme>(
               "Style Theme",
+              description: "Change styles like shadows, outlines and opacities",
               defaultStyleTheme,
               (context, setting) => ThemesScreen(
                 saveTag: 'style_themes',
@@ -191,7 +190,17 @@ SettingGroup appSettings = SettingGroup(
               onChange: (context, styleTheme) {
                 App.setStyleTheme(context, styleTheme);
               },
-              searchTags: ["scheme", "visual"],
+              searchTags: [
+                "scheme",
+                "visual",
+                "shadow",
+                "outline",
+                "elevation",
+                "card",
+                "border",
+                "opacity",
+                "blur"
+              ],
             ),
           ],
         ),
@@ -208,7 +217,9 @@ SettingGroup appSettings = SettingGroup(
           description: "Set default settings for new alarms",
           icon: Icons.settings,
         ),
-        SelectSetting<NotificationAction>("Dismiss Action Type", [
+        SelectSetting<NotificationAction>("Dismiss Action Type", searchTags: [
+          "action"
+        ], [
           SelectSettingOption(
             "Slide",
             NotificationAction(
@@ -259,13 +270,13 @@ SettingGroup appSettings = SettingGroup(
       "Stopwatch",
       [
         SettingGroup(
-          "Time Format",
-          [
-            SwitchSetting("Show Milliseconds", true),
-          ],
-          description: "Show comparison laps bars in stopwatch",
-          icon: Icons.settings,
-        ),
+            "Time Format",
+            [
+              SwitchSetting("Show Milliseconds", true),
+            ],
+            description: "Show comparison laps bars in stopwatch",
+            icon: Icons.settings,
+            searchTags: ["milliseconds"]),
         SettingGroup(
           "Comparison Lap Bars",
           [
@@ -276,6 +287,7 @@ SettingGroup appSettings = SettingGroup(
           ],
           description: "Show comparison laps bars in stopwatch",
           icon: Icons.settings,
+          searchTags: ["fastest", "slowest", "average", "previous"],
         ),
       ],
       icon: FluxIcons.stopwatch,
diff --git a/lib/theme/data/default_color_schemes.dart b/lib/theme/data/default_color_schemes.dart
index 0b023b64..14c6be3d 100644
--- a/lib/theme/data/default_color_schemes.dart
+++ b/lib/theme/data/default_color_schemes.dart
@@ -157,4 +157,18 @@ List<ColorSchemeData> defaultColorSchemes = [
     onError: Colors.white,
     isDefault: true,
   ),
+  ColorSchemeData(
+    name: 'One Dark Pro',
+    background: const Color.fromARGB(255, 40, 44, 52),
+    onBackground: const Color.fromARGB(255, 240, 240, 240),
+    card: const Color.fromARGB(255, 33, 37, 43),
+    onCard: const Color.fromARGB(255, 240, 240, 240),
+    accent: const Color.fromARGB(255, 198, 120, 221),
+    onAccent: const Color.fromARGB(255, 240, 240, 240),
+    shadow: const Color.fromARGB(255, 0, 0, 0),
+    outline: const Color.fromARGB(255, 38, 38, 38),
+    error: const Color.fromARGB(255, 224, 128, 117),
+    onError: Colors.white,
+    isDefault: false,
+  )
 ];
diff --git a/lib/theme/data/default_style_themes.dart b/lib/theme/data/default_style_themes.dart
index 5c591c7e..ee731844 100644
--- a/lib/theme/data/default_style_themes.dart
+++ b/lib/theme/data/default_style_themes.dart
@@ -41,4 +41,14 @@ List<StyleTheme> defaultStyleThemes = [
     borderWidth: 1,
     isDefault: true,
   ),
+  StyleTheme(
+    name: 'Retro',
+    shadowElevation: 1,
+    shadowOpacity: 0.1,
+    shadowBlurRadius: 2,
+    shadowSpreadRadius: 1,
+    borderRadius: 4,
+    borderWidth: 0,
+    isDefault: true,
+  ),
 ];