diff --git a/example/pubspec.lock b/example/pubspec.lock
index 9e9ce622..e73f800f 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,14 +21,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -42,14 +42,14 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -66,21 +66,28 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   persistent_bottom_nav_bar:
     dependency: "direct dev"
     description:
@@ -99,7 +106,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.2"
   stack_trace:
     dependency: transitive
     description:
@@ -134,20 +141,13 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.0"
+    version: "0.4.9"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.17.0-0 <3.0.0"
diff --git a/lib/animations/animations.dart b/lib/animations/animations.dart
index 36cc6f4f..7243f985 100644
--- a/lib/animations/animations.dart
+++ b/lib/animations/animations.dart
@@ -52,7 +52,7 @@ class _OffsetAnimationState extends State<OffsetAnimation>
   }
 
   _hideAnimation() {
-    WidgetsBinding.instance!.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       if (_hideNavigationBar!) {
         _navBarHideAnimationController.forward();
       } else {
diff --git a/lib/models/tab-view.widget.dart b/lib/models/tab-view.widget.dart
index 1bfca579..832a2b31 100644
--- a/lib/models/tab-view.widget.dart
+++ b/lib/models/tab-view.widget.dart
@@ -62,6 +62,8 @@ class _CustomTabViewState extends State<CustomTabView> {
     } else if (widget.routeAndNavigatorSettings!.routes != null) {
       routeBuilder = widget.routeAndNavigatorSettings!.routes![name!];
     }
+    if (widget.routeAndNavigatorSettings!.onGenerateRoute != null)
+      return widget.routeAndNavigatorSettings!.onGenerateRoute!(settings);
     if (routeBuilder != null) {
       return PageRouteBuilder(
         pageBuilder: (context, animation, secondaryAnimation) =>
@@ -74,8 +76,6 @@ class _CustomTabViewState extends State<CustomTabView> {
                 '/9f580fc5-c252-45d0-af25-9429992db112'),
       );
     }
-    if (widget.routeAndNavigatorSettings!.onGenerateRoute != null)
-      return widget.routeAndNavigatorSettings!.onGenerateRoute!(settings);
     return null;
   }
 
diff --git a/lib/nav-bar-styles/style-11-bottom-nav-bar.widget.dart b/lib/nav-bar-styles/style-11-bottom-nav-bar.widget.dart
index 14379350..c42c6857 100644
--- a/lib/nav-bar-styles/style-11-bottom-nav-bar.widget.dart
+++ b/lib/nav-bar-styles/style-11-bottom-nav-bar.widget.dart
@@ -43,7 +43,7 @@ class _BottomNavStyle11State extends State<BottomNavStyle11>
           .animate(_animationControllerList[i]));
     }
 
-    WidgetsBinding.instance!.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       _animationControllerList[_selectedIndex!].forward();
     });
   }
diff --git a/lib/nav-bar-styles/style-12-bottom-nav-bar.widget.dart b/lib/nav-bar-styles/style-12-bottom-nav-bar.widget.dart
index f748cf99..2a2b5841 100644
--- a/lib/nav-bar-styles/style-12-bottom-nav-bar.widget.dart
+++ b/lib/nav-bar-styles/style-12-bottom-nav-bar.widget.dart
@@ -43,7 +43,7 @@ class _BottomNavStyle12State extends State<BottomNavStyle12>
           .animate(_animationControllerList[i]));
     }
 
-    WidgetsBinding.instance!.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       _animationControllerList[_selectedIndex!].forward();
     });
   }
diff --git a/lib/nav-bar-styles/style-13-bottom-nav-bar.widget.dart b/lib/nav-bar-styles/style-13-bottom-nav-bar.widget.dart
index 344226cc..450932e7 100644
--- a/lib/nav-bar-styles/style-13-bottom-nav-bar.widget.dart
+++ b/lib/nav-bar-styles/style-13-bottom-nav-bar.widget.dart
@@ -43,7 +43,7 @@ class _BottomNavStyle13State extends State<BottomNavStyle13>
           .animate(_animationControllerList[i]));
     }
 
-    WidgetsBinding.instance!.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       _animationControllerList[_selectedIndex!].forward();
     });
   }
diff --git a/lib/nav-bar-styles/style-14-bottom-nav-bar.widget.dart b/lib/nav-bar-styles/style-14-bottom-nav-bar.widget.dart
index 2d608b1d..d12005f7 100644
--- a/lib/nav-bar-styles/style-14-bottom-nav-bar.widget.dart
+++ b/lib/nav-bar-styles/style-14-bottom-nav-bar.widget.dart
@@ -43,7 +43,7 @@ class _BottomNavStyle14State extends State<BottomNavStyle14>
           .animate(_animationControllerList[i]));
     }
 
-    WidgetsBinding.instance!.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       _animationControllerList[_selectedIndex!].forward();
     });
   }
diff --git a/lib/nav-bar-styles/style-6-bottom-nav-bar.widget.dart b/lib/nav-bar-styles/style-6-bottom-nav-bar.widget.dart
index 1fc1e0a3..1886392f 100644
--- a/lib/nav-bar-styles/style-6-bottom-nav-bar.widget.dart
+++ b/lib/nav-bar-styles/style-6-bottom-nav-bar.widget.dart
@@ -41,7 +41,7 @@ class _BottomNavStyle6State extends State<BottomNavStyle6>
           .animate(_animationControllerList[i]));
     }
 
-    WidgetsBinding.instance!.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       _animationControllerList[_selectedIndex!].forward();
     });
   }
diff --git a/lib/nav-bar-styles/style-8-bottom-nav-bar.widget.dart b/lib/nav-bar-styles/style-8-bottom-nav-bar.widget.dart
index bae36f56..ed6b56de 100644
--- a/lib/nav-bar-styles/style-8-bottom-nav-bar.widget.dart
+++ b/lib/nav-bar-styles/style-8-bottom-nav-bar.widget.dart
@@ -41,7 +41,7 @@ class _BottomNavStyle8State extends State<BottomNavStyle8>
           .animate(_animationControllerList[i]));
     }
 
-    WidgetsBinding.instance!.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       _animationControllerList[_selectedIndex!].forward();
     });
   }
diff --git a/lib/neumorphic-package-by-serge-software/neumorphic-card.dart b/lib/neumorphic-package-by-serge-software/neumorphic-card.dart
index 42cafe89..eccf7368 100644
--- a/lib/neumorphic-package-by-serge-software/neumorphic-card.dart
+++ b/lib/neumorphic-package-by-serge-software/neumorphic-card.dart
@@ -54,7 +54,7 @@ class NeumorphicContainer extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final color = decoration.color ?? Theme.of(context).backgroundColor;
+    final color = decoration.color ?? Theme.of(context).scaffoldBackgroundColor;
     final emboss = curveType == CurveType.emboss;
 
     Color colorValue = color;
diff --git a/lib/persistent-tab-view.widget.dart b/lib/persistent-tab-view.widget.dart
index 9b359c62..f458d3c0 100644
--- a/lib/persistent-tab-view.widget.dart
+++ b/lib/persistent-tab-view.widget.dart
@@ -365,7 +365,7 @@ class _PersistentTabViewState extends State<PersistentTabView> {
       }
     });
     if (widget.selectedTabScreenContext != null) {
-      WidgetsBinding.instance!.addPostFrameCallback((_) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
         widget.selectedTabScreenContext!(_contextList[_controller!.index]);
       });
     }
diff --git a/pubspec.lock b/pubspec.lock
index 49a0ce66..7d27b519 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,14 +21,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -42,14 +42,14 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -66,21 +66,28 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -92,7 +99,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.2"
   stack_trace:
     dependency: transitive
     description:
@@ -127,20 +134,13 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.0"
+    version: "0.4.9"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.17.0-0 <3.0.0"