diff --git a/lib/configurations/configurations.json b/lib/configurations/configurations.json
index 3bfab94d..0c442cea 100644
--- a/lib/configurations/configurations.json
+++ b/lib/configurations/configurations.json
@@ -4,7 +4,7 @@
     "tablet": 600,
     "desktop": 1280
   },
-  "designSystem": "material2",
+  "designSystem": "material3",
   "componentIsolation": "widgetbook",
   "folderArchitecture": "domain",
   "project-name": "foo",
diff --git a/lib/generation/generators/attribute-helper/pb_size_helper.dart b/lib/generation/generators/attribute-helper/pb_size_helper.dart
index 6a82fc66..ae923d58 100644
--- a/lib/generation/generators/attribute-helper/pb_size_helper.dart
+++ b/lib/generation/generators/attribute-helper/pb_size_helper.dart
@@ -75,7 +75,7 @@ class PBSizeHelper extends PBAttributesHelper {
 
         // Size for LayoutBuilder
         sizeString =
-            '$lowerCaseDimentionString: widget.constraints.max$dimentionString * ${relativeSize.toString()},';
+            '$lowerCaseDimentionString: constraints.max$dimentionString * ${relativeSize.toString()},';
       }
     } else {
       // Size for constants value
diff --git a/lib/generation/generators/pb_generator.dart b/lib/generation/generators/pb_generator.dart
index 9e18b48a..2906826d 100644
--- a/lib/generation/generators/pb_generator.dart
+++ b/lib/generation/generators/pb_generator.dart
@@ -16,12 +16,16 @@ abstract class PBGenerator {
 
   Logger logger;
 
+  /// Chain of responsability restructure
+
+  PBGenerator next;
+
   ///The [TemplateStrategy] that is going to be used to generate the boilerplate code around the node.
   ///
   ///The `default` [TemplateStrategy] is going to be [InlineTemplateStrategy]
   TemplateStrategy templateStrategy;
 
-  PBGenerator({TemplateStrategy strategy}) {
+  PBGenerator({TemplateStrategy strategy, this.next}) {
     templateStrategy = strategy;
     templateStrategy ??= InlineTemplateStrategy();
     logger = Logger(runtimeType.toString());
diff --git a/lib/generation/generators/symbols/layout_builder_gen.dart b/lib/generation/generators/symbols/layout_builder_gen.dart
new file mode 100644
index 00000000..116b351d
--- /dev/null
+++ b/lib/generation/generators/symbols/layout_builder_gen.dart
@@ -0,0 +1,27 @@
+import 'package:parabeac_core/generation/generators/pb_generator.dart';
+import 'package:parabeac_core/generation/generators/value_objects/template_strategy/stateful_template_strategy.dart';
+import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart';
+import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart';
+import 'package:quick_log/quick_log.dart';
+
+class LayoutBuilderGenerator extends PBGenerator {
+  LayoutBuilderGenerator(PBGenerator next)
+      : super(strategy: StatefulTemplateStrategy(), next: next);
+
+  var log = Logger('Layout Builder Generator');
+  @override
+  String generate(PBIntermediateNode source, PBContext context) {
+    var buffer = StringBuffer();
+    buffer.write('LayoutBuilder( \n');
+    buffer.write('  builder: (context, constraints) {\n');
+    buffer.write('    return ');
+
+    buffer.write(next.generate(source, context));
+
+    buffer.write(';\n');
+    buffer.write('}\n');
+    buffer.write(')');
+
+    return buffer.toString();
+  }
+}
diff --git a/lib/generation/generators/symbols/pb_instancesym_gen.dart b/lib/generation/generators/symbols/pb_instancesym_gen.dart
index 2375b399..ceb60307 100644
--- a/lib/generation/generators/symbols/pb_instancesym_gen.dart
+++ b/lib/generation/generators/symbols/pb_instancesym_gen.dart
@@ -19,9 +19,6 @@ class PBSymbolInstanceGenerator extends PBGenerator {
   String generate(PBIntermediateNode source, PBContext generatorContext) {
     if (source is PBSharedInstanceIntermediateNode) {
       var buffer = StringBuffer();
-      buffer.write('LayoutBuilder( \n');
-      buffer.write('  builder: (context, constraints) {\n');
-      buffer.write('    return ');
 
       // If storage found an instance, get its master
       var masterSymbol =
@@ -34,12 +31,6 @@ class PBSymbolInstanceGenerator extends PBGenerator {
         generatorContext,
       ));
 
-      // end of return <genSymbolInstance>();
-      buffer.write(';\n');
-      // end of builder: (context, constraints) {
-      buffer.write('}\n');
-      // end of LayoutBuilder()
-      buffer.write(')');
       return buffer.toString();
     }
     return '';
@@ -93,7 +84,6 @@ class PBSymbolInstanceGenerator extends PBGenerator {
 
     buffer.write(symName.pascalCase);
     buffer.write('(\n');
-    buffer.write('constraints,\n');
 
     // Make sure override property of every value is overridable
     if (overrideValues != null) {
diff --git a/lib/generation/generators/value_objects/template_strategy/stateful_template_strategy.dart b/lib/generation/generators/value_objects/template_strategy/stateful_template_strategy.dart
index 401c225c..51b7997b 100644
--- a/lib/generation/generators/value_objects/template_strategy/stateful_template_strategy.dart
+++ b/lib/generation/generators/value_objects/template_strategy/stateful_template_strategy.dart
@@ -48,9 +48,10 @@ class StatefulTemplateStrategy extends TemplateStrategy {
 ${manager.generateImports()}
 
 class $widgetName extends StatefulWidget{
-  ${node is PBSharedMasterNode ? 'final BoxConstraints constraints;' : ''}
   $overrideVars
-  const $widgetName(${node is PBSharedMasterNode ? 'this.constraints,' : ''} {Key? key, $overrides}) : super(key: key);
+
+  const $widgetName({Key? key, $overrides}) : super(key: key);
+
   @override
   _$widgetName createState() => _$widgetName();
 }
diff --git a/lib/generation/generators/value_objects/template_strategy/stateless_template_strategy.dart b/lib/generation/generators/value_objects/template_strategy/stateless_template_strategy.dart
index a9964840..1a5cea13 100644
--- a/lib/generation/generators/value_objects/template_strategy/stateless_template_strategy.dart
+++ b/lib/generation/generators/value_objects/template_strategy/stateless_template_strategy.dart
@@ -31,9 +31,8 @@ class StatelessTemplateStrategy extends TemplateStrategy {
   ${manager.generateImports()}
 
 class ${widgetName.pascalCase} extends StatelessWidget{
-  ${node is PBSharedMasterNode ? 'final BoxConstraints constraints;' : ''}
   ${overrideVars.isNotEmpty ? overrideVars : ''}
-  const ${widgetName.pascalCase}(${node is PBSharedMasterNode ? 'this.constraints,' : ''} {Key? key, ${overrides.isNotEmpty ? overrides : ''}}) : super(key : key);
+  const ${widgetName.pascalCase}({Key? key, ${overrides.isNotEmpty ? overrides : ''}}) : super(key : key);
   ${manager.generateGlobalVariables()}
 
   @override
diff --git a/lib/generation/generators/visual-widgets/pb_positioned_gen.dart b/lib/generation/generators/visual-widgets/pb_positioned_gen.dart
index f5db9ec3..9596089f 100644
--- a/lib/generation/generators/visual-widgets/pb_positioned_gen.dart
+++ b/lib/generation/generators/visual-widgets/pb_positioned_gen.dart
@@ -86,9 +86,9 @@ class PBPositionedGenerator extends PBGenerator {
     } else if (sizingValueContext ==
         SizingValueContext.LayoutBuilderStatefulValue) {
       if (_positionedValue.isXAxis) {
-        return 'widget.constraints.maxWidth *';
+        return 'constraints.maxWidth *';
       } else {
-        return 'widget.constraints.maxHeight *';
+        return 'constraints.maxHeight *';
       }
     }
 
diff --git a/lib/interpret_and_optimize/entities/pb_shared_master_node.dart b/lib/interpret_and_optimize/entities/pb_shared_master_node.dart
index d1f42e99..6d4431e3 100644
--- a/lib/interpret_and_optimize/entities/pb_shared_master_node.dart
+++ b/lib/interpret_and_optimize/entities/pb_shared_master_node.dart
@@ -1,3 +1,4 @@
+import 'package:parabeac_core/generation/generators/symbols/layout_builder_gen.dart';
 import 'package:parabeac_core/generation/generators/symbols/pb_mastersym_gen.dart';
 import 'package:parabeac_core/generation/prototyping/pb_prototype_node.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/interfaces/pb_inherited_intermediate.dart';
@@ -70,8 +71,7 @@ class PBSharedMasterNode extends PBVisualIntermediateNode
     this.sharedNodeSetID,
   }) : super(UUID, frame, name, constraints: constraints) {
     overridableProperties ??= [];
-
-    generator = PBMasterSymbolGenerator();
+    generator = LayoutBuilderGenerator(PBMasterSymbolGenerator());
     childrenStrategy = TempChildrenStrategy('child');
   }
 
diff --git a/lib/interpret_and_optimize/helpers/pb_configuration.dart b/lib/interpret_and_optimize/helpers/pb_configuration.dart
index b7caf071..4ca8d2e9 100644
--- a/lib/interpret_and_optimize/helpers/pb_configuration.dart
+++ b/lib/interpret_and_optimize/helpers/pb_configuration.dart
@@ -53,7 +53,7 @@ class PBConfiguration {
   ///This is going to be defaulted to [GenerationConfiguration] if nothing else is specified.
   GenerationConfiguration generationConfiguration;
 
-  @JsonKey(defaultValue: 'material2')
+  @JsonKey(defaultValue: 'material3')
   String designSystem;
 
   /// The type of folder architecture that Parabeac-Core should follow
diff --git a/lib/interpret_and_optimize/helpers/pb_configuration.g.dart b/lib/interpret_and_optimize/helpers/pb_configuration.g.dart
index fa72264f..5e7d0b33 100644
--- a/lib/interpret_and_optimize/helpers/pb_configuration.g.dart
+++ b/lib/interpret_and_optimize/helpers/pb_configuration.g.dart
@@ -22,7 +22,7 @@ PBConfiguration _$PBConfigurationFromJson(Map<String, dynamic> json) {
     integrationLevel:
         _$enumDecodeNullable(_$IntegrationLevelEnumMap, json['project-type']) ??
             IntegrationLevel.screens,
-  )..designSystem = json['designSystem'] as String ?? 'material2';
+  )..designSystem = json['designSystem'] as String ?? 'material3';
 }
 
 Map<String, dynamic> _$PBConfigurationToJson(PBConfiguration instance) =>
diff --git a/lib/tags/custom_tag/custom_tag.dart b/lib/tags/custom_tag/custom_tag.dart
index 809f5f66..b29904e6 100644
--- a/lib/tags/custom_tag/custom_tag.dart
+++ b/lib/tags/custom_tag/custom_tag.dart
@@ -175,8 +175,7 @@ class CustomTagGenerator extends PBGenerator {
         ),
         MainInfo().projectName,
       ).toString();
-      suffix =
-          '?? $baseCompName(BoxConstraints(maxWidth: ${child.parent.frame.width}, maxHeight: ${child.parent.frame.height},))';
+      suffix = '?? const $baseCompName()';
     }
 
     return '''
diff --git a/pubspec.yaml b/pubspec.yaml
index b681265a..143f7482 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: parabeac_core
 description: Continuous Design / Continuous Integration for Figma-to-Flutter
 
-version: 3.6.0
+version: 4.0.0
 homepage: https://www.parabeac.com
 
 environment:
diff --git a/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden b/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden
index 8e11b5ad..dcf528c7 100644
--- a/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden
+++ b/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden
@@ -27,6 +27,7 @@ class AdminCitySectionEditScreen extends StatefulWidget {
   const AdminCitySectionEditScreen({
     Key? key,
   }) : super(key: key);
+
   @override
   _AdminCitySectionEditScreen createState() => _AdminCitySectionEditScreen();
 }
@@ -44,11 +45,7 @@ class _AdminCitySectionEditScreen extends State<AdminCitySectionEditScreen> {
           right: 44.0,
           top: 0,
           height: 280.0,
-          child: LayoutBuilder(builder: (context, constraints) {
-            return OrcaCityAdminHeader(
-              constraints,
-            );
-          }),
+          child: OrcaCityAdminHeader(),
         ),
         Positioned(
           left: 36.0,
@@ -89,12 +86,7 @@ class _AdminCitySectionEditScreen extends State<AdminCitySectionEditScreen> {
                                 right: 0,
                                 top: 84.0,
                                 height: 335.0,
-                                child: LayoutBuilder(
-                                    builder: (context, constraints) {
-                                  return FullArticle(
-                                    constraints,
-                                  );
-                                }),
+                                child: FullArticle(),
                               ),
                             ])),
                         SizedBox(
@@ -213,39 +205,21 @@ class _AdminCitySectionEditScreen extends State<AdminCitySectionEditScreen> {
                                                     Container(
                                                         height: 75.0,
                                                         width: 75.0,
-                                                        child: LayoutBuilder(
-                                                            builder: (context,
-                                                                constraints) {
-                                                          return LabelButton(
-                                                            constraints,
-                                                          );
-                                                        })),
+                                                        child: LabelButton()),
                                                     SizedBox(
                                                       width: 16.0,
                                                     ),
                                                     Container(
                                                         height: 75.0,
                                                         width: 75.0,
-                                                        child: LayoutBuilder(
-                                                            builder: (context,
-                                                                constraints) {
-                                                          return LabelButton(
-                                                            constraints,
-                                                          );
-                                                        })),
+                                                        child: LabelButton()),
                                                     SizedBox(
                                                       width: 16.0,
                                                     ),
                                                     Container(
                                                         height: 75.0,
                                                         width: 75.0,
-                                                        child: LayoutBuilder(
-                                                            builder: (context,
-                                                                constraints) {
-                                                          return LabelButton(
-                                                            constraints,
-                                                          );
-                                                        })),
+                                                        child: LabelButton()),
                                                   ])))),
                                 ])),
                         SizedBox(
@@ -270,12 +244,7 @@ class _AdminCitySectionEditScreen extends State<AdminCitySectionEditScreen> {
                                             width: 540.0,
                                             top: 0,
                                             height: 303.75,
-                                            child: LayoutBuilder(builder:
-                                                (context, constraints) {
-                                              return EditMainImage(
-                                                constraints,
-                                              );
-                                            }),
+                                            child: EditMainImage(),
                                           ),
                                         ]))),
                               ),
@@ -407,24 +376,14 @@ class _AdminCitySectionEditScreen extends State<AdminCitySectionEditScreen> {
                                                   width: 540.0,
                                                   top: 0,
                                                   height: 335.0,
-                                                  child: LayoutBuilder(builder:
-                                                      (context, constraints) {
-                                                    return DeleteImageComponent(
-                                                      constraints,
-                                                    );
-                                                  }),
+                                                  child: DeleteImageComponent(),
                                                 ),
                                                 Positioned(
                                                   left: 0,
                                                   width: 540.0,
                                                   top: 354.0,
                                                   height: 335.0,
-                                                  child: LayoutBuilder(builder:
-                                                      (context, constraints) {
-                                                    return DeleteImageComponent(
-                                                      constraints,
-                                                    );
-                                                  }),
+                                                  child: DeleteImageComponent(),
                                                 ),
                                               ])))),
                                 ])),
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk1.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk1.golden
index 4d8aa40e..b690669b 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk1.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk1.golden
@@ -11,6 +11,7 @@ class ColHzFxVrFxSpPk1 extends StatefulWidget {
   const ColHzFxVrFxSpPk1({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrFxSpPk1 createState() => _ColHzFxVrFxSpPk1();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk2.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk2.golden
index cb4385af..3ed837cf 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk2.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk2.golden
@@ -11,6 +11,7 @@ class ColHzFxVrFxSpPk2 extends StatefulWidget {
   const ColHzFxVrFxSpPk2({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrFxSpPk2 createState() => _ColHzFxVrFxSpPk2();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk3.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk3.golden
index b989007c..4482be40 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk3.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk3.golden
@@ -11,6 +11,7 @@ class ColHzFxVrFxSpPk3 extends StatefulWidget {
   const ColHzFxVrFxSpPk3({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrFxSpPk3 createState() => _ColHzFxVrFxSpPk3();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk4.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk4.golden
index 73d6718d..bcb29d7d 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk4.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk4.golden
@@ -11,6 +11,7 @@ class ColHzFxVrFxSpPk4 extends StatefulWidget {
   const ColHzFxVrFxSpPk4({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrFxSpPk4 createState() => _ColHzFxVrFxSpPk4();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk5.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk5.golden
index c093996b..9309cadd 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk5.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk5.golden
@@ -11,6 +11,7 @@ class ColHzFxVrFxSpPk5 extends StatefulWidget {
   const ColHzFxVrFxSpPk5({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrFxSpPk5 createState() => _ColHzFxVrFxSpPk5();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk6.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk6.golden
index 5a2213ec..3f849c5e 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk6.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk6.golden
@@ -11,6 +11,7 @@ class ColHzFxVrFxSpPk6 extends StatefulWidget {
   const ColHzFxVrFxSpPk6({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrFxSpPk6 createState() => _ColHzFxVrFxSpPk6();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk7.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk7.golden
index d32979d1..92c5aa55 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk7.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk7.golden
@@ -11,6 +11,7 @@ class ColHzFxVrFxSpPk7 extends StatefulWidget {
   const ColHzFxVrFxSpPk7({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrFxSpPk7 createState() => _ColHzFxVrFxSpPk7();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk8.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk8.golden
index 2b27be69..fd557c8e 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk8.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk8.golden
@@ -11,6 +11,7 @@ class ColHzFxVrFxSpPk8 extends StatefulWidget {
   const ColHzFxVrFxSpPk8({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrFxSpPk8 createState() => _ColHzFxVrFxSpPk8();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk9.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk9.golden
index 7b27fffc..b5a220bf 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk9.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk9.golden
@@ -11,6 +11,7 @@ class ColHzFxVrFxSpPk9 extends StatefulWidget {
   const ColHzFxVrFxSpPk9({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrFxSpPk9 createState() => _ColHzFxVrFxSpPk9();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb147.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb147.golden
index a3d7f45c..3998230b 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb147.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb147.golden
@@ -11,6 +11,7 @@ class ColHzFxVrFxSpSb147 extends StatefulWidget {
   const ColHzFxVrFxSpSb147({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrFxSpSb147 createState() => _ColHzFxVrFxSpSb147();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb258.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb258.golden
index bf1bc6d0..bfc4a988 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb258.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb258.golden
@@ -11,6 +11,7 @@ class ColHzFxVrFxSpSb258 extends StatefulWidget {
   const ColHzFxVrFxSpSb258({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrFxSpSb258 createState() => _ColHzFxVrFxSpSb258();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb369.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb369.golden
index 136bf900..fa605f21 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb369.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb369.golden
@@ -11,6 +11,7 @@ class ColHzFxVrFxSpSb369 extends StatefulWidget {
   const ColHzFxVrFxSpSb369({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrFxSpSb369 createState() => _ColHzFxVrFxSpSb369();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden
index 20f4aedd..ca35382b 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden
@@ -11,6 +11,7 @@ class ColHzFxVrHgSpPk147 extends StatefulWidget {
   const ColHzFxVrHgSpPk147({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrHgSpPk147 createState() => _ColHzFxVrHgSpPk147();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden
index d91182dd..d6a366f9 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden
@@ -11,6 +11,7 @@ class ColHzFxVrHgSpPk258 extends StatefulWidget {
   const ColHzFxVrHgSpPk258({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrHgSpPk258 createState() => _ColHzFxVrHgSpPk258();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden
index 1cdcdc1c..7091d296 100644
--- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden
@@ -11,6 +11,7 @@ class ColHzFxVrHgSpPk369 extends StatefulWidget {
   const ColHzFxVrHgSpPk369({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzFxVrHgSpPk369 createState() => _ColHzFxVrHgSpPk369();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden
index ab8d943d..cdf0c30c 100644
--- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden
@@ -11,6 +11,7 @@ class ColHzHgVrFxSpPk1 extends StatefulWidget {
   const ColHzHgVrFxSpPk1({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzHgVrFxSpPk1 createState() => _ColHzHgVrFxSpPk1();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden
index 8b08d77b..2b2cd0e9 100644
--- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden
@@ -11,6 +11,7 @@ class ColHzHgVrFxSpPk2 extends StatefulWidget {
   const ColHzHgVrFxSpPk2({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzHgVrFxSpPk2 createState() => _ColHzHgVrFxSpPk2();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden
index 6fc34af7..c36483b2 100644
--- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden
@@ -11,6 +11,7 @@ class ColHzHgVrFxSpPk3 extends StatefulWidget {
   const ColHzHgVrFxSpPk3({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzHgVrFxSpPk3 createState() => _ColHzHgVrFxSpPk3();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden
index 9141fd98..eb92a004 100644
--- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden
@@ -11,6 +11,7 @@ class ColHzHgVrFxSpPk4 extends StatefulWidget {
   const ColHzHgVrFxSpPk4({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzHgVrFxSpPk4 createState() => _ColHzHgVrFxSpPk4();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden
index b1b9888c..6b0a9f30 100644
--- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden
@@ -11,6 +11,7 @@ class ColHzHgVrFxSpPk5 extends StatefulWidget {
   const ColHzHgVrFxSpPk5({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzHgVrFxSpPk5 createState() => _ColHzHgVrFxSpPk5();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden
index 9cf584dd..538df76a 100644
--- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden
@@ -11,6 +11,7 @@ class ColHzHgVrFxSpPk6 extends StatefulWidget {
   const ColHzHgVrFxSpPk6({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzHgVrFxSpPk6 createState() => _ColHzHgVrFxSpPk6();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden
index 7bdb2d07..9483005c 100644
--- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden
@@ -11,6 +11,7 @@ class ColHzHgVrFxSpPk7 extends StatefulWidget {
   const ColHzHgVrFxSpPk7({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzHgVrFxSpPk7 createState() => _ColHzHgVrFxSpPk7();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden
index efef0d59..bca96cc2 100644
--- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden
@@ -11,6 +11,7 @@ class ColHzHgVrFxSpPk8 extends StatefulWidget {
   const ColHzHgVrFxSpPk8({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzHgVrFxSpPk8 createState() => _ColHzHgVrFxSpPk8();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden
index 4e811de0..16f130c0 100644
--- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden
@@ -11,6 +11,7 @@ class ColHzHgVrFxSpPk9 extends StatefulWidget {
   const ColHzHgVrFxSpPk9({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzHgVrFxSpPk9 createState() => _ColHzHgVrFxSpPk9();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden
index 7f08cc3b..8c4e7da4 100644
--- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden
@@ -11,6 +11,7 @@ class ColHzHgVrFxSpSb147 extends StatefulWidget {
   const ColHzHgVrFxSpSb147({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzHgVrFxSpSb147 createState() => _ColHzHgVrFxSpSb147();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden
index 5b26245d..c1dc3066 100644
--- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden
@@ -11,6 +11,7 @@ class ColHzHgVrFxSpSb258 extends StatefulWidget {
   const ColHzHgVrFxSpSb258({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzHgVrFxSpSb258 createState() => _ColHzHgVrFxSpSb258();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden
index 9ebb7746..f7143643 100644
--- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden
@@ -11,6 +11,7 @@ class ColHzHgVrFxSpSb369 extends StatefulWidget {
   const ColHzHgVrFxSpSb369({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzHgVrFxSpSb369 createState() => _ColHzHgVrFxSpSb369();
 }
diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden
index ec75bbef..f39a0b39 100644
--- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden
+++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden
@@ -11,6 +11,7 @@ class ColHzHgVrHgSpPk123456789 extends StatefulWidget {
   const ColHzHgVrHgSpPk123456789({
     Key? key,
   }) : super(key: key);
+
   @override
   _ColHzHgVrHgSpPk123456789 createState() => _ColHzHgVrHgSpPk123456789();
 }
diff --git a/test/golden/golden_files/auto_layout/custom_test_screen.golden b/test/golden/golden_files/auto_layout/custom_test_screen.golden
index 2db0b912..790d27b6 100644
--- a/test/golden/golden_files/auto_layout/custom_test_screen.golden
+++ b/test/golden/golden_files/auto_layout/custom_test_screen.golden
@@ -46,6 +46,7 @@ class CustomTestScreen extends StatefulWidget {
   const CustomTestScreen({
     Key? key,
   }) : super(key: key);
+
   @override
   _CustomTestScreen createState() => _CustomTestScreen();
 }
diff --git a/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden
index 60800ffe..9fc9fc76 100644
--- a/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden
+++ b/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden
@@ -11,6 +11,7 @@ class NoSpaceColHzHgVrHgSpPk123456789 extends StatefulWidget {
   const NoSpaceColHzHgVrHgSpPk123456789({
     Key? key,
   }) : super(key: key);
+
   @override
   _NoSpaceColHzHgVrHgSpPk123456789 createState() =>
       _NoSpaceColHzHgVrHgSpPk123456789();
diff --git a/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden
index 6e0a96de..6a5f1338 100644
--- a/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden
+++ b/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden
@@ -11,6 +11,7 @@ class NoSpaceRowHzHgVrHgSpPk123456789 extends StatefulWidget {
   const NoSpaceRowHzHgVrHgSpPk123456789({
     Key? key,
   }) : super(key: key);
+
   @override
   _NoSpaceRowHzHgVrHgSpPk123456789 createState() =>
       _NoSpaceRowHzHgVrHgSpPk123456789();
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk1.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk1.golden
index 727afd4f..5d594b77 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk1.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk1.golden
@@ -11,6 +11,7 @@ class RowHzFxVrFxSpPk1 extends StatefulWidget {
   const RowHzFxVrFxSpPk1({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrFxSpPk1 createState() => _RowHzFxVrFxSpPk1();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk2.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk2.golden
index eeace5a5..ab3700b6 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk2.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk2.golden
@@ -11,6 +11,7 @@ class RowHzFxVrFxSpPk2 extends StatefulWidget {
   const RowHzFxVrFxSpPk2({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrFxSpPk2 createState() => _RowHzFxVrFxSpPk2();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk3.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk3.golden
index 239651bd..1d5568de 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk3.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk3.golden
@@ -11,6 +11,7 @@ class RowHzFxVrFxSpPk3 extends StatefulWidget {
   const RowHzFxVrFxSpPk3({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrFxSpPk3 createState() => _RowHzFxVrFxSpPk3();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk4.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk4.golden
index 889846c4..3f011e29 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk4.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk4.golden
@@ -11,6 +11,7 @@ class RowHzFxVrFxSpPk4 extends StatefulWidget {
   const RowHzFxVrFxSpPk4({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrFxSpPk4 createState() => _RowHzFxVrFxSpPk4();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk5.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk5.golden
index df4dd901..b85a1d55 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk5.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk5.golden
@@ -11,6 +11,7 @@ class RowHzFxVrFxSpPk5 extends StatefulWidget {
   const RowHzFxVrFxSpPk5({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrFxSpPk5 createState() => _RowHzFxVrFxSpPk5();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk6.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk6.golden
index ea2c794a..8f71e2ca 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk6.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk6.golden
@@ -11,6 +11,7 @@ class RowHzFxVrFxSpPk6 extends StatefulWidget {
   const RowHzFxVrFxSpPk6({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrFxSpPk6 createState() => _RowHzFxVrFxSpPk6();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk7.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk7.golden
index ad7724e3..740cf900 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk7.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk7.golden
@@ -11,6 +11,7 @@ class RowHzFxVrFxSpPk7 extends StatefulWidget {
   const RowHzFxVrFxSpPk7({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrFxSpPk7 createState() => _RowHzFxVrFxSpPk7();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk8.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk8.golden
index e8f84b8c..43404575 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk8.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk8.golden
@@ -11,6 +11,7 @@ class RowHzFxVrFxSpPk8 extends StatefulWidget {
   const RowHzFxVrFxSpPk8({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrFxSpPk8 createState() => _RowHzFxVrFxSpPk8();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk9.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk9.golden
index 72863692..f63e3490 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk9.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk9.golden
@@ -11,6 +11,7 @@ class RowHzFxVrFxSpPk9 extends StatefulWidget {
   const RowHzFxVrFxSpPk9({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrFxSpPk9 createState() => _RowHzFxVrFxSpPk9();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb123.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb123.golden
index 06019edc..5416b14c 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb123.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb123.golden
@@ -11,6 +11,7 @@ class RowHzFxVrFxSpSb123 extends StatefulWidget {
   const RowHzFxVrFxSpSb123({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrFxSpSb123 createState() => _RowHzFxVrFxSpSb123();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb456.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb456.golden
index 1a582934..66731fad 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb456.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb456.golden
@@ -11,6 +11,7 @@ class RowHzFxVrFxSpSb456 extends StatefulWidget {
   const RowHzFxVrFxSpSb456({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrFxSpSb456 createState() => _RowHzFxVrFxSpSb456();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb789.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb789.golden
index 382b9b8a..0f9f7560 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb789.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb789.golden
@@ -11,6 +11,7 @@ class RowHzFxVrFxSpSb789 extends StatefulWidget {
   const RowHzFxVrFxSpSb789({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrFxSpSb789 createState() => _RowHzFxVrFxSpSb789();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden
index 4931e65e..61bff769 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden
@@ -11,6 +11,7 @@ class RowHzFxVrHgSpPk147 extends StatefulWidget {
   const RowHzFxVrHgSpPk147({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrHgSpPk147 createState() => _RowHzFxVrHgSpPk147();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden
index 43241bc0..a12418e7 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden
@@ -11,6 +11,7 @@ class RowHzFxVrHgSpPk258 extends StatefulWidget {
   const RowHzFxVrHgSpPk258({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrHgSpPk258 createState() => _RowHzFxVrHgSpPk258();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden
index 07923480..843cb02d 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden
@@ -11,6 +11,7 @@ class RowHzFxVrHgSpPk369 extends StatefulWidget {
   const RowHzFxVrHgSpPk369({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrHgSpPk369 createState() => _RowHzFxVrHgSpPk369();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden
index db0a6b71..2098cb4c 100644
--- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden
@@ -11,6 +11,7 @@ class RowHzFxVrHgSpSb123456789 extends StatefulWidget {
   const RowHzFxVrHgSpSb123456789({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzFxVrHgSpSb123456789 createState() => _RowHzFxVrHgSpSb123456789();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden
index 50803059..537c685c 100644
--- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden
@@ -11,6 +11,7 @@ class RowHzHgVrFxSpPk147 extends StatefulWidget {
   const RowHzHgVrFxSpPk147({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzHgVrFxSpPk147 createState() => _RowHzHgVrFxSpPk147();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden
index 4602f044..2543cda5 100644
--- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden
@@ -11,6 +11,7 @@ class RowHzHgVrFxSpPk258 extends StatefulWidget {
   const RowHzHgVrFxSpPk258({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzHgVrFxSpPk258 createState() => _RowHzHgVrFxSpPk258();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden
index 7b5e48de..b1f75169 100644
--- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden
@@ -11,6 +11,7 @@ class RowHzHgVrFxSpPk369 extends StatefulWidget {
   const RowHzHgVrFxSpPk369({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzHgVrFxSpPk369 createState() => _RowHzHgVrFxSpPk369();
 }
diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden
index 6739639c..6d962145 100644
--- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden
+++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden
@@ -11,6 +11,7 @@ class RowHzHgVrHgSpPk123456789 extends StatefulWidget {
   const RowHzHgVrHgSpPk123456789({
     Key? key,
   }) : super(key: key);
+
   @override
   _RowHzHgVrHgSpPk123456789 createState() => _RowHzHgVrHgSpPk123456789();
 }
diff --git a/test/golden/golden_files/auto_layout/test_screen.golden b/test/golden/golden_files/auto_layout/test_screen.golden
index 88292f25..5f43e125 100644
--- a/test/golden/golden_files/auto_layout/test_screen.golden
+++ b/test/golden/golden_files/auto_layout/test_screen.golden
@@ -10,6 +10,7 @@ class TestScreen extends StatefulWidget {
   const TestScreen({
     Key? key,
   }) : super(key: key);
+
   @override
   _TestScreen createState() => _TestScreen();
 }
diff --git a/test/golden/golden_files/styling/helloworld.golden b/test/golden/golden_files/styling/helloworld.golden
index dc56d8ae..8c1c8923 100644
--- a/test/golden/golden_files/styling/helloworld.golden
+++ b/test/golden/golden_files/styling/helloworld.golden
@@ -8,13 +8,13 @@ import 'package:flutter/material.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 
 class Helloworld extends StatefulWidget {
-  final BoxConstraints constraints;
   final String? ovrHelloworld;
-  const Helloworld(
-    this.constraints, {
+
+  const Helloworld({
     Key? key,
     this.ovrHelloworld,
   }) : super(key: key);
+
   @override
   _Helloworld createState() => _Helloworld();
 }
@@ -24,30 +24,32 @@ class _Helloworld extends State<Helloworld> {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-        decoration: BoxDecoration(),
-        child: Stack(children: [
-          Positioned(
-            left: widget.constraints.maxWidth * 0.297,
-            width: widget.constraints.maxWidth * 0.41,
-            top: widget.constraints.maxHeight * 0.345,
-            height: widget.constraints.maxHeight * 0.221,
-            child: Container(
-                height: widget.constraints.maxHeight * 0.22123893805309736,
-                width: widget.constraints.maxWidth * 0.40963855421686746,
-                child: AutoSizeText(
-                  widget.ovrHelloworld ?? 'Hello world',
-                  style: TextStyle(
-                    fontFamily: 'Roboto',
-                    fontSize: 20.0,
-                    fontWeight: FontWeight.w400,
-                    letterSpacing: 0.0,
-                    color: Colors.black,
-                  ),
-                  textAlign: TextAlign.left,
-                )),
-          ),
-        ]));
+    return LayoutBuilder(builder: (context, constraints) {
+      return Container(
+          decoration: BoxDecoration(),
+          child: Stack(children: [
+            Positioned(
+              left: constraints.maxWidth * 0.297,
+              width: constraints.maxWidth * 0.41,
+              top: constraints.maxHeight * 0.345,
+              height: constraints.maxHeight * 0.221,
+              child: Container(
+                  height: constraints.maxHeight * 0.22123893805309736,
+                  width: constraints.maxWidth * 0.40963855421686746,
+                  child: AutoSizeText(
+                    widget.ovrHelloworld ?? 'Hello world',
+                    style: TextStyle(
+                      fontFamily: 'Roboto',
+                      fontSize: 20.0,
+                      fontWeight: FontWeight.w400,
+                      letterSpacing: 0.0,
+                      color: Colors.black,
+                    ),
+                    textAlign: TextAlign.left,
+                  )),
+            ),
+          ]));
+    });
   }
 
   @override
diff --git a/test/golden/golden_files/styling/primary_button.golden b/test/golden/golden_files/styling/primary_button.golden
index 659d3fe2..0ef67cbf 100644
--- a/test/golden/golden_files/styling/primary_button.golden
+++ b/test/golden/golden_files/styling/primary_button.golden
@@ -8,13 +8,13 @@ import 'package:flutter/material.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 
 class PrimaryButton extends StatefulWidget {
-  final BoxConstraints constraints;
   final String? ovrClickMe;
-  const PrimaryButton(
-    this.constraints, {
+
+  const PrimaryButton({
     Key? key,
     this.ovrClickMe,
   }) : super(key: key);
+
   @override
   _PrimaryButton createState() => _PrimaryButton();
 }
@@ -24,33 +24,35 @@ class _PrimaryButton extends State<PrimaryButton> {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-        decoration: BoxDecoration(
-          color: Color(0xff59afff),
-          borderRadius: BorderRadius.all(Radius.circular(20.0)),
-        ),
-        child: Stack(children: [
-          Positioned(
-            left: widget.constraints.maxWidth * 0.336,
-            width: widget.constraints.maxWidth * 0.328,
-            top: widget.constraints.maxHeight * 0.39,
-            height: widget.constraints.maxHeight * 0.23,
-            child: Container(
-                height: widget.constraints.maxHeight * 0.23,
-                width: widget.constraints.maxWidth * 0.3276595744680851,
-                child: AutoSizeText(
-                  widget.ovrClickMe ?? 'Click Me',
-                  style: TextStyle(
-                    fontFamily: 'Roboto',
-                    fontSize: 20.0,
-                    fontWeight: FontWeight.w400,
-                    letterSpacing: 0.0,
-                    color: Colors.white,
-                  ),
-                  textAlign: TextAlign.left,
-                )),
+    return LayoutBuilder(builder: (context, constraints) {
+      return Container(
+          decoration: BoxDecoration(
+            color: Color(0xff59afff),
+            borderRadius: BorderRadius.all(Radius.circular(20.0)),
           ),
-        ]));
+          child: Stack(children: [
+            Positioned(
+              left: constraints.maxWidth * 0.336,
+              width: constraints.maxWidth * 0.328,
+              top: constraints.maxHeight * 0.39,
+              height: constraints.maxHeight * 0.23,
+              child: Container(
+                  height: constraints.maxHeight * 0.23,
+                  width: constraints.maxWidth * 0.3276595744680851,
+                  child: AutoSizeText(
+                    widget.ovrClickMe ?? 'Click Me',
+                    style: TextStyle(
+                      fontFamily: 'Roboto',
+                      fontSize: 20.0,
+                      fontWeight: FontWeight.w400,
+                      letterSpacing: 0.0,
+                      color: Colors.white,
+                    ),
+                    textAlign: TextAlign.left,
+                  )),
+            ),
+          ]));
+    });
   }
 
   @override
diff --git a/test/golden/golden_files/styling/primary_button_rect.golden b/test/golden/golden_files/styling/primary_button_rect.golden
index 3df313d8..7059c2ad 100644
--- a/test/golden/golden_files/styling/primary_button_rect.golden
+++ b/test/golden/golden_files/styling/primary_button_rect.golden
@@ -8,13 +8,13 @@ import 'package:flutter/material.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 
 class PrimaryButtonRect extends StatefulWidget {
-  final BoxConstraints constraints;
   final String? ovrClickMe;
-  const PrimaryButtonRect(
-    this.constraints, {
+
+  const PrimaryButtonRect({
     Key? key,
     this.ovrClickMe,
   }) : super(key: key);
+
   @override
   _PrimaryButtonRect createState() => _PrimaryButtonRect();
 }
@@ -24,54 +24,56 @@ class _PrimaryButtonRect extends State<PrimaryButtonRect> {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.all(Radius.circular(20.0)),
-        ),
-        child: Stack(children: [
-          Positioned(
-            left: 0,
-            width: widget.constraints.maxWidth * 1.0,
-            top: 0,
-            height: widget.constraints.maxHeight * 1.0,
-            child: Stack(children: [
-              Positioned(
-                left: 0,
-                width: 235.0,
-                top: 0,
-                height: 100.0,
-                child: Container(
-                  height: 100.0,
+    return LayoutBuilder(builder: (context, constraints) {
+      return Container(
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.all(Radius.circular(20.0)),
+          ),
+          child: Stack(children: [
+            Positioned(
+              left: 0,
+              width: constraints.maxWidth * 1.0,
+              top: 0,
+              height: constraints.maxHeight * 1.0,
+              child: Stack(children: [
+                Positioned(
+                  left: 0,
                   width: 235.0,
-                  decoration: BoxDecoration(
-                    color: Color(0xff59afff),
-                    borderRadius: BorderRadius.all(Radius.circular(20.0)),
+                  top: 0,
+                  height: 100.0,
+                  child: Container(
+                    height: 100.0,
+                    width: 235.0,
+                    decoration: BoxDecoration(
+                      color: Color(0xff59afff),
+                      borderRadius: BorderRadius.all(Radius.circular(20.0)),
+                    ),
                   ),
                 ),
-              ),
-              Positioned(
-                left: widget.constraints.maxWidth * 0.336,
-                width: widget.constraints.maxWidth * 0.328,
-                top: widget.constraints.maxHeight * 0.39,
-                height: widget.constraints.maxHeight * 0.23,
-                child: Container(
-                    height: widget.constraints.maxHeight * 0.23,
-                    width: widget.constraints.maxWidth * 0.3276595744680851,
-                    child: AutoSizeText(
-                      widget.ovrClickMe ?? 'Click Me',
-                      style: TextStyle(
-                        fontFamily: 'Roboto',
-                        fontSize: 20.0,
-                        fontWeight: FontWeight.w400,
-                        letterSpacing: 0.0,
-                        color: Colors.white,
-                      ),
-                      textAlign: TextAlign.left,
-                    )),
-              ),
-            ]),
-          ),
-        ]));
+                Positioned(
+                  left: constraints.maxWidth * 0.336,
+                  width: constraints.maxWidth * 0.328,
+                  top: constraints.maxHeight * 0.39,
+                  height: constraints.maxHeight * 0.23,
+                  child: Container(
+                      height: constraints.maxHeight * 0.23,
+                      width: constraints.maxWidth * 0.3276595744680851,
+                      child: AutoSizeText(
+                        widget.ovrClickMe ?? 'Click Me',
+                        style: TextStyle(
+                          fontFamily: 'Roboto',
+                          fontSize: 20.0,
+                          fontWeight: FontWeight.w400,
+                          letterSpacing: 0.0,
+                          color: Colors.white,
+                        ),
+                        textAlign: TextAlign.left,
+                      )),
+                ),
+              ]),
+            ),
+          ]));
+    });
   }
 
   @override
diff --git a/test/golden/golden_files/styling/secondary_button.golden b/test/golden/golden_files/styling/secondary_button.golden
index c7ee1456..332d1530 100644
--- a/test/golden/golden_files/styling/secondary_button.golden
+++ b/test/golden/golden_files/styling/secondary_button.golden
@@ -8,13 +8,13 @@ import 'package:flutter/material.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 
 class SecondaryButton extends StatefulWidget {
-  final BoxConstraints constraints;
   final String? ovrClickMe;
-  const SecondaryButton(
-    this.constraints, {
+
+  const SecondaryButton({
     Key? key,
     this.ovrClickMe,
   }) : super(key: key);
+
   @override
   _SecondaryButton createState() => _SecondaryButton();
 }
@@ -24,37 +24,39 @@ class _SecondaryButton extends State<SecondaryButton> {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-        decoration: BoxDecoration(
-          color: Colors.white,
-          borderRadius: BorderRadius.all(Radius.circular(20.0)),
-          border: Border.all(
-            color: Color(0xff000000),
-            width: 2.0,
-          ),
-        ),
-        child: Stack(children: [
-          Positioned(
-            left: widget.constraints.maxWidth * 0.336,
-            width: widget.constraints.maxWidth * 0.328,
-            top: widget.constraints.maxHeight * 0.39,
-            height: widget.constraints.maxHeight * 0.23,
-            child: Container(
-                height: widget.constraints.maxHeight * 0.23,
-                width: widget.constraints.maxWidth * 0.3276595744680851,
-                child: AutoSizeText(
-                  widget.ovrClickMe ?? 'Click Me',
-                  style: TextStyle(
-                    fontFamily: 'Roboto',
-                    fontSize: 20.0,
-                    fontWeight: FontWeight.w400,
-                    letterSpacing: 0.0,
-                    color: Colors.black,
-                  ),
-                  textAlign: TextAlign.left,
-                )),
+    return LayoutBuilder(builder: (context, constraints) {
+      return Container(
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.all(Radius.circular(20.0)),
+            border: Border.all(
+              color: Color(0xff000000),
+              width: 2.0,
+            ),
           ),
-        ]));
+          child: Stack(children: [
+            Positioned(
+              left: constraints.maxWidth * 0.336,
+              width: constraints.maxWidth * 0.328,
+              top: constraints.maxHeight * 0.39,
+              height: constraints.maxHeight * 0.23,
+              child: Container(
+                  height: constraints.maxHeight * 0.23,
+                  width: constraints.maxWidth * 0.3276595744680851,
+                  child: AutoSizeText(
+                    widget.ovrClickMe ?? 'Click Me',
+                    style: TextStyle(
+                      fontFamily: 'Roboto',
+                      fontSize: 20.0,
+                      fontWeight: FontWeight.w400,
+                      letterSpacing: 0.0,
+                      color: Colors.black,
+                    ),
+                    textAlign: TextAlign.left,
+                  )),
+            ),
+          ]));
+    });
   }
 
   @override
diff --git a/test/golden/golden_files/styling/styling.golden b/test/golden/golden_files/styling/styling.golden
index df97ecd8..8978e296 100644
--- a/test/golden/golden_files/styling/styling.golden
+++ b/test/golden/golden_files/styling/styling.golden
@@ -12,6 +12,7 @@ class StylingScreen extends StatefulWidget {
   const StylingScreen({
     Key? key,
   }) : super(key: key);
+
   @override
   _StylingScreen createState() => _StylingScreen();
 }