diff --git a/example/lib/src/configuration/configuration.dart b/example/lib/src/configuration/configuration.dart
index 67cbd4b..85281f3 100644
--- a/example/lib/src/configuration/configuration.dart
+++ b/example/lib/src/configuration/configuration.dart
@@ -5,7 +5,7 @@ import "package:example/src/services/shop_service.dart";
 import "package:flutter/material.dart";
 import "package:flutter_order_details/flutter_order_details.dart";
 import "package:flutter_product_page/flutter_product_page.dart";
-import "package:flutter_shopping/main.dart";
+import "package:flutter_shopping/flutter_shopping.dart";
 import "package:flutter_shopping_cart/flutter_shopping_cart.dart";
 import "package:go_router/go_router.dart";
 
diff --git a/example/lib/src/routes.dart b/example/lib/src/routes.dart
index 4df9e53..4899345 100644
--- a/example/lib/src/routes.dart
+++ b/example/lib/src/routes.dart
@@ -1,7 +1,7 @@
 import "package:example/src/configuration/configuration.dart";
 import "package:example/src/ui/homepage.dart";
 import "package:example/src/utils/go_router.dart";
-import "package:flutter_shopping/main.dart";
+import "package:flutter_shopping/flutter_shopping.dart";
 import "package:go_router/go_router.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 
diff --git a/example/lib/src/ui/homepage.dart b/example/lib/src/ui/homepage.dart
index dbfe6f6..800e20b 100644
--- a/example/lib/src/ui/homepage.dart
+++ b/example/lib/src/ui/homepage.dart
@@ -1,5 +1,5 @@
 import "package:flutter/material.dart";
-import "package:flutter_shopping/main.dart";
+import "package:flutter_shopping/flutter_shopping.dart";
 import "package:go_router/go_router.dart";
 
 class Homepage extends StatelessWidget {
@@ -12,9 +12,7 @@ class Homepage extends StatelessWidget {
             label: const Text("1"),
             child: IconButton(
               icon: const Icon(Icons.shopping_cart_outlined, size: 50),
-              onPressed: () {
-                context.go(FlutterShoppingRoutes.shop);
-              },
+              onPressed: () => context.go(FlutterShoppingRoutes.shop),
             ),
           ),
         ),
diff --git a/example/lib/src/utils/theme.dart b/example/lib/src/utils/theme.dart
index c4e60f9..a0bf1d8 100644
--- a/example/lib/src/utils/theme.dart
+++ b/example/lib/src/utils/theme.dart
@@ -6,7 +6,7 @@ ThemeData getTheme() => ThemeData(
         labelMedium: TextStyle(
           fontSize: 14,
           fontWeight: FontWeight.w400,
-          color: Color.fromRGBO(0, 0, 0, 1),
+          color: Colors.black,
         ),
         titleMedium: TextStyle(
           fontSize: 16,
@@ -15,18 +15,18 @@ ThemeData getTheme() => ThemeData(
         ),
       ),
       inputDecorationTheme: const InputDecorationTheme(
-        fillColor: Color.fromRGBO(255, 255, 255, 1),
+        fillColor: Colors.white,
       ),
       colorScheme: const ColorScheme.light(
         primary: Color.fromRGBO(64, 87, 122, 1),
-        secondary: Color.fromRGBO(255, 255, 255, 1),
+        secondary: Colors.white,
         surface: Color.fromRGBO(250, 249, 246, 1),
       ),
       appBarTheme: const AppBarTheme(
         backgroundColor: Color.fromRGBO(64, 87, 122, 1),
         titleTextStyle: TextStyle(
           fontSize: 28,
-          color: Color.fromRGBO(255, 255, 255, 1),
+          color: Colors.white,
         ),
       ),
     );
diff --git a/lib/main.dart b/lib/flutter_shopping.dart
similarity index 86%
rename from lib/main.dart
rename to lib/flutter_shopping.dart
index bd87a53..3cdd31e 100644
--- a/lib/main.dart
+++ b/lib/flutter_shopping.dart
@@ -1,3 +1,6 @@
+/// Flutter Shopping
+library flutter_shopping;
+
 export "package:flutter_shopping/src/config/flutter_shopping_configuration.dart";
 export "package:flutter_shopping/src/routes.dart";
 export "package:flutter_shopping/src/user_stores/flutter_shopping_userstory_go_router.dart";
diff --git a/lib/src/config/default_order_detail_configuration.dart b/lib/src/config/default_order_detail_configuration.dart
index 74a0e66..952f716 100644
--- a/lib/src/config/default_order_detail_configuration.dart
+++ b/lib/src/config/default_order_detail_configuration.dart
@@ -1,6 +1,6 @@
 import "package:flutter/material.dart";
 import "package:flutter_order_details/flutter_order_details.dart";
-import "package:flutter_shopping/main.dart";
+import "package:flutter_shopping/flutter_shopping.dart";
 import "package:go_router/go_router.dart";
 
 /// Default order detail configuration for the app.
@@ -36,11 +36,11 @@ OrderDetailConfiguration getDefaultOrderDetailConfiguration(
         ),
         OrderDetailStep(
           formKey: GlobalKey<FormState>(),
-          stepName: "Adress Information",
+          stepName: "Address Information",
           fields: [
             OrderAddressInput(
-              title: "Your adress",
-              outputKey: "adres",
+              title: "Your address",
+              outputKey: "address",
               textController: TextEditingController(),
             ),
           ],
@@ -57,9 +57,8 @@ OrderDetailConfiguration getDefaultOrderDetailConfiguration(
           ],
         ),
       ],
-      onCompleted: (OrderResult result) async {
-        await onCompleteOrderDetails(context, configuration, result);
-      },
+      onCompleted: (OrderResult result) async =>
+          onCompleteOrderDetails(context, configuration, result),
       appBar: AppBar(
         title: const Text("Order Details"),
         leading: IconButton(
diff --git a/lib/src/user_stores/flutter_shopping_userstory_go_router.dart b/lib/src/user_stores/flutter_shopping_userstory_go_router.dart
index e212b6e..5bac572 100644
--- a/lib/src/user_stores/flutter_shopping_userstory_go_router.dart
+++ b/lib/src/user_stores/flutter_shopping_userstory_go_router.dart
@@ -1,6 +1,6 @@
 import "package:flutter/material.dart";
 import "package:flutter_order_details/flutter_order_details.dart";
-import "package:flutter_shopping/main.dart";
+import "package:flutter_shopping/flutter_shopping.dart";
 import "package:flutter_shopping/src/config/default_order_detail_configuration.dart";
 import "package:flutter_shopping/src/go_router.dart";
 import "package:flutter_shopping/src/widgets/default_order_failed_widget.dart";
diff --git a/lib/src/user_stores/flutter_shopping_userstory_navigation.dart b/lib/src/user_stores/flutter_shopping_userstory_navigation.dart
index fff5bd1..5ced74d 100644
--- a/lib/src/user_stores/flutter_shopping_userstory_navigation.dart
+++ b/lib/src/user_stores/flutter_shopping_userstory_navigation.dart
@@ -1,6 +1,6 @@
 import "package:flutter/material.dart";
 import "package:flutter_order_details/flutter_order_details.dart";
-import "package:flutter_shopping/main.dart";
+import "package:flutter_shopping/flutter_shopping.dart";
 import "package:go_router/go_router.dart";
 
 /// Default on complete order details function.
diff --git a/lib/src/widgets/default_order_failed_widget.dart b/lib/src/widgets/default_order_failed_widget.dart
index 60718c8..24debae 100644
--- a/lib/src/widgets/default_order_failed_widget.dart
+++ b/lib/src/widgets/default_order_failed_widget.dart
@@ -1,5 +1,5 @@
 import "package:flutter/material.dart";
-import "package:flutter_shopping/main.dart";
+import "package:flutter_shopping/flutter_shopping.dart";
 
 /// Default order failed widget.
 class DefaultOrderFailed extends StatelessWidget {
diff --git a/lib/src/widgets/default_order_succes_widget.dart b/lib/src/widgets/default_order_succes_widget.dart
index 98cd9e6..645959a 100644
--- a/lib/src/widgets/default_order_succes_widget.dart
+++ b/lib/src/widgets/default_order_succes_widget.dart
@@ -1,5 +1,5 @@
 import "package:flutter/material.dart";
-import "package:flutter_shopping/main.dart";
+import "package:flutter_shopping/flutter_shopping.dart";
 
 /// Default order success widget.
 class DefaultOrderSucces extends StatelessWidget {