diff --git a/example/pubspec.lock b/example/pubspec.lock
index e69de29b..1e3c35cb 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -0,0 +1,264 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  async:
+    dependency: transitive
+    description:
+      name: async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.2"
+  boolean_selector:
+    dependency: transitive
+    description:
+      name: boolean_selector
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
+  charcode:
+    dependency: transitive
+    description:
+      name: charcode
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.3"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.14.13"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  cupertino_icons:
+    dependency: "direct main"
+    description:
+      name: cupertino_icons
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_svg:
+    dependency: "direct main"
+    description:
+      name: flutter_svg
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.18.1"
+  flutter_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  getwidget:
+    dependency: "direct main"
+    description:
+      path: ".."
+      relative: true
+    source: path
+    version: "1.1.3"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.12.8"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.8"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.7.0"
+  path_drawing:
+    dependency: transitive
+    description:
+      name: path_drawing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.1+1"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.4"
+  platform_detect:
+    dependency: transitive
+    description:
+      name: platform_detect
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.4.0"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.4.4"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.99"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.7.0"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.9.5"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.5"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
+  test_api:
+    dependency: transitive
+    description:
+      name: test_api
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.17"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.0"
+  url_launcher:
+    dependency: "direct main"
+    description:
+      name: url_launcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.5.3"
+  url_launcher_linux:
+    dependency: transitive
+    description:
+      name: url_launcher_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+1"
+  url_launcher_macos:
+    dependency: transitive
+    description:
+      name: url_launcher_macos
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+7"
+  url_launcher_platform_interface:
+    dependency: transitive
+    description:
+      name: url_launcher_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.8"
+  url_launcher_web:
+    dependency: transitive
+    description:
+      name: url_launcher_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3+2"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.2.0"
+sdks:
+  dart: ">=2.9.0-14.0.dev <3.0.0"
+  flutter: ">=1.18.0-6.0.pre <2.0.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 3aa763ea..5069cf9b 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -11,9 +11,9 @@ dependencies:
     sdk: flutter
   getwidget:
     path: ../
-  cupertino_icons: ^0.1.2
-  flutter_svg: ^0.18.0
-  url_launcher: ^5.4.1
+  cupertino_icons: ^0.1.3
+  flutter_svg: ^0.18.1
+  url_launcher: ^5.5.3
 
 dev_dependencies:
   flutter_test:
diff --git a/lib/components/accordian/gf_accordian.dart b/lib/components/accordian/gf_accordian.dart
index 506d68bc..6a2594ee 100644
--- a/lib/components/accordian/gf_accordian.dart
+++ b/lib/components/accordian/gf_accordian.dart
@@ -95,14 +95,10 @@ class _GFAccordionState extends State<GFAccordion>
   @override
   void initState() {
     showAccordion = widget.showAccordion;
-    animationController = AnimationController(
-      duration: const Duration(seconds: 2),
-        vsync: this
-    );
+    animationController =
+        AnimationController(duration: const Duration(seconds: 2), vsync: this);
     controller = AnimationController(
-      duration: const Duration(milliseconds: 300),
-        vsync: this
-    );
+        duration: const Duration(milliseconds: 300), vsync: this);
     offset = Tween(
       begin: const Offset(0, -0.06),
       end: Offset.zero,
diff --git a/lib/components/alert/gf_alert.dart b/lib/components/alert/gf_alert.dart
index 0a7100d5..da62957c 100644
--- a/lib/components/alert/gf_alert.dart
+++ b/lib/components/alert/gf_alert.dart
@@ -67,9 +67,7 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
   @override
   void initState() {
     animationController = AnimationController(
-      duration: const Duration(milliseconds: 300),
-        vsync: this
-    );
+        duration: const Duration(milliseconds: 300), vsync: this);
     animation = CurvedAnimation(
       parent: animationController,
       curve: Curves.fastOutSlowIn,
diff --git a/lib/components/animation/gf_animation.dart b/lib/components/animation/gf_animation.dart
index 59bd97fd..27959dc8 100644
--- a/lib/components/animation/gf_animation.dart
+++ b/lib/components/animation/gf_animation.dart
@@ -118,7 +118,8 @@ class _GFAnimationState extends State<GFAnimation>
     if (widget.type == GFAnimationType.rotateTransition) {
       controller = widget.controller ??
           AnimationController(
-              duration: widget.duration ?? const Duration(seconds: 2), vsync: this);
+              duration: widget.duration ?? const Duration(seconds: 2),
+              vsync: this);
       animation = widget.turnsAnimation ??
           Tween<double>(begin: 0, end: 20).animate(controller);
       if (widget.turnsAnimation == null) {
@@ -127,15 +128,16 @@ class _GFAnimationState extends State<GFAnimation>
     } else if (widget.type == GFAnimationType.scaleTransition) {
       controller = widget.controller ??
           AnimationController(
-              duration: widget.duration ?? const Duration(seconds: 2), vsync: this);
+              duration: widget.duration ?? const Duration(seconds: 2),
+              vsync: this);
       animation = widget.scaleAnimation ??
           CurvedAnimation(
               parent: controller, curve: widget.curve ?? Curves.ease);
       controller.forward();
     } else if (widget.type == GFAnimationType.slideTransition) {
       controller = AnimationController(
-        duration: widget.duration ?? const Duration(seconds: 2), vsync: this
-      )..repeat(reverse: true);
+          duration: widget.duration ?? const Duration(seconds: 2), vsync: this)
+        ..repeat(reverse: true);
       offsetAnimation = Tween<Offset>(
         begin: Offset.zero,
         end: const Offset(1.5, 0),
@@ -252,7 +254,7 @@ class _GFAnimationState extends State<GFAnimation>
                   fontWeight: widget.fontWeight ?? FontWeight.normal,
                   fontSize: widget.fontSize ?? 16,
                   color: widget.color ?? Colors.blue),
-//          textWidthBasis: widget.textWidthBasis ?? TextWidthBasis.parent,
+          textWidthBasis: widget.textWidthBasis ?? TextWidthBasis.parent,
           textAlign: widget.textAlign ?? TextAlign.start,
           curve: widget.curve ?? Curves.linear,
           duration: widget.duration ?? const Duration(seconds: 2),
diff --git a/lib/components/appbar/gf_appbar.dart b/lib/components/appbar/gf_appbar.dart
index 8196fd60..d32582e7 100644
--- a/lib/components/appbar/gf_appbar.dart
+++ b/lib/components/appbar/gf_appbar.dart
@@ -322,12 +322,12 @@ class _GFAppBarState extends State<GFAppBar> {
     IconThemeData actionsIconTheme = widget.actionsIconTheme ??
         appBarTheme.actionsIconTheme ??
         overallIconTheme;
-    TextStyle centerStyle = widget.textTheme?.headline ??
-        appBarTheme.textTheme?.headline ??
-        theme.primaryTextTheme.headline;
-    TextStyle sideStyle = widget.textTheme?.body1 ??
-        appBarTheme.textTheme?.body1 ??
-        theme.primaryTextTheme.body1;
+    TextStyle centerStyle = widget.textTheme?.headline5 ??
+        appBarTheme.textTheme?.headline5 ??
+        theme.primaryTextTheme.headline5;
+    TextStyle sideStyle = widget.textTheme?.bodyText1 ??
+        appBarTheme.textTheme?.bodyText1 ??
+        theme.primaryTextTheme.bodyText1;
 
     if (widget.toolbarOpacity != 1.0) {
       final double opacity = const Interval(
diff --git a/lib/components/avatar/gf_avatar.dart b/lib/components/avatar/gf_avatar.dart
index baee7e65..320c263c 100644
--- a/lib/components/avatar/gf_avatar.dart
+++ b/lib/components/avatar/gf_avatar.dart
@@ -87,7 +87,7 @@ class GFAvatar extends StatelessWidget {
     final Color foregroundColor = this.foregroundColor;
     assert(debugCheckHasMediaQuery(context));
     final ThemeData theme = Theme.of(context);
-    TextStyle textStyle = theme.primaryTextTheme.subtitle.copyWith(
+    TextStyle textStyle = theme.primaryTextTheme.subtitle1.copyWith(
       color: foregroundColor,
     );
     Color effectiveBackgroundColor = backgroundColor;
diff --git a/lib/components/carousel/gf_items_carousel.dart b/lib/components/carousel/gf_items_carousel.dart
index a79c29cf..f65efce4 100644
--- a/lib/components/carousel/gf_items_carousel.dart
+++ b/lib/components/carousel/gf_items_carousel.dart
@@ -82,9 +82,8 @@ class _GFItemsCarouselState extends State<GFItemsCarousel>
   void initState() {
     offset = 0;
     animationController = AnimationController(
-      duration: const Duration(milliseconds: dragAnimationDuration),
-        vsync: this
-    );
+        duration: const Duration(milliseconds: dragAnimationDuration),
+        vsync: this);
     Future.delayed(Duration.zero, () {
       setState(() {
         final double localWidth = MediaQuery.of(context).size.width;
@@ -132,9 +131,8 @@ class _GFItemsCarouselState extends State<GFItemsCarousel>
     }
 
     animationController = AnimationController(
-      duration: const Duration(milliseconds: dragAnimationDuration),
-        vsync: this
-    );
+        duration: const Duration(milliseconds: dragAnimationDuration),
+        vsync: this);
 
     final Tween tween =
         Tween<double>(begin: offset, end: calculateOffset(0.5 * dx));
@@ -164,9 +162,8 @@ class _GFItemsCarouselState extends State<GFItemsCarousel>
     final double beginAnimation = offset;
     final double endAnimation = size * (offset / size).round().toDouble();
     animationController = AnimationController(
-      duration: const Duration(milliseconds: shiftAnimationDuration),
-        vsync: this
-    );
+        duration: const Duration(milliseconds: shiftAnimationDuration),
+        vsync: this);
     final Tween tween = Tween<double>(begin: beginAnimation, end: endAnimation);
     final Animation animation = tween.animate(animationController);
     animation.addListener(() {
diff --git a/lib/components/loader/gf_loader.dart b/lib/components/loader/gf_loader.dart
index b09425ef..769e6426 100644
--- a/lib/components/loader/gf_loader.dart
+++ b/lib/components/loader/gf_loader.dart
@@ -71,10 +71,7 @@ class _GFLoaderState extends State<GFLoader>
   void initState() {
     super.initState();
 
-    controller = AnimationController(
-      duration: widget.duration,
-        vsync: this
-    );
+    controller = AnimationController(duration: widget.duration, vsync: this);
 
     loaderanimation1 = Tween<double>(begin: 0, end: 1).animate(
       CurvedAnimation(
diff --git a/lib/components/progress_bar/gf_progress_bar.dart b/lib/components/progress_bar/gf_progress_bar.dart
index b06b8cf3..5da517f8 100644
--- a/lib/components/progress_bar/gf_progress_bar.dart
+++ b/lib/components/progress_bar/gf_progress_bar.dart
@@ -130,7 +130,8 @@ class _GFProgressBarState extends State<GFProgressBar>
     super.initState();
     if (widget.animation) {
       _animationController = AnimationController(
-          duration: Duration(milliseconds: widget.animationDuration), vsync: this);
+          duration: Duration(milliseconds: widget.animationDuration),
+          vsync: this);
       _animation =
           Tween(begin: 0, end: widget.percentage).animate(_animationController)
             ..addListener(() {
@@ -145,7 +146,8 @@ class _GFProgressBarState extends State<GFProgressBar>
 
     if (widget.animation) {
       circularAnimationController = AnimationController(
-          duration: Duration(milliseconds: widget.animationDuration), vsync: this);
+          duration: Duration(milliseconds: widget.animationDuration),
+          vsync: this);
       circularAnimation = Tween(begin: 0, end: widget.percentage)
           .animate(circularAnimationController)
             ..addListener(() {
diff --git a/lib/components/toast/gf_toast.dart b/lib/components/toast/gf_toast.dart
index 1fde843a..cb53d23e 100644
--- a/lib/components/toast/gf_toast.dart
+++ b/lib/components/toast/gf_toast.dart
@@ -69,10 +69,8 @@ class _GFToastState extends State<GFToast> with TickerProviderStateMixin {
 
   @override
   void initState() {
-    animationController = AnimationController(
-      duration: widget.duration,
-        vsync: this
-    );
+    animationController =
+        AnimationController(duration: widget.duration, vsync: this);
     animation = CurvedAnimation(
       parent: animationController,
       curve: Curves.easeIn,
@@ -80,10 +78,9 @@ class _GFToastState extends State<GFToast> with TickerProviderStateMixin {
 
     if (mounted) {
       animationController.forward();
-      fadeanimationController = AnimationController(
-        duration: widget.animationDuration,
-          vsync: this
-      )..addListener(() => setState(() {}));
+      fadeanimationController =
+          AnimationController(duration: widget.animationDuration, vsync: this)
+            ..addListener(() => setState(() {}));
       fadeanimation = Tween<double>(
         begin: 0,
         end: 1,
diff --git a/pubspec.lock b/pubspec.lock
index 67a7df16..9477cdd7 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,62 +1,55 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.11"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.5.2"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.2"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "2.0.0"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
-  collection:
+    version: "1.1.3"
+  clock:
     dependency: transitive
     description:
-      name: collection
+      name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
-  convert:
+    version: "1.0.1"
+  collection:
     dependency: transitive
     description:
-      name: convert
+      name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
-  crypto:
+    version: "1.14.13"
+  fake_async:
     dependency: transitive
     description:
-      name: crypto
+      name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "1.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -67,20 +60,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  image:
-    dependency: transitive
-    description:
-      name: image
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.6"
+    version: "0.12.8"
   meta:
     dependency: transitive
     description:
@@ -94,28 +80,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.4"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.0+1"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.4.0"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.5"
+    version: "1.7.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -127,14 +92,14 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.7.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.3"
+    version: "1.9.5"
   stream_channel:
     dependency: transitive
     description:
@@ -162,14 +127,14 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.11"
+    version: "0.2.17"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.2.0"
   vector_math:
     dependency: transitive
     description:
@@ -177,12 +142,5 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.5.0"
 sdks:
-  dart: ">=2.4.0 <3.0.0"
+  dart: ">=2.9.0-14.0.dev <3.0.0"