Merge pull request #234 from yaso-meth/QOL--Number-Stepper-Color-Alignment

QOL--Number-Stepper-Color-Alignment

Frontend/lib/main.dart

@@ -3,20 +3,20 @@ import 'mih_config/mih_env.dart';
 import 'mih_config/mih_routeGenerator.dart';
 import 'mih_config/mih_theme.dart';
 
-class MzanziInnovationHub extends StatefulWidget {
-  const MzanziInnovationHub({
+class MzansiInnovationHub extends StatefulWidget {
+  const MzansiInnovationHub({
     super.key,
   });
 
   @override
-  State<MzanziInnovationHub> createState() => _MzanziInnovationHubState();
+  State<MzansiInnovationHub> createState() => _MzansiInnovationHubState();
 
   // ignore: library_private_types_in_public_api
-  static _MzanziInnovationHubState? of(BuildContext context) =>
-      context.findAncestorStateOfType<_MzanziInnovationHubState>();
+  static _MzansiInnovationHubState? of(BuildContext context) =>
+      context.findAncestorStateOfType<_MzansiInnovationHubState>();
 }
 
-class _MzanziInnovationHubState extends State<MzanziInnovationHub> {
+class _MzansiInnovationHubState extends State<MzansiInnovationHub> {
   late MihTheme theme;
 
   Color getPrimany() {

Frontend/lib/main_dev.dart

@@ -26,5 +26,5 @@ void main() async {
     debugPrint('APP INSTALLED!');
   });
   FlutterNativeSplash.remove();
-  runApp(const MzanziInnovationHub());
+  runApp(const MzansiInnovationHub());
 }

Frontend/lib/main_prod.dart

@@ -26,5 +26,5 @@ void main() async {
     debugPrint('APP INSTALLED!');
   });
   FlutterNativeSplash.remove();
-  runApp(const MzanziInnovationHub());
+  runApp(const MzansiInnovationHub());
 }

Frontend/lib/mih_components/mih_layout/mih_body.dart

@@ -18,7 +18,7 @@ class _MIHBodyState extends State<MIHBody> {
   //double paddingSize = 10;
 
   double getHorizontalPaddingSize(Size screenSize) {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       if (widget.borderOn) {
         return 10;
       } else {
@@ -46,10 +46,10 @@ class _MIHBodyState extends State<MIHBody> {
   Decoration? getBoader() {
     if (widget.borderOn) {
       return BoxDecoration(
-        color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
         borderRadius: BorderRadius.circular(25.0),
         border: Border.all(
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             width: 3.0),
       );
     } else {

Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart

@@ -78,13 +78,13 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
       title: Text(
         title,
         style: TextStyle(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         ),
       ),
       subtitle: Text(
         subtitle,
         style: TextStyle(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         ),
       ),
       onTap: () {},
@@ -101,7 +101,7 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
         children: [
           Icon(
             Icons.circle_notifications,
-            color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+            color: MzansiInnovationHub.of(context)!.theme.errorColor(),
           ),
           const SizedBox(
             width: 5,
@@ -110,7 +110,7 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
             child: Text(
               title,
               style: TextStyle(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               ),
             ),
           ),
@@ -124,7 +124,7 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
             child: Text(
               title,
               style: TextStyle(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               ),
             ),
           ),
@@ -136,7 +136,7 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
       subtitle: Text(
         subtitle,
         style: TextStyle(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         ),
       ),
       onTap: () {
@@ -159,7 +159,7 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
         physics: const NeverScrollableScrollPhysics(),
         separatorBuilder: (BuildContext context, index) {
           return Divider(
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           );
         },
         itemCount: widget.notifications.length,
@@ -198,14 +198,14 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
   Widget build(BuildContext context) {
     return SafeArea(
       child: Drawer(
-          //backgroundColor:  MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          //backgroundColor:  MzansiInnovationHub.of(context)!.theme.primaryColor(),
           child: SingleChildScrollView(
         child: Column(
           mainAxisSize: MainAxisSize.max,
           mainAxisAlignment: MainAxisAlignment.start,
           children: [
             Container(
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 crossAxisAlignment: CrossAxisAlignment.center,
@@ -215,7 +215,7 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
                     child: Text(
                       "Notifications",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         fontWeight: FontWeight.bold,
@@ -232,7 +232,7 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
             //   physics: const NeverScrollableScrollPhysics(),
             //   separatorBuilder: (BuildContext context, index) {
             //     return Divider(
-            //       color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            //       color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             //     );
             //   },
             //   itemCount: widget.notifications.length,

Frontend/lib/mih_components/mih_layout/mih_tile.dart

@@ -83,7 +83,7 @@ class _MIHTileState extends State<MIHTile> {
             child: Material(
               color: mainC,
               // shadowColor:
-              //     MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              //     MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               // elevation: 5,
               borderRadius: BorderRadius.circular(80),
               child: InkWell(
@@ -95,9 +95,9 @@ class _MIHTileState extends State<MIHTile> {
                 },
                 // hoverDuration: ,
                 splashColor:
-                    MzanziInnovationHub.of(context)!.theme.highlightColor(),
+                    MzansiInnovationHub.of(context)!.theme.highlightColor(),
                 highlightColor:
-                    MzanziInnovationHub.of(context)!.theme.highlightColor(),
+                    MzansiInnovationHub.of(context)!.theme.highlightColor(),
                 child: widget.tileIcon,
               ),
             ),
@@ -111,7 +111,7 @@ class _MIHTileState extends State<MIHTile> {
               softWrap: true,
               overflow: TextOverflow.visible,
               style: TextStyle(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 fontSize: 40.0,
                 fontWeight: FontWeight.bold,
               ),

Frontend/lib/mih_components/mih_package_components/Example/package_test.dart

@@ -66,7 +66,7 @@ class _PackageTestState extends State<PackageTest> {
           alertIcon: Icon(
             Icons.warning_amber_rounded,
             size: 100,
-            color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+            color: MzansiInnovationHub.of(context)!.theme.errorColor(),
           ),
           alertTitle: "Oops! Looks like some fields are missing.",
           alertBody: Column(
@@ -75,7 +75,7 @@ class _PackageTestState extends State<PackageTest> {
                 "We noticed that some required fields are still empty. To ensure your request is processed smoothly, please fill out all the highlighted fields before submitting the form again.",
                 style: TextStyle(
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   fontSize: 15,
                   fontWeight: FontWeight.bold,
                 ),
@@ -85,7 +85,7 @@ class _PackageTestState extends State<PackageTest> {
                 text: TextSpan(
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: 15,
                     fontWeight: FontWeight.bold,
                   ),
@@ -94,14 +94,14 @@ class _PackageTestState extends State<PackageTest> {
                         text: "Here's a quick tip: ",
                         style: TextStyle(
                             fontStyle: FontStyle.italic,
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .errorColor())),
                     const TextSpan(text: "Look for fields with an asterisk ("),
                     TextSpan(
                         text: "*",
                         style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .errorColor())),
                     const TextSpan(
@@ -111,7 +111,7 @@ class _PackageTestState extends State<PackageTest> {
               ),
             ],
           ),
-          alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(),
+          alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
         );
       },
     );

Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart

@@ -96,17 +96,17 @@ class _PackageToolOneState extends State<PackageToolOne> {
             SpeedDialChild(
               child: Icon(
                 Icons.add,
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               ),
               label: "Show New Window",
               labelBackgroundColor:
-                  MzanziInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.successColor(),
               labelStyle: TextStyle(
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 fontWeight: FontWeight.bold,
               ),
               backgroundColor:
-                  MzanziInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.successColor(),
               onTap: () {
                 // showTestWindow();
               },
@@ -158,7 +158,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
         MihSingleChildScroll(
           child: Padding(
             padding:
-                MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                     ? EdgeInsets.symmetric(horizontal: width * 0.2)
                     : EdgeInsets.symmetric(horizontal: width * 0.075),
             child: Column(
@@ -175,7 +175,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
                       style: TextStyle(
                         fontSize: 25,
                         fontWeight: FontWeight.bold,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),
@@ -196,13 +196,13 @@ class _PackageToolOneState extends State<PackageToolOne> {
                       );
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     elevation: 10,
                     width: 300,
                     child: Text(
                       "Show Loading",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         fontSize: 20,
@@ -221,7 +221,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
                       style: TextStyle(
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),
@@ -242,7 +242,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
                       style: TextStyle(
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),
@@ -302,7 +302,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
                 const SizedBox(height: 10),
                 Divider(
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   thickness: 2,
                 ),
                 const SizedBox(height: 10),
@@ -315,7 +315,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
                       style: TextStyle(
                         fontSize: 25,
                         fontWeight: FontWeight.bold,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),
@@ -326,7 +326,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
                 const SizedBox(height: 10),
                 Divider(
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   thickness: 2,
                 ),
                 const SizedBox(height: 10),
@@ -335,11 +335,11 @@ class _PackageToolOneState extends State<PackageToolOne> {
                   formFields: [
                     MihTextFormField(
                       width: 200,
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: _textFieldZeroController,
                       multiLineInput: false,
                       requiredText: false,
@@ -350,11 +350,11 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     ),
                     const SizedBox(height: 10),
                     MihTextFormField(
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: _textFieldOneController,
                       multiLineInput: false,
                       requiredText: true,
@@ -366,11 +366,11 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     ),
                     const SizedBox(height: 10),
                     MihTextFormField(
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: _textFieldTwoController,
                       multiLineInput: false,
                       requiredText: true,
@@ -383,11 +383,11 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     ),
                     const SizedBox(height: 10),
                     MihTextFormField(
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: _textFieldThreeController,
                       multiLineInput: false,
                       requiredText: true,
@@ -400,11 +400,11 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     const SizedBox(height: 10),
                     MihNumericStepper(
                       controller: _textFieldFiveController,
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       hintText: "Number Stepper",
                       requiredText: true,
                       minValue: 1,
@@ -415,11 +415,11 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     MihToggle(
                       hintText: "Toggle",
                       initialPostion: switchpositioin,
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       secondaryFillColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       readOnly: false,
                       onChange: (value) {
                         setState(() {
@@ -432,11 +432,11 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     MihRadioOptions(
                       controller: _textFieldSixController,
                       hintText: "Radio Options",
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       secondaryFillColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       requiredText: true,
                       radioOptions: const ["Option 1", "Option 2"],
                     ),
@@ -477,11 +477,11 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     const SizedBox(height: 10),
                     MihTextFormField(
                       height: 250,
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: _textFieldFourController,
                       multiLineInput: true,
                       requiredText: false,
@@ -505,7 +505,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
                             MihAlertServices().formNotFilledCompletely(context);
                           }
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                         elevation: 10,
@@ -513,7 +513,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
                         child: Text(
                           "Submit Form",
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,
@@ -527,7 +527,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
                 const SizedBox(height: 10),
                 Divider(
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   thickness: 2,
                 ),
                 const SizedBox(height: 10),
@@ -539,9 +539,9 @@ class _PackageToolOneState extends State<PackageToolOne> {
                   prefixAltIcon: MihIcons.mzansiAi,
                   width: 300,
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   hintColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   onPrefixIconTap: () {
                     print("Search Icon Pressed: ${_searchController.text}");
                   },
@@ -553,14 +553,14 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     print("Button Pressed");
                   },
                   buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   elevation: 10,
                   width: 300,
                   child: Text(
                     "Click Me",
                     style: TextStyle(
                       color:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -572,21 +572,21 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     print("Button Pressed");
                   },
                   buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.successColor(),
                   width: 300,
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
                       Icon(
                         Icons.delete,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                       ),
                       Text(
                         "Click Me",
                         style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           fontSize: 20,
@@ -602,13 +602,13 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     print("Button Pressed");
                   },
                   buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.errorColor(),
+                      MzansiInnovationHub.of(context)!.theme.errorColor(),
                   width: 300,
                   child: Text(
                     "Click Me",
                     style: TextStyle(
                       color:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -626,7 +626,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     icon: Icon(
                       MihIcons.mihLogo,
                       color:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     ),
                   ),
                 ),
@@ -638,9 +638,9 @@ class _PackageToolOneState extends State<PackageToolOne> {
                   fileNameController: _fileNameController,
                   userSelectedfile: file,
                   frameColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   backgroundColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   onChange: (selectedImage) {
                     setState(() {
                       file = selectedImage;
@@ -650,9 +650,9 @@ class _PackageToolOneState extends State<PackageToolOne> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: _fileNameController,
                   hintText: "Selected Avatar File",
                   requiredText: false,
@@ -675,9 +675,9 @@ class _PackageToolOneState extends State<PackageToolOne> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: _imagefileController,
                   hintText: "Selected Image File",
                   requiredText: false,
@@ -698,18 +698,18 @@ class _PackageToolOneState extends State<PackageToolOne> {
                   child: Icon(
                     Icons.add,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   ),
                   label: "Show New Window",
                   labelBackgroundColor:
-                      MzanziInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.successColor(),
                   labelStyle: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     fontWeight: FontWeight.bold,
                   ),
                   backgroundColor:
-                      MzanziInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.successColor(),
                   onTap: () {
                     showTestWindow();
                   },
@@ -718,18 +718,18 @@ class _PackageToolOneState extends State<PackageToolOne> {
                   child: Icon(
                     Icons.add,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   ),
                   label: "Show New Full Window",
                   labelBackgroundColor:
-                      MzanziInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.successColor(),
                   labelStyle: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     fontWeight: FontWeight.bold,
                   ),
                   backgroundColor:
-                      MzanziInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.successColor(),
                   onTap: () {
                     showTestFullWindow();
                   },

Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_two.dart

@@ -32,7 +32,7 @@ class _PackageToolTwoState extends State<PackageToolTwo> {
             style: TextStyle(
               fontSize: 25,
               fontWeight: FontWeight.bold,
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             ),
           ),
           const SizedBox(height: 10),
@@ -46,7 +46,7 @@ class _PackageToolTwoState extends State<PackageToolTwo> {
               onPressed: () {},
               icon: Icon(
                 MihIcons.mihLogo,
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               ),
             ),
           )

Frontend/lib/mih_components/mih_package_components/mih_business_profile_preview.dart

@@ -62,9 +62,9 @@ class _MihBusinessProfilePreviewState extends State<MihBusinessProfilePreview> {
                     fileNameController: TextEditingController(),
                     userSelectedfile: file,
                     frameColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     backgroundColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     onChange: () {},
                   );
                 } else {
@@ -72,7 +72,7 @@ class _MihBusinessProfilePreviewState extends State<MihBusinessProfilePreview> {
                     MihIcons.iDontKnow,
                     size: profilePictureWidth,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   );
                 }
               } else {

Frontend/lib/mih_components/mih_package_components/mih_calendar.dart

@@ -37,7 +37,7 @@ class _MIHCalendarState extends State<MIHCalendar> {
           formatButtonDecoration: BoxDecoration(
             border: Border.fromBorderSide(
               BorderSide(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               ),
             ),
             borderRadius: const BorderRadius.all(
@@ -61,29 +61,29 @@ class _MIHCalendarState extends State<MIHCalendar> {
         calendarStyle: CalendarStyle(
           outsideDaysVisible: false,
           todayTextStyle: TextStyle(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           ),
           todayDecoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.successColor(),
+            color: MzansiInnovationHub.of(context)!.theme.successColor(),
             shape: BoxShape.circle,
           ),
           selectedTextStyle: TextStyle(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           ),
           selectedDecoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             shape: BoxShape.circle,
           ),
           weekendTextStyle: TextStyle(
-            color: MzanziInnovationHub.of(context)!.theme.messageTextColor(),
+            color: MzansiInnovationHub.of(context)!.theme.messageTextColor(),
           ),
         ),
         daysOfWeekStyle: DaysOfWeekStyle(
           weekdayStyle: TextStyle(
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           ),
           weekendStyle: TextStyle(
-            color: MzanziInnovationHub.of(context)!.theme.messageTextColor(),
+            color: MzansiInnovationHub.of(context)!.theme.messageTextColor(),
           ),
         ),
       ),

Frontend/lib/mih_components/mih_package_components/mih_circle_avatar.dart

@@ -110,7 +110,7 @@ class _MihCircleAvatarState extends State<MihCircleAvatar> {
                       type: FileType.image,
                     );
                     // print("Here 1");
-                    if (MzanziInnovationHub.of(context)!.theme.getPlatform() ==
+                    if (MzansiInnovationHub.of(context)!.theme.getPlatform() ==
                         "Web") {
                       // print("Here 2");
                       if (result == null) return;

Frontend/lib/mih_components/mih_package_components/mih_date_field.dart

@@ -47,7 +47,7 @@ class _MihDateFieldState extends State<MihDateField> {
 
   @override
   Widget build(BuildContext context) {
-    final theme = MzanziInnovationHub.of(context)!.theme;
+    final theme = MzansiInnovationHub.of(context)!.theme;
     return Center(
       child: SizedBox(
         width: widget.width,

Frontend/lib/mih_components/mih_package_components/mih_dropdwn_field.dart

@@ -30,7 +30,7 @@ class _MihDropdownFieldState extends State<MihDropdownField> {
 
   List<DropdownMenuEntry<String>> buildMenuOptions(List<String> options) {
     List<DropdownMenuEntry<String>> menuList = [];
-    final theme = MzanziInnovationHub.of(context)!.theme;
+    final theme = MzansiInnovationHub.of(context)!.theme;
     for (final i in options) {
       menuList.add(DropdownMenuEntry(
         value: i,
@@ -59,7 +59,7 @@ class _MihDropdownFieldState extends State<MihDropdownField> {
 
   @override
   Widget build(BuildContext context) {
-    final theme = MzanziInnovationHub.of(context)!.theme;
+    final theme = MzansiInnovationHub.of(context)!.theme;
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,

Frontend/lib/mih_components/mih_package_components/mih_floating_menu.dart

@@ -30,10 +30,10 @@ class _MihFloatingMenuState extends State<MihFloatingMenu> {
       animatedIcon: widget.animatedIcon,
       direction: widget.direction ?? SpeedDialDirection.up,
       activeIcon: Icons.close,
-      backgroundColor: MzanziInnovationHub.of(context)!.theme.successColor(),
+      backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(),
       activeBackgroundColor:
-          MzanziInnovationHub.of(context)!.theme.errorColor(),
-      foregroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.errorColor(),
+      foregroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
       overlayColor: Colors.black,
       overlayOpacity: 0.5,
       children: widget.children,

Frontend/lib/mih_components/mih_package_components/mih_image_display.dart

@@ -33,7 +33,7 @@ class _MihImageDisplayState extends State<MihImageDisplay> {
   ImageProvider<Object>? getImage() {
     Color dark = const Color(0XFF3A4454);
     if (widget.imageFile == null) {
-      if (MzanziInnovationHub.of(context)!.theme.secondaryColor() == dark) {
+      if (MzansiInnovationHub.of(context)!.theme.secondaryColor() == dark) {
         print("here in light icon");
         return const AssetImage(
             'lib/mih_components/mih_package_components/assets/images/i-dont-know-dark.png');
@@ -78,9 +78,9 @@ class _MihImageDisplayState extends State<MihImageDisplay> {
               child: IconButton.filled(
                 style: IconButton.styleFrom(
                   backgroundColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 onPressed: () async {
                   try {
                     FilePickerResult? result =
@@ -88,7 +88,7 @@ class _MihImageDisplayState extends State<MihImageDisplay> {
                       type: FileType.image,
                     );
                     // print("Here 1");
-                    if (MzanziInnovationHub.of(context)!.theme.getPlatform() ==
+                    if (MzansiInnovationHub.of(context)!.theme.getPlatform() ==
                         "Web") {
                       // print("Here 2");
                       if (result == null) return;

Frontend/lib/mih_components/mih_package_components/mih_numeric_stepper.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart';
 
@@ -107,8 +108,10 @@ class _MihNumericStepperState extends State<MihNumericStepper> {
                       width: 40,
                       child: IconButton.filled(
                         style: ButtonStyle(
-                          backgroundColor:
-                              WidgetStateProperty.all<Color>(widget.fillColor),
+                          backgroundColor: WidgetStateProperty.all<Color>(
+                              MzansiInnovationHub.of(context)!
+                                  .theme
+                                  .errorColor()),
                         ),
                         color: widget.inputColor,
                         iconSize: 20,
@@ -189,8 +192,10 @@ class _MihNumericStepperState extends State<MihNumericStepper> {
                       width: 40,
                       child: IconButton.filled(
                         style: ButtonStyle(
-                          backgroundColor:
-                              WidgetStateProperty.all<Color>(widget.fillColor),
+                          backgroundColor: WidgetStateProperty.all<Color>(
+                              MzansiInnovationHub.of(context)!
+                                  .theme
+                                  .successColor()),
                         ),
                         color: widget.inputColor,
                         iconSize: 20,

Frontend/lib/mih_components/mih_package_components/mih_package.dart

@@ -86,7 +86,7 @@ class _MihPackageState extends State<MihPackage>
       vsync: this,
       duration: const Duration(milliseconds: 400),
     );
-    if (!MzanziInnovationHub.of(context)!.theme.kIsWeb) {
+    if (!MzansiInnovationHub.of(context)!.theme.kIsWeb) {
       // Trigger the peak animation on start (or call this elsewhere)
       WidgetsBinding.instance.addPostFrameCallback((_) {
         _peakAnimation();

Frontend/lib/mih_components/mih_package_components/mih_package_alert.dart

@@ -29,7 +29,7 @@ class _MihPackageAlertState extends State<MihPackageAlert> {
   Size? size;
 
   void checkScreenSize() {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       setState(() {
         popUpWidth = (size!.width / 4) * 2;
         popUpheight = null;
@@ -64,7 +64,7 @@ class _MihPackageAlertState extends State<MihPackageAlert> {
             width: popUpWidth,
             height: popUpheight,
             decoration: BoxDecoration(
-              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               borderRadius: BorderRadius.circular(25.0),
               border: Border.all(color: widget.alertColour, width: 5.0),
             ),
@@ -101,7 +101,7 @@ class _MihPackageAlertState extends State<MihPackageAlert> {
               },
               icon: Icon(
                 Icons.close,
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 size: 35,
               ),
             ),

Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart

@@ -85,7 +85,7 @@ class _MihPackageTileState extends State<MihPackageTile> {
                   // overflow: TextOverflow.visible,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: 20.0,
                     fontWeight: FontWeight.bold,
                   ),

Frontend/lib/mih_components/mih_package_components/mih_package_tool_body.dart

@@ -19,7 +19,7 @@ class MihPackageToolBody extends StatefulWidget {
 class _MihPackageToolBodyState extends State<MihPackageToolBody> {
   late double _innerBodyPadding;
   double getHorizontalPaddingSize(Size screenSize) {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       if (widget.borderOn) {
         return widget.innerHorizontalPadding ?? 10;
       } else {
@@ -48,19 +48,19 @@ class _MihPackageToolBodyState extends State<MihPackageToolBody> {
     if (widget.borderOn) {
       _innerBodyPadding = 10.0;
       return BoxDecoration(
-        color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
         borderRadius: BorderRadius.circular(25.0),
         border: Border.all(
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             width: 3.0),
       );
     } else {
       _innerBodyPadding = 0.0;
       return BoxDecoration(
-        color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
         borderRadius: BorderRadius.circular(25.0),
         border: Border.all(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             width: 3.0),
       );
     }

Frontend/lib/mih_components/mih_package_components/mih_package_window.dart

@@ -35,7 +35,7 @@ class _MihPackageWindowState extends State<MihPackageWindow> {
   void checkScreenSize() {
     // print("screen width: $width");
     // print("screen height: $height");
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       setState(() {
         windowTitleSize = 25;
         horizontralWindowPadding = width / 7;
@@ -84,9 +84,9 @@ class _MihPackageWindowState extends State<MihPackageWindow> {
               child: IconButton.filled(
                 style: ButtonStyle(
                   backgroundColor: WidgetStateProperty.all<Color>(
-                      MzanziInnovationHub.of(context)!.theme.errorColor()),
+                      MzansiInnovationHub.of(context)!.theme.errorColor()),
                 ),
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 iconSize: 20,
                 onPressed: () {
                   widget.onWindowTapClose();
@@ -108,7 +108,7 @@ class _MihPackageWindowState extends State<MihPackageWindow> {
               style: TextStyle(
                 fontSize: windowTitleSize,
                 fontWeight: FontWeight.bold,
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               ),
             ),
           ),
@@ -165,10 +165,10 @@ class _MihPackageWindowState extends State<MihPackageWindow> {
       insetAnimationDuration: Durations.short1,
       child: Container(
         decoration: BoxDecoration(
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           borderRadius: BorderRadius.circular(25.0),
           border: Border.all(
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               width: 5.0),
         ),
         child: widget.fullscreen

Frontend/lib/mih_components/mih_package_components/mih_personal_profile_preview.dart

@@ -48,9 +48,9 @@ class _MihPersonalProfilePreviewState extends State<MihPersonalProfilePreview> {
                   fileNameController: TextEditingController(),
                   userSelectedfile: file,
                   frameColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   backgroundColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   onChange: () {},
                 );
               } else {
@@ -58,14 +58,14 @@ class _MihPersonalProfilePreviewState extends State<MihPersonalProfilePreview> {
                   MihIcons.iDontKnow,
                   size: profilePictureWidth,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 );
               }
             } else {
               return Icon(
                 MihIcons.mihRing,
                 size: profilePictureWidth,
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               );
             }
           },

Frontend/lib/mih_components/mih_package_components/mih_text_form_field.dart

@@ -215,7 +215,7 @@ class _MihTextFormFieldState extends State<MihTextFormField> {
                                     widget.borderRadius ?? 8.0),
                                 borderSide: field.hasError
                                     ? BorderSide(
-                                        color: MzanziInnovationHub.of(context)!
+                                        color: MzansiInnovationHub.of(context)!
                                             .theme
                                             .errorColor(),
                                         width: 2.0,
@@ -232,7 +232,7 @@ class _MihTextFormFieldState extends State<MihTextFormField> {
                                     widget.borderRadius ?? 8.0),
                                 borderSide: BorderSide(
                                   color: field.hasError
-                                      ? MzanziInnovationHub.of(context)!
+                                      ? MzansiInnovationHub.of(context)!
                                           .theme
                                           .errorColor()
                                       : widget.inputColor,
@@ -243,7 +243,7 @@ class _MihTextFormFieldState extends State<MihTextFormField> {
                                 borderRadius: BorderRadius.circular(
                                     widget.borderRadius ?? 8.0),
                                 borderSide: BorderSide(
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .errorColor(),
                                   width: 3.0,
@@ -253,7 +253,7 @@ class _MihTextFormFieldState extends State<MihTextFormField> {
                                 borderRadius: BorderRadius.circular(
                                     widget.borderRadius ?? 8.0),
                                 borderSide: BorderSide(
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .errorColor(),
                                   width: 3.0,
@@ -276,7 +276,7 @@ class _MihTextFormFieldState extends State<MihTextFormField> {
                                 field.errorText ?? '',
                                 style: TextStyle(
                                   fontSize: 12,
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .errorColor(),
                                   fontWeight: FontWeight.bold,

Frontend/lib/mih_components/mih_package_components/mih_time_field.dart

@@ -57,7 +57,7 @@ class _MihTimeFieldState extends State<MihTimeField> {
 
   @override
   Widget build(BuildContext context) {
-    final theme = MzanziInnovationHub.of(context)!.theme;
+    final theme = MzansiInnovationHub.of(context)!.theme;
     return Center(
       child: SizedBox(
         width: widget.width,

Frontend/lib/mih_components/mih_package_components/mih_toggle.dart

@@ -66,11 +66,11 @@ class _MihToggleState extends State<MihToggle> {
                 return Colors.grey;
               }
               if (states.contains(WidgetState.selected)) {
-                return MzanziInnovationHub.of(context)!
+                return MzansiInnovationHub.of(context)!
                     .theme
                     .successColor(); // Outline color when active
               }
-              return MzanziInnovationHub.of(context)!
+              return MzansiInnovationHub.of(context)!
                   .theme
                   .errorColor(); // Outline color when active
             },
@@ -79,12 +79,12 @@ class _MihToggleState extends State<MihToggle> {
               widget.readOnly == true ? Colors.grey : widget.secondaryFillColor,
           activeTrackColor: widget.readOnly == true
               ? Colors.grey.shade400
-              : MzanziInnovationHub.of(context)!.theme.successColor(),
+              : MzansiInnovationHub.of(context)!.theme.successColor(),
           inactiveThumbColor:
               widget.readOnly == true ? Colors.grey : widget.secondaryFillColor,
           inactiveTrackColor: widget.readOnly == true
               ? Colors.grey.shade400
-              : MzanziInnovationHub.of(context)!.theme.errorColor(),
+              : MzansiInnovationHub.of(context)!.theme.errorColor(),
           // activeColor: widget.secondaryFillColor,
           // activeTrackColor: widget.fillColor,
           // inactiveThumbColor: widget.fillColor,

Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart

@@ -28,7 +28,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
   late double height;
 
   void checkScreenSize() {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       setState(() {
         popUpWidth = (width / 4) * 2;
         popUpheight = null;
@@ -59,10 +59,10 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -73,7 +73,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
@@ -81,7 +81,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -91,7 +91,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   "This note will be deleted permanently. Are you certain you want to delete it?",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -100,13 +100,13 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 MihButton(
                   onPressed: widget.onTap,
                   buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.errorColor(),
+                      MzansiInnovationHub.of(context)!.theme.errorColor(),
                   width: 300,
                   child: Text(
                     "Delete",
                     style: TextStyle(
                       color:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -127,7 +127,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -144,10 +144,10 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -158,7 +158,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
@@ -166,7 +166,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -176,7 +176,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   "This file will be deleted permanently. Are you certain you want to delete it?",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -185,13 +185,13 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 MihButton(
                   onPressed: widget.onTap,
                   buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.errorColor(),
+                      MzansiInnovationHub.of(context)!.theme.errorColor(),
                   width: 300,
                   child: Text(
                     "Delete",
                     style: TextStyle(
                       color:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -212,7 +212,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -229,10 +229,10 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -243,7 +243,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
@@ -251,7 +251,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -261,7 +261,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   "This team member will be deleted permanently from the business profile. Are you certain you want to delete it?",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -271,13 +271,13 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 MihButton(
                   onPressed: widget.onTap,
                   buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.errorColor(),
+                      MzansiInnovationHub.of(context)!.theme.errorColor(),
                   width: 300,
                   child: Text(
                     "Delete",
                     style: TextStyle(
                       color:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -298,7 +298,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -315,10 +315,10 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -329,7 +329,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
@@ -337,7 +337,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -347,7 +347,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   "This appointment will be deleted permanently from your calendar. Are you certain you want to delete it?",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -356,13 +356,13 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 MihButton(
                   onPressed: widget.onTap,
                   buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.errorColor(),
+                      MzansiInnovationHub.of(context)!.theme.errorColor(),
                   width: 300,
                   child: Text(
                     "Delete",
                     style: TextStyle(
                       color:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -383,7 +383,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -400,10 +400,10 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -414,7 +414,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
@@ -422,7 +422,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -432,7 +432,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                   "This Card will be deleted permanently from your Mzansi Wallet. Are you certain you want to delete it?",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -441,13 +441,13 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 MihButton(
                   onPressed: widget.onTap,
                   buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.errorColor(),
+                      MzansiInnovationHub.of(context)!.theme.errorColor(),
                   width: 300,
                   child: Text(
                     "Delete",
                     style: TextStyle(
                       color:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -468,7 +468,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),

Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart

@@ -24,7 +24,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
   Size? size;
 
   void checkScreenSize() {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       setState(() {
         popUpWidth = (size!.width / 4) * 2;
         popUpheight = null;
@@ -55,10 +55,10 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -68,14 +68,14 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 ),
                 //const SizedBox(height: 5),
                 Text(
                   "Oops! Looks like some fields are missing.",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -85,7 +85,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   "We noticed that some required fields are still empty. To ensure your request is processed smoothly, please fill out all the highlighted fields before submitting the form again.",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -94,7 +94,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 RichText(
                   text: TextSpan(
                     style: TextStyle(
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       fontSize: popUpBodySize,
@@ -105,7 +105,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                           text: "Here's a quick tip: ",
                           style: TextStyle(
                               fontStyle: FontStyle.italic,
-                              color: MzanziInnovationHub.of(context)!
+                              color: MzansiInnovationHub.of(context)!
                                   .theme
                                   .errorColor())),
                       const TextSpan(
@@ -113,7 +113,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                       TextSpan(
                           text: "*",
                           style: TextStyle(
-                              color: MzanziInnovationHub.of(context)!
+                              color: MzansiInnovationHub.of(context)!
                                   .theme
                                   .errorColor())),
                       const TextSpan(
@@ -137,7 +137,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -154,10 +154,10 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -167,14 +167,14 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Password Doesn't Meet Requirements",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -184,7 +184,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   "Oops! Your password doesn't quite meet our standards. To keep your account secure, please make sure your password meets the following requirements",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -193,7 +193,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 RichText(
                   text: TextSpan(
                     style: TextStyle(
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       fontSize: 15.0,
@@ -205,7 +205,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                           style: TextStyle(
                               fontStyle: FontStyle.italic,
                               fontSize: popUpBodySize,
-                              color: MzanziInnovationHub.of(context)!
+                              color: MzansiInnovationHub.of(context)!
                                   .theme
                                   .errorColor())),
                       const TextSpan(
@@ -243,7 +243,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -260,10 +260,10 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -273,14 +273,14 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Let's Fix That Username",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -290,7 +290,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   "Let's create a great username for you! Just a few quick tips:\n• Your username should start with a letter.\n• You can use letters, numbers, and/ or underscores.\n• Keep it between 6 and 20 characters.\n• Avoid special characters like @, #, or \$.\"",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -311,7 +311,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -328,10 +328,10 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -341,14 +341,14 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Oops! Invalid Email",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -358,7 +358,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   "Looks like there's a little hiccup with that email address. Please double-check that you've entered it correctly, including the \"@\" symbol and a domain (like example@email.com).",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -379,7 +379,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -396,10 +396,10 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -409,14 +409,14 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 ),
                 //SizedBox(height: 15),
                 Text(
                   "Email Already Exists",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -426,7 +426,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   "An account is already registered with this email address. Please try logging in or use a different email.",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -435,7 +435,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "Here are some things to keep in mind:",
                   style: TextStyle(
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     fontSize: popUpSubtitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -446,7 +446,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   textAlign: TextAlign.left,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: 15.0,
                     fontWeight: FontWeight.bold,
                   ),
@@ -466,7 +466,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -483,10 +483,10 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -496,14 +496,14 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 ),
                 //SizedBox(height: 15),
                 Text(
                   "Passwords Don't Match",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -513,7 +513,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   "The password and confirm password fields do not match. Please make sure they are identical.",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -522,7 +522,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "Here are some things to keep in mind:",
                   style: TextStyle(
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     fontSize: popUpSubtitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -533,7 +533,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   textAlign: TextAlign.left,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -554,7 +554,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -571,10 +571,10 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -584,14 +584,14 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 ),
                 //SizedBox(height: 15),
                 Text(
                   "Uh oh! Login attempt unsuccessful.",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -601,7 +601,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   "The email address or password you entered doesn't seem to match our records. Please double-check your information and try again.",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -610,7 +610,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "Here are some things to keep in mind:",
                   style: TextStyle(
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     fontSize: popUpSubtitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -621,7 +621,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   textAlign: TextAlign.left,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -642,7 +642,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -659,10 +659,10 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -672,14 +672,14 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Internet Connection Lost!",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -689,7 +689,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   "We seem to be having some trouble connecting you to the internet. This could be due to a temporary outage or an issue with your device's connection.",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -698,7 +698,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "Here are a few things you can try:",
                   style: TextStyle(
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     fontSize: popUpSubtitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -709,7 +709,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   textAlign: TextAlign.left,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -730,7 +730,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -747,10 +747,10 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -760,14 +760,14 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Location Services Not Enabled",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -777,7 +777,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   "To get the most out of MIH, we need your location. Please go to the site settings of the app and enable location services. Once you do that, we can start showing you relevant information based on your location.",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -786,7 +786,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 // Text(
                 //   "Here are a few things you can try:",
                 //   style: TextStyle(
-                //     color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                //     color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 //     fontSize: popUpSubtitleSize,
                 //     fontWeight: FontWeight.bold,
                 //   ),
@@ -797,7 +797,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 //   textAlign: TextAlign.left,
                 //   style: TextStyle(
                 //     color:
-                //         MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                //         MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 //     fontSize: popUpBodySize,
                 //     fontWeight: FontWeight.bold,
                 //   ),
@@ -818,7 +818,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),

Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.dart

@@ -20,7 +20,7 @@ class _MihloadingcircleState extends State<Mihloadingcircle> {
   late double height;
 
   void checkScreenSize() {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       setState(() {
         popUpWidth = 250;
         popUpheight = 250;
@@ -58,18 +58,18 @@ class _MihloadingcircleState extends State<Mihloadingcircle> {
               // width: 250,
               // height: 275,
               decoration: BoxDecoration(
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 borderRadius: BorderRadius.circular(25.0),
                 border: Border.all(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     width: 5.0),
               ),
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
                   GifView.asset(
-                    MzanziInnovationHub.of(context)!
+                    MzansiInnovationHub.of(context)!
                         .theme
                         .loadingImageLocation(),
                     height: 200,

Frontend/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart

@@ -30,7 +30,7 @@ class _MIHNotificationMessageState extends State<MIHNotificationMessage>
   Size? size;
 
   void checkScreenSize() {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       setState(() {
         popUpWidth = (size!.width / 4) * 2;
         popUpheight = 90;
@@ -131,8 +131,8 @@ class _MIHNotificationMessageState extends State<MIHNotificationMessage>
   void initState() {
     super.initState();
     setState(() {
-      primary = MzanziInnovationHub.of(context)!.theme.primaryColor();
-      secondary = MzanziInnovationHub.of(context)!.theme.errorColor();
+      primary = MzansiInnovationHub.of(context)!.theme.primaryColor();
+      secondary = MzansiInnovationHub.of(context)!.theme.errorColor();
     });
     _animationController = AnimationController(
       vsync: this,

Frontend/lib/mih_components/mih_pop_up_messages/mih_success_message.dart

@@ -28,7 +28,7 @@ class _MIHSuccessMessageState extends State<MIHSuccessMessage> {
   late Size? size;
 
   void checkScreenSize() {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       setState(() {
         popUpWidth = (size!.width / 4) * 2;
         popUpheight = null;
@@ -59,10 +59,10 @@ class _MIHSuccessMessageState extends State<MIHSuccessMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.successColor(),
+                color: MzansiInnovationHub.of(context)!.theme.successColor(),
                 width: 5.0),
           ),
           child: Column(
@@ -71,14 +71,14 @@ class _MIHSuccessMessageState extends State<MIHSuccessMessage> {
               Icon(
                 Icons.check_circle_outline_rounded,
                 size: popUpIconSize,
-                color: MzanziInnovationHub.of(context)!.theme.successColor(),
+                color: MzansiInnovationHub.of(context)!.theme.successColor(),
               ),
               //const SizedBox(height: 15),
               Text(
                 "Success!",
                 textAlign: TextAlign.center,
                 style: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.successColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.successColor(),
                   fontSize: popUpTitleSize,
                   fontWeight: FontWeight.bold,
                 ),
@@ -89,7 +89,7 @@ class _MIHSuccessMessageState extends State<MIHSuccessMessage> {
                   message,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -101,13 +101,13 @@ class _MIHSuccessMessageState extends State<MIHSuccessMessage> {
                   Navigator.pop(context);
                 },
                 buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 width: 300,
                 child: Text(
                   "Dismiss",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),

Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart

@@ -25,7 +25,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
   late double height;
 
   void checkScreenSize() {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       setState(() {
         popUpWidth = (width / 4) * 2;
         popUpheight = null;
@@ -56,10 +56,10 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -70,7 +70,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
@@ -78,7 +78,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -88,7 +88,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   "Your access request is currently being reviewed.\nOnce approved, you'll be able to view patient data.\nPlease follow up with the patient to approve your access request.",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -109,7 +109,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -126,10 +126,10 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -140,7 +140,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
@@ -148,7 +148,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -158,7 +158,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   "To proceed with booking an appointment, you must have access to the patient's profile. This will allow you to view their medical history and other relevant information. Please contact the appropriate administrator to request access.",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -179,7 +179,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -196,10 +196,10 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -210,7 +210,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
@@ -218,7 +218,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -228,7 +228,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   "This appointment has been canceled. As a result, you no longer have access to the patient's profile. If you would like to view the patient's profile again, please book a new appointment.",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -249,7 +249,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -266,10 +266,10 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -280,7 +280,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
@@ -288,7 +288,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -298,7 +298,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   "This appointment has been canceled. As a result, access has been cancelled and the doctor no longer have access to the patient's profile. If you would like them to view the patient's profile again, please book a new appointment through them.",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -319,7 +319,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -336,10 +336,10 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -350,7 +350,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
@@ -358,7 +358,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -368,7 +368,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   "Your request to access the patient's profile has been denied. Please contact the patient directly to inquire about the reason for this restriction.",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -389,7 +389,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),
@@ -406,10 +406,10 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -420,7 +420,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 //const SizedBox(height: 15),
                 Text(
@@ -428,7 +428,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -438,7 +438,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                   "You no longer have access to this patient profile. The authorized access period has ended. Access to a patients profile is limited to 7 days from appointment date.",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -459,7 +459,7 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               size: 35,
             ),
           ),

Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart

@@ -30,7 +30,7 @@ class PolicyAndTermsText {
         child: FittedBox(
           child: Icon(
             MihIcons.mihLogo,
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           ),
         ),
       ),
@@ -427,7 +427,7 @@ class PolicyAndTermsText {
         child: FittedBox(
           child: Icon(
             MihIcons.mihLogo,
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           ),
         ),
       ),

Frontend/lib/mih_packages/about_mih/package_tile/about_mih_tile.dart

@@ -27,12 +27,12 @@ class _AboutMihTileState extends State<AboutMihTile> {
       appName: "About MIH",
       appIcon: Icon(
         MihIcons.aboutMih,
-        color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     );
   }
 }

Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart

@@ -35,7 +35,7 @@ class _MihAttributesState extends State<MihAttributes> {
                     icon,
                     // size: 125,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                 ),
               ),
@@ -71,12 +71,12 @@ class _MihAttributesState extends State<MihAttributes> {
                 );
               },
               buttonColor:
-                  MzanziInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.successColor(),
               width: 100,
               child: Text(
                 "Visit",
                 style: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   fontSize: 20,
                   fontWeight: FontWeight.bold,
                 ),
@@ -110,7 +110,7 @@ class _MihAttributesState extends State<MihAttributes> {
         children: [
           Icon(
             MihIcons.mihLogo,
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             size: 165,
           ),
           const SizedBox(

Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart

@@ -48,7 +48,7 @@ class _MihInfoState extends State<MihInfo> {
     bio +=
         "6 Year of banking experience with one of the big 5 banks of South Africa.";
     ImageProvider logoFrame =
-        MzanziInnovationHub.of(context)!.theme.altLogoFrame();
+        MzansiInnovationHub.of(context)!.theme.altLogoFrame();
     return Wrap(
       alignment: WrapAlignment.center,
       crossAxisAlignment: WrapCrossAlignment.center,
@@ -63,7 +63,7 @@ class _MihInfoState extends State<MihInfo> {
             children: [
               CircleAvatar(
                 backgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 backgroundImage: const AssetImage(
                     "lib/mih_components/mih_package_components/assets/images/founder.jpg"),
                 //'https://media.licdn.com/dms/image/D4D03AQGd1-QhjtWWpA/profile-displayphoto-shrink_400_400/0/1671698053061?e=2147483647&v=beta&t=a3dJI5yxs5-KeXjj10LcNCFuC9IOfa8nNn3k_Qyr0CA'),
@@ -231,12 +231,12 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.youtube,
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           size: 175,
         ),
       ),
-      p: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      s: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -247,12 +247,12 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.tiktok,
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           size: 200,
         ),
       ),
-      p: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      s: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -263,12 +263,12 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.twitch,
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           size: 200,
         ),
       ),
-      p: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      s: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -279,12 +279,12 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.threads,
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           size: 200,
         ),
       ),
-      p: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      s: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -295,12 +295,12 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.whatsapp,
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           size: 200,
         ),
       ),
-      p: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      s: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -311,12 +311,12 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.instagram,
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           size: 200,
         ),
       ),
-      p: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      s: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     ));
     //==================================================================
 
@@ -328,12 +328,12 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.xTwitter,
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           size: 200,
         ),
       ),
-      p: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      s: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -344,12 +344,12 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.linkedin,
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           size: 200,
         ),
       ),
-      p: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      s: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -360,12 +360,12 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.facebook,
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           size: 200,
         ),
       ),
-      p: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      s: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -376,12 +376,12 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.reddit,
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           size: 200,
         ),
       ),
-      p: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      s: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -393,19 +393,19 @@ class _MihInfoState extends State<MihInfo> {
         child: Text(
           "KICK",
           style: TextStyle(
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             fontWeight: FontWeight.bold,
             fontSize: 100,
           ),
         ),
         // FaIcon(
         //   FontAwesomeIcons.tv,
-        //   color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        //   color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
         //   size: 200,
         // ),
       ),
-      p: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      s: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     ));
     //==================================================================
     return socials;
@@ -426,10 +426,10 @@ class _MihInfoState extends State<MihInfo> {
       return "Install MIH (Play Store)";
     } else if (isWebIos) {
       return "Install MIH (PWA)";
-    } else if (MzanziInnovationHub.of(context)!.theme.getPlatform() ==
+    } else if (MzansiInnovationHub.of(context)!.theme.getPlatform() ==
         "Android") {
       return "Update MIH (Play Store)";
-    } else if (MzanziInnovationHub.of(context)!.theme.getPlatform() == "iOS") {
+    } else if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "iOS") {
       return "Update MIH (App Store)";
     } else {
       return "Install MIH (PWA)";
@@ -464,7 +464,7 @@ class _MihInfoState extends State<MihInfo> {
                   child: Icon(
                     MihIcons.mihLogo,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                 ),
               ),
@@ -479,7 +479,7 @@ class _MihInfoState extends State<MihInfo> {
                 ),
               ),
               Text(
-                "MIH App Version: ${MzanziInnovationHub.of(context)!.theme.getLatestVersion()}",
+                "MIH App Version: ${MzansiInnovationHub.of(context)!.theme.getLatestVersion()}",
                 style: const TextStyle(
                   fontWeight: FontWeight.normal,
                   fontSize: 15,
@@ -516,12 +516,12 @@ class _MihInfoState extends State<MihInfo> {
                         MihInstallServices().installMihTrigger(context);
                       },
                       buttonColor:
-                          MzanziInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.successColor(),
                       width: 300,
                       child: Text(
                         getInstallButtonText(),
                         style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           fontSize: 20,
@@ -538,12 +538,12 @@ class _MihInfoState extends State<MihInfo> {
                         );
                       },
                       buttonColor:
-                          MzanziInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.successColor(),
                       width: 300,
                       child: Text(
                         "MIH Beginners Guide",
                         style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           fontSize: 20,
@@ -587,17 +587,17 @@ class _MihInfoState extends State<MihInfo> {
               SpeedDialChild(
                 child: Icon(
                   Icons.vpn_lock,
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 ),
                 label: "MIH - Web",
                 labelBackgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 labelStyle: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   fontWeight: FontWeight.bold,
                 ),
                 backgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 onTap: () {
                   shareMIHLink(
                     context,
@@ -609,17 +609,17 @@ class _MihInfoState extends State<MihInfo> {
               SpeedDialChild(
                 child: Icon(
                   Icons.apple,
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 ),
                 label: "MIH - iOS",
                 labelBackgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 labelStyle: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   fontWeight: FontWeight.bold,
                 ),
                 backgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 onTap: () {
                   shareMIHLink(
                     context,
@@ -631,17 +631,17 @@ class _MihInfoState extends State<MihInfo> {
               SpeedDialChild(
                 child: Icon(
                   Icons.android,
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 ),
                 label: "MIH - Android",
                 labelBackgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 labelStyle: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   fontWeight: FontWeight.bold,
                 ),
                 backgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 onTap: () {
                   shareMIHLink(
                     context,

Frontend/lib/mih_packages/access_review/builder/build_access_request_list.dart

@@ -132,25 +132,25 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.successColor()));
+              color: MzansiInnovationHub.of(context)!.theme.successColor()));
     } else if (access == "PENDING") {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
               color:
-                  MzanziInnovationHub.of(context)!.theme.messageTextColor()));
+                  MzansiInnovationHub.of(context)!.theme.messageTextColor()));
     } else {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.errorColor()));
+              color: MzansiInnovationHub.of(context)!.theme.errorColor()));
     }
 
     return ListTile(
       title: Text(
         line1,
         style: TextStyle(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         ),
       ),
       subtitle: RichText(
@@ -166,7 +166,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       // Text(
       //   subtitle,
       //   style: TextStyle(
-      //     color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+      //     color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
       //   ),
       // ),
       onTap: () {
@@ -178,13 +178,13 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       },
       // trailing: Icon(
       //   Icons.arrow_forward,
-      //   color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+      //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
       // ),
     );
   }
 
   void checkScreenSize() {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       setState(() {
         popUpWidth = (width / 4) * 2;
         popUpheight = null;
@@ -234,7 +234,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                   textAlign: TextAlign.left,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     //fontWeight: FontWeight.bold,
                   ),
@@ -249,12 +249,12 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                       updateAccessAPICall(index, "declined");
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.errorColor(),
+                        MzansiInnovationHub.of(context)!.theme.errorColor(),
                     width: 300,
                     child: Text(
                       "Decline",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         fontSize: 20,
@@ -267,12 +267,12 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                       updateAccessAPICall(index, "approved");
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Approve",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         fontSize: 20,
@@ -311,7 +311,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         );
       },
       itemCount: widget.accessRequests.length,

Frontend/lib/mih_packages/access_review/builder/build_business_access_list.dart

@@ -85,25 +85,25 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.successColor()));
+              color: MzansiInnovationHub.of(context)!.theme.successColor()));
     } else if (access == "PENDING") {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
               color:
-                  MzanziInnovationHub.of(context)!.theme.messageTextColor()));
+                  MzansiInnovationHub.of(context)!.theme.messageTextColor()));
     } else {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.errorColor()));
+              color: MzansiInnovationHub.of(context)!.theme.errorColor()));
     }
 
     return ListTile(
       title: Text(
         line1,
         style: TextStyle(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         ),
       ),
       subtitle: RichText(
@@ -118,7 +118,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
       // Text(
       //   subtitle,
       //   style: TextStyle(
-      //     color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+      //     color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
       //   ),
       // ),
       onTap: () {
@@ -126,13 +126,13 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
       },
       // trailing: Icon(
       //   Icons.arrow_forward,
-      //   color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+      //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
       // ),
     );
   }
 
   void checkScreenSize() {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       setState(() {
         popUpWidth = (width / 4) * 2;
         popUpheight = null;
@@ -195,7 +195,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                   textAlign: TextAlign.left,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     //fontWeight: FontWeight.bold,
                   ),
@@ -213,7 +213,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                       style: TextStyle(
                         fontWeight: FontWeight.bold,
                         color:
-                            MzanziInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.errorColor(),
                       ),
                     ),
                     Text(
@@ -221,7 +221,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                       style: TextStyle(
                         fontWeight: FontWeight.normal,
                         color:
-                            MzanziInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.errorColor(),
                       ),
                     ),
                     SizedBox(
@@ -230,7 +230,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "1. Permanent Access: Once you accepts this access request, it will become permanent.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .errorColor(),
                         ),
@@ -242,7 +242,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "2. Shared Information: Any updates make to youe patient profile will be visible to all who have access to the profile.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .errorColor(),
                         ),
@@ -254,7 +254,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "3. Irreversible Access: Once granted, you cannot revoke access to your patient's profile.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .errorColor(),
                         ),
@@ -265,7 +265,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                       style: TextStyle(
                         fontWeight: FontWeight.bold,
                         color:
-                            MzanziInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.errorColor(),
                       ),
                     ),
                   ],
@@ -282,7 +282,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                       style: TextStyle(
                         fontWeight: FontWeight.bold,
                         color:
-                            MzanziInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.errorColor(),
                       ),
                     ),
                     Text(
@@ -290,7 +290,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                       style: TextStyle(
                         fontWeight: FontWeight.normal,
                         color:
-                            MzanziInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.errorColor(),
                       ),
                     ),
                     SizedBox(
@@ -299,7 +299,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "1. Permanent Access: This access is permanent.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .errorColor(),
                         ),
@@ -311,7 +311,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "2. Shared Information: Any updates make to youe patient profile will be visible to all who have access to the profile.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .errorColor(),
                         ),
@@ -323,7 +323,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "3. Irreversible Access: You cannot revoke this access to your patient's profile.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .errorColor(),
                         ),
@@ -356,12 +356,12 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         );
                       },
                       buttonColor:
-                          MzanziInnovationHub.of(context)!.theme.errorColor(),
+                          MzansiInnovationHub.of(context)!.theme.errorColor(),
                       width: 300,
                       child: Text(
                         "Decline",
                         style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           fontSize: 20,
@@ -383,12 +383,12 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         );
                       },
                       buttonColor:
-                          MzanziInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.successColor(),
                       width: 300,
                       child: Text(
                         "Approve",
                         style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           fontSize: 20,
@@ -428,7 +428,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         );
       },
       itemCount: widget.patientAccessList.length,

Frontend/lib/mih_packages/access_review/package_tile/mih_access_tile.dart

@@ -31,12 +31,12 @@ class _MihAccessTileState extends State<MihAccessTile> {
       appName: "Access Controls",
       appIcon: Icon(
         MihIcons.accessControl,
-        color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     );
   }
 }

Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart

@@ -191,7 +191,7 @@ class _MihAccessRequestState extends State<MihAccessRequest> {
                       "No Request have been made.",
                       style: TextStyle(
                           fontSize: 25,
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .messageTextColor()),
                       textAlign: TextAlign.center,
@@ -208,7 +208,7 @@ class _MihAccessRequestState extends State<MihAccessRequest> {
                     "$errorCode: Error pulling Patients Data\n$baseUrl/queue/patients/\n$errorBody",
                     style: TextStyle(
                         fontSize: 25,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .errorColor()),
                     textAlign: TextAlign.center,

Frontend/lib/mih_packages/authentication/auth_check.dart

@@ -46,9 +46,9 @@ class _AuthCheckState extends State<AuthCheck> {
     //     SchedulerBinding.instance.platformDispatcher.platformBrightness;
     // bool isDarkMode = brightness == Brightness.dark;
     // if (isDarkMode) {
-    //   MzanziInnovationHub.of(context)!.theme.mode = "Dark";
+    //   MzansiInnovationHub.of(context)!.theme.mode = "Dark";
     // } else {
-    //   MzanziInnovationHub.of(context)!.theme.mode = "Light";
+    //   MzansiInnovationHub.of(context)!.theme.mode = "Light";
     // }
     super.initState();
   }

Frontend/lib/mih_packages/authentication/biometric_check.dart

@@ -38,7 +38,7 @@ class _BiometricCheckState extends State<BiometricCheck> {
           child: FittedBox(
             child: Icon(
               MihIcons.mihLogo,
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             ),
           ),
         ),
@@ -109,7 +109,7 @@ class _BiometricCheckState extends State<BiometricCheck> {
     Widget alertpopUp = MihPackageAlert(
       alertIcon: Icon(
         Icons.fingerprint,
-        color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+        color: MzansiInnovationHub.of(context)!.theme.errorColor(),
         size: 100,
       ),
       alertTitle: "Biometric Authentication Error",
@@ -120,7 +120,7 @@ class _BiometricCheckState extends State<BiometricCheck> {
             "Hi there! To jump into the MIH Home Package, you'll need to authenticate yourself with your phones biometrics, please set up biometric authentication (like fingerprint, face ID, pattern or pin) on your device first.\n\nIf you have already set up biometric authentication, press \"Authenticate now\" to try again or press \"Set Up Authentication\" to go to your device settings.",
             style: TextStyle(
               fontSize: 15,
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             ),
           ),
           const SizedBox(height: 20),
@@ -138,13 +138,13 @@ class _BiometricCheckState extends State<BiometricCheck> {
                   Navigator.of(context).pop();
                 },
                 buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 width: 300,
                 child: Text(
                   "Set Up Authentication",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -156,13 +156,13 @@ class _BiometricCheckState extends State<BiometricCheck> {
                   authenticateUser();
                 },
                 buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 width: 300,
                 child: Text(
                   "Authenticate Now",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -172,7 +172,7 @@ class _BiometricCheckState extends State<BiometricCheck> {
           ),
         ],
       ),
-      alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(),
+      alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
     );
     showDialog(
       context: context,
@@ -198,7 +198,7 @@ class _BiometricCheckState extends State<BiometricCheck> {
                     Icons.fingerprint,
                     size: 100,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                   //spacer
                   const SizedBox(height: 10),
@@ -209,7 +209,7 @@ class _BiometricCheckState extends State<BiometricCheck> {
                     style: TextStyle(
                       fontSize: 25,
                       fontWeight: FontWeight.bold,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -221,7 +221,7 @@ class _BiometricCheckState extends State<BiometricCheck> {
                     Icons.lock,
                     size: 200,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                   const SizedBox(height: 30),
                   MihButton(
@@ -229,12 +229,12 @@ class _BiometricCheckState extends State<BiometricCheck> {
                       authenticateUser();
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Authenticate Now",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         fontSize: 20,
@@ -274,7 +274,7 @@ class _BiometricCheckState extends State<BiometricCheck> {
 
   @override
   Widget build(BuildContext context) {
-    if (MzanziInnovationHub.of(context)!.theme.getPlatform() == "Web") {
+    if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") {
       return MIHProfileGetter(
         personalSelected: widget.personalSelected,
       );

Frontend/lib/mih_packages/authentication/forgot_password.dart

@@ -79,11 +79,11 @@ class _ForgotPasswordState extends State<ForgotPassword> {
   }
 
   Color getPrim() {
-    return MzanziInnovationHub.of(context)!.theme.secondaryColor();
+    return MzansiInnovationHub.of(context)!.theme.secondaryColor();
   }
 
   Color getSec() {
-    return MzanziInnovationHub.of(context)!.theme.primaryColor();
+    return MzansiInnovationHub.of(context)!.theme.primaryColor();
   }
 
   void prePassResteWarning() {
@@ -94,7 +94,7 @@ class _ForgotPasswordState extends State<ForgotPassword> {
           alertIcon: Icon(
             Icons.warning_amber_rounded,
             size: 100,
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           ),
           alertTitle: "Password Reset Confirmation",
           alertBody: Column(
@@ -106,7 +106,7 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                   "Before you reset your password, please be aware that you'll receive an email with a link to confirm your identity and set a new password. Make sure to check your inbox, including spam or junk folders. If you don't receive the email within a few minutes, please try resending the reset request.",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: 15.0,
                     fontWeight: FontWeight.bold,
                   ),
@@ -122,13 +122,13 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                   validateInput();
                 },
                 buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 width: 300,
                 child: Text(
                   "Continue",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -136,7 +136,7 @@ class _ForgotPasswordState extends State<ForgotPassword> {
               ),
             ],
           ),
-          alertColour: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          alertColour: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         );
       },
     );
@@ -223,7 +223,7 @@ class _ForgotPasswordState extends State<ForgotPassword> {
               child: SingleChildScrollView(
                 physics: const BouncingScrollPhysics(),
                 child: Padding(
-                  padding: MzanziInnovationHub.of(context)!.theme.screenType ==
+                  padding: MzansiInnovationHub.of(context)!.theme.screenType ==
                           "desktop"
                       ? EdgeInsets.symmetric(
                           vertical: 25, horizontal: width * 0.2)
@@ -236,7 +236,7 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                       Icon(
                         Icons.lock,
                         size: 100,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),
@@ -248,7 +248,7 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                         style: TextStyle(
                           fontSize: 25,
                           fontWeight: FontWeight.bold,
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .secondaryColor(),
                         ),
@@ -258,10 +258,10 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                         formKey: _formKey,
                         formFields: [
                           MihTextFormField(
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: emailController,
@@ -286,14 +286,14 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                                       .formNotFilledCompletely(context);
                                 }
                               },
-                              buttonColor: MzanziInnovationHub.of(context)!
+                              buttonColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .successColor(),
                               width: 300,
                               child: Text(
                                 "Reset Password",
                                 style: TextStyle(
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .primaryColor(),
                                   fontSize: 20,

Frontend/lib/mih_packages/authentication/register.dart

@@ -231,7 +231,7 @@ class _RegisterState extends State<Register> {
 
   Widget getSecondaryActionButton() {
     return Visibility(
-      visible: MzanziInnovationHub.of(context)!.theme.getPlatform() == "Web",
+      visible: MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web",
       child: MIHAction(
         icon: Padding(
           padding: const EdgeInsets.all(10.0),
@@ -239,12 +239,12 @@ class _RegisterState extends State<Register> {
             onPressed: () {
               MihInstallServices().installMihTrigger(context);
             },
-            buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(),
+            buttonColor: MzansiInnovationHub.of(context)!.theme.successColor(),
             width: 150,
             child: Text(
               "Install MIH",
               style: TextStyle(
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 fontSize: 20,
                 fontWeight: FontWeight.bold,
               ),
@@ -268,7 +268,7 @@ class _RegisterState extends State<Register> {
           child: FittedBox(
             child: Icon(
               MihIcons.mihLogo,
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             ),
           ),
         ),
@@ -320,7 +320,7 @@ class _RegisterState extends State<Register> {
             child: SingleChildScrollView(
               physics: const BouncingScrollPhysics(),
               child: Padding(
-                padding: MzanziInnovationHub.of(context)!.theme.screenType ==
+                padding: MzansiInnovationHub.of(context)!.theme.screenType ==
                         "desktop"
                     ? EdgeInsets.symmetric(horizontal: width * 0.2)
                     : EdgeInsets.symmetric(horizontal: width * 0.075),
@@ -331,7 +331,7 @@ class _RegisterState extends State<Register> {
                     Icon(
                       Icons.lock,
                       size: 100,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -343,7 +343,7 @@ class _RegisterState extends State<Register> {
                       style: TextStyle(
                         fontSize: 25,
                         fontWeight: FontWeight.bold,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),
@@ -355,10 +355,10 @@ class _RegisterState extends State<Register> {
                       formFields: [
                         //email input
                         MihTextFormField(
-                          fillColor: MzanziInnovationHub.of(context)!
+                          fillColor: MzansiInnovationHub.of(context)!
                               .theme
                               .secondaryColor(),
-                          inputColor: MzanziInnovationHub.of(context)!
+                          inputColor: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           controller: emailController,
@@ -374,10 +374,10 @@ class _RegisterState extends State<Register> {
                         const SizedBox(height: 10),
                         //password input
                         MihTextFormField(
-                          fillColor: MzanziInnovationHub.of(context)!
+                          fillColor: MzansiInnovationHub.of(context)!
                               .theme
                               .secondaryColor(),
-                          inputColor: MzanziInnovationHub.of(context)!
+                          inputColor: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           controller: passwordController,
@@ -394,10 +394,10 @@ class _RegisterState extends State<Register> {
                         //spacer
                         const SizedBox(height: 10),
                         MihTextFormField(
-                          fillColor: MzanziInnovationHub.of(context)!
+                          fillColor: MzansiInnovationHub.of(context)!
                               .theme
                               .secondaryColor(),
-                          inputColor: MzanziInnovationHub.of(context)!
+                          inputColor: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           controller: confirmPasswordController,
@@ -430,14 +430,14 @@ class _RegisterState extends State<Register> {
                                         .formNotFilledCompletely(context);
                                   }
                                 },
-                                buttonColor: MzanziInnovationHub.of(context)!
+                                buttonColor: MzansiInnovationHub.of(context)!
                                     .theme
                                     .successColor(),
                                 width: 300,
                                 child: Text(
                                   "Create New Account",
                                   style: TextStyle(
-                                    color: MzanziInnovationHub.of(context)!
+                                    color: MzansiInnovationHub.of(context)!
                                         .theme
                                         .primaryColor(),
                                     fontSize: 20,
@@ -447,14 +447,14 @@ class _RegisterState extends State<Register> {
                               ),
                               MihButton(
                                 onPressed: widget.onTap,
-                                buttonColor: MzanziInnovationHub.of(context)!
+                                buttonColor: MzansiInnovationHub.of(context)!
                                     .theme
                                     .secondaryColor(),
                                 width: 300,
                                 child: Text(
                                   "I have an account",
                                   style: TextStyle(
-                                    color: MzanziInnovationHub.of(context)!
+                                    color: MzansiInnovationHub.of(context)!
                                         .theme
                                         .primaryColor(),
                                     fontSize: 20,

Frontend/lib/mih_packages/authentication/reset_password.dart

@@ -98,11 +98,11 @@ class _ResetPasswordState extends State<ResetPassword> {
   }
 
   Color getPrim() {
-    return MzanziInnovationHub.of(context)!.theme.secondaryColor();
+    return MzansiInnovationHub.of(context)!.theme.secondaryColor();
   }
 
   Color getSec() {
-    return MzanziInnovationHub.of(context)!.theme.primaryColor();
+    return MzansiInnovationHub.of(context)!.theme.primaryColor();
   }
 
   void loginError() {
@@ -203,7 +203,7 @@ class _ResetPasswordState extends State<ResetPassword> {
               child: SingleChildScrollView(
                 physics: const BouncingScrollPhysics(),
                 child: Padding(
-                  padding: MzanziInnovationHub.of(context)!.theme.screenType ==
+                  padding: MzansiInnovationHub.of(context)!.theme.screenType ==
                           "desktop"
                       ? EdgeInsets.symmetric(horizontal: width * 0.2)
                       : EdgeInsets.symmetric(horizontal: width * 0.075),
@@ -214,7 +214,7 @@ class _ResetPasswordState extends State<ResetPassword> {
                       Icon(
                         Icons.lock,
                         size: 100,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),
@@ -226,7 +226,7 @@ class _ResetPasswordState extends State<ResetPassword> {
                         style: TextStyle(
                           fontSize: 25,
                           fontWeight: FontWeight.bold,
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .secondaryColor(),
                         ),
@@ -237,10 +237,10 @@ class _ResetPasswordState extends State<ResetPassword> {
                         formKey: _formKey,
                         formFields: [
                           MihTextFormField(
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: passwordController,
@@ -257,10 +257,10 @@ class _ResetPasswordState extends State<ResetPassword> {
                           //spacer
                           const SizedBox(height: 10),
                           MihTextFormField(
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: confirmPasswordController,
@@ -288,14 +288,14 @@ class _ResetPasswordState extends State<ResetPassword> {
                                       .formNotFilledCompletely(context);
                                 }
                               },
-                              buttonColor: MzanziInnovationHub.of(context)!
+                              buttonColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .successColor(),
                               width: 300,
                               child: Text(
                                 "Reset Password",
                                 style: TextStyle(
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .primaryColor(),
                                   fontSize: 20,

Frontend/lib/mih_packages/authentication/signin.dart

@@ -87,11 +87,11 @@ class _SignInState extends State<SignIn> {
   }
 
   Color getPrim() {
-    return MzanziInnovationHub.of(context)!.theme.secondaryColor();
+    return MzansiInnovationHub.of(context)!.theme.secondaryColor();
   }
 
   Color getSec() {
-    return MzanziInnovationHub.of(context)!.theme.primaryColor();
+    return MzansiInnovationHub.of(context)!.theme.primaryColor();
   }
 
   void setSandboxProfiles(List<MIHTile> tileList) {
@@ -211,7 +211,7 @@ class _SignInState extends State<SignIn> {
       context: context,
       builder: (context) {
         return Dialog(
-          //backgroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          //backgroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           child: Stack(
             children: [
               Container(
@@ -219,10 +219,10 @@ class _SignInState extends State<SignIn> {
                 width: 500.0,
                 height: 500,
                 decoration: BoxDecoration(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   borderRadius: BorderRadius.circular(25.0),
                   border: Border.all(
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       width: 5.0),
@@ -234,7 +234,7 @@ class _SignInState extends State<SignIn> {
                       "Sandbox Profiles",
                       textAlign: TextAlign.center,
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                         fontSize: 25.0,
@@ -246,7 +246,7 @@ class _SignInState extends State<SignIn> {
                       "NB: These accounts are used for test purposes. Please do not store personal information on these profiles.",
                       textAlign: TextAlign.center,
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                         fontSize: 15.0,
@@ -281,7 +281,7 @@ class _SignInState extends State<SignIn> {
                   },
                   icon: Icon(
                     Icons.close,
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                     size: 35,
                   ),
                 ),
@@ -295,7 +295,7 @@ class _SignInState extends State<SignIn> {
 
   Widget getSecondaryActionButton() {
     return Visibility(
-      visible: MzanziInnovationHub.of(context)!.theme.getPlatform() == "Web",
+      visible: MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web",
       child: MIHAction(
         icon: Padding(
           padding: const EdgeInsets.all(10.0),
@@ -303,12 +303,12 @@ class _SignInState extends State<SignIn> {
             onPressed: () {
               MihInstallServices().installMihTrigger(context);
             },
-            buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(),
+            buttonColor: MzansiInnovationHub.of(context)!.theme.successColor(),
             width: 150,
             child: Text(
               "Install MIH",
               style: TextStyle(
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 fontSize: 20,
                 fontWeight: FontWeight.bold,
               ),
@@ -335,7 +335,7 @@ class _SignInState extends State<SignIn> {
           child: FittedBox(
             child: Icon(
               MihIcons.mihLogo,
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             ),
           ),
         ),
@@ -387,7 +387,7 @@ class _SignInState extends State<SignIn> {
               child: SingleChildScrollView(
                 physics: const BouncingScrollPhysics(),
                 child: Padding(
-                  padding: MzanziInnovationHub.of(context)!.theme.screenType ==
+                  padding: MzansiInnovationHub.of(context)!.theme.screenType ==
                           "desktop"
                       ? EdgeInsets.symmetric(horizontal: width * 0.2)
                       : EdgeInsets.symmetric(horizontal: width * 0.075),
@@ -399,7 +399,7 @@ class _SignInState extends State<SignIn> {
                         Icon(
                           Icons.lock,
                           size: 100,
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .secondaryColor(),
                         ),
@@ -411,7 +411,7 @@ class _SignInState extends State<SignIn> {
                           style: TextStyle(
                             fontSize: 25,
                             fontWeight: FontWeight.bold,
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
                           ),
@@ -422,10 +422,10 @@ class _SignInState extends State<SignIn> {
                           formKey: _formKey,
                           formFields: [
                             MihTextFormField(
-                              fillColor: MzanziInnovationHub.of(context)!
+                              fillColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .secondaryColor(),
-                              inputColor: MzanziInnovationHub.of(context)!
+                              inputColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .primaryColor(),
                               controller: emailController,
@@ -442,10 +442,10 @@ class _SignInState extends State<SignIn> {
                             const SizedBox(height: 10),
                             //password input
                             MihTextFormField(
-                              fillColor: MzanziInnovationHub.of(context)!
+                              fillColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .secondaryColor(),
-                              inputColor: MzanziInnovationHub.of(context)!
+                              inputColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .primaryColor(),
                               controller: passwordController,
@@ -476,7 +476,7 @@ class _SignInState extends State<SignIn> {
                                       'Forgot Password?',
                                       style: TextStyle(
                                         fontSize: 15,
-                                        color: MzanziInnovationHub.of(context)!
+                                        color: MzansiInnovationHub.of(context)!
                                             .theme
                                             .secondaryColor(),
                                         fontWeight: FontWeight.bold,
@@ -507,14 +507,14 @@ class _SignInState extends State<SignIn> {
                                       }
                                     },
                                     buttonColor:
-                                        MzanziInnovationHub.of(context)!
+                                        MzansiInnovationHub.of(context)!
                                             .theme
                                             .successColor(),
                                     width: 300,
                                     child: Text(
                                       "Sign In",
                                       style: TextStyle(
-                                        color: MzanziInnovationHub.of(context)!
+                                        color: MzansiInnovationHub.of(context)!
                                             .theme
                                             .primaryColor(),
                                         fontSize: 20,
@@ -525,14 +525,14 @@ class _SignInState extends State<SignIn> {
                                   MihButton(
                                     onPressed: widget.onTap,
                                     buttonColor:
-                                        MzanziInnovationHub.of(context)!
+                                        MzansiInnovationHub.of(context)!
                                             .theme
                                             .secondaryColor(),
                                     width: 300,
                                     child: Text(
                                       "Create New Account",
                                       style: TextStyle(
-                                        color: MzanziInnovationHub.of(context)!
+                                        color: MzansiInnovationHub.of(context)!
                                             .theme
                                             .primaryColor(),
                                         fontSize: 20,
@@ -569,7 +569,7 @@ class _SignInState extends State<SignIn> {
                                           style: TextStyle(
                                               fontWeight: FontWeight.bold,
                                               fontSize: 15,
-                                              color: MzanziInnovationHub.of(
+                                              color: MzansiInnovationHub.of(
                                                       context)!
                                                   .theme
                                                   .secondaryColor()),
@@ -620,7 +620,7 @@ class _SignInState extends State<SignIn> {
                                         textAlign: TextAlign.center,
                                         style: TextStyle(
                                           color:
-                                              MzanziInnovationHub.of(context)!
+                                              MzansiInnovationHub.of(context)!
                                                   .theme
                                                   .secondaryColor(),
                                           fontSize: 15.0,

Frontend/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart

@@ -30,12 +30,12 @@ class _MihCalculatorTileState extends State<MihCalculatorTile> {
       appName: "Calculator",
       appIcon: Icon(
         MihIcons.calculator,
-        color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     );
   }
 }

Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart

@@ -76,7 +76,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
             Icon(
               Icons.currency_exchange,
               size: 150,
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             ),
             const SizedBox(height: 20),
             FittedBox(
@@ -87,7 +87,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                   fontSize: 30,
                   fontWeight: FontWeight.bold,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
               ),
             ),
@@ -102,7 +102,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                     style: TextStyle(
                       fontSize: 30,
                       fontWeight: FontWeight.bold,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -116,7 +116,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                     style: TextStyle(
                       fontSize: 30,
                       fontWeight: FontWeight.bold,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -135,7 +135,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                     style: TextStyle(
                       fontSize: 30,
                       fontWeight: FontWeight.bold,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -149,7 +149,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                     style: TextStyle(
                       fontSize: 30,
                       fontWeight: FontWeight.bold,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -186,7 +186,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
               textAlign: TextAlign.center,
               style: TextStyle(
                 fontSize: 25,
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 fontWeight: FontWeight.bold,
               ),
             ),
@@ -206,7 +206,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
               '$companyName makes no representations or warranties of any kind, express or implied, as to the accuracy, completeness, reliability, or suitability of the information and calculations generated by the Tool. All exchange rates and results are estimates and are subject to change without notice.',
               style: TextStyle(
                 fontSize: 15,
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 fontWeight: FontWeight.normal,
               ),
             ),
@@ -217,7 +217,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
               'The information provided by the Tool should not be construed as financial, investment, trading, or any other form of advice. You should not make any financial decisions based solely on the output of this Tool. We expressly recommend that you seek independent professional advice and verify all data with a qualified financial advisor and/or through alternative, reliable market data sources before executing any foreign exchange transactions.',
               style: TextStyle(
                 fontSize: 15,
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 fontWeight: FontWeight.normal,
               ),
             ),
@@ -228,7 +228,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
               'By using the Tool, you agree that $companyName, its affiliates, directors, and employees shall not be held liable for any direct, indirect, incidental, special, consequential, or exemplary damages, including but not limited to, damages for loss of profits, goodwill, use, data, or other intangible losses, resulting from: (i) the use or the inability to use the Tool; (ii) any inaccuracies, errors, or omissions in the Tool\'s calculations or data; or (iii) any reliance placed by you on the information provided by the Tool.',
               style: TextStyle(
                 fontSize: 15,
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 fontWeight: FontWeight.normal,
               ),
             ),
@@ -243,7 +243,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
       text: TextSpan(
         style: TextStyle(
           fontSize: 15,
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           fontWeight: FontWeight.normal,
         ),
         children: <TextSpan>[
@@ -290,7 +290,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
           } else if (snapshot.connectionState == ConnectionState.done) {
             return MihSingleChildScroll(
               child: Padding(
-                padding: MzanziInnovationHub.of(context)!.theme.screenType ==
+                padding: MzansiInnovationHub.of(context)!.theme.screenType ==
                         "desktop"
                     ? EdgeInsets.symmetric(horizontal: width * 0.2)
                     : EdgeInsets.symmetric(horizontal: width * 0.075),
@@ -300,10 +300,10 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                       formKey: _formKey,
                       formFields: <Widget>[
                         MihTextFormField(
-                          fillColor: MzanziInnovationHub.of(context)!
+                          fillColor: MzansiInnovationHub.of(context)!
                               .theme
                               .secondaryColor(),
-                          inputColor: MzanziInnovationHub.of(context)!
+                          inputColor: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           controller: _fromAmountController,
@@ -345,7 +345,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                           text: TextSpan(
                             style: TextStyle(
                               fontSize: 15,
-                              color: MzanziInnovationHub.of(context)!
+                              color: MzansiInnovationHub.of(context)!
                                   .theme
                                   .errorColor(),
                             ),
@@ -357,7 +357,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                                 text: "Diclaimer",
                                 style: TextStyle(
                                   decoration: TextDecoration.underline,
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .secondaryColor(),
                                   fontWeight: FontWeight.bold,
@@ -388,14 +388,14 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                                         .formNotFilledCompletely(context);
                                   }
                                 },
-                                buttonColor: MzanziInnovationHub.of(context)!
+                                buttonColor: MzansiInnovationHub.of(context)!
                                     .theme
                                     .successColor(),
                                 width: 300,
                                 child: Text(
                                   "Calculate",
                                   style: TextStyle(
-                                    color: MzanziInnovationHub.of(context)!
+                                    color: MzansiInnovationHub.of(context)!
                                         .theme
                                         .primaryColor(),
                                     fontSize: 20,
@@ -407,14 +407,14 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                                 onPressed: () {
                                   clearInput();
                                 },
-                                buttonColor: MzanziInnovationHub.of(context)!
+                                buttonColor: MzansiInnovationHub.of(context)!
                                     .theme
                                     .errorColor(),
                                 width: 300,
                                 child: Text(
                                   "Clear",
                                   style: TextStyle(
-                                    color: MzanziInnovationHub.of(context)!
+                                    color: MzansiInnovationHub.of(context)!
                                         .theme
                                         .primaryColor(),
                                     fontSize: 20,
@@ -437,7 +437,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                 "Error pulling Currency Exchange Data.",
                 style: TextStyle(
                     fontSize: 25,
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor()),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor()),
                 textAlign: TextAlign.center,
               ),
             );

Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart

@@ -87,7 +87,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
     // print("height: $height");
     // print("newheight: $newheight");
     double calcWidth = 500;
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       if (height < 700) {
         calcWidth = 300;
       }
@@ -108,7 +108,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
                 style: TextStyle(
                   fontSize: 40,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
               ),
             ),
@@ -123,7 +123,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
               style: TextStyle(
                   fontSize: 30,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   fontWeight: FontWeight.bold),
             ),
           ),
@@ -165,7 +165,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,
@@ -186,7 +186,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             userInput += buttons[index];
                           });
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .messageTextColor(),
                         width: 50,
@@ -195,7 +195,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,
@@ -215,7 +215,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             userInput += buttons[index];
                           });
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .messageTextColor(),
                         width: 50,
@@ -224,7 +224,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,
@@ -255,7 +255,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             });
                           }
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .messageTextColor(),
                         width: 50,
@@ -264,7 +264,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,
@@ -296,13 +296,13 @@ class _SimpleCalcState extends State<SimpleCalc> {
                           });
                         },
                         buttonColor:
-                            MzanziInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.errorColor(),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Icon(
                           Icons.backspace,
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                         ),
@@ -320,7 +320,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             userInput = answer;
                           });
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .successColor(),
                         width: 50,
@@ -329,7 +329,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,
@@ -350,7 +350,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             equalPressed();
                           });
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                         width: 50,
@@ -359,7 +359,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,

Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart

@@ -111,7 +111,7 @@ class _TipCalcState extends State<TipCalc> {
                 FaIcon(
                   FontAwesomeIcons.coins,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   size: 35,
                 ),
                 const SizedBox(width: 15),
@@ -122,7 +122,7 @@ class _TipCalcState extends State<TipCalc> {
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                 ),
               ],
@@ -133,7 +133,7 @@ class _TipCalcState extends State<TipCalc> {
               style: TextStyle(
                 fontSize: 30,
                 fontWeight: FontWeight.bold,
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               ),
             ),
             const Divider(),
@@ -144,7 +144,7 @@ class _TipCalcState extends State<TipCalc> {
                 FaIcon(
                   FontAwesomeIcons.moneyBills,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   size: 35,
                 ),
                 const SizedBox(width: 15),
@@ -155,7 +155,7 @@ class _TipCalcState extends State<TipCalc> {
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                 ),
               ],
@@ -166,7 +166,7 @@ class _TipCalcState extends State<TipCalc> {
               style: TextStyle(
                 fontSize: 30,
                 fontWeight: FontWeight.bold,
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               ),
             ),
             Text(
@@ -175,7 +175,7 @@ class _TipCalcState extends State<TipCalc> {
               style: TextStyle(
                 fontSize: 30,
                 fontWeight: FontWeight.bold,
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               ),
             ),
             if (splitBillController.text == "Yes") const Divider(),
@@ -187,7 +187,7 @@ class _TipCalcState extends State<TipCalc> {
                   FaIcon(
                     FontAwesomeIcons.peopleGroup,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     size: 35,
                   ),
                   const SizedBox(width: 15),
@@ -197,7 +197,7 @@ class _TipCalcState extends State<TipCalc> {
                     style: TextStyle(
                       fontSize: 25,
                       fontWeight: FontWeight.bold,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -212,7 +212,7 @@ class _TipCalcState extends State<TipCalc> {
                   fontSize: 30,
                   fontWeight: FontWeight.bold,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
               ),
             if (splitBillController.text == "Yes")
@@ -223,7 +223,7 @@ class _TipCalcState extends State<TipCalc> {
                   fontSize: 30,
                   fontWeight: FontWeight.bold,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
               ),
             SizedBox(height: 10),
@@ -257,7 +257,7 @@ class _TipCalcState extends State<TipCalc> {
   Widget getBody(double width) {
     return MihSingleChildScroll(
       child: Padding(
-        padding: MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+        padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
             ? EdgeInsets.symmetric(horizontal: width * 0.2)
             : EdgeInsets.symmetric(horizontal: width * 0.075),
         child: Column(
@@ -268,9 +268,9 @@ class _TipCalcState extends State<TipCalc> {
               formFields: [
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: billAmountController,
                   multiLineInput: false,
                   requiredText: true,
@@ -283,9 +283,9 @@ class _TipCalcState extends State<TipCalc> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: tipPercentageController,
                   multiLineInput: false,
                   requiredText: true,
@@ -300,9 +300,9 @@ class _TipCalcState extends State<TipCalc> {
                   hintText: "Split Bill",
                   initialPostion: splitPosition,
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   secondaryFillColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   onChange: (value) {
                     setState(() {
                       splitBillController.text = value ? "Yes" : "No";
@@ -339,10 +339,10 @@ class _TipCalcState extends State<TipCalc> {
                         children: [
                           MihNumericStepper(
                             controller: noPeopleController,
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             hintText: "No. People",
@@ -352,10 +352,10 @@ class _TipCalcState extends State<TipCalc> {
                             validationOn: true,
                           ),
                           // MihTextFormField(
-                          //   fillColor: MzanziInnovationHub.of(context)!
+                          //   fillColor: MzansiInnovationHub.of(context)!
                           //       .theme
                           //       .secondaryColor(),
-                          //   inputColor: MzanziInnovationHub.of(context)!
+                          //   inputColor: MzansiInnovationHub.of(context)!
                           //       .theme
                           //       .primaryColor(),
                           //   controller: noPeopleController,
@@ -392,14 +392,14 @@ class _TipCalcState extends State<TipCalc> {
                             MihAlertServices().formNotFilledCompletely(context);
                           }
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .successColor(),
                         width: 300,
                         child: Text(
                           "Calculate",
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,
@@ -412,12 +412,12 @@ class _TipCalcState extends State<TipCalc> {
                           clearInput();
                         },
                         buttonColor:
-                            MzanziInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.errorColor(),
                         width: 300,
                         child: Text(
                           "Clear",
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,

Frontend/lib/mih_packages/calendar/builder/build_access_request_list.dart

@@ -134,25 +134,25 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.successColor()));
+              color: MzansiInnovationHub.of(context)!.theme.successColor()));
     } else if (access == "PENDING") {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
               color:
-                  MzanziInnovationHub.of(context)!.theme.messageTextColor()));
+                  MzansiInnovationHub.of(context)!.theme.messageTextColor()));
     } else {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.errorColor()));
+              color: MzansiInnovationHub.of(context)!.theme.errorColor()));
     }
 
     return ListTile(
       title: Text(
         line1,
         style: TextStyle(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         ),
       ),
       subtitle: RichText(
@@ -168,7 +168,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       // Text(
       //   subtitle,
       //   style: TextStyle(
-      //     color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+      //     color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
       //   ),
       // ),
       onTap: () {
@@ -180,13 +180,13 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       },
       // trailing: Icon(
       //   Icons.arrow_forward,
-      //   color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+      //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
       // ),
     );
   }
 
   void checkScreenSize() {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       setState(() {
         popUpWidth = (width / 4) * 2;
         popUpheight = null;
@@ -236,7 +236,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                   textAlign: TextAlign.left,
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     fontSize: popUpBodySize,
                     //fontWeight: FontWeight.bold,
                   ),
@@ -251,12 +251,12 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                       updateAccessAPICall(index, "declined");
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.errorColor(),
+                        MzansiInnovationHub.of(context)!.theme.errorColor(),
                     width: 300,
                     child: Text(
                       "Decline",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         fontSize: 20,
@@ -269,12 +269,12 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                       updateAccessAPICall(index, "approved");
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Approve",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         fontSize: 20,
@@ -313,7 +313,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         );
       },
       itemCount: widget.accessRequests.length,

Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart

@@ -65,7 +65,7 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
   late double height;
 
   double getPaddingSize() {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       return (width / 10);
     } else {
       return 0.0;
@@ -89,18 +89,18 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
     // print("Appointment Date: $appointDate");
     // print("Appointment Hour: $appointHour");
     Color appointmentColor =
-        MzanziInnovationHub.of(context)!.theme.secondaryColor();
+        MzansiInnovationHub.of(context)!.theme.secondaryColor();
     if (date == appointDate) {
       if (appointHour < hourNow) {
         appointmentColor =
-            MzanziInnovationHub.of(context)!.theme.messageTextColor();
+            MzansiInnovationHub.of(context)!.theme.messageTextColor();
       } else if (appointHour == hourNow) {
         appointmentColor =
-            MzanziInnovationHub.of(context)!.theme.successColor();
+            MzansiInnovationHub.of(context)!.theme.successColor();
       }
     } else if (DateTime.parse(appointDate).isBefore(DateTime.parse(date))) {
       appointmentColor =
-          MzanziInnovationHub.of(context)!.theme.messageTextColor();
+          MzansiInnovationHub.of(context)!.theme.messageTextColor();
     }
 
     return Container(
@@ -158,17 +158,17 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
             SpeedDialChild(
               child: Icon(
                 Icons.edit,
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               ),
               label: "Edit Appointment",
               labelBackgroundColor:
-                  MzanziInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.successColor(),
               labelStyle: TextStyle(
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 fontWeight: FontWeight.bold,
               ),
               backgroundColor:
-                  MzanziInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.successColor(),
               onTap: () {
                 appointmentUpdateWindow(index, bodyWidth);
               },
@@ -176,17 +176,17 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
             SpeedDialChild(
               child: Icon(
                 Icons.delete,
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               ),
               label: "Delete Appointment",
               labelBackgroundColor:
-                  MzanziInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.successColor(),
               labelStyle: TextStyle(
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 fontWeight: FontWeight.bold,
               ),
               backgroundColor:
-                  MzanziInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.successColor(),
               onTap: () {
                 deleteAppointmentConfirmationWindow(index);
               },
@@ -201,7 +201,7 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
           },
           windowBody: Padding(
             padding:
-                MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                     ? EdgeInsets.symmetric(horizontal: width * 0.05)
                     : const EdgeInsets.symmetric(horizontal: 0),
             child: Column(
@@ -209,9 +209,9 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: widget.titleController,
                   multiLineInput: false,
                   requiredText: true,
@@ -221,9 +221,9 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: widget.dateController,
                   multiLineInput: false,
                   requiredText: true,
@@ -233,9 +233,9 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: widget.timeController,
                   multiLineInput: false,
                   requiredText: true,
@@ -245,9 +245,9 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: widget.descriptionIDController,
                   multiLineInput: true,
                   height: 250,
@@ -276,17 +276,17 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
             SpeedDialChild(
               child: Icon(
                 Icons.edit,
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               ),
               label: "Edit Appointment",
               labelBackgroundColor:
-                  MzanziInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.successColor(),
               labelStyle: TextStyle(
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 fontWeight: FontWeight.bold,
               ),
               backgroundColor:
-                  MzanziInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.successColor(),
               onTap: () {
                 appointmentUpdateWindow(index, bodyWidth);
               },
@@ -294,17 +294,17 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
             SpeedDialChild(
               child: Icon(
                 Icons.delete,
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               ),
               label: "Delete Appointment",
               labelBackgroundColor:
-                  MzanziInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.successColor(),
               labelStyle: TextStyle(
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 fontWeight: FontWeight.bold,
               ),
               backgroundColor:
-                  MzanziInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.successColor(),
               onTap: () {
                 deleteAppointmentConfirmationWindow(index);
               },
@@ -319,7 +319,7 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
           },
           windowBody: Padding(
             padding:
-                MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                     ? EdgeInsets.symmetric(horizontal: width * 0.05)
                     : const EdgeInsets.symmetric(horizontal: 0),
             child: Column(
@@ -327,9 +327,9 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: widget.titleController,
                   multiLineInput: false,
                   requiredText: true,
@@ -339,9 +339,9 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: widget.dateController,
                   multiLineInput: false,
                   requiredText: true,
@@ -351,9 +351,9 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: widget.timeController,
                   multiLineInput: false,
                   requiredText: true,
@@ -363,9 +363,9 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: widget.descriptionIDController,
                   multiLineInput: true,
                   height: 250,
@@ -416,7 +416,7 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
           },
           windowBody: Padding(
             padding:
-                MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                     ? EdgeInsets.symmetric(horizontal: width * 0.05)
                     : const EdgeInsets.symmetric(horizontal: 0),
             child: Column(
@@ -425,11 +425,11 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                   formKey: _formKey,
                   formFields: [
                     MihTextFormField(
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: widget.titleController,
                       multiLineInput: false,
                       requiredText: true,
@@ -458,11 +458,11 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                     ),
                     const SizedBox(height: 10),
                     MihTextFormField(
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: widget.descriptionIDController,
                       multiLineInput: true,
                       height: 250,
@@ -488,14 +488,14 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                                     .formNotFilledCompletely(context);
                               }
                             },
-                            buttonColor: MzanziInnovationHub.of(context)!
+                            buttonColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .successColor(),
                             width: 300,
                             child: Text(
                               "Update",
                               style: TextStyle(
-                                color: MzanziInnovationHub.of(context)!
+                                color: MzansiInnovationHub.of(context)!
                                     .theme
                                     .primaryColor(),
                                 fontSize: 20,

Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart

@@ -44,7 +44,7 @@ class _BuildQueueListState extends State<BuildQueueList> {
       title: Text(
         title,
         style: TextStyle(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         ),
       ),
       subtitle: RichText(
@@ -121,7 +121,7 @@ class _BuildQueueListState extends State<BuildQueueList> {
       shrinkWrap: true,
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         );
       },
       itemCount: widget.patientQueue.length,

Frontend/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart

@@ -31,12 +31,12 @@ class _MzansiCalendarTileState extends State<MzansiCalendarTile> {
       appName: "Calendar",
       appIcon: Icon(
         MihIcons.calendar,
-        color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     );
   }
 }

Frontend/lib/mih_packages/calendar/package_tools/appointments.dart

@@ -90,7 +90,7 @@ class _PatientAccessRequestState extends State<Appointments> {
             "No Appointments for $selectedDay",
             style: TextStyle(
               fontSize: 25,
-              color: MzanziInnovationHub.of(context)!.theme.messageTextColor(),
+              color: MzansiInnovationHub.of(context)!.theme.messageTextColor(),
             ),
             textAlign: TextAlign.center,
             softWrap: true,
@@ -117,7 +117,7 @@ class _PatientAccessRequestState extends State<Appointments> {
           },
           windowBody: Padding(
             padding:
-                MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                     ? EdgeInsets.symmetric(horizontal: width * 0.05)
                     : const EdgeInsets.symmetric(horizontal: 0),
             child: Column(
@@ -126,11 +126,11 @@ class _PatientAccessRequestState extends State<Appointments> {
                   formKey: _formKey,
                   formFields: [
                     MihTextFormField(
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: _appointmentTitleController,
                       multiLineInput: false,
                       requiredText: true,
@@ -159,11 +159,11 @@ class _PatientAccessRequestState extends State<Appointments> {
                     ),
                     const SizedBox(height: 10),
                     MihTextFormField(
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: _appointmentDescriptionIDController,
                       multiLineInput: true,
                       height: 250,
@@ -183,14 +183,14 @@ class _PatientAccessRequestState extends State<Appointments> {
                             MihAlertServices().formNotFilledCompletely(context);
                           }
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .successColor(),
                         width: 300,
                         child: Text(
                           "Add",
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,
@@ -296,7 +296,7 @@ class _PatientAccessRequestState extends State<Appointments> {
                     });
                   }),
               // Divider(
-              //   color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               // ),
               Row(
                 mainAxisSize: MainAxisSize.max,
@@ -318,7 +318,7 @@ class _PatientAccessRequestState extends State<Appointments> {
                               "Error pulling appointments",
                               style: TextStyle(
                                   fontSize: 25,
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .errorColor()),
                               textAlign: TextAlign.center,
@@ -341,17 +341,17 @@ class _PatientAccessRequestState extends State<Appointments> {
               SpeedDialChild(
                 child: Icon(
                   Icons.add,
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 ),
                 label: "Add Appointment",
                 labelBackgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 labelStyle: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   fontWeight: FontWeight.bold,
                 ),
                 backgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 onTap: () {
                   addAppointmentWindow(width);
                 },

Frontend/lib/mih_packages/mih_authentication/package_tools/mih_register.dart

@@ -233,7 +233,7 @@ class _MihRegisterState extends State<MihRegister> {
       child: MihSingleChildScroll(
         child: Padding(
           padding:
-              MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+              MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                   ? EdgeInsets.symmetric(horizontal: width * 0.2)
                   : EdgeInsets.symmetric(horizontal: width * 0.075),
           child: Column(
@@ -243,7 +243,7 @@ class _MihRegisterState extends State<MihRegister> {
               Icon(
                 Icons.lock,
                 size: 100,
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               ),
               //spacer
               const SizedBox(height: 10),
@@ -254,7 +254,7 @@ class _MihRegisterState extends State<MihRegister> {
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
               ),
               //spacer
@@ -265,9 +265,9 @@ class _MihRegisterState extends State<MihRegister> {
                   //email input
                   MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: emailController,
                     multiLineInput: false,
                     requiredText: true,
@@ -282,9 +282,9 @@ class _MihRegisterState extends State<MihRegister> {
                   //password input
                   MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: passwordController,
                     multiLineInput: false,
                     requiredText: true,
@@ -299,9 +299,9 @@ class _MihRegisterState extends State<MihRegister> {
                   const SizedBox(height: 10),
                   MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: confirmPasswordController,
                     multiLineInput: false,
                     requiredText: true,
@@ -331,14 +331,14 @@ class _MihRegisterState extends State<MihRegister> {
                                   .formNotFilledCompletely(context);
                             }
                           },
-                          buttonColor: MzanziInnovationHub.of(context)!
+                          buttonColor: MzansiInnovationHub.of(context)!
                               .theme
                               .successColor(),
                           width: 300,
                           child: Text(
                             "Create New Account",
                             style: TextStyle(
-                              color: MzanziInnovationHub.of(context)!
+                              color: MzansiInnovationHub.of(context)!
                                   .theme
                                   .primaryColor(),
                               fontSize: 20,
@@ -348,14 +348,14 @@ class _MihRegisterState extends State<MihRegister> {
                         ),
                         MihButton(
                           onPressed: widget.onExistingUserButtonTap,
-                          buttonColor: MzanziInnovationHub.of(context)!
+                          buttonColor: MzansiInnovationHub.of(context)!
                               .theme
                               .secondaryColor(),
                           width: 300,
                           child: Text(
                             "I have an account",
                             style: TextStyle(
-                              color: MzanziInnovationHub.of(context)!
+                              color: MzansiInnovationHub.of(context)!
                                   .theme
                                   .primaryColor(),
                               fontSize: 20,

Frontend/lib/mih_packages/mih_authentication/package_tools/mih_sign_in.dart

@@ -159,11 +159,11 @@ class _MihSignInState extends State<MihSignIn> {
   }
 
   Color getPrim() {
-    return MzanziInnovationHub.of(context)!.theme.secondaryColor();
+    return MzansiInnovationHub.of(context)!.theme.secondaryColor();
   }
 
   Color getSec() {
-    return MzanziInnovationHub.of(context)!.theme.primaryColor();
+    return MzansiInnovationHub.of(context)!.theme.primaryColor();
   }
 
   void loginError() {
@@ -209,7 +209,7 @@ class _MihSignInState extends State<MihSignIn> {
       child: MihSingleChildScroll(
         child: Padding(
           padding:
-              MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+              MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                   ? EdgeInsets.symmetric(horizontal: width * 0.2)
                   : EdgeInsets.symmetric(horizontal: width * 0.075),
           child: AutofillGroup(
@@ -222,7 +222,7 @@ class _MihSignInState extends State<MihSignIn> {
                   mainAxisAlignment: MainAxisAlignment.end,
                   children: [
                     Visibility(
-                      visible: MzanziInnovationHub.of(context)!
+                      visible: MzansiInnovationHub.of(context)!
                               .theme
                               .getPlatform() ==
                           "Web",
@@ -232,14 +232,14 @@ class _MihSignInState extends State<MihSignIn> {
                           onPressed: () {
                             MihInstallServices().installMihTrigger(context);
                           },
-                          buttonColor: MzanziInnovationHub.of(context)!
+                          buttonColor: MzansiInnovationHub.of(context)!
                               .theme
                               .successColor(),
                           width: 150,
                           child: Text(
                             "Install MIH",
                             style: TextStyle(
-                              color: MzanziInnovationHub.of(context)!
+                              color: MzansiInnovationHub.of(context)!
                                   .theme
                                   .primaryColor(),
                               fontSize: 20,
@@ -256,7 +256,7 @@ class _MihSignInState extends State<MihSignIn> {
                   Icons.lock,
                   size: 100,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 //spacer
                 const SizedBox(height: 10),
@@ -267,7 +267,7 @@ class _MihSignInState extends State<MihSignIn> {
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                 ),
                 //spacer
@@ -276,11 +276,11 @@ class _MihSignInState extends State<MihSignIn> {
                   formKey: _formKey,
                   formFields: [
                     MihTextFormField(
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: emailController,
                       multiLineInput: false,
                       requiredText: true,
@@ -294,11 +294,11 @@ class _MihSignInState extends State<MihSignIn> {
                     const SizedBox(height: 10),
                     //password input
                     MihTextFormField(
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: passwordController,
                       multiLineInput: false,
                       requiredText: true,
@@ -326,7 +326,7 @@ class _MihSignInState extends State<MihSignIn> {
                               'Forgot Password?',
                               style: TextStyle(
                                 fontSize: 15,
-                                color: MzanziInnovationHub.of(context)!
+                                color: MzansiInnovationHub.of(context)!
                                     .theme
                                     .secondaryColor(),
                                 fontWeight: FontWeight.bold,
@@ -356,14 +356,14 @@ class _MihSignInState extends State<MihSignIn> {
                                     .formNotFilledCompletely(context);
                               }
                             },
-                            buttonColor: MzanziInnovationHub.of(context)!
+                            buttonColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .successColor(),
                             width: 300,
                             child: Text(
                               "Sign In",
                               style: TextStyle(
-                                color: MzanziInnovationHub.of(context)!
+                                color: MzansiInnovationHub.of(context)!
                                     .theme
                                     .primaryColor(),
                                 fontSize: 20,
@@ -373,14 +373,14 @@ class _MihSignInState extends State<MihSignIn> {
                           ),
                           MihButton(
                             onPressed: widget.onNewUserButtonTap,
-                            buttonColor: MzanziInnovationHub.of(context)!
+                            buttonColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
                             width: 300,
                             child: Text(
                               "Create New Account",
                               style: TextStyle(
-                                color: MzanziInnovationHub.of(context)!
+                                color: MzansiInnovationHub.of(context)!
                                     .theme
                                     .primaryColor(),
                                 fontSize: 20,
@@ -417,7 +417,7 @@ class _MihSignInState extends State<MihSignIn> {
                                   style: TextStyle(
                                       fontWeight: FontWeight.bold,
                                       fontSize: 15,
-                                      color: MzanziInnovationHub.of(context)!
+                                      color: MzansiInnovationHub.of(context)!
                                           .theme
                                           .secondaryColor()),
                                 ),
@@ -465,7 +465,7 @@ class _MihSignInState extends State<MihSignIn> {
                                 "NB: These accounts are used for test purposes. Please do not store personal information on these profiles.",
                                 textAlign: TextAlign.center,
                                 style: TextStyle(
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .errorColor(),
                                   fontSize: 15.0,

Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart

@@ -57,9 +57,9 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
         fileNameController: proPicController,
         onChange: (_) {},
         userSelectedfile: null,
-        frameColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        frameColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
         backgroundColor:
-            MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            MzansiInnovationHub.of(context)!.theme.secondaryColor(),
       ),
       // MIHProfilePicture(
       //   profilePictureFile: widget.propicFile,
@@ -69,7 +69,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
       //   radius: 27,
       //   drawerMode: true,
       //   editable: false,
-      //   frameColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      //   frameColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
       //   onChange: (newProPic) {},
       // ),
 
@@ -79,7 +79,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
       //   children: [
       //     CircleAvatar(
       //       backgroundColor:
-      //           MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      //           MzansiInnovationHub.of(context)!.theme.primaryColor(),
       //       backgroundImage: widget.propicFile,
       //       //'https://media.licdn.com/dms/image/D4D03AQGd1-QhjtWWpA/profile-displayphoto-shrink_400_400/0/1671698053061?e=2147483647&v=beta&t=a3dJI5yxs5-KeXjj10LcNCFuC9IOfa8nNn3k_Qyr0CA'),
       //       radius: 27,
@@ -110,10 +110,10 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
   @override
   Widget build(BuildContext context) {
     // precacheImage(
-    //     MzanziInnovationHub.of(context)!.theme.logoImage().image, context);
+    //     MzansiInnovationHub.of(context)!.theme.logoImage().image, context);
     return SafeArea(
       child: Drawer(
-        //backgroundColor:  MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        //backgroundColor:  MzansiInnovationHub.of(context)!.theme.primaryColor(),
         child: LayoutBuilder(
           builder: (BuildContext context, BoxConstraints constraints) {
             return Stack(
@@ -126,7 +126,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                   children: [
                     DrawerHeader(
                       decoration: BoxDecoration(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),
@@ -142,7 +142,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                               "${widget.signedInUser.fname} ${widget.signedInUser.lname}",
                               style: TextStyle(
                                 fontWeight: FontWeight.bold,
-                                color: MzanziInnovationHub.of(context)!
+                                color: MzansiInnovationHub.of(context)!
                                     .theme
                                     .primaryColor(),
                               ),
@@ -152,7 +152,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                               style: TextStyle(
                                 fontSize: 12,
                                 fontWeight: FontWeight.bold,
-                                color: MzanziInnovationHub.of(context)!
+                                color: MzansiInnovationHub.of(context)!
                                     .theme
                                     .primaryColor(),
                               ),
@@ -162,7 +162,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                               style: TextStyle(
                                 fontSize: 10,
                                 fontWeight: FontWeight.bold,
-                                color: MzanziInnovationHub.of(context)!
+                                color: MzansiInnovationHub.of(context)!
                                     .theme
                                     .primaryColor(),
                               ),
@@ -178,14 +178,14 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                     //       Icon(
                     //         Icons.home_outlined,
                     //         color:
-                    //             MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    //             MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     //       ),
                     //       const SizedBox(width: 25.0),
                     //       Text(
                     //         "Home",
                     //         style: TextStyle(
                     //           //fontWeight: FontWeight.bold,
-                    //           color: MzanziInnovationHub.of(context)!
+                    //           color: MzansiInnovationHub.of(context)!
                     //               .theme
                     //               .secondaryColor(),
                     //         ),
@@ -208,7 +208,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                               children: [
                                 Icon(
                                   Icons.policy,
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .secondaryColor(),
                                 ),
@@ -217,7 +217,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                                   "Privacy Policy",
                                   style: TextStyle(
                                     //fontWeight: FontWeight.bold,
-                                    color: MzanziInnovationHub.of(context)!
+                                    color: MzansiInnovationHub.of(context)!
                                         .theme
                                         .secondaryColor(),
                                   ),
@@ -237,7 +237,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                               children: [
                                 Icon(
                                   Icons.design_services_rounded,
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .secondaryColor(),
                                 ),
@@ -246,7 +246,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                                   "Terms of Service",
                                   style: TextStyle(
                                     //fontWeight: FontWeight.bold,
-                                    color: MzanziInnovationHub.of(context)!
+                                    color: MzansiInnovationHub.of(context)!
                                         .theme
                                         .secondaryColor(),
                                   ),
@@ -266,7 +266,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                               children: [
                                 Icon(
                                   Icons.logout,
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .secondaryColor(),
                                 ),
@@ -275,7 +275,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                                   "Sign Out",
                                   style: TextStyle(
                                     //fontWeight: FontWeight.bold,
-                                    color: MzanziInnovationHub.of(context)!
+                                    color: MzansiInnovationHub.of(context)!
                                         .theme
                                         .secondaryColor(),
                                   ),
@@ -310,15 +310,15 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                   child: InkWell(
                     onTap: () {
                       setState(() {
-                        if (MzanziInnovationHub.of(context)?.theme.mode ==
+                        if (MzansiInnovationHub.of(context)?.theme.mode ==
                             "Dark") {
                           //darkm = !darkm;
-                          MzanziInnovationHub.of(context)!
+                          MzansiInnovationHub.of(context)!
                               .changeTheme(ThemeMode.light);
                           //print("Dark Mode: $darkm");
                         } else {
                           //darkm = !darkm;
-                          MzanziInnovationHub.of(context)!
+                          MzansiInnovationHub.of(context)!
                               .changeTheme(ThemeMode.dark);
                           //print("Dark Mode: $darkm");
                         }
@@ -333,19 +333,19 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                     child: Icon(
                       MihIcons.mihLogo,
                       color:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     ),
                   ),
                   // IconButton(
                   //   onPressed: () {
                   //     setState(() {
-                  //       if (MzanziInnovationHub.of(context)?.theme.mode == "Dark") {
+                  //       if (MzansiInnovationHub.of(context)?.theme.mode == "Dark") {
                   //         //darkm = !darkm;
-                  //         MzanziInnovationHub.of(context)!.changeTheme(ThemeMode.light);
+                  //         MzansiInnovationHub.of(context)!.changeTheme(ThemeMode.light);
                   //         //print("Dark Mode: $darkm");
                   //       } else {
                   //         //darkm = !darkm;
-                  //         MzanziInnovationHub.of(context)!.changeTheme(ThemeMode.dark);
+                  //         MzansiInnovationHub.of(context)!.changeTheme(ThemeMode.dark);
                   //         //print("Dark Mode: $darkm");
                   //       }
                   //       Navigator.of(context).popAndPushNamed('/');
@@ -353,7 +353,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                   //   },
                   //   icon: Icon(
                   //     Icons.light_mode,
-                  //     color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  //     color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   //     size: 35,
                   //   ),
                   // ),

Frontend/lib/mih_packages/mih_home/mih_home.dart

@@ -117,9 +117,9 @@ class _MihHomeState extends State<MihHome> {
             fileNameController: proPicController,
             userSelectedfile: null,
             // frameColor: frameColor,
-            frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             backgroundColor:
-                MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                MzansiInnovationHub.of(context)!.theme.primaryColor(),
             onChange: (_) {},
           ),
           // MIHProfilePicture(
@@ -130,7 +130,7 @@ class _MihHomeState extends State<MihHome> {
           //   radius: 21,
           //   drawerMode: false,
           //   editable: false,
-          //   frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          //   frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           //   onChange: (newProPic) {},
           // ),
         ),

Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart

@@ -86,7 +86,7 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
   //     );
 
   void setAppsNewPersonal(List<MIHTile> tileList) {
-    ImageProvider logo = MzanziInnovationHub.of(context)!.theme.logoImage();
+    ImageProvider logo = MzansiInnovationHub.of(context)!.theme.logoImage();
 
     if (widget.signedInUser.fname == "") {
       tileList.add(MIHTile(
@@ -128,8 +128,8 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
   }
 
   void setAppsPersonal(List<MIHTile> tileList) {
-    ImageProvider logo = MzanziInnovationHub.of(context)!.theme.logoImage();
-    ImageProvider aiLogo = MzanziInnovationHub.of(context)!.theme.aiLogoImage();
+    ImageProvider logo = MzansiInnovationHub.of(context)!.theme.logoImage();
+    ImageProvider aiLogo = MzansiInnovationHub.of(context)!.theme.aiLogoImage();
     tileList.add(MIHTile(
       videoID: "P2bM9eosJ_A",
       onTap: () {
@@ -355,7 +355,7 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
   }
 
   void setAppsBusiness(List<MIHTile> tileList) {
-    ImageProvider aiLogo = MzanziInnovationHub.of(context)!.theme.aiLogoImage();
+    ImageProvider aiLogo = MzansiInnovationHub.of(context)!.theme.aiLogoImage();
     tileList.add(MIHTile(
       videoID: "NWyJZq2ZYOM",
       onTap: () {
@@ -866,18 +866,18 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
                     child: Icon(
                       Icons.delete,
                       color:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     ),
                     label: "Delete File",
                     labelBackgroundColor:
-                        MzanziInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.successColor(),
                     labelStyle: TextStyle(
                       color:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       fontWeight: FontWeight.bold,
                     ),
                     backgroundColor:
-                        MzanziInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.successColor(),
                     onTap: () {},
                   ),
                 ],
@@ -954,11 +954,11 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
   }
 
   Color getPrim() {
-    return MzanziInnovationHub.of(context)!.theme.secondaryColor();
+    return MzansiInnovationHub.of(context)!.theme.secondaryColor();
   }
 
   Color getSec() {
-    return MzanziInnovationHub.of(context)!.theme.primaryColor();
+    return MzansiInnovationHub.of(context)!.theme.primaryColor();
   }
 
   bool isBusinessUser(AppUser signedInUser) {
@@ -995,7 +995,7 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
           //   radius: 21,
           //   drawerMode: false,
           //   editable: false,
-          //   frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          //   frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           //   onChange: (newProPic) {},
           // ),
         ),
@@ -1025,7 +1025,7 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
             child: Icon(
               Icons.circle,
               size: 10,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
             ),
           )
         ],
@@ -1093,9 +1093,9 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
                     prefixIcon: Icons.search,
                     prefixAltIcon: MihIcons.mzansiAi,
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     hintColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     onPrefixIconTap: () {
                       print("Search Text: ${searchController.text}");
                       setState(() {
@@ -1170,11 +1170,11 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
         child: Placeholder(),
         // GNav(
         //   //hoverColor: Colors.lightBlueAccent,
-        //   color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         //   iconSize: 35.0,
-        //   activeColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        //   activeColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
         //   tabBackgroundColor:
-        //       MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        //       MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         //   //gap: 20,
         //   //padding: EdgeInsets.all(15),
         //   tabs: [
@@ -1220,7 +1220,7 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
   }
 
   Future<void> refreshNotifications() async {
-    if (MzanziInnovationHub.of(context)!.theme.getPlatform() == "Web") {
+    if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") {
       html.window.location.reload();
     } else {
       var responseNotification = await http.get(Uri.parse(

Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart

@@ -92,7 +92,7 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
               "Connection Error",
               textAlign: TextAlign.center,
               style: TextStyle(
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 fontSize: 35,
                 fontWeight: FontWeight.bold,
               ),
@@ -100,7 +100,7 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
             Icon(
               Icons.power_off_outlined,
               size: 150,
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             ),
             SizedBox(
               width: 500,
@@ -109,7 +109,7 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
                 textAlign: TextAlign.center,
                 style: TextStyle(
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   fontSize: 20,
                   fontWeight: FontWeight.bold,
                 ),
@@ -121,12 +121,12 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
                 Navigator.of(context).popAndPushNamed("/");
               },
               buttonColor:
-                  MzanziInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.successColor(),
               width: 300,
               child: Text(
                 "Refresh",
                 style: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   fontSize: 20,
                   fontWeight: FontWeight.bold,
                 ),
@@ -143,7 +143,7 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
                     textAlign: TextAlign.left,
                     style: TextStyle(
                       color:
-                          MzanziInnovationHub.of(context)!.theme.errorColor(),
+                          MzansiInnovationHub.of(context)!.theme.errorColor(),
                       fontSize: 15,
                       fontWeight: FontWeight.bold,
                     ),

Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart

@@ -139,7 +139,7 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
   }
 
   EdgeInsets getPadding(double width, double height) {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "mobile") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "mobile") {
       double mobilePadding = 10;
       return EdgeInsets.only(
         left: mobilePadding,
@@ -216,7 +216,7 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
           // Icon(
           //   MihIcons.mihLogo,
           //   size: width / 2,
-          //   color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           // ),
           // const SizedBox(height: 10),
           // Text(
@@ -226,7 +226,7 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
           //   style: TextStyle(
           //     fontSize: 30,
           //     fontWeight: FontWeight.bold,
-          //     color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          //     color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           //   ),
           // ),
           // const SizedBox(height: 20),
@@ -238,8 +238,8 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
               prefixIcon: Icons.search,
               prefixAltIcon: MihIcons.mzansiAi,
               fillColor:
-                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-              hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               onPrefixIconTap: () {
                 Navigator.of(context).pushNamed(
                   '/mzansi-ai',
@@ -289,7 +289,7 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
                     Icon(
                       MihIcons.mzansiAi,
                       size: 165,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -301,7 +301,7 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
                       style: TextStyle(
                         fontSize: 25,
                         fontWeight: FontWeight.bold,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),

Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart

@@ -171,11 +171,11 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
           appName: "Test",
           appIcon: Icon(
             Icons.warning_amber_rounded,
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           ),
           iconSize: packageSize,
-          primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-          secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
         )
       });
     }
@@ -183,7 +183,7 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
   }
 
   EdgeInsets getPadding(double width, double height) {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "mobile") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "mobile") {
       double mobilePadding = 10;
       return EdgeInsets.only(
         left: mobilePadding,
@@ -261,7 +261,7 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
           // Icon(
           //   MihIcons.mihLogo,
           //   size: 200,
-          //   color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           // ),
           // const SizedBox(height: 10),
           // Text(
@@ -271,7 +271,7 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
           //   style: TextStyle(
           //     fontSize: 30,
           //     fontWeight: FontWeight.bold,
-          //     color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          //     color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           //   ),
           // ),
           // const SizedBox(height: 20),
@@ -283,8 +283,8 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
               prefixIcon: Icons.search,
               prefixAltIcon: MihIcons.mzansiAi,
               fillColor:
-                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-              hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               onPrefixIconTap: () {
                 Navigator.of(context).pushNamed(
                   '/mzansi-ai',
@@ -335,7 +335,7 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
                     Icon(
                       MihIcons.mzansiAi,
                       size: 165,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -347,7 +347,7 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
                       style: TextStyle(
                         fontSize: 25,
                         fontWeight: FontWeight.bold,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),

Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart

@@ -35,12 +35,12 @@ class _MzansiAiTileState extends State<MzansiAiTile> {
       appName: "Mzansi AI",
       appIcon: Icon(
         MihIcons.mzansiAi,
-        color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     );
   }
 }

Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart

@@ -187,21 +187,21 @@ class _AiChatState extends State<AiChat> {
                     SpeedDialChild(
                       child: Icon(
                         Icons.volume_up,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                       ),
                       label: "Read Aloud",
                       labelBackgroundColor:
-                          MzanziInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.successColor(),
                       labelStyle: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         fontWeight: FontWeight.bold,
                       ),
                       backgroundColor:
-                          MzanziInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.successColor(),
                       onTap: () {
                         _speakText(snapshot.requireData);
                       },
@@ -222,7 +222,7 @@ class _AiChatState extends State<AiChat> {
                     snapshot.requireData,
                     textAlign: TextAlign.left,
                     style: TextStyle(
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       fontSize: _chatFrontSize,
@@ -305,29 +305,29 @@ class _AiChatState extends State<AiChat> {
 
   ChatTheme getChatTheme() {
     return DarkChatTheme(
-      backgroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      backgroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
       inputBackgroundColor:
-          MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      inputTextColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      inputTextColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
       inputTextCursorColor:
-          MzanziInnovationHub.of(context)!.theme.primaryColor(),
-      primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzanziInnovationHub.of(context)!.theme.successColor(),
-      errorColor: MzanziInnovationHub.of(context)!.theme.errorColor(),
+          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      secondaryColor: MzansiInnovationHub.of(context)!.theme.successColor(),
+      errorColor: MzansiInnovationHub.of(context)!.theme.errorColor(),
       sentMessageBodyTextStyle: TextStyle(
-        color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
         fontSize: _chatFrontSize,
         fontWeight: FontWeight.w500,
         fontFamily: 'Segoe UI',
       ),
       receivedMessageBodyTextStyle: TextStyle(
-        color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
         fontSize: _chatFrontSize,
         fontWeight: FontWeight.w500,
         fontFamily: 'Segoe UI',
       ),
       emptyChatPlaceholderTextStyle: TextStyle(
-        color: MzanziInnovationHub.of(context)!.theme.messageTextColor(),
+        color: MzansiInnovationHub.of(context)!.theme.messageTextColor(),
         fontSize: _chatFrontSize,
         fontWeight: FontWeight.w500,
         fontFamily: 'Segoe UI',
@@ -350,10 +350,10 @@ class _AiChatState extends State<AiChat> {
                   padding: const EdgeInsets.all(10.0),
                   decoration: BoxDecoration(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     borderRadius: BorderRadius.circular(25.0),
                     border: Border.all(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                         width: 3.0),
@@ -370,7 +370,7 @@ class _AiChatState extends State<AiChat> {
                             style: TextStyle(
                               fontSize: 25,
                               fontWeight: FontWeight.bold,
-                              color: MzanziInnovationHub.of(context)!
+                              color: MzansiInnovationHub.of(context)!
                                   .theme
                                   .secondaryColor(),
                             ),
@@ -385,11 +385,11 @@ class _AiChatState extends State<AiChat> {
                             child: MihRadioOptions(
                               controller: _modelController,
                               hintText: "AI Model",
-                              fillColor: MzanziInnovationHub.of(context)!
+                              fillColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .secondaryColor(),
                               secondaryFillColor:
-                                  MzanziInnovationHub.of(context)!
+                                  MzansiInnovationHub.of(context)!
                                       .theme
                                       .primaryColor(),
                               requiredText: true,
@@ -445,11 +445,11 @@ class _AiChatState extends State<AiChat> {
                                   style: ButtonStyle(
                                     backgroundColor:
                                         WidgetStateProperty.all<Color>(
-                                            MzanziInnovationHub.of(context)!
+                                            MzansiInnovationHub.of(context)!
                                                 .theme
                                                 .successColor()),
                                   ),
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .primaryColor(),
                                   iconSize: 25,
@@ -474,10 +474,10 @@ class _AiChatState extends State<AiChat> {
                             width: 300,
                             child: MihNumericStepper(
                               controller: _fontSizeController,
-                              fillColor: MzanziInnovationHub.of(context)!
+                              fillColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .secondaryColor(),
-                              inputColor: MzanziInnovationHub.of(context)!
+                              inputColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .primaryColor(),
                               hintText: "Font Size",
@@ -696,10 +696,10 @@ class _AiChatState extends State<AiChat> {
                   child: IconButton.filled(
                     style: ButtonStyle(
                       backgroundColor: WidgetStateProperty.all<Color>(
-                          MzanziInnovationHub.of(context)!.theme.errorColor()),
+                          MzansiInnovationHub.of(context)!.theme.errorColor()),
                     ),
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     iconSize: 20,
                     onPressed: () {
                       if (_showModelOptions.value == true) {
@@ -747,17 +747,17 @@ class _AiChatState extends State<AiChat> {
               SpeedDialChild(
                 child: Icon(
                   Icons.refresh,
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 ),
                 label: "New Chat",
                 labelBackgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 labelStyle: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   fontWeight: FontWeight.bold,
                 ),
                 backgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 onTap: () {
                   _resetChat();
                 },
@@ -765,17 +765,17 @@ class _AiChatState extends State<AiChat> {
               SpeedDialChild(
                 child: Icon(
                   Icons.settings,
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 ),
                 label: "Settings",
                 labelBackgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 labelStyle: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   fontWeight: FontWeight.bold,
                 ),
                 backgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 onTap: () {
                   if (_showModelOptions.value == true) {
                     setState(() {

Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart

@@ -27,12 +27,12 @@ class _BuildBusinessSearchResultsListState
       itemCount: widget.businessList.length,
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         );
       },
       itemBuilder: (context, index) {
         return Material(
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           child: InkWell(
             onTap: () {
               Navigator.of(context).pushNamed(
@@ -40,7 +40,7 @@ class _BuildBusinessSearchResultsListState
                 arguments: widget.businessList[index],
               );
             },
-            splashColor: MzanziInnovationHub.of(context)!
+            splashColor: MzansiInnovationHub.of(context)!
                 .theme
                 .secondaryColor()
                 .withOpacity(0.2),

Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart

@@ -25,12 +25,12 @@ class _BuildUserSearchResultsListState
       itemCount: widget.userList.length,
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         );
       },
       itemBuilder: (context, index) {
         return Material(
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
           child: InkWell(
             onTap: () {
               Navigator.of(context).pushNamed(
@@ -38,7 +38,7 @@ class _BuildUserSearchResultsListState
                 arguments: widget.userList[index],
               );
             },
-            splashColor: MzanziInnovationHub.of(context)!
+            splashColor: MzansiInnovationHub.of(context)!
                 .theme
                 .secondaryColor()
                 .withOpacity(0.2),

Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart

@@ -27,12 +27,12 @@ class _MzansiDirectoryTileState extends State<MzansiDirectoryTile> {
       appName: "Mzansi Directory",
       appIcon: Icon(
         MihIcons.mzansiDirectory,
-        color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     );
   }
 }

Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_contacts.dart

@@ -36,8 +36,8 @@ class _MihContactsState extends State<MihContacts> {
               hintText: "Search Contacts",
               prefixIcon: Icons.search,
               fillColor:
-                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-              hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               onPrefixIconTap: () {},
               searchFocusNode: searchFocusNode,
             ),

Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart

@@ -37,8 +37,8 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
               hintText: "Search Businesses",
               prefixIcon: Icons.search,
               fillColor:
-                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-              hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               onPrefixIconTap: () {},
               searchFocusNode: searchFocusNode,
             ),

Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart

@@ -85,12 +85,12 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                       Icons.display_settings,
                       size: 35,
                       color:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     ))
               ],
               fillColor:
-                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-              hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               onPrefixIconTap: () {
                 if (userSearch) {
                   setState(() {
@@ -169,7 +169,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                   MihIcons.personalProfile,
                   size: 165,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 const SizedBox(height: 10),
                 Text(
@@ -180,7 +180,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                 ),
               ],
@@ -196,7 +196,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                   MihIcons.iDontKnow,
                   size: 165,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 const SizedBox(height: 10),
                 Text(
@@ -207,7 +207,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                 ),
               ],
@@ -218,7 +218,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                 "Error pulling Patients Data\n/users/search/${mzansiSearchController.text}",
                 style: TextStyle(
                     fontSize: 25,
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor()),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor()),
                 textAlign: TextAlign.center,
               ),
             );
@@ -260,7 +260,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                   MihIcons.iDontKnow,
                   size: 165,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 const SizedBox(height: 10),
                 Text(
@@ -271,7 +271,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                 ),
               ],
@@ -286,7 +286,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                   MihIcons.businessProfile,
                   size: 165,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
                 const SizedBox(height: 10),
                 Text(
@@ -297,7 +297,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                 ),
               ],
@@ -308,7 +308,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                 "Error pulling Patients Data\n/users/search/${mzansiSearchController.text}",
                 style: TextStyle(
                     fontSize: 25,
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor()),
+                    color: MzansiInnovationHub.of(context)!.theme.errorColor()),
                 textAlign: TextAlign.center,
               ),
             );

Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart

@@ -161,17 +161,17 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
           SpeedDialChild(
             child: Icon(
               Icons.delete,
-              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             ),
             label: "Delete Employee",
             labelBackgroundColor:
-                MzanziInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.successColor(),
             labelStyle: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               fontWeight: FontWeight.bold,
             ),
             backgroundColor:
-                MzanziInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.successColor(),
             onTap: () {
               showDeleteWarning(index);
             },
@@ -182,7 +182,7 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
         },
         windowBody: Padding(
           padding:
-              MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+              MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                   ? EdgeInsets.symmetric(horizontal: width * 0.05)
                   : const EdgeInsets.symmetric(horizontal: 0),
           child: Column(
@@ -192,9 +192,9 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
                 formFields: [
                   MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: fnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -204,9 +204,9 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
                   const SizedBox(height: 10.0),
                   MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: lnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -258,12 +258,12 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
                         }
                       },
                       buttonColor:
-                          MzanziInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.successColor(),
                       width: 300,
                       child: Text(
                         "Update",
                         style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           fontSize: 20,
@@ -309,7 +309,7 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         );
       },
       itemCount: widget.employees.length,
@@ -327,7 +327,7 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
           subtitle: Text(
             "${widget.employees[index].username}\n${widget.employees[index].email}\nAccess: ${widget.employees[index].access}",
             style: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             ),
           ),
           onTap: () {

Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart

@@ -133,7 +133,7 @@ class _BuildUserListState extends State<BuildUserList> {
             windowTitle: "Add Employee",
             windowBody: Padding(
               padding:
-                  MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+                  MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                       ? EdgeInsets.symmetric(horizontal: width * 0.05)
                       : const EdgeInsets.symmetric(horizontal: 0),
               child: Column(
@@ -142,10 +142,10 @@ class _BuildUserListState extends State<BuildUserList> {
                     formKey: _formKey,
                     formFields: [
                       MihTextFormField(
-                        fillColor: MzanziInnovationHub.of(context)!
+                        fillColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        inputColor: MzanziInnovationHub.of(context)!
+                        inputColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         controller: usernameController,
@@ -156,10 +156,10 @@ class _BuildUserListState extends State<BuildUserList> {
                       ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzanziInnovationHub.of(context)!
+                        fillColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        inputColor: MzanziInnovationHub.of(context)!
+                        inputColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         controller: emailController,
@@ -213,14 +213,14 @@ class _BuildUserListState extends State<BuildUserList> {
                                   .formNotFilledCompletely(context);
                             }
                           },
-                          buttonColor: MzanziInnovationHub.of(context)!
+                          buttonColor: MzansiInnovationHub.of(context)!
                               .theme
                               .successColor(),
                           width: 300,
                           child: Text(
                             "Add",
                             style: TextStyle(
-                              color: MzanziInnovationHub.of(context)!
+                              color: MzansiInnovationHub.of(context)!
                                   .theme
                                   .primaryColor(),
                               fontSize: 20,
@@ -256,7 +256,7 @@ class _BuildUserListState extends State<BuildUserList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         );
       },
       itemCount: widget.users.length,
@@ -271,7 +271,7 @@ class _BuildUserListState extends State<BuildUserList> {
           subtitle: Text(
             "Email: ${hideEmail(widget.users[index].email)}",
             style: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             ),
           ),
           onTap: () {

Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart

@@ -35,7 +35,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               alertIcon: Icon(
                 Icons.warning_rounded,
                 size: 100,
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               ),
               alertTitle: "Error Making Call",
               alertBody: Column(
@@ -43,7 +43,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   Text(
                     "We couldn't open your phone app to call ${widget.cellNumber}. To fix this, make sure you have a phone application installed and it's set as your default dialer.",
                     style: TextStyle(
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       fontSize: 15,
@@ -51,7 +51,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   ),
                 ],
               ),
-              alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
             );
           });
     }
@@ -85,7 +85,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               alertIcon: Icon(
                 Icons.warning_rounded,
                 size: 100,
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               ),
               alertTitle: "Error Creating Email",
               alertBody: Column(
@@ -93,7 +93,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   Text(
                     "We couldn't launch your email app to send a message to ${widget.email}. To fix this, please confirm that you have an email application installed and that it's set as your default.",
                     style: TextStyle(
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       fontSize: 15,
@@ -101,7 +101,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   ),
                 ],
               ),
-              alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
             );
           });
     }
@@ -126,7 +126,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                 alertIcon: Icon(
                   Icons.warning_rounded,
                   size: 100,
-                  color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 ),
                 alertTitle: "Error Creating Maps",
                 alertBody: Column(
@@ -134,7 +134,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                     Text(
                       "There was an issue opening maps for ${widget.businessName}. This usually happens if you don't have a maps app installed or it's not set as your default. Please install one to proceed.",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                         fontSize: 15,
@@ -143,7 +143,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   ],
                 ),
                 alertColour:
-                    MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    MzansiInnovationHub.of(context)!.theme.errorColor(),
               );
             });
       }
@@ -155,7 +155,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               alertIcon: Icon(
                 Icons.warning_rounded,
                 size: 100,
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               ),
               alertTitle: "Error Creating Maps",
               alertBody: Column(
@@ -163,7 +163,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   Text(
                     "There was an issue opening maps for ${widget.businessName}. This usually happens if you don't have a maps app installed or it's not set as your default. Please install one to proceed.",
                     style: TextStyle(
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       fontSize: 15,
@@ -171,7 +171,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   ),
                 ],
               ),
-              alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
             );
           });
     }
@@ -195,7 +195,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                 alertIcon: Icon(
                   Icons.warning_rounded,
                   size: 100,
-                  color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 ),
                 alertTitle: "Error Opening Website",
                 alertBody: Column(
@@ -203,7 +203,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                     Text(
                       "We couldn't open the link to $newUrl. To view this website, please ensure you have a web browser installed and set as your default.",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                         fontSize: 15,
@@ -212,7 +212,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   ],
                 ),
                 alertColour:
-                    MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    MzansiInnovationHub.of(context)!.theme.errorColor(),
               );
             });
       }
@@ -224,7 +224,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               alertIcon: Icon(
                 Icons.warning_rounded,
                 size: 100,
-                color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
               ),
               alertTitle: "Error Opening Website",
               alertBody: Column(
@@ -232,7 +232,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   Text(
                     "We couldn't open the link to $newUrl. To view this website, please ensure you have a web browser installed and set as your default.",
                     style: TextStyle(
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       fontSize: 15,
@@ -240,7 +240,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   ),
                 ],
               ),
-              alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(),
+              alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
             );
           });
     }
@@ -254,10 +254,10 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
     Function()? ontap,
   ) {
     return Material(
-      color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+      color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
       child: InkWell(
         onTap: ontap,
-        splashColor: MzanziInnovationHub.of(context)!
+        splashColor: MzansiInnovationHub.of(context)!
             .theme
             .primaryColor()
             .withOpacity(0.2),
@@ -278,7 +278,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                 child: Icon(
                   icon,
                   size: 35,
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 ),
               ),
               SizedBox(width: 20),
@@ -293,7 +293,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                       style: TextStyle(
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         height: 1.0,
@@ -304,7 +304,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                       style: TextStyle(
                         fontSize: 12,
                         fontWeight: FontWeight.w700,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                       ),
@@ -322,7 +322,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
   @override
   Widget build(BuildContext context) {
     return Material(
-      color: MzanziInnovationHub.of(context)!
+      color: MzansiInnovationHub.of(context)!
           .theme
           .secondaryColor()
           .withValues(alpha: 0.6),
@@ -331,7 +331,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
       shadowColor: Colors.black,
       child: Container(
         decoration: BoxDecoration(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           borderRadius: BorderRadius.circular(10),
         ),
         child: Column(
@@ -348,7 +348,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               },
             ),
             Divider(
-              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             ),
             _buildContactInfo(
               "Email",
@@ -365,7 +365,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               },
             ),
             Divider(
-              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             ),
             _buildContactInfo(
               "Location",
@@ -385,7 +385,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
             Visibility(
               visible: widget.website != null && widget.website! != "",
               child: Divider(
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               ),
             ),
             Visibility(
@@ -403,7 +403,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
             // Padding(
             //   padding: const EdgeInsets.symmetric(horizontal: 10.0),
             //   child: Divider(
-            //     color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            //     color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             //   ),
             // ),
             // _buildContactInfo(
@@ -419,7 +419,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
             // Padding(
             //   padding: const EdgeInsets.symmetric(horizontal: 10.0),
             //   child: Divider(
-            //     color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            //     color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             //   ),
             // ),
             // _buildContactInfo(
@@ -436,7 +436,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
             // Padding(
             //   padding: const EdgeInsets.symmetric(horizontal: 10.0),
             //   child: Divider(
-            //     color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            //     color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             //   ),
             // ),
           ],

Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart

@@ -31,12 +31,12 @@ class _MzansiBusinessProfileTileState extends State<MzansiBusinessProfileTile> {
       appName: "Business Profile",
       appIcon: Icon(
         MihIcons.businessProfile,
-        color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     );
   }
 }

Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart

@@ -32,11 +32,11 @@ class _MzansiSetupBusinessProfileTileState
       appName: "Setup Business",
       appIcon: Icon(
         MihIcons.profileSetup,
-        color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     );
   }
 }

Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart

@@ -103,7 +103,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
               return MihPackageAlert(
                 alertIcon: Icon(
                   Icons.warning_rounded,
-                  color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 ),
                 alertTitle: "Error Updating Business Details",
                 alertBody: Column(
@@ -111,7 +111,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                     Text(
                       "An error occurred while updating the business details. Please check internet connection and try again.",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),
@@ -119,7 +119,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                   ],
                 ),
                 alertColour:
-                    MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    MzansiInnovationHub.of(context)!.theme.errorColor(),
               );
             },
           );
@@ -207,7 +207,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
               },
               windowBody: MihSingleChildScroll(
                 child: Padding(
-                  padding: MzanziInnovationHub.of(context)!.theme.screenType ==
+                  padding: MzansiInnovationHub.of(context)!.theme.screenType ==
                           "desktop"
                       ? EdgeInsets.symmetric(horizontal: width * 0.05)
                       : EdgeInsets.symmetric(horizontal: width * 0),
@@ -223,10 +223,10 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                               editable: true,
                               fileNameController: fileNameController,
                               userSelectedfile: imageFile,
-                              frameColor: MzanziInnovationHub.of(context)!
+                              frameColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .secondaryColor(),
-                              backgroundColor: MzanziInnovationHub.of(context)!
+                              backgroundColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .primaryColor(),
                               onChange: (selectedfile) {
@@ -239,10 +239,10 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           Visibility(
                             visible: false,
                             child: MihTextFormField(
-                              fillColor: MzanziInnovationHub.of(context)!
+                              fillColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .secondaryColor(),
-                              inputColor: MzanziInnovationHub.of(context)!
+                              inputColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .primaryColor(),
                               controller: fileNameController,
@@ -254,10 +254,10 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 20),
                           MihTextFormField(
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: nameController,
@@ -270,10 +270,10 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 10),
                           MihTextFormField(
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: typeController,
@@ -297,10 +297,10 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           // ),
                           const SizedBox(height: 10),
                           MihTextFormField(
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: emailController,
@@ -314,10 +314,10 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 10),
                           MihTextFormField(
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: contactController,
@@ -330,10 +330,10 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 10),
                           MihTextFormField(
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: websiteController,
@@ -348,10 +348,10 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           const SizedBox(height: 10),
                           MihTextFormField(
                             height: 250,
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: missionVisionController,
@@ -395,10 +395,10 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 10.0),
                           MihTextFormField(
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: regController,
@@ -411,10 +411,10 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 10),
                           MihTextFormField(
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: practiceNoController,
@@ -428,10 +428,10 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 10),
                           MihTextFormField(
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: vatNoController,
@@ -448,10 +448,10 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                             children: [
                               Flexible(
                                 child: MihTextFormField(
-                                  fillColor: MzanziInnovationHub.of(context)!
+                                  fillColor: MzansiInnovationHub.of(context)!
                                       .theme
                                       .secondaryColor(),
-                                  inputColor: MzanziInnovationHub.of(context)!
+                                  inputColor: MzansiInnovationHub.of(context)!
                                       .theme
                                       .primaryColor(),
                                   controller: locationController,
@@ -485,14 +485,14 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                                     Navigator.of(context).pop();
                                   });
                                 },
-                                buttonColor: MzanziInnovationHub.of(context)!
+                                buttonColor: MzansiInnovationHub.of(context)!
                                     .theme
                                     .secondaryColor(),
                                 width: 100,
                                 child: Text(
                                   "Set",
                                   style: TextStyle(
-                                    color: MzanziInnovationHub.of(context)!
+                                    color: MzansiInnovationHub.of(context)!
                                         .theme
                                         .primaryColor(),
                                     fontSize: 20,
@@ -513,14 +513,14 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                                       .formNotFilledCompletely(context);
                                 }
                               },
-                              buttonColor: MzanziInnovationHub.of(context)!
+                              buttonColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .successColor(),
                               width: 300,
                               child: Text(
                                 "Update",
                                 style: TextStyle(
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .primaryColor(),
                                   fontSize: 20,
@@ -541,9 +541,9 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
 
   Color getMissionVisionLimitColor(int limit) {
     if (_counter.value <= limit) {
-      return MzanziInnovationHub.of(context)!.theme.secondaryColor();
+      return MzansiInnovationHub.of(context)!.theme.secondaryColor();
     } else {
-      return MzanziInnovationHub.of(context)!.theme.errorColor();
+      return MzansiInnovationHub.of(context)!.theme.errorColor();
     }
   }
 
@@ -611,7 +611,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
         MihSingleChildScroll(
           child: Padding(
             padding:
-                MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                     ? EdgeInsets.symmetric(horizontal: width * 0.2)
                     : EdgeInsets.symmetric(horizontal: width * 0.075),
             child: Column(
@@ -624,9 +624,9 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                     fileNameController: fileNameController,
                     userSelectedfile: imageFile,
                     frameColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     backgroundColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     onChange: (selectedfile) {
                       setState(() {
                         imageFile = selectedfile;
@@ -640,7 +640,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                     style: TextStyle(
                       fontSize: 35,
                       fontWeight: FontWeight.bold,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -652,7 +652,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                 //     style: TextStyle(
                 //       fontSize: 15,
                 //       fontWeight: FontWeight.bold,
-                //       color: MzanziInnovationHub.of(context)!
+                //       color: MzansiInnovationHub.of(context)!
                 //           .theme
                 //           .secondaryColor(),
                 //     ),
@@ -669,7 +669,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                       style: TextStyle(
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),
@@ -696,12 +696,12 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                       editBizProfileWindow(width);
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Edit Profile",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         fontSize: 20,
@@ -723,17 +723,17 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
               SpeedDialChild(
                 child: Icon(
                   Icons.edit,
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 ),
                 label: "Edit Profile",
                 labelBackgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 labelStyle: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   fontWeight: FontWeight.bold,
                 ),
                 backgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 onTap: () {
                   editBizProfileWindow(width);
                 },

Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart

@@ -53,7 +53,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
         MihSingleChildScroll(
           child: Padding(
             padding:
-                MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                     ? EdgeInsets.symmetric(horizontal: width * 0.2)
                     : EdgeInsets.symmetric(horizontal: width * 0.075),
             child: Column(
@@ -71,10 +71,10 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                             editable: false,
                             fileNameController: TextEditingController(),
                             userSelectedfile: file,
-                            frameColor: MzanziInnovationHub.of(context)!
+                            frameColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            backgroundColor: MzanziInnovationHub.of(context)!
+                            backgroundColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             onChange: () {},
@@ -83,7 +83,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                           return Icon(
                             MihIcons.iDontKnow,
                             size: profilePictureWidth,
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
                           );
@@ -92,7 +92,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                         return Icon(
                           MihIcons.mihRing,
                           size: profilePictureWidth,
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .secondaryColor(),
                         );
@@ -106,9 +106,9 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                 //     fileNameController: fileNameController,
                 //     userSelectedfile: imageFile,
                 //     frameColor:
-                //         MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                //         MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 //     backgroundColor:
-                //         MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                //         MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 //     onChange: (selectedfile) {
                 //       setState(() {
                 //         imageFile = selectedfile;
@@ -122,7 +122,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                     style: TextStyle(
                       fontSize: 35,
                       fontWeight: FontWeight.bold,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -134,7 +134,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                 //     style: TextStyle(
                 //       fontSize: 15,
                 //       fontWeight: FontWeight.bold,
-                //       color: MzanziInnovationHub.of(context)!
+                //       color: MzansiInnovationHub.of(context)!
                 //           .theme
                 //           .secondaryColor(),
                 //     ),
@@ -151,7 +151,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                       style: TextStyle(
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),

Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart

@@ -66,7 +66,7 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
         "Enter Username or Email to search",
         style: TextStyle(
             fontSize: 25,
-            color: MzanziInnovationHub.of(context)!.theme.messageTextColor()),
+            color: MzansiInnovationHub.of(context)!.theme.messageTextColor()),
         textAlign: TextAlign.center,
       ),
     );
@@ -105,8 +105,8 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
             controller: searchController,
             hintText: "Search Users",
             prefixIcon: Icons.search,
-            fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-            hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             onPrefixIconTap: () {
               submitUserForm();
             },
@@ -144,7 +144,7 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
                   style: TextStyle(
                       fontSize: 25,
                       color:
-                          MzanziInnovationHub.of(context)!.theme.errorColor()),
+                          MzansiInnovationHub.of(context)!.theme.errorColor()),
                   textAlign: TextAlign.center,
                 ),
               );

Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart

@@ -60,7 +60,7 @@ class _MihMyBusinessTeamState extends State<MihMyBusinessTeam> {
         "",
         style: TextStyle(
             fontSize: 25,
-            color: MzanziInnovationHub.of(context)!.theme.messageTextColor()),
+            color: MzansiInnovationHub.of(context)!.theme.messageTextColor()),
         textAlign: TextAlign.center,
       ),
     );
@@ -106,7 +106,7 @@ class _MihMyBusinessTeamState extends State<MihMyBusinessTeam> {
                   style: TextStyle(
                       fontSize: 25,
                       color:
-                          MzanziInnovationHub.of(context)!.theme.errorColor()),
+                          MzansiInnovationHub.of(context)!.theme.errorColor()),
                   textAlign: TextAlign.center,
                 ),
               );

Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart

@@ -128,7 +128,7 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
               return MihPackageAlert(
                 alertIcon: Icon(
                   Icons.warning_rounded,
-                  color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
                 ),
                 alertTitle: "Error Updating Business User Details",
                 alertBody: Column(
@@ -136,7 +136,7 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                     Text(
                       "An error occurred while updating the business User details. Please check internet connection and try again.",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),
@@ -144,7 +144,7 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                   ],
                 ),
                 alertColour:
-                    MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    MzansiInnovationHub.of(context)!.theme.errorColor(),
               );
             },
           );
@@ -215,7 +215,7 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
   Widget getBody(double width) {
     return MihSingleChildScroll(
       child: Padding(
-        padding: MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+        padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
             ? EdgeInsets.symmetric(horizontal: width * 0.2)
             : EdgeInsets.symmetric(horizontal: width * 0.075),
         child: Column(
@@ -231,9 +231,9 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                     fileNameController: fileNameController,
                     userSelectedfile: userPicFile,
                     frameColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     backgroundColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     onChange: (_) {},
                   ),
                 ),
@@ -241,9 +241,9 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                   visible: false,
                   child: MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: fileNameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -266,9 +266,9 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: titleTextController,
                   multiLineInput: false,
                   requiredText: true,
@@ -280,9 +280,9 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: fnameController,
                   multiLineInput: false,
                   requiredText: true,
@@ -295,9 +295,9 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: lnameController,
                   multiLineInput: false,
                   requiredText: true,
@@ -310,9 +310,9 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                 const SizedBox(height: 10),
                 MihTextFormField(
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   inputColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   controller: accessController,
                   multiLineInput: false,
                   requiredText: true,
@@ -354,9 +354,9 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                   visible: false,
                   child: MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: fileNameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -375,12 +375,12 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                       }
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Update",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         fontSize: 20,

Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart

@@ -243,9 +243,9 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
 
   Color getMissionVisionLimitColor(int limit) {
     if (_counter.value <= limit) {
-      return MzanziInnovationHub.of(context)!.theme.secondaryColor();
+      return MzansiInnovationHub.of(context)!.theme.secondaryColor();
     } else {
-      return MzanziInnovationHub.of(context)!.theme.errorColor();
+      return MzansiInnovationHub.of(context)!.theme.errorColor();
     }
   }
 
@@ -269,7 +269,7 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
           child: SingleChildScrollView(
             child: Padding(
               padding:
-                  MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+                  MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                       ? EdgeInsets.symmetric(horizontal: width * 0.2)
                       : EdgeInsets.symmetric(horizontal: width * 0.075),
               child: Column(
@@ -282,7 +282,7 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                     ),
                   ),
                   Divider(
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor()),
                   const SizedBox(height: 10.0),
@@ -290,10 +290,10 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                     formKey: _formKey,
                     formFields: [
                       MihTextFormField(
-                        fillColor: MzanziInnovationHub.of(context)!
+                        fillColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        inputColor: MzanziInnovationHub.of(context)!
+                        inputColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         controller: nameController,
@@ -306,10 +306,10 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzanziInnovationHub.of(context)!
+                        fillColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        inputColor: MzanziInnovationHub.of(context)!
+                        inputColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         controller: typeController,
@@ -333,10 +333,10 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       // ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzanziInnovationHub.of(context)!
+                        fillColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        inputColor: MzanziInnovationHub.of(context)!
+                        inputColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         controller: emailController,
@@ -349,10 +349,10 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzanziInnovationHub.of(context)!
+                        fillColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        inputColor: MzanziInnovationHub.of(context)!
+                        inputColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         controller: contactController,
@@ -365,10 +365,10 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzanziInnovationHub.of(context)!
+                        fillColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        inputColor: MzanziInnovationHub.of(context)!
+                        inputColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         controller: websiteController,
@@ -383,10 +383,10 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       const SizedBox(height: 10.0),
                       MihTextFormField(
                         height: 250,
-                        fillColor: MzanziInnovationHub.of(context)!
+                        fillColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        inputColor: MzanziInnovationHub.of(context)!
+                        inputColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         controller: missionVisionController,
@@ -431,10 +431,10 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       const SizedBox(height: 10.0),
 
                       MihTextFormField(
-                        fillColor: MzanziInnovationHub.of(context)!
+                        fillColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        inputColor: MzanziInnovationHub.of(context)!
+                        inputColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         controller: regController,
@@ -447,10 +447,10 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzanziInnovationHub.of(context)!
+                        fillColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        inputColor: MzanziInnovationHub.of(context)!
+                        inputColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         controller: practiceNoController,
@@ -464,10 +464,10 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
 
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzanziInnovationHub.of(context)!
+                        fillColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        inputColor: MzanziInnovationHub.of(context)!
+                        inputColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         controller: vatNoController,
@@ -484,15 +484,16 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                         children: [
                           Flexible(
                             child: MihTextFormField(
-                              fillColor: MzanziInnovationHub.of(context)!
+                              fillColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .secondaryColor(),
-                              inputColor: MzanziInnovationHub.of(context)!
+                              inputColor: MzansiInnovationHub.of(context)!
                                   .theme
                                   .primaryColor(),
                               controller: locationController,
                               multiLineInput: false,
                               requiredText: true,
+                              readOnly: true,
                               hintText: "GPS Location",
                             ),
                           ),
@@ -519,14 +520,14 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                                 Navigator.of(context).pop();
                               });
                             },
-                            buttonColor: MzanziInnovationHub.of(context)!
+                            buttonColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
                             width: 100,
                             child: Text(
                               "Set",
                               style: TextStyle(
-                                color: MzanziInnovationHub.of(context)!
+                                color: MzansiInnovationHub.of(context)!
                                     .theme
                                     .primaryColor(),
                                 fontSize: 20,
@@ -548,7 +549,7 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                         ),
                       ),
                       Divider(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .secondaryColor()),
                       const SizedBox(height: 10.0),
@@ -565,10 +566,10 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzanziInnovationHub.of(context)!
+                        fillColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        inputColor: MzanziInnovationHub.of(context)!
+                        inputColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         controller: fnameController,
@@ -581,10 +582,10 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzanziInnovationHub.of(context)!
+                        fillColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        inputColor: MzanziInnovationHub.of(context)!
+                        inputColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         controller: lnameController,
@@ -618,14 +619,14 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                                   .formNotFilledCompletely(context);
                             }
                           },
-                          buttonColor: MzanziInnovationHub.of(context)!
+                          buttonColor: MzansiInnovationHub.of(context)!
                               .theme
                               .successColor(),
                           width: 300,
                           child: Text(
                             "Add",
                             style: TextStyle(
-                              color: MzanziInnovationHub.of(context)!
+                              color: MzansiInnovationHub.of(context)!
                                   .theme
                                   .primaryColor(),
                               fontSize: 20,

Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart

@@ -24,7 +24,7 @@ class MzansiProfileTile extends StatefulWidget {
 class _MzansiProfileTileState extends State<MzansiProfileTile> {
   @override
   Widget build(BuildContext context) {
-    // ImageProvider logo = MzanziInnovationHub.of(context)!.theme.logoImage();
+    // ImageProvider logo = MzansiInnovationHub.of(context)!.theme.logoImage();
     return MihPackageTile(
       onTap: () {
         Navigator.of(context).pushNamed(
@@ -38,12 +38,12 @@ class _MzansiProfileTileState extends State<MzansiProfileTile> {
       appName: "Mzansi Profile",
       appIcon: Icon(
         MihIcons.mihLogo,
-        color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     );
   }
 }

Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart

@@ -37,12 +37,12 @@ class _MzansiSetupProfileTileState extends State<MzansiSetupProfileTile> {
       appName: "Setup Profile",
       appIcon: Icon(
         MihIcons.profileSetup,
-        color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     );
   }
 }

Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart

@@ -54,7 +54,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
           alertIcon: Icon(
             Icons.warning_amber_rounded,
             size: 100,
-            color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+            color: MzansiInnovationHub.of(context)!.theme.errorColor(),
           ),
           alertTitle: "Too Slow, That Username is Taken",
           alertBody: const Text(
@@ -63,7 +63,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
               fontSize: 15,
             ),
           ),
-          alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(),
+          alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
         );
       },
     );
@@ -189,9 +189,9 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
 
   Color getPurposeLimitColor(int limit) {
     if (_counter.value <= limit) {
-      return MzanziInnovationHub.of(context)!.theme.secondaryColor();
+      return MzansiInnovationHub.of(context)!.theme.secondaryColor();
     } else {
-      return MzanziInnovationHub.of(context)!.theme.errorColor();
+      return MzansiInnovationHub.of(context)!.theme.errorColor();
     }
   }
 
@@ -206,7 +206,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
         },
         windowBody: Padding(
           padding:
-              MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+              MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                   ? EdgeInsets.symmetric(horizontal: width * 0.05)
                   : EdgeInsets.symmetric(horizontal: width * 0),
           child: Column(
@@ -222,11 +222,11 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                       editable: true,
                       fileNameController: proPicController,
                       userSelectedfile: proPic,
-                      frameColor: MzanziInnovationHub.of(context)!
+                      frameColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       backgroundColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       onChange: (selectedImage) {
                         setState(() {
                           proPic = selectedImage;
@@ -238,11 +238,11 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                   Visibility(
                     visible: false,
                     child: MihTextFormField(
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: proPicController,
                       multiLineInput: false,
                       requiredText: true,
@@ -253,9 +253,9 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                   const SizedBox(height: 10.0),
                   MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: usernameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -267,9 +267,9 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                   const SizedBox(height: 10.0),
                   MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: fnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -281,9 +281,9 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                   const SizedBox(height: 10.0),
                   MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: lnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -296,9 +296,9 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                   MihTextFormField(
                     height: 250,
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: purposeController,
                     multiLineInput: true,
                     requiredText: true,
@@ -343,9 +343,9 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                     hintText: "Activate Business Account",
                     initialPostion: businessUser,
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     secondaryFillColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     onChange: (value) {
                       setState(() {
                         businessUser = value;
@@ -364,12 +364,12 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                         }
                       },
                       buttonColor:
-                          MzanziInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.successColor(),
                       width: 300,
                       child: Text(
                         "Update",
                         style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           fontSize: 20,
@@ -442,7 +442,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
         MihSingleChildScroll(
           child: Padding(
             padding:
-                MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                     ? EdgeInsets.symmetric(horizontal: width * 0.2)
                     : EdgeInsets.symmetric(horizontal: width * 0.075),
             child: Column(
@@ -456,9 +456,9 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                     fileNameController: proPicController,
                     userSelectedfile: proPic,
                     frameColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     backgroundColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     onChange: (selectedImage) {
                       setState(() {
                         proPic = selectedImage;
@@ -474,7 +474,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                     style: TextStyle(
                       fontSize: 35,
                       fontWeight: FontWeight.bold,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -488,7 +488,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                     style: TextStyle(
                       fontSize: 25,
                       fontWeight: FontWeight.bold,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -500,7 +500,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                     style: TextStyle(
                       fontSize: 15,
                       fontWeight: FontWeight.bold,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -518,7 +518,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                       style: TextStyle(
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       ),
@@ -533,14 +533,14 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                       editProfileWindow(width);
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       widget.arguments.signedInUser.username.isEmpty
                           ? "Set Up Profile"
                           : "Edit Profile",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         fontSize: 20,
@@ -562,17 +562,17 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
               SpeedDialChild(
                 child: Icon(
                   Icons.edit,
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 ),
                 label: "Edit Profile",
                 labelBackgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 labelStyle: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   fontWeight: FontWeight.bold,
                 ),
                 backgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 onTap: () {
                   editProfileWindow(width);
                 },

Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile_view.dart

@@ -49,7 +49,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
     double profilePictureWidth = 150;
     return MihSingleChildScroll(
       child: Padding(
-        padding: MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+        padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
             ? EdgeInsets.symmetric(horizontal: width * 0.2)
             : EdgeInsets.symmetric(horizontal: width * 0.075),
         child: Column(
@@ -67,10 +67,10 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                         editable: false,
                         fileNameController: TextEditingController(),
                         userSelectedfile: file,
-                        frameColor: MzanziInnovationHub.of(context)!
+                        frameColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                        backgroundColor: MzanziInnovationHub.of(context)!
+                        backgroundColor: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         onChange: () {},
@@ -79,7 +79,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                       return Icon(
                         MihIcons.iDontKnow,
                         size: profilePictureWidth,
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                       );
@@ -88,7 +88,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                     return Icon(
                       MihIcons.mihRing,
                       size: profilePictureWidth,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     );
@@ -100,11 +100,11 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                   //     editable: false,
                   //     fileNameController: proPicController,
                   //     userSelectedfile: proPic,
-                  //     frameColor: MzanziInnovationHub.of(context)!
+                  //     frameColor: MzansiInnovationHub.of(context)!
                   //         .theme
                   //         .secondaryColor(),
                   //     backgroundColor:
-                  //         MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  //         MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   //     onChange: (selectedImage) {
                   //       setState(() {
                   //         proPic = selectedImage;
@@ -122,7 +122,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                   fontSize: 35,
                   fontWeight: FontWeight.bold,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
               ),
             ),
@@ -135,7 +135,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
               ),
             ),
@@ -146,7 +146,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                   fontSize: 15,
                   fontWeight: FontWeight.bold,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
               ),
             ),
@@ -163,7 +163,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                     fontSize: 15,
                     fontWeight: FontWeight.bold,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                 ),
               ),
@@ -175,7 +175,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
             //       // Connect with the user
             //     },
             //     buttonColor:
-            //         MzanziInnovationHub.of(context)!.theme.successColor(),
+            //         MzansiInnovationHub.of(context)!.theme.successColor(),
             //     width: 300,
             //     child: Text(
             //       widget.user.username.isEmpty
@@ -183,7 +183,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
             //           : "Edit Profile",
             //       style: TextStyle(
             //         color:
-            //             MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            //             MzansiInnovationHub.of(context)!.theme.primaryColor(),
             //         fontSize: 20,
             //         fontWeight: FontWeight.bold,
             //       ),

Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart

@@ -38,7 +38,7 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
           alertIcon: Icon(
             Icons.warning_amber_rounded,
             size: 100,
-            color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+            color: MzansiInnovationHub.of(context)!.theme.errorColor(),
           ),
           alertTitle:
               "Are you sure you want to permanently delete your MIH account?",
@@ -49,7 +49,7 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
                 "This action will remove all of your data, and it cannot be recovered. We understand this is a big decision, so please take a moment to double-check.\n\nIf you're certain, please confirm below. If you've changed your mind, you can simply close this window.",
                 style: TextStyle(
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   fontSize: 15,
                   fontWeight: FontWeight.bold,
                 ),
@@ -65,12 +65,12 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
                           widget.signedInUser.app_id, context);
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.errorColor(),
+                        MzansiInnovationHub.of(context)!.theme.errorColor(),
                     width: 300,
                     child: Text(
                       "Delete",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         fontSize: 20,
@@ -83,12 +83,12 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
                       Navigator.pop(context);
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Cancel",
                       style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                        color: MzansiInnovationHub.of(context)!
                             .theme
                             .primaryColor(),
                         fontSize: 20,
@@ -100,7 +100,7 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
               )
             ],
           ),
-          alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(),
+          alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
         );
       },
     );
@@ -113,7 +113,7 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
           Center(
             child: FaIcon(
               FontAwesomeIcons.trashCan,
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               size: 150,
             ),
           ),
@@ -124,7 +124,7 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
             style: TextStyle(
               fontSize: 18,
               fontWeight: FontWeight.bold,
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             ),
           ),
           const SizedBox(height: 10.0),
@@ -132,12 +132,12 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
             onPressed: () {
               deleteAccountPopUp(context);
             },
-            buttonColor: MzanziInnovationHub.of(context)!.theme.errorColor(),
+            buttonColor: MzansiInnovationHub.of(context)!.theme.errorColor(),
             width: 300,
             child: Text(
               "Delete Account",
               style: TextStyle(
-                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 fontSize: 20,
                 fontWeight: FontWeight.bold,
               ),

Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart

@@ -63,7 +63,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
         },
         windowBody: Padding(
           padding:
-              MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+              MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                   ? EdgeInsets.symmetric(horizontal: width * 0.05)
                   : EdgeInsets.symmetric(horizontal: width * 0),
           child: Column(
@@ -73,9 +73,9 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 formFields: [
                   MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: _nicknameController,
                     multiLineInput: false,
                     requiredText: false,
@@ -89,10 +89,10 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                     children: [
                       Flexible(
                         child: MihTextFormField(
-                          fillColor: MzanziInnovationHub.of(context)!
+                          fillColor: MzansiInnovationHub.of(context)!
                               .theme
                               .secondaryColor(),
-                          inputColor: MzanziInnovationHub.of(context)!
+                          inputColor: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           controller: _cardNumberController,
@@ -110,14 +110,14 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                         onPressed: () {
                           openscanner();
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                         width: 100,
                         child: Text(
                           "Scan",
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,
@@ -147,12 +147,12 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                         }
                       },
                       buttonColor:
-                          MzanziInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.successColor(),
                       width: 300,
                       child: Text(
                         "Update",
                         style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           fontSize: 20,
@@ -195,10 +195,10 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
       barrierDismissible: false,
       builder: (context) {
         return MihPackageAlert(
-          alertColour: MzanziInnovationHub.of(context)!.theme.successColor(),
+          alertColour: MzansiInnovationHub.of(context)!.theme.successColor(),
           alertIcon: Icon(
             Icons.favorite,
-            color: MzanziInnovationHub.of(context)!.theme.successColor(),
+            color: MzansiInnovationHub.of(context)!.theme.successColor(),
             size: 100,
           ),
           alertTitle: "Add to Favourites",
@@ -209,7 +209,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 style: TextStyle(
                   fontSize: 20,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
               ),
               const SizedBox(
@@ -229,13 +229,13 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                   );
                 },
                 buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 width: 300,
                 child: Text(
                   "Add",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -254,10 +254,10 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
       barrierDismissible: false,
       builder: (context) {
         return MihPackageAlert(
-          alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(),
+          alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
           alertIcon: Icon(
             Icons.favorite_border,
-            color: MzanziInnovationHub.of(context)!.theme.errorColor(),
+            color: MzansiInnovationHub.of(context)!.theme.errorColor(),
             size: 100,
           ),
           alertTitle: "Remove From Favourites",
@@ -268,7 +268,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 style: TextStyle(
                   fontSize: 20,
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 ),
               ),
               const SizedBox(
@@ -288,13 +288,13 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                   );
                 },
                 buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.errorColor(),
+                    MzansiInnovationHub.of(context)!.theme.errorColor(),
                 width: 300,
                 child: Text(
                   "Remove",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -328,24 +328,24 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 ? Icon(
                     Icons.favorite,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   )
                 : Icon(
                     Icons.favorite_border,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   ),
             label: widget.cardList[index].favourite == ""
                 ? "Add to Favourite"
                 : "Remove from Favourite",
             labelBackgroundColor:
-                MzanziInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.successColor(),
             labelStyle: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               fontWeight: FontWeight.bold,
             ),
             backgroundColor:
-                MzanziInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.successColor(),
             onTap: () {
               if (widget.cardList[index].favourite == "") {
                 addToFavCardWindow(context, index);
@@ -357,17 +357,17 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
           SpeedDialChild(
             child: Icon(
               Icons.edit,
-              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             ),
             label: "Edit Card Details",
             labelBackgroundColor:
-                MzanziInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.successColor(),
             labelStyle: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               fontWeight: FontWeight.bold,
             ),
             backgroundColor:
-                MzanziInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.successColor(),
             onTap: () {
               setState(() {
                 _cardNumberController.text = widget.cardList[index].card_number;
@@ -379,17 +379,17 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
           SpeedDialChild(
             child: Icon(
               Icons.delete,
-              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             ),
             label: "Delete Card",
             labelBackgroundColor:
-                MzanziInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.successColor(),
             labelStyle: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               fontWeight: FontWeight.bold,
             ),
             backgroundColor:
-                MzanziInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.successColor(),
             onTap: () {
               deleteCardWindow(context, index);
             },
@@ -427,7 +427,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                       height: 75,
                       // width: 300,
                       child: BarcodeWidget(
-                        //color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        //color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                         barcode: Barcode.code128(),
                         backgroundColor: Colors.white,
                         data: widget.cardList[index].card_number,
@@ -449,7 +449,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                         color: Colors.black,
                         fontSize: 25,
                         fontWeight: FontWeight.bold
-                        //MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        //MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                         ),
                   ),
                 ],
@@ -465,7 +465,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
   }
 
   double getHorizontalPaddingSize(Size screenSize) {
-    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
       return screenSize.width / 10;
     } else {
       return 20;
@@ -531,7 +531,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
       //   physics: const NeverScrollableScrollPhysics(),
       //   separatorBuilder: (BuildContext context, int index) {
       //     return Divider(
-      //       color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+      //       color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
       //     );
       //   },
       //   itemCount: widget.cardList.length,

Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart

@@ -105,7 +105,7 @@ class _MihBarcodeScannerState extends State<MihBarcodeScanner>
                   decoration: BoxDecoration(
                     border: Border.all(
                       width: 5,
-                      color: MzanziInnovationHub.of(context)!
+                      color: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                     ),
@@ -126,13 +126,13 @@ class _MihBarcodeScannerState extends State<MihBarcodeScanner>
                         Navigator.of(context).pop();
                       },
                       buttonColor:
-                          MzanziInnovationHub.of(context)!.theme.errorColor(),
+                          MzansiInnovationHub.of(context)!.theme.errorColor(),
                       width: 100,
                       height: 50,
                       child: Text(
                         "Cancel",
                         style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           fontSize: 20,

Frontend/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart

@@ -32,12 +32,12 @@ class _MihWalletTileState extends State<MihWalletTile> {
       appName: "Mzansi Wallet",
       appIcon: Icon(
         MihIcons.mzansiWallet,
-        color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     );
   }
 }

Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart

@@ -90,18 +90,18 @@ class _MihCardFavouritesState extends State<MihCardFavourites> {
         //           child: Icon(
         //             Icons.add,
         //             color:
-        //                 MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        //                 MzansiInnovationHub.of(context)!.theme.primaryColor(),
         //           ),
         //           label: "Add Loyalty Card",
         //           labelBackgroundColor:
-        //               MzanziInnovationHub.of(context)!.theme.successColor(),
+        //               MzansiInnovationHub.of(context)!.theme.successColor(),
         //           labelStyle: TextStyle(
         //             color:
-        //                 MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        //                 MzansiInnovationHub.of(context)!.theme.primaryColor(),
         //             fontWeight: FontWeight.bold,
         //           ),
         //           backgroundColor:
-        //               MzanziInnovationHub.of(context)!.theme.successColor(),
+        //               MzansiInnovationHub.of(context)!.theme.successColor(),
         //           onTap: () {
         //             // addCardWindow(context);
         //           },

Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart

@@ -102,7 +102,7 @@ class _MihCardsState extends State<MihCards> {
         },
         windowBody: Padding(
           padding:
-              MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+              MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                   ? EdgeInsets.symmetric(horizontal: width * 0.05)
                   : EdgeInsets.symmetric(horizontal: width * 0),
           child: Column(
@@ -187,9 +187,9 @@ class _MihCardsState extends State<MihCards> {
                   const SizedBox(height: 10),
                   MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: _nicknameController,
                     multiLineInput: false,
                     requiredText: false,
@@ -203,10 +203,10 @@ class _MihCardsState extends State<MihCards> {
                     children: [
                       Flexible(
                         child: MihTextFormField(
-                          fillColor: MzanziInnovationHub.of(context)!
+                          fillColor: MzansiInnovationHub.of(context)!
                               .theme
                               .secondaryColor(),
-                          inputColor: MzanziInnovationHub.of(context)!
+                          inputColor: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           controller: cardNumberController,
@@ -224,14 +224,14 @@ class _MihCardsState extends State<MihCards> {
                         onPressed: () {
                           openscanner();
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
                         width: 100,
                         child: Text(
                           "Scan",
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,
@@ -272,12 +272,12 @@ class _MihCardsState extends State<MihCards> {
                         }
                       },
                       buttonColor:
-                          MzanziInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.successColor(),
                       width: 300,
                       child: Text(
                         "Add",
                         style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           fontSize: 20,
@@ -341,9 +341,9 @@ class _MihCardsState extends State<MihCards> {
                   // prefixIcon: Icons.search,
                   prefixIcon: Icons.search,
                   fillColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   hintColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   onPrefixIconTap: () {
                     // print("Search Icon Pressed: ${cardSearchController.text}");
                   },
@@ -400,18 +400,18 @@ class _MihCardsState extends State<MihCards> {
                   child: Icon(
                     Icons.add,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   ),
                   label: "Add Loyalty Card",
                   labelBackgroundColor:
-                      MzanziInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.successColor(),
                   labelStyle: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     fontWeight: FontWeight.bold,
                   ),
                   backgroundColor:
-                      MzanziInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.successColor(),
                   onTap: () {
                     addCardWindow(context, width);
                   },

Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart

@@ -222,8 +222,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
           children: [
             MihTextFormField(
               fillColor:
-                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-              inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               controller: idController,
               multiLineInput: false,
               requiredText: true,
@@ -236,8 +236,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
             const SizedBox(height: 10.0),
             MihTextFormField(
               fillColor:
-                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-              inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               controller: fnameController,
               multiLineInput: false,
               requiredText: true,
@@ -250,8 +250,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
             const SizedBox(height: 10.0),
             MihTextFormField(
               fillColor:
-                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-              inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               controller: lnameController,
               multiLineInput: false,
               requiredText: true,
@@ -264,8 +264,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
             const SizedBox(height: 10.0),
             MihTextFormField(
               fillColor:
-                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-              inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
               controller: accessStatusController,
               multiLineInput: false,
               requiredText: true,
@@ -287,7 +287,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                     style: TextStyle(
                       fontWeight: FontWeight.bold,
                       color:
-                          MzanziInnovationHub.of(context)!.theme.errorColor(),
+                          MzansiInnovationHub.of(context)!.theme.errorColor(),
                     ),
                   ),
                   Text(
@@ -295,7 +295,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                     style: TextStyle(
                       fontWeight: FontWeight.normal,
                       color:
-                          MzanziInnovationHub.of(context)!.theme.errorColor(),
+                          MzansiInnovationHub.of(context)!.theme.errorColor(),
                     ),
                   ),
                   SizedBox(
@@ -305,7 +305,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                       style: TextStyle(
                         fontWeight: FontWeight.normal,
                         color:
-                            MzanziInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.errorColor(),
                       ),
                     ),
                   ),
@@ -316,7 +316,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                       style: TextStyle(
                         fontWeight: FontWeight.normal,
                         color:
-                            MzanziInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.errorColor(),
                       ),
                     ),
                   ),
@@ -327,7 +327,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                       style: TextStyle(
                         fontWeight: FontWeight.normal,
                         color:
-                            MzanziInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.errorColor(),
                       ),
                     ),
                   ),
@@ -336,7 +336,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                     style: TextStyle(
                       fontWeight: FontWeight.bold,
                       color:
-                          MzanziInnovationHub.of(context)!.theme.errorColor(),
+                          MzansiInnovationHub.of(context)!.theme.errorColor(),
                     ),
                   ),
                 ],
@@ -369,14 +369,14 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                             noAccessWarning();
                           }
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .successColor(),
                         width: 300,
                         child: Text(
                           "View Profile",
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,
@@ -405,14 +405,14 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                             context,
                           );
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .successColor(),
                         width: 300,
                         child: Text(
                           "Request Access",
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,
@@ -439,14 +439,14 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                             context,
                           );
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .successColor(),
                         width: 300,
                         child: Text(
                           "Re-apply",
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,
@@ -488,7 +488,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
           Text(
             "$firstLetterFName$fnameStar $firstLetterLName$lnameStar",
             style: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
             ),
           ),
           const SizedBox(
@@ -496,7 +496,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
           ),
           Icon(
             Icons.star_border_rounded,
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           ),
         ],
       );
@@ -504,7 +504,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
       return Text(
         "$firstLetterFName$fnameStar $firstLetterLName$lnameStar",
         style: TextStyle(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         ),
       );
     }
@@ -518,7 +518,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         subtitle: Text(
           "ID No.: ${widget.patients[index].id_no}\nMedical Aid No.: $medAidNoStar",
           style: TextStyle(
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           ),
         ),
         onTap: () {
@@ -533,7 +533,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         },
         trailing: Icon(
           Icons.arrow_forward,
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         ),
       );
     } else {
@@ -542,7 +542,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         subtitle: Text(
           "ID No.: ${widget.patients[index].id_no}\nMedical Aid No.: $medAidNoStar",
           style: TextStyle(
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
           ),
         ),
         onTap: () {
@@ -556,7 +556,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         },
         trailing: Icon(
           Icons.add,
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         ),
       );
     }
@@ -580,7 +580,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         );
       },
       itemCount: widget.patients.length,

Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_my_patient_list_list.dart

@@ -99,7 +99,7 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
         },
         windowBody: Padding(
           padding:
-              MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+              MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                   ? EdgeInsets.symmetric(horizontal: width * 0.056)
                   : const EdgeInsets.symmetric(horizontal: 0),
           child: Column(
@@ -109,9 +109,9 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                 formFields: [
                   MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: idController,
                     multiLineInput: false,
                     requiredText: true,
@@ -124,9 +124,9 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                   const SizedBox(height: 10.0),
                   MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: fnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -139,9 +139,9 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                   const SizedBox(height: 10.0),
                   MihTextFormField(
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     inputColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     controller: lnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -191,12 +191,12 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                         }
                       },
                       buttonColor:
-                          MzanziInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.successColor(),
                       width: 300,
                       child: Text(
                         "Book Appointment",
                         style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           fontSize: 20,
@@ -263,16 +263,16 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
         },
         windowBody: Padding(
           padding:
-              MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+              MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                   ? EdgeInsets.symmetric(horizontal: width * 0.05)
                   : const EdgeInsets.symmetric(horizontal: 0),
           child: Column(
             children: [
               MihTextFormField(
                 fillColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 inputColor:
-                    MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 controller: idController,
                 multiLineInput: false,
                 requiredText: true,
@@ -285,9 +285,9 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
               const SizedBox(height: 10.0),
               MihTextFormField(
                 fillColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 inputColor:
-                    MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 controller: fnameController,
                 multiLineInput: false,
                 requiredText: true,
@@ -300,9 +300,9 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
               const SizedBox(height: 10.0),
               MihTextFormField(
                 fillColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 inputColor:
-                    MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 controller: lnameController,
                 multiLineInput: false,
                 requiredText: true,
@@ -323,12 +323,12 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                         appointmentPopUp(index, width);
                       },
                       buttonColor:
-                          MzanziInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.successColor(),
                       width: 300,
                       child: Text(
                         "Book Appointment",
                         style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           fontSize: 20,
@@ -348,14 +348,14 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                                   "business",
                                 ));
                       },
-                      buttonColor: MzanziInnovationHub.of(context)!
+                      buttonColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       width: 300,
                       child: Text(
                         "View Medical Records",
                         style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
                           fontSize: 20,
@@ -387,7 +387,7 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.successColor()));
+              color: MzansiInnovationHub.of(context)!.theme.successColor()));
     } else if (access == "PENDING") {
       firstName = "${widget.patientAccesses[index].fname[0]}********";
       lastName = "${widget.patientAccesses[index].lname[0]}********";
@@ -395,21 +395,21 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
           text: "$access\n",
           style: TextStyle(
               color:
-                  MzanziInnovationHub.of(context)!.theme.messageTextColor()));
+                  MzansiInnovationHub.of(context)!.theme.messageTextColor()));
     } else {
       firstName = "${widget.patientAccesses[index].fname[0]}********";
       lastName = "${widget.patientAccesses[index].lname[0]}********";
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzanziInnovationHub.of(context)!.theme.errorColor()));
+              color: MzansiInnovationHub.of(context)!.theme.errorColor()));
     }
 
     return ListTile(
       title: Text(
         "$firstName $lastName",
         style: TextStyle(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         ),
       ),
       subtitle: RichText(
@@ -438,7 +438,7 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
       },
       trailing: Icon(
         Icons.arrow_forward,
-        color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
       ),
     );
   }
@@ -461,7 +461,7 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         );
       },
       itemCount: widget.patientAccesses.length,

Frontend/lib/mih_packages/patient_profile/pat_manager/package_tiles/pat_manager_tile.dart

@@ -30,12 +30,12 @@ class _PatManagerTileState extends State<PatManagerTile> {
       appName: "Patient Manager",
       appIcon: Icon(
         MihIcons.patientManager,
-        color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
     );
   }
 }

Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart

@@ -48,8 +48,8 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
             controller: _mihPatientSearchController,
             hintText: "Search Patient ID/ Aid No.",
             prefixIcon: Icons.search,
-            fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-            hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             onPrefixIconTap: () {
               submitPatientSearch();
             },
@@ -91,7 +91,7 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
                   style: TextStyle(
                       fontSize: 25,
                       color:
-                          MzanziInnovationHub.of(context)!.theme.errorColor()),
+                          MzansiInnovationHub.of(context)!.theme.errorColor()),
                   textAlign: TextAlign.center,
                 ),
               );
@@ -133,7 +133,7 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
             style: TextStyle(
                 fontSize: 25,
                 color:
-                    MzanziInnovationHub.of(context)!.theme.messageTextColor()),
+                    MzansiInnovationHub.of(context)!.theme.messageTextColor()),
             textAlign: TextAlign.center,
           ),
         ),
@@ -147,7 +147,7 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
             style: TextStyle(
                 fontSize: 25,
                 color:
-                    MzanziInnovationHub.of(context)!.theme.messageTextColor()),
+                    MzansiInnovationHub.of(context)!.theme.messageTextColor()),
             textAlign: TextAlign.center,
           ),
         ),

Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart

@@ -49,8 +49,8 @@ class _MyPatientListState extends State<MyPatientList> {
             controller: _myPatientSearchController,
             hintText: "Search Patient ID",
             prefixIcon: Icons.search,
-            fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-            hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             onPrefixIconTap: () {
               setState(() {
                 _myPatientIdSearchString = _myPatientSearchController.text;
@@ -94,7 +94,7 @@ class _MyPatientListState extends State<MyPatientList> {
                   style: TextStyle(
                       fontSize: 25,
                       color:
-                          MzanziInnovationHub.of(context)!.theme.errorColor()),
+                          MzansiInnovationHub.of(context)!.theme.errorColor()),
                   textAlign: TextAlign.center,
                 ),
               );
@@ -121,7 +121,7 @@ class _MyPatientListState extends State<MyPatientList> {
           "No Patients matching search",
           style: TextStyle(
               fontSize: 25,
-              color: MzanziInnovationHub.of(context)!.theme.messageTextColor()),
+              color: MzansiInnovationHub.of(context)!.theme.messageTextColor()),
           textAlign: TextAlign.center,
         ),
       ),

Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart

@@ -80,7 +80,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
                     });
                   }),
               // Divider(
-              //   color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
               // ),
               Row(
                 mainAxisSize: MainAxisSize.max,
@@ -104,7 +104,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
                               "Error pulling appointments",
                               style: TextStyle(
                                   fontSize: 25,
-                                  color: MzanziInnovationHub.of(context)!
+                                  color: MzansiInnovationHub.of(context)!
                                       .theme
                                       .errorColor()),
                               textAlign: TextAlign.center,
@@ -127,17 +127,17 @@ class _WaitingRoomState extends State<WaitingRoom> {
               SpeedDialChild(
                 child: Icon(
                   Icons.add,
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 ),
                 label: "Add Appointment",
                 labelBackgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 labelStyle: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
                   fontWeight: FontWeight.bold,
                 ),
                 backgroundColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 onTap: () {
                   // addAppointmentWindow();
                   appointmentTypeSelection(width);
@@ -177,7 +177,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
             "No Appointments for $selectedDay",
             style: TextStyle(
               fontSize: 25,
-              color: MzanziInnovationHub.of(context)!.theme.messageTextColor(),
+              color: MzansiInnovationHub.of(context)!.theme.messageTextColor(),
             ),
             textAlign: TextAlign.center,
             softWrap: true,
@@ -211,7 +211,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
                 question,
                 style: TextStyle(
                     fontSize: 20,
-                    color: MzanziInnovationHub.of(context)!
+                    color: MzansiInnovationHub.of(context)!
                         .theme
                         .secondaryColor()),
                 textAlign: TextAlign.left,
@@ -223,13 +223,13 @@ class _WaitingRoomState extends State<WaitingRoom> {
                   Navigator.of(context).pop();
                 },
                 buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 width: 300,
                 child: Text(
                   "Existing Patient",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -242,13 +242,13 @@ class _WaitingRoomState extends State<WaitingRoom> {
                   Navigator.of(context).pop();
                 },
                 buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 width: 300,
                 child: Text(
                   "Existing MIH User",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -261,13 +261,13 @@ class _WaitingRoomState extends State<WaitingRoom> {
                   addAppointmentWindow(width);
                 },
                 buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.successColor(),
                 width: 300,
                 child: Text(
                   "Skeleton Appointment",
                   style: TextStyle(
                     color:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -298,7 +298,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
           },
           windowBody: Padding(
             padding:
-                MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                     ? EdgeInsets.symmetric(horizontal: width * 0.05)
                     : const EdgeInsets.symmetric(horizontal: 0),
             child: Column(
@@ -307,11 +307,11 @@ class _WaitingRoomState extends State<WaitingRoom> {
                   formKey: _formKey,
                   formFields: [
                     MihTextFormField(
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: _appointmentTitleController,
                       multiLineInput: false,
                       requiredText: true,
@@ -341,11 +341,11 @@ class _WaitingRoomState extends State<WaitingRoom> {
                     const SizedBox(height: 10),
                     MihTextFormField(
                       height: 250,
-                      fillColor: MzanziInnovationHub.of(context)!
+                      fillColor: MzansiInnovationHub.of(context)!
                           .theme
                           .secondaryColor(),
                       inputColor:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       controller: _appointmentDescriptionIDController,
                       multiLineInput: true,
                       requiredText: true,
@@ -364,14 +364,14 @@ class _WaitingRoomState extends State<WaitingRoom> {
                             MihAlertServices().formNotFilledCompletely(context);
                           }
                         },
-                        buttonColor: MzanziInnovationHub.of(context)!
+                        buttonColor: MzansiInnovationHub.of(context)!
                             .theme
                             .successColor(),
                         width: 300,
                         child: Text(
                           "Add",
                           style: TextStyle(
-                            color: MzanziInnovationHub.of(context)!
+                            color: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             fontSize: 20,

Frontend/lib/mih_packages/patient_profile/pat_profile/add_or_view_patient.dart

@@ -90,7 +90,7 @@ class _AddOrViewPatientState extends State<AddOrViewPatient> {
           loading = Container(
             width: width,
             height: height,
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
             child: const Mihloadingcircle(),
           );
 

Frontend/lib/mih_packages/patient_profile/pat_profile/components/claim_statement_window.dart

@@ -83,7 +83,7 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
 
   Widget getWindowBody(double width) {
     return Padding(
-      padding: MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+      padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
           ? EdgeInsets.symmetric(horizontal: width * 0.05)
           : const EdgeInsets.symmetric(horizontal: 0),
       child: Column(
@@ -95,9 +95,9 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
                 controller: _docTypeController,
                 hintText: "Document Type",
                 fillColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 secondaryFillColor:
-                    MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 requiredText: true,
                 radioOptions: const ["Claim", "Statement"],
               ),
@@ -110,13 +110,13 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                 ),
               ),
               Divider(
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor()),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor()),
               const SizedBox(height: 10),
               MihDateField(
                 controller: _serviceDateController,
@@ -131,9 +131,9 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
                 controller: _serviceDescController,
                 hintText: "Serviced Description",
                 fillColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 secondaryFillColor:
-                    MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 requiredText: true,
                 radioOptions: const [
                   "Consultation",
@@ -155,10 +155,10 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
                             key: const ValueKey('consultation_type_dropdown'),
                             controller: _serviceDescOptionsController,
                             hintText: "Consultation Type",
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            secondaryFillColor: MzanziInnovationHub.of(context)!
+                            secondaryFillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             requiredText: true,
@@ -180,10 +180,10 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
                           MihTextFormField(
                             key: const ValueKey(
                                 'procedure_name_field'), // Added key
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: _prcedureNameController,
@@ -198,10 +198,10 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
                           MihTextFormField(
                             key: const ValueKey(
                                 'procedure_additional_info_field'), // Added key
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: _proceedureAdditionalInfoController,
@@ -223,10 +223,10 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
                           MihTextFormField(
                             key: const ValueKey(
                                 'other_service_description_field'), // Added key
-                            fillColor: MzanziInnovationHub.of(context)!
+                            fillColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .secondaryColor(),
-                            inputColor: MzanziInnovationHub.of(context)!
+                            inputColor: MzansiInnovationHub.of(context)!
                                 .theme
                                 .primaryColor(),
                             controller: _serviceDescOptionsController,
@@ -256,7 +256,7 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
                         style: TextStyle(
                           fontSize: 18,
                           fontWeight: FontWeight.bold,
-                          color: MzanziInnovationHub.of(context)!
+                          color: MzansiInnovationHub.of(context)!
                               .theme
                               .secondaryColor(),
                         )),
@@ -267,9 +267,9 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
                     hintText: "ICD-10 Search",
                     prefixIcon: Icons.search,
                     fillColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                     hintColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
                     onPrefixIconTap: () {
                       MIHIcd10CodeApis.getIcd10Codes(
                               _icd10CodeController.text, context)
@@ -287,9 +287,9 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
               const SizedBox(height: 10),
               MihTextFormField(
                 fillColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 inputColor:
-                    MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 controller: _amountController,
                 multiLineInput: false,
                 requiredText: true,
@@ -308,19 +308,19 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
                     color:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                   ),
                 ),
               ),
               Divider(
                   color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor()),
+                      MzansiInnovationHub.of(context)!.theme.secondaryColor()),
               const SizedBox(height: 10),
               MihTextFormField(
                 fillColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
                 inputColor:
-                    MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.primaryColor(),
                 controller: _preauthNoController,
                 multiLineInput: false,
                 requiredText: false,
@@ -384,13 +384,13 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
                     }
                   },
                   buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.successColor(),
                   width: 300,
                   child: Text(
                     "Generate",
                     style: TextStyle(
                       color:
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),