diff --git a/lib/components/form/text_form_field.dart b/lib/components/form/text_form_field.dart
index b07c33e3..dc92c257 100644
--- a/lib/components/form/text_form_field.dart
+++ b/lib/components/form/text_form_field.dart
@@ -14,7 +14,7 @@ class TextFormBuilderField extends StatelessWidget {
   // final AlignmentGeometry? placeholderAlignment;
   // final AlignmentGeometry? leadingAlignment;
   // final AlignmentGeometry? trailingAlignment;
-  final bool border;
+  final Border? border;
   final List<InputFeature> features;
   final EdgeInsetsGeometry? padding;
   final ValueChanged<String>? onSubmitted;
@@ -61,7 +61,7 @@ class TextFormBuilderField extends StatelessWidget {
     this.minLines,
     this.filled = false,
     this.placeholder,
-    this.border = true,
+    this.border,
     this.padding,
     this.onSubmitted,
     this.onEditingComplete,
diff --git a/lib/main.dart b/lib/main.dart
index 8f02371d..b1eb7c78 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -217,7 +217,7 @@ class Spotube extends HookConsumerWidget {
         iconTheme: const IconThemeProperties(),
         colorScheme:
             colorSchemeMap[accentMaterialColor.name]?.call(ThemeMode.light) ??
-                ColorSchemes.lightOrange(),
+                LegacyColorSchemes.lightOrange(),
         surfaceOpacity: .8,
         surfaceBlur: 10,
       ),
@@ -226,7 +226,7 @@ class Spotube extends HookConsumerWidget {
         iconTheme: const IconThemeProperties(),
         colorScheme:
             colorSchemeMap[accentMaterialColor.name]?.call(ThemeMode.dark) ??
-                ColorSchemes.darkOrange(),
+                LegacyColorSchemes.darkOrange(),
         surfaceOpacity: .8,
         surfaceBlur: 10,
       ),
diff --git a/lib/modules/settings/color_scheme_picker_dialog.dart b/lib/modules/settings/color_scheme_picker_dialog.dart
index 3fb05e72..9469ff00 100644
--- a/lib/modules/settings/color_scheme_picker_dialog.dart
+++ b/lib/modules/settings/color_scheme_picker_dialog.dart
@@ -41,18 +41,18 @@ final Set<SpotubeColor> colorsMap = {
 };
 
 final colorSchemeMap = {
-  "slate": ColorSchemes.slate,
-  "gray": ColorSchemes.gray,
-  "zinc": ColorSchemes.zinc,
-  "neutral": ColorSchemes.neutral,
-  "stone": ColorSchemes.stone,
-  "red": ColorSchemes.red,
-  "orange": ColorSchemes.orange,
-  "yellow": ColorSchemes.yellow,
-  "green": ColorSchemes.green,
-  "blue": ColorSchemes.blue,
-  "violet": ColorSchemes.violet,
-  "rose": ColorSchemes.rose,
+  "slate": LegacyColorSchemes.slate,
+  "gray": LegacyColorSchemes.gray,
+  "zinc": LegacyColorSchemes.zinc,
+  "neutral": LegacyColorSchemes.neutral,
+  "stone": LegacyColorSchemes.stone,
+  "red": LegacyColorSchemes.red,
+  "orange": LegacyColorSchemes.orange,
+  "yellow": LegacyColorSchemes.yellow,
+  "green": LegacyColorSchemes.green,
+  "blue": LegacyColorSchemes.blue,
+  "violet": LegacyColorSchemes.violet,
+  "rose": LegacyColorSchemes.rose,
 };
 
 class ColorSchemePickerDialog extends HookConsumerWidget {
diff --git a/pubspec.lock b/pubspec.lock
index 00ff5cbf..88cf5f5a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1235,7 +1235,7 @@ packages:
     description:
       path: "."
       ref: main
-      resolved-ref: "7e9032c054c547f7900c9c9fe4b76e29c8ac1cd1"
+      resolved-ref: "577ad115dce0514afc53e2b3ab7b96bcd88d3be3"
       url: "https://github.com/hetu-community/hetu_std.git"
     source: git
     version: "1.0.0"
@@ -2121,10 +2121,10 @@ packages:
     dependency: "direct main"
     description:
       name: shadcn_flutter
-      sha256: "979a86e203eb1fb139e8b5c84b49b17b28808804cbff189b43052d56ba6854b5"
+      sha256: "4a4dff36252101f344c77fd659d791c52c808cfe3ab68deea4ea949d942d9e5b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.0.37"
+    version: "0.0.39"
   shared_preferences:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 3802b2c0..8f11fc37 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -101,7 +101,7 @@ dependencies:
       ref: dart-3-support
       url: https://github.com/KRTirtho/scrobblenaut.git
   scroll_to_index: ^3.0.1
-  shadcn_flutter: ^0.0.37
+  shadcn_flutter: ^0.0.39
   shared_preferences: ^2.2.3
   shelf: ^1.4.1
   shelf_router: ^1.1.4