diff --git a/lib/pages/home.dart b/lib/pages/home.dart
index 3399f81..d8e6d87 100644
--- a/lib/pages/home.dart
+++ b/lib/pages/home.dart
@@ -34,7 +34,7 @@ import '../widgets/mobile/mobile_navigation_drawer.dart';
 class Home extends StatefulWidget {
   final String title;
 
-  Home({Key key, this.title = ''}) : super(key: key);
+  Home({Key? key, this.title = ''}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() {
@@ -46,11 +46,11 @@ class Home extends StatefulWidget {
 class HomeState extends State<Home> {
   final _scaffoldKey = GlobalKey<ScaffoldState>();
   List<Gallery> galleries = [];
-  String content1Message;
-  Map<String, dynamic> content2;
+  String? content1Message;
+  Map<String, dynamic>? content2;
 
-  StreamSubscription _sub;
-  Uri _latestUri;
+  StreamSubscription? _sub;
+  Uri? _latestUri;
 
   @override
   Widget build(BuildContext context) {
@@ -80,9 +80,9 @@ class HomeState extends State<Home> {
                   mainAxisSize: MainAxisSize.min,
                   children: [
                     MobileIndexCarousel(galleries),
-                    MobileIndexMainContent1(content1Message),
-                    MobileIndexMainContent2(content2),
-                    MobileIndexMainContent3(content2),
+                    MobileIndexMainContent1(content1Message ?? ''),
+                    MobileIndexMainContent2(content2 ?? <String, dynamic>{}),
+                    MobileIndexMainContent3(content2 ?? <String, dynamic>{}),
                   ],
                 ),
               ),
@@ -91,24 +91,24 @@ class HomeState extends State<Home> {
                   mainAxisSize: MainAxisSize.min,
                   children: [
                     DesktopIndexCarousel(galleries),
-                    DesktopIndexMainContent1(content1Message),
-                    DesktopIndexMainContent2(content2),
+                    DesktopIndexMainContent1(content1Message ?? ''),
+                    DesktopIndexMainContent2(content2 ?? <String, dynamic>{}),
                     CustomersLogo(),
-                    DesktopIndexMainContent3(content2),
+                    DesktopIndexMainContent3(content2 ?? <String, dynamic>{}),
                   ],
                 ),
               ),
               desktop: Scrollbar(
-                isAlwaysShown: true,
+                thumbVisibility: true,
                 child: SingleChildScrollView(
                   child: Column(
                     mainAxisSize: MainAxisSize.min,
                     children: [
                       DesktopIndexCarousel(galleries),
-                      DesktopIndexMainContent1(content1Message),
-                      DesktopIndexMainContent2(content2),
+                      DesktopIndexMainContent1(content1Message ?? ''),
+                      DesktopIndexMainContent2(content2 ?? <String, dynamic>{}),
                       CustomersLogo(),
-                      DesktopIndexMainContent3(content2),
+                      DesktopIndexMainContent3(content2 ?? <String, dynamic>{}),
                     ],
                   ),
                 ),
@@ -136,7 +136,7 @@ class HomeState extends State<Home> {
     _loadData();
     eventBus.on<OpenDrawer>().listen((event) {
       if (mounted) {
-        _scaffoldKey.currentState.openDrawer();
+        _scaffoldKey.currentState?.openDrawer();
       }
     });
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
@@ -163,7 +163,7 @@ class HomeState extends State<Home> {
       if (!mounted) return;
       _latestUri = Uri.base;
       print('uri base $_latestUri');
-      eventBus.fire(OnGotDeepLinkUri(_latestUri));
+      eventBus.fire(OnGotDeepLinkUri(_latestUri!));
     } else {
 //       _sub = getUriLinksStream().listen((Uri uri) {
 //         print('_sub should get uri $uri');
@@ -189,7 +189,7 @@ class HomeState extends State<Home> {
 //
 //       if (!mounted) return;
 //       _latestUri = initialUri;
-//       eventBus.fire(OnGotDeepLinkUri(_latestUri));
+//       eventBus.fire(OnGotDeepLinkUri(_latestUri!));
     }
   }
 }
\ No newline at end of file
diff --git a/lib/widgets/desktop/desktop_Index_carousel.dart b/lib/widgets/desktop/desktop_Index_carousel.dart
index b0eaaf1..3f9e9fe 100644
--- a/lib/widgets/desktop/desktop_Index_carousel.dart
+++ b/lib/widgets/desktop/desktop_Index_carousel.dart
@@ -7,7 +7,7 @@ import '../../utils/util_web.dart' if (dart.library.io) '../../utils/util_io.dar
 class DesktopIndexCarousel extends StatefulWidget {
   final List<Gallery> galleries;
 
-  const DesktopIndexCarousel(this.galleries, {Key key}) : super(key: key);
+  const DesktopIndexCarousel(this.galleries, {Key? key}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() {
@@ -53,8 +53,8 @@ class DesktopIndexCarouselState extends State<DesktopIndexCarousel> {
                             ),
                           ),
                           onTap: () {
-                            if (i.linkUrl != null && i.linkUrl.isNotEmpty) {
-                              Util.openWebUrl(context, i.linkUrl);
+                            if (i.linkUrl?.isNotEmpty == true) {
+                              Util.openWebUrl(context, i.linkUrl!);
                             }
                           },
                         ),
diff --git a/lib/widgets/desktop/desktop_appbar_menu.dart b/lib/widgets/desktop/desktop_appbar_menu.dart
index 759cd35..ca0d3f6 100644
--- a/lib/widgets/desktop/desktop_appbar_menu.dart
+++ b/lib/widgets/desktop/desktop_appbar_menu.dart
@@ -12,12 +12,12 @@ import '../../widgets/general/navigationbar_logo.dart';
 import '../../widgets/general/text_link.dart';
 
 class DesktopAppBarMenu extends StatelessWidget {
-  User _user;
+  User? _user;
 
   @override
   Widget build(BuildContext context) {
     _user = store.state.user;
-    String currentRoute = ModalRoute.of(context).settings.name;
+    String currentRoute = ModalRoute.of(context)?.settings.name ?? '';
     Widget menuBar = Container(
       height: 56.0,
       padding: EdgeInsets.only(left: 10.0, right: 10.0, top: 5.0, bottom: 5.0),
diff --git a/lib/widgets/desktop/desktop_customers_logo.dart b/lib/widgets/desktop/desktop_customers_logo.dart
index 054336c..99f9f2b 100644
--- a/lib/widgets/desktop/desktop_customers_logo.dart
+++ b/lib/widgets/desktop/desktop_customers_logo.dart
@@ -10,7 +10,7 @@ import '../../utils/util_web.dart' if (dart.library.io) '../../utils/util_io.dar
 
 class CustomersLogo extends StatefulWidget {
 
-  const CustomersLogo({Key key}) : super(key: key);
+  const CustomersLogo({Key? key}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() => CustomersLogoState();
diff --git a/lib/widgets/desktop/desktop_index_main_content_1.dart b/lib/widgets/desktop/desktop_index_main_content_1.dart
index 92994e1..1f5013f 100644
--- a/lib/widgets/desktop/desktop_index_main_content_1.dart
+++ b/lib/widgets/desktop/desktop_index_main_content_1.dart
@@ -4,7 +4,7 @@ import 'package:flutter_wisetronic/generated/l10n.dart';
 
 class DesktopIndexMainContent1 extends StatefulWidget {
   final String message;
-  const DesktopIndexMainContent1(this.message, {Key key}) : super(key: key);
+  const DesktopIndexMainContent1(this.message, {Key? key}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() {
diff --git a/lib/widgets/desktop/desktop_index_main_content_2.dart b/lib/widgets/desktop/desktop_index_main_content_2.dart
index 3a03ad7..19ce2fd 100644
--- a/lib/widgets/desktop/desktop_index_main_content_2.dart
+++ b/lib/widgets/desktop/desktop_index_main_content_2.dart
@@ -6,7 +6,7 @@ import '../../utils/util_web.dart' if (dart.library.io) '../../utils/util_io.dar
 
 class DesktopIndexMainContent2 extends StatefulWidget {
   final Map<String, dynamic> content;
-  const DesktopIndexMainContent2(this.content, {Key key}) : super(key: key);
+  const DesktopIndexMainContent2(this.content, {Key? key}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() {
diff --git a/lib/widgets/desktop/desktop_index_main_content_3.dart b/lib/widgets/desktop/desktop_index_main_content_3.dart
index ced65b8..38dadbf 100644
--- a/lib/widgets/desktop/desktop_index_main_content_3.dart
+++ b/lib/widgets/desktop/desktop_index_main_content_3.dart
@@ -7,7 +7,7 @@ import '../../constants.dart';
 
 class DesktopIndexMainContent3 extends StatefulWidget {
   final Map<String, dynamic> content;
-  const DesktopIndexMainContent3(this.content, {Key key}) : super(key: key);
+  const DesktopIndexMainContent3(this.content, {Key? key}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() {
diff --git a/lib/widgets/desktop/desktop_navigationbar.dart b/lib/widgets/desktop/desktop_navigationbar.dart
index 51206ab..9aac93e 100644
--- a/lib/widgets/desktop/desktop_navigationbar.dart
+++ b/lib/widgets/desktop/desktop_navigationbar.dart
@@ -14,12 +14,12 @@ import '../../widgets/general/breadcrumbs.dart';
 import '../../widgets/general/navigationbar.dart';
 
 class DesktopNavigationBar extends StatefulWidget {
-  final bool hasBack;
-  final List<BreadCrumb> breadCrumbs;
-  final Widget shoppingCart;
-  final OnBackPress onBackPress;
+  final bool? hasBack;
+  final List<BreadCrumb>? breadCrumbs;
+  final Widget? shoppingCart;
+  final OnBackPress? onBackPress;
 
-  const DesktopNavigationBar({Key key, this.hasBack, this.breadCrumbs,
+  const DesktopNavigationBar({Key? key, this.hasBack, this.breadCrumbs,
     this.shoppingCart, this.onBackPress}) : super(key: key);
 
   @override
@@ -30,16 +30,16 @@ class DesktopNavigationBar extends StatefulWidget {
 }
 
 class DesktopNavigationBarState extends State<DesktopNavigationBar> {
-  User _user;
+  User? _user;
 
   @override
   Widget build(BuildContext context) {
     Widget sc = SizedBox.shrink();
     if (widget.shoppingCart != null) {
-      sc = widget.shoppingCart;
+      sc = widget.shoppingCart!;
     }
     Widget breadCrumbBar = SizedBox.shrink();
-    if (widget.breadCrumbs != null && widget.breadCrumbs.length > 0) {
+    if (widget.breadCrumbs != null && widget.breadCrumbs!.length > 0) {
       breadCrumbBar = Container(
         width: MediaQuery.of(context).size.width,
         height: Constants.BREADCRUMB_HEIGHT,
diff --git a/lib/widgets/general/double_back_to_close_app_wrapper.dart b/lib/widgets/general/double_back_to_close_app_wrapper.dart
index 8d66405..b32b7c8 100644
--- a/lib/widgets/general/double_back_to_close_app_wrapper.dart
+++ b/lib/widgets/general/double_back_to_close_app_wrapper.dart
@@ -6,7 +6,7 @@ import '../../utils/double_back_to_close_app.dart';
 class DoubleBackToCloseAppWrapper extends StatelessWidget {
   final Widget child;
 
-  const DoubleBackToCloseAppWrapper({Key key, this.child}) : super(key: key);
+  const DoubleBackToCloseAppWrapper({Key? key, required this.child}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/mobile/MobileBottomNav.dart b/lib/widgets/mobile/MobileBottomNav.dart
index 7c918ca..77fd6cc 100644
--- a/lib/widgets/mobile/MobileBottomNav.dart
+++ b/lib/widgets/mobile/MobileBottomNav.dart
@@ -1,6 +1,6 @@
 
 import 'package:badges/badges.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Badge;
 import '../../constants.dart';
 import '../../generated/l10n.dart';
 import '../../routes.dart';
@@ -15,10 +15,11 @@ class MobileBottomNav extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if (store.state.cartInfos != null && store.state.cartInfos.length > 0) {
+    final cartInfos = store.state.cartInfos;
+    if (cartInfos != null && cartInfos.length > 0) {
       count = 0;
-      for (var i = 0; i < store.state.cartInfos.length; i++) {
-        if (store.state.cartInfos[i].productList != null && store.state.cartInfos[i].productList.length > 0) {
+      for (var i = 0; i < cartInfos.length; i++) {
+        if (cartInfos[i].productList != null && cartInfos[i].productList!.length > 0) {
           count += 1;
         }
       }
diff --git a/lib/widgets/mobile/mobile_index_carousel.dart b/lib/widgets/mobile/mobile_index_carousel.dart
index c506484..1a9daa8 100644
--- a/lib/widgets/mobile/mobile_index_carousel.dart
+++ b/lib/widgets/mobile/mobile_index_carousel.dart
@@ -7,7 +7,7 @@ import '../../utils/util_web.dart' if (dart.library.io) '../../utils/util_io.dar
 class MobileIndexCarousel extends StatefulWidget {
   final List<Gallery> galleries;
 
-  const MobileIndexCarousel(this.galleries, {Key key}) : super(key: key);
+  const MobileIndexCarousel(this.galleries, {Key? key}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() {
@@ -39,8 +39,8 @@ class MobileIndexCarouselState extends State<MobileIndexCarousel> {
                         ),
                       ),
                       onTap: () {
-                        if (i.linkUrl != null && i.linkUrl.isNotEmpty) {
-                          Util.openWebUrl(context, i.linkUrl);
+                        if (i.linkUrl?.isNotEmpty == true) {
+                          Util.openWebUrl(context, i.linkUrl!);
                         }
                       },
                     ),
diff --git a/lib/widgets/mobile/mobile_index_main_content_1.dart b/lib/widgets/mobile/mobile_index_main_content_1.dart
index 375d927..7033e8c 100644
--- a/lib/widgets/mobile/mobile_index_main_content_1.dart
+++ b/lib/widgets/mobile/mobile_index_main_content_1.dart
@@ -5,7 +5,7 @@ import 'package:flutter_wisetronic/generated/l10n.dart';
 class MobileIndexMainContent1 extends StatefulWidget {
   final String message;
 
-  const MobileIndexMainContent1(this.message, {Key key}) : super(key: key);
+  const MobileIndexMainContent1(this.message, {Key? key}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() {
diff --git a/lib/widgets/mobile/mobile_index_main_content_2.dart b/lib/widgets/mobile/mobile_index_main_content_2.dart
index 57f3e3c..ba1fc28 100644
--- a/lib/widgets/mobile/mobile_index_main_content_2.dart
+++ b/lib/widgets/mobile/mobile_index_main_content_2.dart
@@ -7,7 +7,7 @@ import '../../utils/util_web.dart' if (dart.library.io) '../../utils/util_io.dar
 class MobileIndexMainContent2 extends StatefulWidget {
   final Map<String, dynamic> content;
 
-  const MobileIndexMainContent2(this.content, {Key key}) : super(key: key);
+  const MobileIndexMainContent2(this.content, {Key? key}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() {
diff --git a/lib/widgets/mobile/mobile_index_main_content_3.dart b/lib/widgets/mobile/mobile_index_main_content_3.dart
index 2283512..784fd79 100644
--- a/lib/widgets/mobile/mobile_index_main_content_3.dart
+++ b/lib/widgets/mobile/mobile_index_main_content_3.dart
@@ -7,7 +7,7 @@ import '../../utils/util_web.dart' if (dart.library.io) '../../utils/util_io.dar
 class MobileIndexMainContent3 extends StatefulWidget {
   final Map<String, dynamic> content;
 
-  const MobileIndexMainContent3(this.content, {Key key}) : super(key: key);
+  const MobileIndexMainContent3(this.content, {Key? key}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() {
diff --git a/lib/widgets/mobile/mobile_navigation_drawer.dart b/lib/widgets/mobile/mobile_navigation_drawer.dart
index 66f527c..356b06a 100644
--- a/lib/widgets/mobile/mobile_navigation_drawer.dart
+++ b/lib/widgets/mobile/mobile_navigation_drawer.dart
@@ -13,7 +13,7 @@ import '../../widgets/mobile/mobile_navigation_drawer_header.dart';
 import '../../constants.dart';
 
 class MobileNavigationDrawer extends StatefulWidget {
-  const MobileNavigationDrawer({Key key}) : super(key: key);
+  const MobileNavigationDrawer({Key? key}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() {
@@ -23,11 +23,11 @@ class MobileNavigationDrawer extends StatefulWidget {
 }
 
 class MobileNavigationDrawerState extends State<MobileNavigationDrawer> {
-  User _user;
+  User? _user;
 
   @override
   Widget build(BuildContext context) {
-    String currentRoute = ModalRoute.of(context).settings.name;
+    String currentRoute = ModalRoute.of(context)?.settings.name ?? '';
 
     return Container(
       width: 200.0,
diff --git a/lib/widgets/mobile/mobile_navigationbar.dart b/lib/widgets/mobile/mobile_navigationbar.dart
index e49a51d..1b907ed 100644
--- a/lib/widgets/mobile/mobile_navigationbar.dart
+++ b/lib/widgets/mobile/mobile_navigationbar.dart
@@ -10,11 +10,12 @@ import '../../widgets/general/navigationbar_logo.dart';
 import '../../routes.dart';
 
 class MobileNavigationBar extends StatefulWidget {
-  final String title;
-  final bool back;
-  final bool toHome;
-  final bool showMe;
-  const MobileNavigationBar({Key key, this.title, this.back, this.toHome, this.showMe}) : super(key: key);
+  final String? title;
+  final bool? back;
+  final bool? toHome;
+  final bool? showMe;
+
+  const MobileNavigationBar({Key? key, this.title, this.back, this.toHome, this.showMe}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() {
@@ -24,19 +25,19 @@ class MobileNavigationBar extends StatefulWidget {
 }
 
 class MobileNavigationBarState extends State<MobileNavigationBar> {
-  User _user;
+  User? _user;
 
   @override
   Widget build(BuildContext context) {
     return AppBar(
-      leading: widget.back ?
+      leading: widget.back == true ?
       IconButton(
         icon: Icon(
           Icons.arrow_back_ios,
           color: Colors.white,
         ),
         onPressed: () {
-          if (widget.toHome) {
+          if (widget.toHome == true) {
             Routes.router.navigateTo(context, '/', clearStack: true);
           } else {
             Routes.router.pop(context);
@@ -53,7 +54,7 @@ class MobileNavigationBarState extends State<MobileNavigationBar> {
         },
       ),
       title: Container(
-        child: widget.title.isNotEmpty ?
+        child: widget.title?.isNotEmpty == true ?
         Container(
           child: Text(
             '${widget.title}',