diff --git a/lib/utils/double_back_to_close_app.dart b/lib/utils/double_back_to_close_app.dart
index a786d63..50e9e2d 100644
--- a/lib/utils/double_back_to_close_app.dart
+++ b/lib/utils/double_back_to_close_app.dart
@@ -22,8 +22,8 @@ class DoubleBackToCloseApp extends StatefulWidget {
   /// the back-button.
   const DoubleBackToCloseApp({
     Key? key,
-    @required this.snackBar,
-    @required this.child,
+    required this.snackBar,
+    required this.child,
   })  : assert(snackBar != null),
         assert(child != null),
         super(key: key);
diff --git a/lib/widgets/desktop/desktop_new_comment.dart b/lib/widgets/desktop/desktop_new_comment.dart
index 585454e..4eae9af 100644
--- a/lib/widgets/desktop/desktop_new_comment.dart
+++ b/lib/widgets/desktop/desktop_new_comment.dart
@@ -204,7 +204,7 @@ class DesktopNewCommentState extends State<DesktopNewComment> {
     );
 
     if (comment != null && comment.images!.length > 0) {
-      for (ProductImage image in comment.images) {
+      for (ProductImage image in comment.images!) {
         row.children.add(
           Container(
             padding: EdgeInsets.only(left: 10.0),
diff --git a/lib/widgets/desktop/desktop_order_detail.dart b/lib/widgets/desktop/desktop_order_detail.dart
index f07d066..3ff6812 100644
--- a/lib/widgets/desktop/desktop_order_detail.dart
+++ b/lib/widgets/desktop/desktop_order_detail.dart
@@ -190,7 +190,7 @@ class DesktopOrderDetailState extends State<DesktopOrderDetail> {
               }
             }
 
-            for (CartLineItem lineItem in order.cartInfo!.productList) {
+            for (CartLineItem lineItem in order.cartInfo!.productList!) {
 
               col.children.add(Container(
                 padding: EdgeInsets.only(top: 16.0, bottom: 0.0),
@@ -884,7 +884,7 @@ class DesktopOrderDetailState extends State<DesktopOrderDetail> {
               ),
             ),);
 
-            for (Fulfillment fulfillment in order.fulfillments) {
+            for (Fulfillment fulfillment in order.fulfillments!) {
               col.children.add(Container(
                 padding: EdgeInsets.only(top: 10.0, bottom: 10.0),
                 width: double.infinity,
diff --git a/lib/widgets/desktop/desktop_product_detail_page.dart b/lib/widgets/desktop/desktop_product_detail_page.dart
index b6eac17..2a0eec3 100644
--- a/lib/widgets/desktop/desktop_product_detail_page.dart
+++ b/lib/widgets/desktop/desktop_product_detail_page.dart
@@ -30,7 +30,7 @@ class DesktopProductDetailPage extends StatefulWidget {
   final Product product;
 
   const DesktopProductDetailPage(
-      {@required this.business, @required this.product, Key? key})
+      {required this.business, required this.product, Key? key})
       : super(key: key);
 
   @override
diff --git a/lib/widgets/desktop/desktop_shopping_cart_widget.dart b/lib/widgets/desktop/desktop_shopping_cart_widget.dart
index 6409195..e8cca7a 100644
--- a/lib/widgets/desktop/desktop_shopping_cart_widget.dart
+++ b/lib/widgets/desktop/desktop_shopping_cart_widget.dart
@@ -11,7 +11,7 @@ class DesktopShoppingCartWidget extends StatefulWidget {
   final Business business;
   final Function? onTap;
 
-  DesktopShoppingCartWidget({@required this.business, this.onTap});
+  DesktopShoppingCartWidget({required this.business, this.onTap});
 
   @override
   State<StatefulWidget> createState() => DesktopShoppingCartWidgetState();
diff --git a/lib/widgets/desktop/shopping_cart_widget.dart b/lib/widgets/desktop/shopping_cart_widget.dart
index 8510e7a..49c6b48 100644
--- a/lib/widgets/desktop/shopping_cart_widget.dart
+++ b/lib/widgets/desktop/shopping_cart_widget.dart
@@ -12,7 +12,7 @@ class ShoppingCartWidget extends StatefulWidget {
   final Business business;
   final Function? onTap;
 
-  ShoppingCartWidget({@required this.business, this.onTap});
+  ShoppingCartWidget({required this.business, this.onTap});
 
   @override
   State<StatefulWidget> createState() => ShoppingCartWidgetState();
diff --git a/lib/widgets/general/animation_point_manager.dart b/lib/widgets/general/animation_point_manager.dart
index 9fa906c..317b524 100644
--- a/lib/widgets/general/animation_point_manager.dart
+++ b/lib/widgets/general/animation_point_manager.dart
@@ -9,12 +9,12 @@ class AnimationPointManager {
   static late AnimationController controller2;
 
   Future<void> addParabolicAniamtion({
-    @required TickerProvider vsync,
-    @required GlobalKey stackKey,
-    @required GlobalKey startKey,
-    @required GlobalKey endKey,
-    @required Duration duration,
-    @required AnimationStatusListener statusListener,
+    required TickerProvider vsync,
+    required GlobalKey stackKey,
+    required GlobalKey startKey,
+    required GlobalKey endKey,
+    required Duration duration,
+    required AnimationStatusListener statusListener,
     Color color = Colors.red,
     double size = 20,
     Offset startAdjustOffset = Offset.zero,
@@ -51,10 +51,10 @@ class AnimationPointManager {
   }
 
   Future<void> addPopupAniamtion({
-    @required TickerProvider vsync,
-    @required GlobalKey stackKey,
-    @required GlobalKey startKey,
-    @required Widget child,
+    required TickerProvider vsync,
+    required GlobalKey stackKey,
+    required GlobalKey startKey,
+    required Widget child,
     Duration? duration,
     Offset popupOffset = Offset.zero,
     AnimationStatusListener? statusListener,
diff --git a/lib/widgets/general/attribute/check_options.dart b/lib/widgets/general/attribute/check_options.dart
index 692f4e0..286235b 100644
--- a/lib/widgets/general/attribute/check_options.dart
+++ b/lib/widgets/general/attribute/check_options.dart
@@ -14,7 +14,7 @@ import 'rules.dart';
 import 'options_base.dart';
 
 class CheckOptions extends OptionsBase {
-  CheckOptions({@required Product product, @required int index, @required Map<String, dynamic> selections})
+  CheckOptions({required Product product, required int index, required Map<String, dynamic> selections})
     : super(product: product, index: index, selections: selections);
 
   @override
diff --git a/lib/widgets/general/attribute/options_base.dart b/lib/widgets/general/attribute/options_base.dart
index be2638f..c20f5be 100644
--- a/lib/widgets/general/attribute/options_base.dart
+++ b/lib/widgets/general/attribute/options_base.dart
@@ -9,7 +9,7 @@ abstract class OptionsBase extends StatefulWidget {
   final Product product;
   final int index;
   final Map<String, dynamic> selections;
-  OptionsBase({@required Product product, @required int index, @required Map<String, dynamic> selections})
+  OptionsBase({required Product product, required int index, required Map<String, dynamic> selections})
     : product = product,
       index = index,
       selections = selections;
diff --git a/lib/widgets/general/attribute/qty_options.dart b/lib/widgets/general/attribute/qty_options.dart
index 4f7df10..62206a1 100644
--- a/lib/widgets/general/attribute/qty_options.dart
+++ b/lib/widgets/general/attribute/qty_options.dart
@@ -14,7 +14,7 @@ import 'options_base.dart';
 import 'rules.dart';
 
 class QtyOptions extends OptionsBase {
-  QtyOptions({@required Product product, @required int index, @required Map<String, dynamic> selections})
+  QtyOptions({required Product product, required int index, required Map<String, dynamic> selections})
     : super(product: product, index: index, selections: selections);
 
   @override
diff --git a/lib/widgets/general/attribute/radio_options.dart b/lib/widgets/general/attribute/radio_options.dart
index 0a909ba..cf11914 100644
--- a/lib/widgets/general/attribute/radio_options.dart
+++ b/lib/widgets/general/attribute/radio_options.dart
@@ -14,7 +14,7 @@ import 'options_base.dart';
 import 'rules.dart';
 
 class RadioOptions extends OptionsBase {
-  RadioOptions({@required Product product, @required int index, @required Map<String, dynamic> selections})
+  RadioOptions({required Product product, required int index, required Map<String, dynamic> selections})
     : super(product: product, index: index, selections: selections);
 
   @override
diff --git a/lib/widgets/general/parabolic_animation_widget.dart b/lib/widgets/general/parabolic_animation_widget.dart
index 8ec0c1b..e6d9db4 100644
--- a/lib/widgets/general/parabolic_animation_widget.dart
+++ b/lib/widgets/general/parabolic_animation_widget.dart
@@ -12,10 +12,10 @@ class ParabolicAnimationWidget extends AnimatedWidget {
   final Offset endAdjustOffset;
 
   late ParabolicAnimationWidget({
-    @required Animation<double> animation,
-    @required this.stackKey,
-    @required this.startKey,
-    @required this.endKey,
+    required Animation<double> animation,
+    required this.stackKey,
+    required this.startKey,
+    required this.endKey,
     this.size = 20.0,
     this.color = Colors.red,
     this.startAdjustOffset = Offset.zero,
diff --git a/lib/widgets/general/popup_animation_widget.dart b/lib/widgets/general/popup_animation_widget.dart
index f70ba96..2b0f407 100644
--- a/lib/widgets/general/popup_animation_widget.dart
+++ b/lib/widgets/general/popup_animation_widget.dart
@@ -10,10 +10,10 @@ class PopupAnimationWidget extends AnimatedWidget {
   final Animation<double> animation;
 
   late PopupAnimationWidget({
-    @required this.animation,
-    @required this.stackKey,
-    @required this.startKey,
-    @required this.child,
+    required this.animation,
+    required this.stackKey,
+    required this.startKey,
+    required this.child,
     this.color = Colors.yellow,
     this.popupOffset = Offset.zero,
   }) : super(listenable: animation);
diff --git a/lib/widgets/mobile/mobile_attribute_selection.dart b/lib/widgets/mobile/mobile_attribute_selection.dart
index 9cd560b..5ffed59 100644
--- a/lib/widgets/mobile/mobile_attribute_selection.dart
+++ b/lib/widgets/mobile/mobile_attribute_selection.dart
@@ -22,7 +22,7 @@ class MobileAttributeSelection extends StatefulWidget {
   final Key? key;
   final GlobalKey? startKey;
 
-  const MobileAttributeSelection({@required this.product, @required this.business, this.key, this.startKey})
+  const MobileAttributeSelection({required this.product, required this.business, this.key, this.startKey})
     : super(key: key);
 
   @override
diff --git a/lib/widgets/mobile/mobile_me.dart b/lib/widgets/mobile/mobile_me.dart
index b09be19..5cedb06 100644
--- a/lib/widgets/mobile/mobile_me.dart
+++ b/lib/widgets/mobile/mobile_me.dart
@@ -816,9 +816,9 @@ class MobileMeState extends State<MobileMe> {
 
 class _SliverAppBarDelegate extends SliverPersistentHeaderDelegate {
   _SliverAppBarDelegate({
-    @required this.minHeight,
-    @required this.maxHeight,
-    @required this.child,
+    required this.minHeight,
+    required this.maxHeight,
+    required this.child,
   });
 
   final double minHeight;
diff --git a/lib/widgets/mobile/mobile_new_comment.dart b/lib/widgets/mobile/mobile_new_comment.dart
index e494b9a..9fa08f7 100644
--- a/lib/widgets/mobile/mobile_new_comment.dart
+++ b/lib/widgets/mobile/mobile_new_comment.dart
@@ -168,7 +168,7 @@ class MobileNewCommentState extends State<MobileNewComment> {
     );
 
     if (comment != null && comment.images!.length > 0) {
-      for (ProductImage image in comment.images) {
+      for (ProductImage image in comment.images!) {
         row.children.add(
           Container(
             padding: EdgeInsets.only(left: 10.0),
diff --git a/lib/widgets/mobile/mobile_order_detail.dart b/lib/widgets/mobile/mobile_order_detail.dart
index dab1eb2..8ce349d 100644
--- a/lib/widgets/mobile/mobile_order_detail.dart
+++ b/lib/widgets/mobile/mobile_order_detail.dart
@@ -205,7 +205,7 @@ class MobileOrderDetailState extends State<MobileOrderDetail> {
                   }
                 }
 
-                for (CartLineItem lineItem in order.cartInfo!.productList) {
+                for (CartLineItem lineItem in order.cartInfo!.productList!) {
 
                   col.children.add(Container(
                     padding: EdgeInsets.only(top: 16.0, bottom: 0.0),
@@ -899,7 +899,7 @@ class MobileOrderDetailState extends State<MobileOrderDetail> {
                   ),
                 ),);
 
-                for (Fulfillment fulfillment in order.fulfillments) {
+                for (Fulfillment fulfillment in order.fulfillments!) {
                   col.children.add(Container(
                     padding: EdgeInsets.only(top: 10.0, bottom: 10.0),
                     width: double.infinity,
diff --git a/lib/widgets/mobile/mobile_product_detail_page.dart b/lib/widgets/mobile/mobile_product_detail_page.dart
index 2d0dbb5..c8ccab7 100644
--- a/lib/widgets/mobile/mobile_product_detail_page.dart
+++ b/lib/widgets/mobile/mobile_product_detail_page.dart
@@ -33,7 +33,7 @@ class MobileProductDetailPage extends StatefulWidget {
   final Product product;
 
   const MobileProductDetailPage(
-      {@required this.business, @required this.product, Key? key})
+      {required this.business, required this.product, Key? key})
       : super(key: key);
 
   @override
@@ -447,9 +447,9 @@ class MobileProductDetailPageState extends State<MobileProductDetailPage>
 
 class _SliverAppBarDelegate extends SliverPersistentHeaderDelegate {
   _SliverAppBarDelegate({
-    @required this.minHeight,
-    @required this.maxHeight,
-    @required this.child,
+    required this.minHeight,
+    required this.maxHeight,
+    required this.child,
   });
 
   final double minHeight;
diff --git a/lib/widgets/mobile/shop.dart b/lib/widgets/mobile/shop.dart
index 5740bfe..00c719a 100644
--- a/lib/widgets/mobile/shop.dart
+++ b/lib/widgets/mobile/shop.dart
@@ -582,7 +582,7 @@ class ShopState extends State<Shop>
               children: <Widget>[],
             );
             if (comment.images!.length > 0) {
-              for (ProductImage image in comment.images) {
+              for (ProductImage image in comment.images!) {
                 imageRow.children.add(
                   GestureDetector(
                     child: Container(
@@ -1416,7 +1416,7 @@ class ShopState extends State<Shop>
                           ))
                     ],
                   )));
-              for (var p in cp.products) {
+              for (var p in cp.products!) {
                 var pStack = new Stack(
                   children: <Widget>[],
                 );
@@ -1932,9 +1932,9 @@ class ShopState extends State<Shop>
 
 class _SliverAppBarDelegate2 extends SliverPersistentHeaderDelegate {
   _SliverAppBarDelegate2({
-    @required this.minHeight,
-    @required this.maxHeight,
-    @required this.child,
+    required this.minHeight,
+    required this.maxHeight,
+    required this.child,
   });
 
   final double minHeight;
diff --git a/lib/widgets/mobile/shopping_cart_bar.dart b/lib/widgets/mobile/shopping_cart_bar.dart
index b084c5b..5820bad 100644
--- a/lib/widgets/mobile/shopping_cart_bar.dart
+++ b/lib/widgets/mobile/shopping_cart_bar.dart
@@ -23,7 +23,7 @@ class ShoppingCartBar extends StatefulWidget {
   final OnPanelOpenCloseRequest? onPanelOpenCloseRequest;
   final bool barAtBottom;
   final bool hasPicture;
-  ShoppingCartBar({@required this.business, this.endKey,
+  ShoppingCartBar({required this.business, this.endKey,
     this.onEmptyCartListener, this.onPanelOpenCloseRequest,
     this.barAtBottom = false, this.hasPicture = false
   });