diff --git a/lib/core/theme/app_theme.dart b/lib/core/theme/app_theme.dart
index 6a5e3a9..24de67e 100644
--- a/lib/core/theme/app_theme.dart
+++ b/lib/core/theme/app_theme.dart
@@ -279,7 +279,7 @@ class AppTheme {
             borderRadius: BorderRadius.circular(radiusMd),
           ),
           padding:
-              const EdgeInsets.symmetric(horizontal: spacing20, vertical: spacing10),
+              const EdgeInsets.symmetric(horizontal: spacing20, vertical: spacing12),
           textStyle: GoogleFonts.inter(
             fontWeight: FontWeight.w600,
             fontSize: 14,
@@ -301,7 +301,7 @@ class AppTheme {
       ),
 
       // ============ CARDS ============
-      cardTheme: CardTheme(
+      cardTheme: CardThemeData(
         color: AppColors.surface,
         elevation: 0,
         margin: EdgeInsets.zero,
@@ -312,7 +312,7 @@ class AppTheme {
       ),
 
       // ============ DIALOGS & BOTTOM SHEETS ============
-      dialogTheme: DialogTheme(
+      dialogTheme: DialogThemeData(
         backgroundColor: AppColors.surface,
         elevation: elevationXl,
         shape: RoundedRectangleBorder(
diff --git a/lib/core/widgets/components/ui_components.dart b/lib/core/widgets/components/ui_components.dart
index 139d907..3419c6d 100644
--- a/lib/core/widgets/components/ui_components.dart
+++ b/lib/core/widgets/components/ui_components.dart
@@ -79,7 +79,7 @@ class _GradientButtonState extends State<GradientButton>
   void initState() {
     super.initState();
     _controller = AnimationController(
-      duration: AppTheme.durationFast,
+      duration: AppTheme.durationSm,
       vsync: this,
     );
     _scaleAnimation = Tween<double>(begin: 1.0, end: 0.95).animate(
@@ -356,10 +356,10 @@ class _MediaCardState extends State<MediaCard>
             Expanded(
               child: AnimatedScale(
                 scale: _isHovered ? 1.05 : 1.0,
-                duration: AppTheme.durationFast,
+                duration: AppTheme.durationSm,
                 curve: AppTheme.curveDefault,
                 child: AnimatedContainer(
-                  duration: AppTheme.durationFast,
+                  duration: AppTheme.durationSm,
                   decoration: BoxDecoration(
                     borderRadius: BorderRadius.circular(AppTheme.radiusMd),
                     color: AppColors.surface,
diff --git a/lib/features/admin/screens/admin_panel.dart b/lib/features/admin/screens/admin_panel.dart
index da7418a..4eefc2d 100644
--- a/lib/features/admin/screens/admin_panel.dart
+++ b/lib/features/admin/screens/admin_panel.dart
@@ -137,7 +137,7 @@ class _AdminContentState extends ConsumerState<AdminContent>
         return GestureDetector(
           onTap: () => _tabController.animateTo(index),
           child: AnimatedContainer(
-            duration: AppTheme.durationFast,
+            duration: AppTheme.durationSm,
             padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
             decoration: BoxDecoration(
               color: isSelected ? AppColors.focusColor : Colors.transparent,
diff --git a/lib/features/iptv/screens/dashboard_screen.dart b/lib/features/iptv/screens/dashboard_screen.dart
index f715be8..6c589f5 100644
--- a/lib/features/iptv/screens/dashboard_screen.dart
+++ b/lib/features/iptv/screens/dashboard_screen.dart
@@ -102,7 +102,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
               opacity: 0.1,
               // blur is hardcoded in GlassContainer (15), so we don't pass it
               // border is bool, borderColor allows customization
-              border: true,
+              hasBorder: true,
               borderColor: Colors.white.withOpacity(0.1),
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
diff --git a/lib/features/iptv/screens/player_screen.dart b/lib/features/iptv/screens/player_screen.dart
index e76ba4b..760aaa1 100644
--- a/lib/features/iptv/screens/player_screen.dart
+++ b/lib/features/iptv/screens/player_screen.dart
@@ -636,7 +636,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
                         child: GlassContainer(
                           borderRadius: 24,
                           opacity: 0.2, // Slightly more opaque for controls
-                          border: true,
+                          hasBorder: true,
                           borderColor: Colors.white.withOpacity(0.1),
                           padding: const EdgeInsets.all(24),
                           child: Column(
diff --git a/lib/mobile/theme/mobile_theme.dart b/lib/mobile/theme/mobile_theme.dart
index d005e6f..5a09850 100644
--- a/lib/mobile/theme/mobile_theme.dart
+++ b/lib/mobile/theme/mobile_theme.dart
@@ -260,7 +260,7 @@ class MobileTheme {
       ),
 
       // ============ CARDS ============
-      cardTheme: CardTheme(
+      cardTheme: CardThemeData(
         color: AppColors.surface,
         elevation: 0,
         margin: EdgeInsets.zero,
@@ -271,7 +271,7 @@ class MobileTheme {
       ),
 
       // ============ DIALOGS ============
-      dialogTheme: DialogTheme(
+      dialogTheme: DialogThemeData(
         backgroundColor: AppColors.surface,
         elevation: AppTheme.elevationLg,
         shape: RoundedRectangleBorder(